gentoo resync : 14.04.2018

15 files changed, 283 insertions, 535 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e76a878caa01..0cd7608e7d03 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index fd339649c2f3..d8bda5fa002d 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,6 +1,4 @@
-DIST ispc-1.9.1.tar.gz 19276043 BLAKE2B a9cc96b138cc5424e3a09fa517c8554f79af3c947c05a75c179b35e509e399785da18f72b0a2e0d81be8ea8f04b3ca0f6a90003a76d5d9ac641f55cfdcd47dfc SHA512 4acd9e99dadba684829235a267e15ca8ff4cf33c4cadaa2983006bcb2c2f45fce49e8b11963f4bce78c256aaf8ece0583cf6cb729c6bc75af32b7fa4238ca743
 DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
-EBUILD ispc-1.9.1.ebuild 1100 BLAKE2B d5137a5d3bd3d135c6048ee0e2e71ba609feaca8af9344117b9dec3343c27a260856b40e661ba20724214f2bbade07abb7b7079a080240be54bffe8af92a3ae8 SHA512 0539b86b64f45a7e52ed4a72006cadd3f9eb32ab40ad9b5394f7598923769d716a67ca11c39c637eed677d619cc67c6297ee667c783eb5dba7c95cecfb43e359
 EBUILD ispc-1.9.2.ebuild 1100 BLAKE2B 4bfdcf2d708ddc9e5c9e84f9a8adbab0111ceda9c5a10d7b11b21ef21cb24e56cca857e9cde0d593b0b1c49f1098a1ab0035d239ccc1b268ce1d5832c5979463 SHA512 5595b9a47e860adbfd6c7c9e3fa94f39f68f3d167cf17f3da964e51e8dfff170cf9ef6dcbee8ea82f1813f9a66d3724721ad2b44269e69703842a80d2aa25129
 EBUILD ispc-9999.ebuild 1100 BLAKE2B 4bfdcf2d708ddc9e5c9e84f9a8adbab0111ceda9c5a10d7b11b21ef21cb24e56cca857e9cde0d593b0b1c49f1098a1ab0035d239ccc1b268ce1d5832c5979463 SHA512 5595b9a47e860adbfd6c7c9e3fa94f39f68f3d167cf17f3da964e51e8dfff170cf9ef6dcbee8ea82f1813f9a66d3724721ad2b44269e69703842a80d2aa25129
 MISC metadata.xml 327 BLAKE2B 54a38462b0fe6a1ed78bf0098fa3e85c3c7e745e4777a90d9da67286f8f4bd5b3b1df035de5274c6c2cc3f04c4fd454bacf93e6a09ebf6ddb6fa3b832ec82b77 SHA512 94078b0d77481ac78255fc9fbceec4e204b7fa20da59f103d163eb22f33fb78d0dd2ae039157666f6e80eee81922a6e89acc2ddf89d29275ff19ce5e9391ca83
diff --git a/dev-lang/ispc/ispc-1.9.1.ebuild b/dev-lang/ispc/ispc-1.9.1.ebuild
deleted file mode 100644
index 72e2ab831c83..000000000000
--- a/dev-lang/ispc/ispc-1.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=sys-devel/clang-3.0:0
-	>=sys-devel/llvm-3.0:0
-	"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	sys-devel/bison
-	sys-devel/flex
-	"
-
-src_compile() {
-	#make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
-	sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
-	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
-	dobin ispc
-	dodoc README.rst
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3f0cebc60ef7..f798f6a2a072 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -5,6 +5,7 @@ AUX 3.6-disable-nis.patch 864 BLAKE2B a960b2f44ff1358677ebb0cf82bcff1ddc7812ed51
 AUX 3.6.5-disable-nis.patch 297 BLAKE2B 86ca3e6b9aa1bcd9af55ea5f1ad835b60154d23339bf9d02404a5c50b774c556f482138f35d005c9a96b95b6fd9be94ac634164d0b8d173c15fbf841163cabba SHA512 e0a31d256c70159dcbd362ff35b7561c94087851514637bd2b26b6a1b3199309f81eb82305adec7f8d01118dd0856c5228863319ced1e275fbf6f4932034e855
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
+AUX python-2.7-libressl-compatibility.patch 2783 BLAKE2B 44c13d121291c1f660a2fd2edbbaafb4861896503423e9a85d506aea3c416de238a5a1ff08a6065cb4cd2498e456fb3646186dbd3472fbb37058b6ebfd47ad0f SHA512 d258b28d3d9d87e11148b16d3e2f8d378c95897b630f5132058654ee031045f4a0dcc7f11dfb43a8deeac2723e6c1ae88e55db1b4eaad019e1d3b9fa47ea2991
 AUX python-2.7.10-cross-compile-warn-test.patch 775 BLAKE2B 617938353c7e19a9b931544ff1fdcd60cf46e3a68f3ff63bc6ac16432220aad13df4d2b405a968505fb64d31da51a478c46499944ab58e9bbfa5a5b44d392f00 SHA512 652941239541f6139ee3580ec0ea5240baf07ae1afb786f76a69b1d748de1f4dda2740a95c28866e9b0b59023410f8a1e86507642595991c0d90d187519cb758
 AUX python-2.7.10-system-libffi.patch 1232 BLAKE2B 3483385cbbf7ef2304cf109d05b5e1d58ec2b9015b614c996c66a9917ab10703865b40c775d7ff89a6fa80e9c8c9600292d8d916e9753027e9e0b23b0548ccff SHA512 3c888638180edc81b98a869478085de63741668ea62bdb919a60708fd64cb394e60f44a3730e2ccf3e41d1d61b72b469242fe2ccd20dc61bc2064b3e759c52bd
 AUX python-2.7.5-nonfatal-compileall.patch 750 BLAKE2B a7999a6c5a706fbab213cd8a01c6df9b130537556d59bf50b1f5ca223bb9dcd24ccfef48e70e5d3a8afe2b9c6236e1ada87d5899052a2b39f05c4644697953e2 SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6
@@ -27,7 +28,7 @@ DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 BLAKE2B 2a636f5500f4c7d354f42113
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
-EBUILD python-2.7.14-r1.ebuild 10784 BLAKE2B d445806263033f5f6fb6bf816df12f6698acbb959b0a9b7a6db8c66d5d2a22cd849d3b80143fb6b7725133cad102bc3d97e57f079808fb75517f5fdc7d4933f8 SHA512 75ffa41dd4f6c15f02c07491c61ecbc3b0e47bab670e73eb34f13dba0aff06e9ce45da4c2220bc94dfc50cca2c9b3e2211d07263cfe2b13ce66b0ba79a2e01ea
+EBUILD python-2.7.14-r1.ebuild 10847 BLAKE2B 165c8b34e3be68c308a01a40b0d8874d163481be86340e2af7d6890256b2ec07136f1b23f2a0dc2506a7c278931d9dc02bee9a778c50eeb7a33a0830c2d4bdd3 SHA512 22d78089652e5595dd2edce96aa0374fa1b66a2dbaf4a3309caf60ea73bc12bc5cde4f786f97b5453b84c24589445601041d19f68f6233ea29c08acc8b9f56f7
 EBUILD python-3.4.5-r1.ebuild 10658 BLAKE2B 46398a90c4f67b4923d9c65476f0eceb42135084b0f71f456162557a2c7adf2cf0c6f07e2d9b65d49eb92ee75233c249bfac32a9e5fb1fcdcd67988f19e4033a SHA512 7a2e1312afcfa032aa16579868f2c7efe04eb38904db2b66f11f87e174533c9df89abeb16a28e3f6372651e2a733f885ae5bb78b07cacd150c9ffe8c66f9c2aa
 EBUILD python-3.4.6-r1.ebuild 10592 BLAKE2B 448762119589dde742a632950c21b423eeb7f48f7c5b632b28179839031b1a96232f131942027f1c41d0ceca76ca65592f69ee3d1d556e967b2125b257b9f4ef SHA512 a01670f2eeb8a8c86c6c6d597760c40208dc235c52a635099872a8e2f27332d9b094dfc41b4bd87e7db5e1f0a224d7bd24ece60ec71dfd0d63285093db7dfa77
 EBUILD python-3.4.8.ebuild 10592 BLAKE2B 448762119589dde742a632950c21b423eeb7f48f7c5b632b28179839031b1a96232f131942027f1c41d0ceca76ca65592f69ee3d1d556e967b2125b257b9f4ef SHA512 a01670f2eeb8a8c86c6c6d597760c40208dc235c52a635099872a8e2f27332d9b094dfc41b4bd87e7db5e1f0a224d7bd24ece60ec71dfd0d63285093db7dfa77
diff --git a/dev-lang/python/files/python-2.7-libressl-compatibility.patch b/dev-lang/python/files/python-2.7-libressl-compatibility.patch
new file mode 100644
index 000000000000..c9e7a8458e35
--- /dev/null
+++ b/dev-lang/python/files/python-2.7-libressl-compatibility.patch
@@ -0,0 +1,92 @@
+# From https://github.com/python/cpython/pull/6215
+
+# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
+# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
+# LibreSSL < 2.7.
+
+# Documentation updates and fixes for failing tests will be provided in
+# another patch set.
+
+# Signed-off-by: Christian Heimes christian@python.org.
+# (cherry picked from commit 4ca0739)
+
+#Co-authored-by: Christian Heimes christian@python.org
+
+--- a/Modules/_ssl.c	2017-09-16 17:38:35.000000000 +0000
++++ b/Modules/_ssl.c	2018-04-13 15:55:10.919424126 +0000
+@@ -97,6 +102,12 @@
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ #  define OPENSSL_VERSION_1_1 1
++#  define PY_OPENSSL_1_1_API 1
++#endif
++
++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
++#  define PY_OPENSSL_1_1_API 1
+ #endif
+ 
+ /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
+@@ -118,24 +129,44 @@
+ #endif
+ 
+ /* ALPN added in OpenSSL 1.0.2 */
+-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+-# define HAVE_ALPN
++#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
++# define HAVE_ALPN 1
++#else
++# define HAVE_ALPN 0
++#endif
++
++/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped
++ * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility
++ * reasons. The check for TLSEXT_TYPE_next_proto_neg works with
++ * OpenSSL 1.0.1+ and LibreSSL.
++ * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg.
++ */
++#ifdef OPENSSL_NO_NEXTPROTONEG
++# define HAVE_NPN 0
++#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
++# define HAVE_NPN 0
++#elif defined(TLSEXT_TYPE_next_proto_neg)
++# define HAVE_NPN 1
++#else
++# define HAVE_NPN 0
+ #endif
+ 
+ #ifndef INVALID_SOCKET /* MS defines this */
+ #define INVALID_SOCKET (-1)
+ #endif
+ 
+-#ifdef OPENSSL_VERSION_1_1
+-/* OpenSSL 1.1.0+ */
+-#ifndef OPENSSL_NO_SSL2
+-#define OPENSSL_NO_SSL2
+-#endif
+-#else /* OpenSSL < 1.1.0 */
+-#if defined(WITH_THREAD)
++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
+ #define HAVE_OPENSSL_CRYPTO_LOCK
+ #endif
+ 
++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
++#define OPENSSL_NO_SSL2
++#endif
++
++#ifndef PY_OPENSSL_1_1_API
++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
++
+ #define TLS_method SSLv23_method
+ 
+ static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
+@@ -178,7 +209,7 @@
+ {
+     return store->param;
+ }
+-#endif /* OpenSSL < 1.1.0 or LibreSSL */
++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
+ 
+ 
+ enum py_ssl_error {
diff --git a/dev-lang/python/python-2.7.14-r1.ebuild b/dev-lang/python/python-2.7.14-r1.ebuild
index 7a006eb67d78..f5e6506189ee 100644
--- a/dev-lang/python/python-2.7.14-r1.ebuild
+++ b/dev-lang/python/python-2.7.14-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	tk? (
 		>=dev-lang/tcl-8.0:0=
@@ -102,6 +102,7 @@ src_prepare() {
 	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
 	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
 	epatch "${FILESDIR}/2.7-disable-nis.patch"
+	epatch "${FILESDIR}/python-2.7-libressl-compatibility.patch"
 
 	epatch_user
 
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 4b522508e567..3950f3700813 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,11 +1,3 @@
-DIST rust-1.12.1-i686-unknown-linux-gnu.tar.gz 123818795 BLAKE2B 6acf1257d2debc0dc7e4165ba1ed73b26b927e06389a54f2630f980add567ba3d7fec139b9589fedcf88900d8d44291b0749d7263e7957ee9944a1a810ada707 SHA512 8393bd91652ebe2a3a6decdd53bcb388d308a8867736ea68f75c2d073a0356583d90f74ce0af6105bd867ab03feed02af17422f25cf3bbf0601d59062aa1c70a
-DIST rust-1.12.1-x86_64-unknown-linux-gnu.tar.gz 120844880 BLAKE2B 652cd72a54725b27afc9346ba2d8dbfcf457243b3b28adf2867bbcc246482286f1917b990394cdd18c32bc8db9168bb311db095eaa70ef134fabcdda4d53f5d0 SHA512 888ad195b9d4b8d1d7ccaffd460e6fe0f6003461a6818937b4b6f80a92462eb96095888729188421f21e6bd0e21fa558a7ea81327b78eab5c3b70807c5069492
-DIST rust-1.13.0-i686-unknown-linux-gnu.tar.gz 94614521 BLAKE2B dac91b9e7c2004094fa908473df35a8d96846b60e0d5e2e12f6c3d5a98b71c72a02e82a98fd23abe0e81a22bb0becb4a73d2cd4ce49606c0ce3ecbc24446166f SHA512 acea228b6c17cddfc6b1db1ab7d9e71ef852e7137bd992eaef69fa051f9d6f1b449d91b3f0984c3c64de274f246b5c37f9dc9cd5457d797be01beb3357d3c557
-DIST rust-1.13.0-x86_64-unknown-linux-gnu.tar.gz 91007029 BLAKE2B a67509c0bc068fa5c537977d1a1df2ce1a07b7bccaed31c44ce843f095248c53d0ef63559968f60d6beeae446fc063ff5988890948781aadf4ad72371ebefdb3 SHA512 b5d217aef6e20ed159506d2b46df2003de09c212794725693bc09fa4bcd7e527fed23969e62121591601749ec161de4d90b2c261807f83e2c0114727659b4f6e
-DIST rust-1.14.0-i686-unknown-linux-gnu.tar.gz 126452488 BLAKE2B ff6d1ca188edc4e37696441e7103abe180528cb1827901a8524afbb9979308bdd59ba3a8533df42cf4488c192dd6cbb6fb278fa3b01d6f1fe9d4cf6ee90737fe SHA512 2e1cd7cb1c9a1c147fcfe16f5eac3876b88a5a04bc1a6d2386756181986046b8636c317fb76834ca75aec99f0bcf9e5ce760eacf74b4b9811210db4a59fdb66f
-DIST rust-1.14.0-x86_64-unknown-linux-gnu.tar.gz 122820395 BLAKE2B 9d3df35b7af53651ca89ebc731e6739c84bd4250330a1ff1bdcb23e665771aea956259491e4cc0e2ed97311598ebd35e2ca9c65ee0ab3ef71f82a24be7c12221 SHA512 6ec7155a2ac95718d1c28ffada0d365ca46cca7b1879b4533a662a4e63140fd2a70a9647a4b4d57e12d0d20dd46b7aba18365db0ed0cfd870b0a0394d4266b8c
-DIST rust-1.15.0-i686-unknown-linux-gnu.tar.gz 103875063 BLAKE2B ef76c20a0a65c0a00000be3763eec1d88f3cc02ad4134b463d349a891b2b5697b123fd565c37bae201cb44efeb0adbfaf0bf5dce7bb443030694798f39b75803 SHA512 92886d873a1d5407839cf3ff6480fb6c68ab3ee16c8e30a5bc221551a9e588405bec6f1382841ce81d8895c6e9a77650f5da56ccc2c8dc0490019210083786e7
-DIST rust-1.15.0-x86_64-unknown-linux-gnu.tar.gz 101145605 BLAKE2B af76732f21dacdde2d9f13b0230888fb4663f254121b43ff9a98c62743f72263982ad77cba09a258cff0048b4c7c45018136b128b906f9960a010e15161c666c SHA512 0f582e540241ca9cc9e36face8c28061d1e2814acba7480ab818b15fc0db98519d28aa9649c6cbb5ccea95c28c2e0927268b76cbfe7178b136e56cbcc6b25aaf
 DIST rust-1.15.1-i686-unknown-linux-gnu.tar.gz 103889253 BLAKE2B 7b922eb9aa3dcab0b791764b328d2758912e7f932f9a4ea802793544c6f7e2d3945aa74be936a2bd6e9e9fc650a19119028bc36422fb656abd6a4e5d590ba056 SHA512 13d602842e7a2ef360c80d3ec84ecd5d6c742ea6dad642394a2a57b28554a7758905b37daaf2bcc549428c5f9383307270f8508e8685748b906fc2b9230bc4ad
 DIST rust-1.15.1-x86_64-unknown-linux-gnu.tar.gz 101140146 BLAKE2B dd6508b52ffdfe59a833a0280dfc9999c146eca8dbb9649c3655f7b15d5d7323f2897ee1483f65bff3fad195f539ea58078bcd345c69632a2630cd5549c03182 SHA512 e089c455b1a7507aeed4652f05c0672c4e996e708c46f4405191f4b3a9d08403cab27f1a5a63f865d9a8f099f6ca980d2d2eef37aaa5e7e5bd751a3224e88b84
 DIST rust-1.16.0-i686-unknown-linux-gnu.tar.gz 106129219 BLAKE2B ea549c33e4a4be9ce5aaaa4204535134ffab325e9976d1984c478105774c1d5684a684ad1f3e4d6784b8ce90cdfb1631807b8c60322d2417fc8319ebb4b3729a SHA512 7a780a107d98c6a8883f95dbb5a5ec95bad52fb1e735afba29b47411b450d464cbc8dfe73d35de1eb18b9a1f9ea727daa1ca9d3042e2a98c67ad570d328e139d
@@ -14,12 +6,11 @@ DIST rust-1.19.0-i686-unknown-linux-gnu.tar.gz 143010900 BLAKE2B fd47fc710f151d7
 DIST rust-1.19.0-x86_64-unknown-linux-gnu.tar.gz 151087058 BLAKE2B 796bd295393669cd55cf0a0b25f28a85b2d86394cb637b4de468c1095c5757212dda52f7d5d5ca30cfb69c0b5719d6bdce71c0ad7ed8f9ed7a40f7705f8ba550 SHA512 fc98ad7728a72c9bc93505458f7558405cc6a608eb19aa6c609e0155e7c081123f116cf023d19af2f0cd9cb81b8e1bbe69efd88f7bb61cca2d258d5fa2ed6bba
 DIST rust-1.23.0-i686-unknown-linux-gnu.tar.gz 180646185 BLAKE2B 1f4653141722baffdfc9114979ac7b3abd01a8d3bf879c1e57e26daef28af39d2d64f2eea1bfadfee37f7ec9d91be06251a0dccdac1bf817f850b60bb6a1eec4 SHA512 b4b5a26b6416ceb81cbb7202c42481bfa10ef2afabfa46c2eefc89d58f87b1b4785c1f65e2f58ea863ae3d3e794aa06e101f9097d5aa757e6749d891006a7542
 DIST rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz 187313088 BLAKE2B eaef537506106b4cdb4c26652cc322ca7cc5f47fe15bd8551c07334bdaccdd98b14c1f91153e96ca79c22c88dfb69d2a7823fc3ac90e27b0a2c36c6559cda04b SHA512 71c0a893b25f6498bfd73104f006b79b5d6a31e4a4bcc6dcbe1b48183120afca28c12404b436417e010e3c449845c98e27e76d2b0f33498bcb35d2434b1fa821
-EBUILD rust-bin-1.12.1.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
-EBUILD rust-bin-1.13.0.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
-EBUILD rust-bin-1.14.0.ebuild 2644 BLAKE2B a87418832a5f5b490e00666d34d0fa9fd9d7960c398da977c6dced9b363a4c3be9095cd5ad4136871eeb7043c632cb64c519fd21d7ca4856998412604af140a0 SHA512 75267bee27ae591c2d6443fbf768b19e8476f81e1f93ff2a780b816aee3d77e4a080f769ee0d5439867aa4a61c7957f6f42ace080d5e9c1b91673f36c892fab1
-EBUILD rust-bin-1.15.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
+DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
+DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
 EBUILD rust-bin-1.15.1.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
 EBUILD rust-bin-1.16.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
 EBUILD rust-bin-1.19.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
 EBUILD rust-bin-1.23.0.ebuild 2695 BLAKE2B 6200ecac0f8d1327cb4a12fcc5e5f1ac0c1b4375f9a91d115a390c056994045bca5d2e5a4fdbea97034c0fee42437ae3a9f56ca22e4830f1f46753130552fe56 SHA512 c9846fcf8a5be0ddf5b950039b5c25d5c1379e72e32156d692644bfe4e7143425c2389ff8b6b774e78338c035c8c9b45e86d8c96508d5d48ce763307ade927fe
+EBUILD rust-bin-1.25.0.ebuild 2695 BLAKE2B 6200ecac0f8d1327cb4a12fcc5e5f1ac0c1b4375f9a91d115a390c056994045bca5d2e5a4fdbea97034c0fee42437ae3a9f56ca22e4830f1f46753130552fe56 SHA512 c9846fcf8a5be0ddf5b950039b5c25d5c1379e72e32156d692644bfe4e7143425c2389ff8b6b774e78338c035c8c9b45e86d8c96508d5d48ce763307ade927fe
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/dev-lang/rust-bin/rust-bin-1.12.1.ebuild b/dev-lang/rust-bin/rust-bin-1.12.1.ebuild
deleted file mode 100644
index dbba3ec82295..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.12.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.13.0.ebuild b/dev-lang/rust-bin/rust-bin-1.13.0.ebuild
deleted file mode 100644
index dbba3ec82295..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.13.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.14.0.ebuild b/dev-lang/rust-bin/rust-bin-1.14.0.ebuild
deleted file mode 100644
index dbba3ec82295..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.14.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.15.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
index 319576f891af..9e2dadd1a193 100644
--- a/dev-lang/rust-bin/rust-bin-1.15.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,6 +27,7 @@ QA_PREBUILT="
 	opt/${P}/bin/rustdoc-bin-${PV}
 	opt/${P}/lib/*.so
 	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
 "
 
 src_unpack() {
@@ -58,9 +59,9 @@ src_install() {
 	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
 	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
 
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
 
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/opt/${P}/lib"
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 205342ac135f..55772c27eddf 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -4,21 +4,22 @@ DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 BLAKE2B 39eed4905b06a9
 DIST rust-1.22.0-aarch64-unknown-linux-gnu.tar.gz 144904402 BLAKE2B d9b4349fa11c673130d9a9ecc9d3ac0653c20d2a2582118377c5a0e612d98db70457d8c5baa07e01a5aa65858aad1759f6fc8927dd4dfcfdcca4fca11179d529 SHA512 3a21f7b29c15ab54270be303e4ee053c944d04b971ad4c73243e1c44bbe5fe245170e80ca9617f77648e0e957c1faf0c7e59b7d9d9303bbf5017215b888e5e05
 DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 BLAKE2B cf2f30fdc01cbcf45de427b5a5a226b8482f3fc13e122cc4f021a75f648678b23a789706b54b6425346bdba57224898809102d97bfee8b143f90763ea985b6c3 SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0
 DIST rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz 160427151 BLAKE2B f56a8205023ec39a5569e443f1c7954c55c9b2fe94126c03bcf9eadf4d26cb60d8ae9e8c6638550e79acc5906d865bdaaa5e0e61a63c9b23383afef673018638 SHA512 30206d5ccec432a6a92aeffb34170290109d65973a6d1cd91e7e1aa82781a0da00023275b5a3a3effad79d539d2f4829d1eea5fc3d0c1c58a7f3a4855a84785c
+DIST rust-1.24.0-aarch64-unknown-linux-gnu.tar.gz 184157362 BLAKE2B 68b1b9471b6d26dbb2c3bf897d2bffc15d2fcd1fde774d4f23389e9ccb96fc60d8ec8c343b5f93651bced05bdf228d549c747f3f3d4de9c8232e99aa1b6bef6a SHA512 d15548a7b21ca4605ff24d098a59414548a315acd736ac4d8ac845399c9febdd810ba76fdf2dd9336325bd749866ee72f3d8c7c573b04a4d932d00cd7cac34c0
+DIST rust-1.24.0-i686-unknown-linux-gnu.tar.gz 193631843 BLAKE2B f19e9f717f5626b2267da4e661b53f45f7948a83a25156239af3cadb1184bf39669171364754f1787cdb78c3b62bd145bff1e3f4c3c7890f0dd52839bd8ae923 SHA512 3806bee5dccc080fae437bbc7f2e2062803244eb57c25e5e591e46279810c661bf016a4043e0af991b49b9e09a5d81ec275a852c3647a474507b03846d76aac0
+DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 2373637eb4410c07328b3cbaecb56ca465956ec1a2f14786e00922d74c4e68760538383960080348be003bee656761f5bbd0aa871ea21e22d029b3f8ab5344a7 SHA512 63ecb84b31f586c85e25229fb673892567edc2f557ac2ca1958caf3e26aa4e6c9a55b410aeeeadf1a61a5ebd66a517106e942f923a2884ce69ee92aec622187b
 DIST rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz 66316236 BLAKE2B 64712595bd979b7eadb626198df1c43951cf040dd94e9b18821d5cc9807d6b3135c62129d89b8cbebe2aabb28e7fcbe22454cc7c4a66ef1a16db899f30e91671 SHA512 0649743437f15d80f7fe08ae32177b36e2a89e87db8062433cfa6d0f62fe7e8fdbc109a025c02dc110d8abdf4b74ddfe80ba8fb895992b0f5ac6a880bbbdf051
 DIST rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz 75723132 BLAKE2B 1a0407be9f65db914dd5573daf4ca47804bd3254a3ef51b244c1952e91b5f1395f712dd2c82eb73623ad7da79bffcc8ac9b5e6e0404b3ffa300fe0292189caec SHA512 98f50016cf6f7c89f90830e1c9f41b5413adf2eaa5e2874ca117ffe84ee59fe77cb461ca3601ee65c5c5c884eb42e22509a94c00544527c727f2e3d6d0adb530
-DIST rustc-1.14.0-i686-unknown-linux-gnu.tar.gz 51391277 BLAKE2B 3c9c9f6567bc03c03dd45516b137a9ac19ee05adf32440a720941c9edc9c3158dd003a37f54694919ac5efd559383f8c893e86651aa5e5bd30cdd74f7d81e6cc SHA512 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb
-DIST rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz 49370951 BLAKE2B bc226cc826ced161bbbfc70c6202f7f3e96dc1636e663df1bd393048f8c9f7490792abde3e7aa41a5f4aad9a6a41844fee7f7e555e562dde725ccdbb332334da SHA512 da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32
 DIST rustc-1.15.1-i686-unknown-linux-gnu.tar.gz 39314075 BLAKE2B 59e79324807d92d57e71588f82983457cd6f3fbbf7eb2bd9b63a84c16d15e30679bc7625dbd20b20da62a80ccdeed58825bee1357b3b7af9b4a5aa83ba5f3a60 SHA512 138a4a893a70860650da1636f734977c215e32b1f9b15b957bfc31575d2662ea6c2c65a130bd13647ec1f2366fe0deb26a94ea09aaec7cbda8e466fa295a0c42
-DIST rustc-1.15.1-src.tar.gz 28100203 BLAKE2B 1fea7db9c75003d71d34df87c0180c27fcb863bd18095bdb70b3522602c485f5996ecd552e871612fc92352789d870836d4c509e73cffd7cb920504e763a9e57 SHA512 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339
 DIST rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz 37650863 BLAKE2B 15ad871d0c23c662d63093e372b730ea02c79e35bbe4e7cbad64d2ae4d3e43f94edabaa3ab7b0f18f198d22830754a1271a55b283a423d155b6274b9d17b9409 SHA512 97f2fd905b1c2c9ee1fb9a9604a931154aa928692e6334af5a60f1853e49246b13af26afb6342f085cf77e624f23e90c409f05b81983408cf0538ba1401ef7cb
 DIST rustc-1.16.0-src.tar.gz 28470372 BLAKE2B 0b1f5156e97d8b6ecca086a818a9a15b667badcaf15a86e4ff9212c9f1e641e67ad82788008b3059d380e83fede7e7347f54209d9e85644decf6614c7d12f4ac SHA512 096b1b7406be9bc61161bb7cdd2061f2bc2174c161a31f4ed6ceecf7fc379f315fc2f7cb9f6c134ea4f8519c27bf6e5a3f712cf1e56d5785831d8c8374eb0ba5
 DIST rustc-1.18.0-i686-unknown-linux-gnu.tar.gz 47281118 BLAKE2B 96dbd061a048d74a4054356bc4073dc538aa0799dae362885909fc9fbd30e25ebe7da8215231a049ff83b6696d0e76a5741bc337c86a4b8d34fd0d4abc4e6170 SHA512 e270a314fb326fb226226741a5a15f237846ffb7ae6e0ab349f56328f5b3557d8b3dfdcfbc168f3ed4d9875806434537ce7bd5fb97b2c3078f7d03fd6ce65d2d
 DIST rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz 45281645 BLAKE2B 3034a693aa808d1d489ce36db5a00ce7d239bef8265f322c6fe4f1f5a9d77cf8f9e447e2ca539f6d3e758214dd01224957d8c662eeedd76ffccad3ad4f341f3c SHA512 7d8865a43b979150c3dc3abaa852921f46bebb54659bb0f14bc9b82b367f94ec031da4d03242cb6aae8bd11167402b9e166a14aa3c4a141413be54e9a685af31
 DIST rustc-1.19.0-src.tar.gz 50108626 BLAKE2B ae6016f816f2c41b81668764e2892d7846226ff944be9f173d9d8818c22aeb21cc7457e346bd4c985f41d3d22df1dad009d1977a733bbf40ff6fb8a6f0854254 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24
 DIST rustc-1.23.0-src.tar.gz 60010149 BLAKE2B 64bba97fd1a16d3162b65b0d8dd2024ca07166a4fb3d541a96216a27a392baac5f5addd9b3b223ce935df9437a0789cd5c3d8328957f983cc3317a63f13a4dcd SHA512 a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e
-EBUILD rust-1.15.1.ebuild 3984 BLAKE2B 282c07c0a78dcac9e862dc2c8788c3231d93a64e6276569ef4a609b155e30917d0412b9603a245fa818807d1726941a11ee335e15f17fbfe1e8f1d94e8d0d8de SHA512 a6b14e295a562308f5d9bfa2e5087c5ede31c93a99cc41b37fcabca42042ed958384660e51486372127d2262feb1071e3ffd386c974d86ad7647eb9c0ef8648d
+DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 EBUILD rust-1.16.0.ebuild 3840 BLAKE2B 163ebba85b39e44406fd8b7dc9e5c1f9e929702a167f8ccb00605dd7e97f3e57101bc04ceb13887c3bfe1a79bd80f52f26f9f98727b1b2ceddb7a69bfd0c7924 SHA512 8c661074f6a53f6d8397d712c8236dfc34f18c386e699a1ab1db9a9eceba9e776c09c733ad615a1897916f1268c46e58a56c5f80cd2efe787fca5f8fdc8591e4
 EBUILD rust-1.19.0.ebuild 4145 BLAKE2B 0a8abe73955900466c432df65d77d18bc7d01fa570f5b3c7876f4cf465f2c1cc5821d554352343a62fd0e1330cb97735665821ed8cc8223d98667292e05a00d0 SHA512 0da72a60a704d7215a3dea336e780c81473253ea3ccbfc41c1cef4cf2b2f86a791a41f42356a8958088d6522e6c3a917cfa196d14556feef5f56667b92012739
 EBUILD rust-1.23.0-r1.ebuild 4650 BLAKE2B c637315babceb455d76dc125030976d6baa7261314d916c68d4bbdbfc7b1f3fce8b0bfb722178663635603de6e699b1440c77358b9ec916dcb01a42097f09cad SHA512 96b1f2f3ba1d1bac71a1ae6feca980c856c637af475d954a82ac547934a57d64e3328556ffd36b6ba57c5952cdc36dd615524f167060571151d5a77258a723ae
 EBUILD rust-1.23.0.ebuild 4494 BLAKE2B 10bb2d2bf83471ef0e78887265ec8fed165decf68034a1760d8ae6400dc93c8eb02d7e5cd36c096e1b11ee63eeca672fe4d609f49941fe42e4e8a72e0a549b8e SHA512 07dddcee213e0c655e4308f7702b9e8f447ae91fa9dfc5e2ecbaa0cd5c9dc2ebe9ec8406d553f33940ad09fb7bc7a122e385916e273e25b170ce6a11e419fb0c
-MISC metadata.xml 793 BLAKE2B 729b050dbd248a52895ef7bb2e6cff449c478beb70db846729f9d353a66e53e4364369f05c30e9689eae3129ed27cb4f4ace7ee124f26288a8b440e21f5edd68 SHA512 2091ad3e4991d2ab64e0b01f3cadc9edd7dc055632de8921f874ed0b0b4c86d0884f61c35366d7aaaf89a88017cca646e6f9c3138ec5ceb28d61010d0020a89d
+EBUILD rust-1.25.0.ebuild 4594 BLAKE2B 8ba0e744e8772318809fb9c9973d61cc2868143aac3629811164b625efb83030d87ee678ba90080803b1a365939315dcafedf10c8e1d97bbb9cb2742f35b19bb SHA512 f074a04d7889b98fc0a2414c7b1c034fd6f862d11d2b1b872f8eaa5721da5cac5521562b11b56153282f8ecbc6c828d554209630fb22ef2ce17ad3f4eaada7e2
+MISC metadata.xml 688 BLAKE2B 73d221f770fac85ee6d96cea52932c5022c545643bf140e3b0dfae6e9fb55c1b4031825fc877fe653a359abcf725016fda4aacf78fc758ac8d9b24bb394dc4e1 SHA512 fae633297179568dab653bd54221d3195d40c077778712c019e55eca546610f62f0cceab22ec5e11a6e1532c84a7717bb50f83a28623e33806ed8cf460867a7e
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 8c2f85d8d94a..96224d872b4f 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -11,8 +11,6 @@
     alongside the compiler and stdlib</flag>
     <flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
     library when building with <pkg>sys-devel/clang</pkg></flag>
-    <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
-    place of the bundled one</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the
     standard memory allocator</flag>
   </use>
diff --git a/dev-lang/rust/rust-1.15.1.ebuild b/dev-lang/rust/rust-1.15.1.ebuild
deleted file mode 100644
index 5d7f76787c57..000000000000
--- a/dev-lang/rust/rust-1.15.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
-RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clang debug doc libcxx +system-llvm"
-REQUIRED_USE="libcxx? ( clang )"
-
-RDEPEND="libcxx? ( sys-libs/libcxx )
-	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0
-		<sys-devel/llvm-3.10.0:0 )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-"
-
-PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	>=dev-util/cargo-${CARGO_VERSION}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-src_prepare() {
-	find mk -name '*.mk' -exec \
-		 sed -i -e "s/-Werror / /g" {} \; || die
-
-	default
-}
-
-src_configure() {
-	export CFG_DISABLE_LDCONFIG="notempty"
-
-	local stagename="RUST_STAGE0_${ARCH}"
-	local stage0="${!stagename}"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		--release-channel=${SLOT%%/*} \
-		--disable-manage-submodules \
-		--disable-rustbuild \
-		--default-linker=$(tc-getBUILD_CC) \
-		--default-ar=$(tc-getBUILD_AR) \
-		--python=${EPYTHON} \
-		--disable-rpath \
-		--enable-local-rust \
-		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable doc docs) \
-		$(use_enable libcxx libcpp) \
-		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	unset SUDO_USER
-
-	default
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-
-	dodoc COPYRIGHT
-
-	dodir "/usr/share/doc/rust-${PV}/"
-	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
-	rmdir "${D}/usr/share/doc/rust/" || die
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/usr/$(get_libdir)/${P}"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.25.0.ebuild b/dev-lang/rust/rust-1.25.0.ebuild
new file mode 100644
index 000000000000..acfbcd1213ae
--- /dev/null
+++ b/dev-lang/rust/rust-1.25.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multiprocessing python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+CHOST_arm64=aarch64-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.gz )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="debug doc extended +jemalloc"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_target_name="CHOST_${ARCH}"
+	local rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = ["${rust_target}"]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		verbose = 2
+		extended = $(toml_usex extended)
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		[target.${rust_target}]
+		cc = "$(tc-getBUILD_CC)"
+		cxx = "$(tc-getBUILD_CXX)"
+		linker = "$(tc-getCC)"
+		ar = "$(tc-getAR)"
+	EOF
+}
+
+src_compile() {
+	./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+
+	dodoc COPYRIGHT
+
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}