dev-util/cargo: use a newer snapshot to build

Use a newer snapshot of Cargo to build Cargo so that we can drop the
special casing in the ebuild.

Signed-off-by: Doug Goldstein <cardoe@gentoo.org>

3 files changed, 4 insertions, 100 deletions

diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 555c930465d0..7433f78b9e39 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -11,11 +11,11 @@ DIST cargo-0.12.0.tar.gz 574902 SHA256 4080d76b56b8202f7df271b4bb7d7d22abea5ff8c
 DIST cargo-0.13.0.crate 631199 SHA256 8360389a6b6ba539eb1f533a4452fd5eccfa4bb2b4e73bfa103c3751d5353ea6 SHA512 278ebedcb21df0b2e4e6a86e356a7795e23f3f980c5445ef9d0b6c5df704766f79936d30103193034a66ad2b91919f68692f48b6bd6bb79cb116c1e032deef0d WHIRLPOOL 7376721ea2419f6b781a4846ef58566d4b6737b3a0c31e92ae3907cd7876963dc3c0e13b6f30c6c57b8d1c7bac4a89eb150b8d0952ba1ec4b55573bcef32a7ca
 DIST cargo-0.13.0.tar.gz 610125 SHA256 90429180d3724385acb094f2896feea0c73690451a92215d6054d05edf4a5c49 SHA512 04b5ad177fb58696534eeee9a11da36a1fff0d883ff2b21e783a6163c0c5497d559c44c9fb98e201eb7e5dc0e72608f83f9990e239df3a23824c961e305cced7 WHIRLPOOL 8d40be025f04097ec34866ecf242bd31734a9820c3955b936099266f89b7f0a1d94ce4ac5b87b64ec8a43b40160ffe196deb225359279b9bf426f9c90ba040bd
 DIST cargo-0.14.0.tar.gz 625305 SHA256 90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531 SHA512 dcd6857f256f1b4cd4d0dfedbb7fceedadcf3ecbe92014f58ff3e668870624d5a1cddda1c4b2653b6ec713c6aef4810760e112e589b6eba81bba9692356acb4f WHIRLPOOL d9794dc55539356d48d05f72fd16794956b4dc6b05e31a2df214513d3aabc32e81ae41ef17b42c6852de01dc7c4bc8ca1fdb988fd717e8d062e681a0f92f45a4
-DIST cargo-registry-14f7adaa984f78037839f7e64912fe89d7af025a.tar.gz 2567101 SHA256 ee2e0232c730876a49f212e227b1f4990059a090300b061a79ca358d590533e2 SHA512 16c2c0fbbb9632547a1227d241025d550bd40125e9c6b04ddd3b1e07dc829dd7b41ad645cce0934e0e4b4c174cf4ba94eea404642de268d137359e06948288c0 WHIRLPOOL f7eb57414927a9d704254d7dd67064f3d89e9c92adb71a55e43e486330eea50a664f738582f1d959c1cb80c2c2bdc70bc95805148a758cfda98c625d034f9c35
-DIST cargo-registry-2aed1d5050840971fd1527e2a2961e05dd392e04.tar.gz 2340078 SHA256 7739c0aeb11da985849240e86fc3df17c5494a01b79311400a268f368d66f341 SHA512 f7f001813811c1734238fdeb766537e8fdb2c79d57f6e434ef662c96c7b4ee3ca4c8afd751e7e24a39a22181676ef4a07ac0c9f3d1797a1c9b764a25fcc0b9fb WHIRLPOOL 80101bc037e4402dc8ae3ea1446c0fe3f85b77935b82b043f79b4074d00cba63f5d5bb03cfc0700e93b974189072035f75d7804993586a5dbb79c26a427d7c88
 DIST cargo-registry-64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee.tar.gz 2149630 SHA256 3c0f6e30fa266e39975e8b983d325f34c0d34e6b9bfb82ad93c625b33f2adc82 SHA512 57341ef04e747ddb67d1105b7599ad59fbb386b71ae885158c5163654d409933e086bc55cc5bc15735afdb1013e3fe127df474269073c9d800c598af026592cc WHIRLPOOL d2eb55b69f5fc7163672a43e626d475b1bf4d15ddf0a66e6a0b8fa7dce2deb7bf5ed4aa5754db5761d483b6516bf97c2ad6b70e887473e036272725e749f0c1b
 DIST cargo-snapshot-amd64-2016-03-21.tar.gz 4163903 SHA256 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2 SHA512 475087ff1905fc42bd875488696d8f67fc68f9fb3e48ef9f25bbd6d8f949aa9a3984f61a8bd1741ce8c98e33c6910e020ea7fd5cb67cf2b7fc1703947561ae0e WHIRLPOOL ddda8983c38f238237fbb78fd8242e08df44c31bd0c29d2e75b53dcb0ecc601660f4c765b00e066781da6feb9ccccf8df494b99228b126f3cdd89d028253c2c5
+DIST cargo-snapshot-amd64-2016-09-01.tar.gz 4453020 SHA256 365e5cad79512d244b8ced32f8e5b86a710fc6c17f0d0f5f744b8058ef6dc756 SHA512 a87cd21e5be8f7dc580e1d0b78a2ca57b98c8cf09d5d1517a7422448b5e27e6af82ad61d2170b39c2265fd02078ceb9714bd6e79116a30d9cdeefdfe97eceeac WHIRLPOOL 8f7ac8c98a79f59635bcfa3f9872495b0476bb3e9997d09d404169c12cc43f2aa810eeba8b55247abed7cb1c6b4526d9f9ba0f757427f02a15c59e9061b4380d
 DIST cargo-snapshot-x86-2016-03-21.tar.gz 3889095 SHA256 b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425 SHA512 3c6d6a9c6ee2a93abec5c9c3d79f86a623db6429e192d028729279c07d5769548d6f716afbd8e984ab2f6449f75cd24efb32b87f97b6b90c0e7b3b25779e8624 WHIRLPOOL 8bafd298e6cf54d22c420859c105be98047b556802494d2ccf9b13b06837f85902cf61fd1846dcff3e527d0ce0ee188723f44f4cb598cc34e0fedb6c2f2b3d41
+DIST cargo-snapshot-x86-2016-09-01.tar.gz 4145052 SHA256 764617ab0a46edfaf5d714488fdb8283edaf9bff96e7132844d14d44c14e69cb SHA512 8f8715c117f7e54101db7dabef12a0a69696a3b173789e4b1c05f578d785ee4f77ecf9f9076d0caf74e1f0effe6c68304280afdd4013e9d8f840b7e090e6c137 WHIRLPOOL de900c1b213e46b28e651d73fb5be13fdf5a28b588ddfdf2ddee3051f94cbe86df1652a7e5a714e76e6d9846fa17094feec6456b27da075d92d7faa1ecb40877
 DIST cargotest-0.1.0.crate 335 SHA256 9f159eae7986fc918c85a308f9389aacaf569d78e0431e777376432d7aa4ddd5 SHA512 d96dfc584dd6c0ed05b609d4fc4375af4950e37d41493113d2693c5180ebb11987c4f7e3fe9e5ccb4b71f37b3afe3bcc646f92ad325ed5fd1df92ac5b095dde8 WHIRLPOOL 21331acc22c77610fded8b48f0e38502f63b7fd7a33daea02d4bd00022ccc59238d5d909ff25fd22a984fb4f7bb39a41abec83244a9f3500c853b3411b714d3a
 DIST cfg-if-0.1.0.crate 2758 SHA256 de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb WHIRLPOOL 8a57a78a8e4a72c3321cf8ac97c2b50f18eb4ed35b2e3c22ca06b5f8031eadccce015237ac846ce78ecf9414632b75a04b168993439d1469eb928d4d05c843e5
 DIST cmake-0.1.16.crate 10125 SHA256 eb61a8d3b65f8e0af52ac579923ec48bdd5ca4e335c0fde4071e5860eb650532 SHA512 80f8f33fc66402b1a5a31f993349d9c6a6237ebe461e1aa24064eb31328e7f5901303b5753d1f62ece0881de9f7c1c42077488ce682a3889a8a74642a8b84f84 WHIRLPOOL 5a02bbda79faa44f3e3696f490e146fabf1a3a06a5563ea53040fa949086c5469afb82b8cb49cc52c360f7c2a31587f30039a49717574189a0062e575658502f
diff --git a/dev-util/cargo/cargo-0.13.0-r1.ebuild b/dev-util/cargo/cargo-0.13.0-r1.ebuild
index 963ac609c61f..68a2fdc41b20 100644
--- a/dev-util/cargo/cargo-0.13.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.13.0-r1.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=6
 
-CARGO_SNAPSHOT_DATE="2016-03-21"
-CARGO_INDEX_COMMIT="2aed1d5050840971fd1527e2a2961e05dd392e04"
+CARGO_SNAPSHOT_DATE="2016-09-01"
 CRATES="
 advapi32-sys-0.2.0
 aho-corasick-0.5.2
@@ -86,7 +85,6 @@ inherit cargo bash-completion-r1
 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
-	https://github.com/rust-lang/crates.io-index/archive/${CARGO_INDEX_COMMIT}.tar.gz -> cargo-registry-${CARGO_INDEX_COMMIT}.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 ->
@@ -120,52 +118,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
-# Until cargo bootstraps itself with a version based on 0.13.0, this needs
-# to stay (these variables and src_unpack)
-ECARGO_HOME="${WORKDIR}/cargo_home"
-ECARGO_REPO="github.com-88ac128001ac3a9a"
-ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
-ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
-ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
-
-src_unpack() {
-	mkdir -p "${ECARGO_INDEX}" || die
-	mkdir -p "${ECARGO_CACHE}" || die
-	mkdir -p "${ECARGO_SRC}" || die
-	mkdir -p "${S}" || die
-
-	local archive
-	for archive in ${A}; do
-		case "${archive}" in
-			*.crate)
-				ebegin "Unpacking ${archive}"
-				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
-				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
-				eend $?
-				;;
-			cargo-snapshot*)
-				ebegin "Unpacking ${archive}"
-				mkdir -p "${S}"/target/snapshot
-				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
-				# cargo's makefile needs this otherwise it will try to
-				# download it
-				touch "${S}"/target/snapshot/bin/cargo || die
-				eend $?
-				;;
-			cargo-registry*)
-				ebegin "Unpacking ${archive}"
-				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
-				# prevent cargo from attempting to download this again
-				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
-				eend $?
-				;;
-			*)
-				unpack ${archive}
-				;;
-		esac
-	done
-}
-
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu
diff --git a/dev-util/cargo/cargo-0.14.0.ebuild b/dev-util/cargo/cargo-0.14.0.ebuild
index 25808b053ad1..93e00768d1d5 100644
--- a/dev-util/cargo/cargo-0.14.0.ebuild
+++ b/dev-util/cargo/cargo-0.14.0.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=6
 
-CARGO_SNAPSHOT_DATE="2016-03-21"
-CARGO_INDEX_COMMIT="14f7adaa984f78037839f7e64912fe89d7af025a"
+CARGO_SNAPSHOT_DATE="2016-09-01"
 CRATES="
 advapi32-sys-0.2.0
 aho-corasick-0.5.3
@@ -86,7 +85,6 @@ inherit cargo bash-completion-r1
 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
-	https://github.com/rust-lang/crates.io-index/archive/${CARGO_INDEX_COMMIT}.tar.gz -> cargo-registry-${CARGO_INDEX_COMMIT}.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 ->
@@ -120,52 +118,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
-# Until cargo bootstraps itself with a version based on 0.13.0, this needs
-# to stay (these variables and src_unpack)
-ECARGO_HOME="${WORKDIR}/cargo_home"
-ECARGO_REPO="github.com-88ac128001ac3a9a"
-ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
-ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
-ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
-
-src_unpack() {
-	mkdir -p "${ECARGO_INDEX}" || die
-	mkdir -p "${ECARGO_CACHE}" || die
-	mkdir -p "${ECARGO_SRC}" || die
-	mkdir -p "${S}" || die
-
-	local archive
-	for archive in ${A}; do
-		case "${archive}" in
-			*.crate)
-				ebegin "Unpacking ${archive}"
-				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
-				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
-				eend $?
-				;;
-			cargo-snapshot*)
-				ebegin "Unpacking ${archive}"
-				mkdir -p "${S}"/target/snapshot
-				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
-				# cargo's makefile needs this otherwise it will try to
-				# download it
-				touch "${S}"/target/snapshot/bin/cargo || die
-				eend $?
-				;;
-			cargo-registry*)
-				ebegin "Unpacking ${archive}"
-				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
-				# prevent cargo from attempting to download this again
-				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
-				eend $?
-				;;
-			*)
-				unpack ${archive}
-				;;
-		esac
-	done
-}
-
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu