From 5fd32cd379edf85c30b83e2885dccfbcb9e2ed51 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Sat, 24 Dec 2016 17:00:54 +0100
Subject: [PATCH] cargo: update to 0.15.0.

---
 srcpkgs/cargo/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 8cdf2a183ba..12aa9ffb0b3 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.14.0
+version=0.15.0
 revision=1
-_githash_installer=755bc3db4ff795865ea31b5b4f38ac920d8acacb
+_githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf
 patch_args="-Np1"
 build_style=gnu-configure
 make_build_args="VERBOSE=1"
@@ -15,8 +15,8 @@ license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz
  https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz"
-checksum="90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531
- 2cf7a1b8920970b163bc9968685cd32234b7785a6d057a0d3b0d043110de81c7"
+checksum="6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64
+ dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae"
 nocross=yes
 
 case "$XBPS_MACHINE" in
@@ -28,9 +28,9 @@ x86_64-musl)
         ;;
 x86_64)
         distfiles+="  
-         https://static.rust-lang.org/cargo-dist/2016-07-05/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
+	 https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
         checksum+="
-         cf47787fd50bf6c7f68db290eab054e493e4619d42a8faf66565431449055f1c"
+         55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2"
         ;;
 esac
 
@@ -39,15 +39,18 @@ post_extract() {
 	mv ../rust-installer-${_githash_installer} src/rust-installer
 	sed -i 's,/etc/bash_completion.d,/share/bash-completion/completions,g' Makefile.in
 	mkdir -p target/snapshot
-	mv ../cargo-nightly*/cargo/* target/snapshot
-	sed -i '/dl-snapshot/d' Makefile.in
+	cp ../cargo-nightly*/cargo/bin/cargo cargo
+	rm Cargo.lock  # unlock rust-openssl 0.9.4
 }
 pre_configure() {
-	configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-}"
+	configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-} --cargo=$wrksrc/cargo"
 	sed -i '/not recognized/s/err/warn/' configure
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes
 	export CARGO_HOME="${wrksrc}/.cargo"
 }
+pre_build() {
+	export LIBGIT2_SYS_USE_PKG_CONFIG=yes
+}
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/rustlib ${DESTDIR}/usr/share/doc/cargo
 	vlicense LICENSE-APACHE