From 3965e0b37088eda04ee75868a3d8e9dcdd800224 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Thu, 6 Dec 2018 17:31:32 +0100
Subject: [PATCH] rust: update to 1.31.0.

[ci skip]
---
 srcpkgs/rust/template | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 9cdc040f1e6..4393960039b 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,9 +1,9 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.30.1
+version=1.31.0
 revision=1
-_rust_dist_version=1.30.1
-_cargo_dist_version=0.31.0
+_rust_dist_version=1.31.0
+_cargo_dist_version=0.32.0
 # NB. if you push any(!) new version, don't forget to put a build
 # output of musl to https://alpha.de.repo.voidlinux.org/distfiles/
 wrksrc="rustc-${version}-src"
@@ -19,9 +19,12 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="https://www.rust-lang.org/"
 license="MIT, Apache-2.0"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=36a38902dbd9a3e1240d46ab0f2ca40d2fd07c2ab6508ed7970c6c4c036b5b29
+checksum=9ad54dc0baf1db5fc6a79d54e71c439c82aff85cd96778978456f2958211ef06
 
 if [ "$CROSS_BUILD" ]; then
+
+	broken="build non-cross first"
+
 	hostmakedepends+=" cargo llvm"
 
 	# These are required for building the buildhost's stage0/1
@@ -34,11 +37,11 @@ else
 		distfiles+="
 		 https://alpha.de.repo.voidlinux.org/distfiles/rustc-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz
 		 https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz
-		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl-libressl-2.8.tar.gz"
+		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum+="
-		 44abd56868e63447c43eb8644847d14662f57f2aa65342147432dc89fc4c94aa
-		 341fb3dee37eae8235b6193110f84bb2915c08b451d228532b4f1d80366afe9b
-		 61d72ac378f3ee592cd3c82b02518f717bfcf328946ad4a51d24a2dac546c1cb"
+		 7ca7360b9243b7117bbb5281b563fdf2bfae61d223ad858199aabc438c828926
+		 b5cadf379e82905459dea5359c7111b30cfbba33a17b6960e3beb72ce79b7db9
+		 4dfb1cca7730b38920c04731be0e9d47ec520b3365059b4ccd9c0948346787ea"
 		;;
 	x86_64)
 		# extract from src/stage0.txt
@@ -47,9 +50,9 @@ else
 		 https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
 		 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz"
 		checksum+="
-		 d84de208499b59e4a3c074f9f3f2fcbb26fb20d6bfd19262e6d5f4181ddbe34d
-		 12c4b164efed44c28096fcd141225ee9bf74e7e3395bc6a60c11c9115a0536c6
-		 21ef918ba8970815856ef2764ad1b377a2d4868bed96340ac05d7fe62f8cf952"
+		 5c4581f0fc05f0f5076db6231b0c1a4d27eb61c0b36bfb42d97243ad8f4e43a0
+		 fe67a62c7a63acbf2458a36d7689ef41903187a472f0c28850f1fca7ea478da8
+		 c5e0db9d19ed3490b94893883115c5f4e5fa1c958422d234a7c6c9e78f6d216f"
 		;;
 	i686)
 		# extract from src/stage0.txt
@@ -58,9 +61,9 @@ else
 		 https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
 		 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz"
 		checksum+="
-		7259121446e2ef579f2a3ed24c8a54a85a2a1a8d5ff517a0249ba3639ee989cf
-		88aadaf4dd4fdf565a72ec822e08de5c6a72d3784fc378b82689f2843f8da874
-		642e298e1431a9d65559a3bae9c4e1dab79816577b7b3c1f35e28c5621878165"
+		 549116e23dce8687f69327f5ea2c717c93175d24d82d456fab37160f800f8ce8
+		 14de38321f6f2c64496e77bac793ad5511d37696b9c33283bb6f395dc590c4d9
+		 7c903dd340f84e7e02428a7042f22f1830114cef0403f2c20027d087a2ba09f6"
 		;;
 	esac
 fi