From bd1944e4843fe6375e493dd56d207a735a1f8e83 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 8 Nov 2019 13:47:33 +0100
Subject: [PATCH] cargo: update to 0.40.0

---
 srcpkgs/cargo/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 584ca07efe2..008ba9e3bde 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.39.0
+version=0.40.0
 revision=1
 wrksrc="cargo-${version}"
 build_helper=rust
@@ -11,10 +11,11 @@ short_desc="Rust package manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
+_libgit2_ver=0.9.1
 distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
- https://github.com/rust-lang/git2-rs/archive/libgit2-sys-0.8.2.tar.gz"
-checksum="1fade63d5c09eab6fa234a1fdf64693ccf1b63398a316ad27edeb1f76ee4a57e
- c6597bcdc2be7a2fd70c1bb8fdc75883ca5df6aea33f0354c5a8124eacc0938b"
+ https://github.com/rust-lang/git2-rs/archive/libgit2-sys-${_libgit2_ver}.tar.gz"
+checksum="b0a6808a2eaa9b20ccaeedeb04f583ee34b33d289f4d0076044b9fc2b1f4c59d
+ 81e20fa9a0f6ea3e3a0e6458148f3dea4a89af87d34128d4375f2b7fd661a49c"
 _cargo_dist_version=0.39.0
 build_options="static"
 
@@ -79,8 +80,8 @@ post_extract() {
 		cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo
 	fi
 
-	# need this for the patch to work
-	cp -R ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-0.8.2/libgit2-sys .
+	mv ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-${_libgit2_ver} .
+	mv git2-rs-libgit2-sys-${_libgit2_ver}/libgit2-sys .
 }
 
 post_patch() {
@@ -110,6 +111,9 @@ do_build() {
 		cargo="./cargo"
 	fi
 
+	# gotta pin out libgit2-sys at the version
+	$cargo update
+	$cargo update --package libgit2-sys --precise ${_libgit2_ver}
 	$cargo build --release $(vopt_if static --features="all-static")
 }