From fdf584faae5bf35573efb88a47c19738003cac88 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Mon, 12 Nov 2018 21:11:03 +0100
Subject: [PATCH] rust: update to 1.30.1.

[ci skip]
---
 srcpkgs/rust/template | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index b5edb7d00a8..09ba2c3e370 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,8 +1,8 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.30.0
+version=1.30.1
 revision=1
-_rust_dist_version=1.29.2
+_rust_dist_version=1.30.1
 _cargo_dist_version=0.31.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/
@@ -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=cd0ba83fcca55b64c0c9f23130fe731dfc1882b73ae21bef96be8f2362c108ee
+checksum=36a38902dbd9a3e1240d46ab0f2ca40d2fd07c2ab6508ed7970c6c4c036b5b29
 
 if [ "$CROSS_BUILD" ]; then
+
+	broken="do native builds first"
+
 	hostmakedepends+=" cargo llvm"
 
 	# These are required for building the buildhost's stage0/1
@@ -36,8 +39,8 @@ else
 		 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"
 		checksum+="
-		 9550baae3d2848a881b9e42b4dd8d798615271843bc56ae1f34cdf5f946daae2
-		 ded98b3ba0938715c1fe02812628bc0239c07109248f8d73889af9e8866fd776
+		 44abd56868e63447c43eb8644847d14662f57f2aa65342147432dc89fc4c94aa
+		 341fb3dee37eae8235b6193110f84bb2915c08b451d228532b4f1d80366afe9b
 		 61d72ac378f3ee592cd3c82b02518f717bfcf328946ad4a51d24a2dac546c1cb"
 		;;
 	x86_64)
@@ -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+="
-		 b04146b09edc4bad0de7c8fa1a5a2aa4416d365c03c5962b8a5b26c7047b7cc9
-		 1fe9a0f354256483a354ee1b51c60bf9f3f48868581f7cb36d0cc51a82400605
-		 391518dab2831a90851158cbace4362fb85ad909483ed08dad0c8a11bbe6bee8"
+		 d84de208499b59e4a3c074f9f3f2fcbb26fb20d6bfd19262e6d5f4181ddbe34d
+		 12c4b164efed44c28096fcd141225ee9bf74e7e3395bc6a60c11c9115a0536c6
+		 21ef918ba8970815856ef2764ad1b377a2d4868bed96340ac05d7fe62f8cf952"
 		;;
 	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+="
-		9309858b2f6f194c5a440ca163782b45b7f9f11351c2e0e1745dfdf2416aba40
-		d2958af5d99f1d0bd2751afe7eebce7dab24da6794be3096e1c45e98c7be7f40
-		800a5d9f8784231541e1a31612568951e9b3607f07fa11c728fb288aeafba000"
+		7259121446e2ef579f2a3ed24c8a54a85a2a1a8d5ff517a0249ba3639ee989cf
+		88aadaf4dd4fdf565a72ec822e08de5c6a72d3784fc378b82689f2843f8da874
+		642e298e1431a9d65559a3bae9c4e1dab79816577b7b3c1f35e28c5621878165"
 		;;
 	esac
 fi
@@ -78,7 +81,9 @@ post_extract() {
 
 	if [ -z "$CROSS_BUILD" ]; then
 		mkdir -p stage0
+		rm ../rustc-*/rustc/manifest.in
 		cp -bflr ../rustc-*/rustc/* stage0
+		rm ../rust-std-*/rust-std-*/manifest.in
 		cp -bflr ../rust-std-*/rust-std-*/* stage0
 		case "$XBPS_MACHINE" in
 			*-musl) cp -bflr ../cargo stage0/bin;;