[patch] patch for dev-util/cargo ebuild using new eclass

cargo-0.16.0.ebuild.patch (text/plain), 2.55 KB, created by Marcus Comstedt on 2017-02-23 13:48:50 UTC

--- /usr/portage/dev-util/cargo/cargo-0.16.0.ebuild	2017-02-02 21:40:08.000000000 +0100
+++ /usr/local/portage/dev-util/cargo/cargo-0.16.0.ebuild	2017-02-23 11:34:44.063841694 +0100
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-CARGO_SNAPSHOT_DATE="2016-09-01"
+CARGO_SNAPSHOT_DATE="2016-11-28"
 CRATES="
 advapi32-sys-0.2.0
 aho-corasick-0.5.3
@@ -78,20 +78,13 @@
 ws2_32-sys-0.2.1
 "
 
-inherit cargo bash-completion-r1
+inherit cargo bash-completion-r1 rust-toolchain
 
 DESCRIPTION="The Rust's package manager"
 HOMEPAGE="http://crates.io"
 SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-i686-unknown-linux-gnu.tar.gz ->
-		cargo-snapshot-x86-${CARGO_SNAPSHOT_DATE}.tar.gz
-	)
-	amd64? (
-		https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz ->
-		cargo-snapshot-amd64-${CARGO_SNAPSHOT_DATE}.tar.gz
-	)"
+	$(rust_all_arch_uris https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly cargo-snapshot-${CARGO_SNAPSHOT_DATE})"
 
 RESTRICT="mirror"
 LICENSE="|| ( MIT Apache-2.0 )"
@@ -117,23 +110,15 @@
 	sys-apps/sed"
 
 src_configure() {
-	# Cargo only supports these GNU triples:
-	# - Linux: <arch>-unknown-linux-gnu
-	# - MacOS: <arch>-apple-darwin
-	# - Windows: <arch>-pc-windows-gnu
-	# where <arch> could be 'x86_64' (amd64) or 'i686' (x86)
-	use amd64 && CTARGET="x86_64-unknown-linux-gnu"
-	use x86 && CTARGET="i686-unknown-linux-gnu"
-
 	# NOTE: 'disable-nightly' is used by crates (such as 'matches') to entirely
 	# skip their internal libraries that make use of unstable rustc features.
 	# Don't use 'enable-nightly' with a stable release of rustc as DEPEND,
 	# otherwise you could get compilation issues.
 	# see: github.com/gentoo/gentoo-rust/issues/13
 	local myeconfargs=(
-		--host=${CTARGET}
-		--build=${CTARGET}
-		--target=${CTARGET}
+		--host=$(rust_abi)
+		--build=$(rust_abi)
+		--target=$(rust_abi)
 		--cargo="${WORKDIR}"/${P}/target/snapshot/bin/cargo
 		--enable-optimize
 #		--release-channel stable
@@ -154,7 +139,7 @@
 }
 
 src_install() {
-	emake prepare-image-${CTARGET} IMGDIR_${CTARGET}="${ED}/usr"
+	emake prepare-image-$(rust_abi) IMGDIR_$(rust_abi)="${ED}/usr"
 
 	# Install HTML documentation
 	use doc && HTML_DOCS=("target/doc")
@@ -173,5 +158,5 @@
 	emake test \
 		CFG_ENABLE_OPTIMIZE=1 \
 		VERBOSE=1 \
-		CFG_LOCAL_CARGO="${WORKDIR}"/${P}/target/${CTARGET}/release/cargo
+		CFG_LOCAL_CARGO="${WORKDIR}"/${P}/target/$(rust_abi)/release/cargo
 }