--- gentoo/dev-util/cargo/cargo-0.17.0.ebuild	2017-03-18 11:41:17.000000000 +0100
+++ local/dev-util/cargo/cargo-0.18.0.ebuild	2017-05-19 08:00:03.240685867 +0200
@@ -3,97 +3,117 @@
 
 EAPI=6
 
-CARGO_SNAPSHOT_DATE="2016-09-01"
+inherit cargo bash-completion-r1
+
 CRATES="
 advapi32-sys-0.2.0
 aho-corasick-0.5.3
-bitflags-0.1.1
+aho-corasick-0.6.3
 bitflags-0.7.0
 bufstream-0.1.2
-cargotest-0.1.0
 cfg-if-0.1.0
-cmake-0.1.19
-crates-io-0.6.0
+chrono-0.2.25
+cmake-0.1.22
 crossbeam-0.2.10
-curl-0.4.1
-curl-sys-0.3.6
-docopt-0.6.86
-env_logger-0.3.5
-error-chain-0.7.2
+curl-0.4.6
+curl-sys-0.3.11
+docopt-0.7.0
+dtoa-0.4.1
+env_logger-0.4.2
 filetime-0.1.10
-flate2-0.2.14
-fs2-0.3.0
-gcc-0.3.39
+flate2-0.2.17
+foreign-types-0.2.0
+fs2-0.4.1
+gcc-0.3.45
 gdi32-sys-0.2.0
-git2-0.6.3
+git2-0.6.4
 git2-curl-0.7.0
 glob-0.2.11
 hamcrest-0.1.1
 idna-0.1.0
+itoa-0.3.1
 kernel32-sys-0.2.2
-lazy_static-0.2.2
-libc-0.2.18
-libgit2-sys-0.6.6
+lazy_static-0.2.5
+libc-0.2.21
+libgit2-sys-0.6.8
 libssh2-sys-0.2.5
 libz-sys-1.0.13
-log-0.3.6
+log-0.3.7
 matches-0.1.4
 memchr-0.1.11
-metadeps-1.1.1
-miniz-sys-0.1.7
-miow-0.1.3
-net2-0.2.26
-num-0.1.36
-num-bigint-0.1.35
-num-complex-0.1.35
-num-integer-0.1.32
-num-iter-0.1.32
-num-rational-0.1.35
-num-traits-0.1.36
-num_cpus-1.1.0
-openssl-0.9.6
+memchr-1.0.1
+miniz-sys-0.1.9
+miow-0.2.1
+net2-0.2.27
+num-0.1.37
+num-bigint-0.1.37
+num-complex-0.1.36
+num_cpus-1.3.0
+num-integer-0.1.33
+num-iter-0.1.33
+num-rational-0.1.36
+num-traits-0.1.37
+openssl-0.9.10
 openssl-probe-0.1.0
-openssl-sys-0.9.6
-pkg-config-0.3.8
+openssl-sys-0.9.10
+pkg-config-0.3.9
 psapi-sys-0.1.0
-rand-0.3.14
+quote-0.3.15
+rand-0.3.15
+redox_syscall-0.1.17
 regex-0.1.80
+regex-0.2.1
 regex-syntax-0.3.9
-rustc-serialize-0.3.21
-semver-0.5.1
-semver-parser-0.6.1
+regex-syntax-0.4.0
+rustc-serialize-0.3.23
+semver-0.6.0
+semver-parser-0.7.0
+serde-0.9.12
+serde_codegen_internals-0.14.2
+serde_derive-0.9.12
+serde_ignored-0.0.2
+serde_json-0.9.9
 shell-escape-0.1.3
-strsim-0.5.1
-tar-0.4.9
+strsim-0.6.0
+syn-0.11.9
+synom-0.11.3
+tar-0.4.11
 tempdir-0.3.5
-term-0.4.4
+term-0.4.5
 thread-id-2.0.0
+thread-id-3.0.0
 thread_local-0.2.7
-toml-0.2.1
-unicode-bidi-0.2.3
-unicode-normalization-0.1.2
-url-1.2.3
+thread_local-0.3.3
+time-0.1.36
+toml-0.3.1
+unicode-bidi-0.2.5
+unicode-normalization-0.1.4
+unicode-xid-0.0.4
+unreachable-0.1.1
+url-1.4.0
 user32-sys-0.2.0
 utf8-ranges-0.1.3
+utf8-ranges-1.0.0
+void-1.0.2
 winapi-0.2.8
 winapi-build-0.1.1
 ws2_32-sys-0.2.1
 "
 
-inherit cargo bash-completion-r1
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+
+CARGO_STAGE0_VERSION="${PV}"
+CARGO_STAGE0_amd64="cargo-${CARGO_STAGE0_VERSION}-${CHOST_amd64}"
+CARGO_STAGE0_x86="cargo-${CARGO_STAGE0_VERSION}-${CHOST_x86}"
 
 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
-	)"
+	amd64? ( https://static.rust-lang.org/dist/${CARGO_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${CARGO_STAGE0_x86}.tar.gz )
+"
 
 RESTRICT="mirror"
 LICENSE="|| ( MIT Apache-2.0 )"
@@ -119,6 +139,9 @@
 	sys-apps/sed"
 
 src_configure() {
+	local cargo_stagename="CARGO_STAGE0_${ARCH}"
+	local cargo_stage0="${!cargo_stagename}"
+
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu
 	# - MacOS: <arch>-apple-darwin
@@ -136,9 +159,9 @@
 		--host=${CTARGET}
 		--build=${CTARGET}
 		--target=${CTARGET}
-		--cargo="${WORKDIR}"/${P}/target/snapshot/bin/cargo
+		--cargo="${WORKDIR}/${cargo_stage0}/cargo/bin/cargo"
 		--enable-optimize
-#		--release-channel stable
+		--release-channel=stable
 		--disable-verify-install
 		--disable-debug
 		--disable-cross-tests