From f50c36e2ed3bf7699835f87ad961f121d544b1f3 Mon Sep 17 00:00:00 2001
From: johannes <johannes.brechtmann@gmail.com>
Date: Sun, 25 Feb 2018 18:38:17 +0100
Subject: [PATCH] rust: update to 1.24.0.

Closes: #11888 [via git-merge-pr]
---
 srcpkgs/rust/patches/llvm-with-ffi.patch |  2 +-
 srcpkgs/rust/template                    | 38 +++++++++++++-----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/rust/patches/llvm-with-ffi.patch b/srcpkgs/rust/patches/llvm-with-ffi.patch
index 42e1b5fea2..f357317d9b 100644
--- a/srcpkgs/rust/patches/llvm-with-ffi.patch
+++ b/srcpkgs/rust/patches/llvm-with-ffi.patch
@@ -5,5 +5,5 @@
      }
  }
 +
-+#[link(name = "ffi")]                  
++#[link(name = "ffi")]
 +extern {}
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 11d920000b..31d87ad255 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,8 +1,10 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.23.0
+version=1.24.0
 revision=1
-_date=2018-01-02
+_date=2018-01-04
+_rust_dist_version=1.23.0
+_cargo_dist_version=0.24.0
 # NB. if you push any(!) new version, don't forget to put a build
 # output of musl to https://repo.voidlinux.eu/distfiles/
 wrksrc="rustc-${version}-src"
@@ -18,40 +20,40 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://www.rust-lang.org/"
 license="MIT, Apache-2.0"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5cb4eb2fe146cb91
+checksum=bb8276f6044e877e447f29f566e4bbf820fa51fea2f912d59b73233ffd95639f
 
 case "$XBPS_MACHINE" in
 x86_64-musl)
 	hostmakedepends+=" libcurl libgit2"
 	distfiles+="
-	 https://repo.voidlinux.eu/distfiles/rustc-1.22.1-x86_64-unknown-linux-musl.tar.gz
-	 https://repo.voidlinux.eu/distfiles/rust-std-1.22.1-x86_64-unknown-linux-musl.tar.gz
-	 https://repo.voidlinux.eu/distfiles/cargo-0.24.0-x86_64-unknown-linux-musl.tar.gz"
+	 https://repo.voidlinux.eu/distfiles/rustc-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/rust-std-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.gz
+	 https://repo.voidlinux.eu/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.gz"
 	checksum+="
-	 2a2a807a11bc41dd52649edcd2e96552694f037b478066f5b96dc02d70159f05
-	 0eb41deb30ce8158077adb291e49cdd3447f0949c5827858ce022462825b36fc
+	 4a82a9a401013d768456beee2eb2a7d5bdd4a82188acab3979eea48380033035
+	 dc4dbdac7d56ecce232d290059f7456c6d7507ec6c2bd09d31aa095c96405b8c
 	 8a784a2318eea7bfd7db7d854f51dc31a25ed866757bc948babbb8edb3ba41a0"
 	;;
 x86_64)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-x86_64-unknown-linux-gnu.tar.gz
-	 https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-x86_64-unknown-linux-gnu.tar.gz
-	 https://dev-static.rust-lang.org/dist/${_date}/cargo-0.24.0-x86_64-unknown-linux-gnu.tar.xz"
+	 https://static.rust-lang.org/dist/${_date}/rustc-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/${_date}/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/${_date}/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 a54835b06f960cb04507136a6491e561271374701bc38a8e8fd085f9e78e12e6
-	 c065c4958444955968aae60a3724bea177ddabf364c5b8cf29a08dd5d1e7df6f
+	 27b124fd0d94c082978ff81e45f7b7c37e91d64714587829bf828d64d76524ee
+	 83c7351bdc4326caf785c208cff86682825dad4a89ccee705fa05f55ce7bd25b
 	 93b953c8c7a2088aef952de8dccd7f6ccf9b21bf94b735d3909961ffe831da8c"
 	;;
 i686)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-i686-unknown-linux-gnu.tar.gz
-	 https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-i686-unknown-linux-gnu.tar.gz
-	 https://dev-static.rust-lang.org/dist/${_date}/cargo-0.24.0-i686-unknown-linux-gnu.tar.xz"
+	 https://static.rust-lang.org/dist/${_date}/rustc-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/${_date}/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/${_date}/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 fb5d94ccdfa5d60ca35b7aa8b2f60b82a2e1c67ae41acc3744549eaebd1f1ddf
-	 5ec4414598cfbba4114a343911042c8f01b6284cab386e52bd37c0adea56582b
+	 bbfd1267f57e70c7e6d3b65e7b5d577c97e647b4326abc890d84acc236a6fc47
+	 e39b3a60898026ad01bdb136e0a58a02a9da61dbbfb348661e6fe199923617a9
 	 6ffc847e0ee2a1273223ce500f7b212d051e99a6d234e34585d0c55e21a963ea"
 	;;
 esac