diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/Manifest b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/Manifest
index 752207b7f4..15c64eb2fb 100644
--- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/Manifest
@@ -1 +1 @@
-DIST eselect-rust-0.3_pre20150428.tar.gz 64722 SHA256 2c8c8703ef252d3504befc67da37c1ff5bc7f7df876754ae962a8805ed7d0837 SHA512 214a6eb4b1f9bfcaed1a5fe92ec9633a82316716ffda8db2d2f88bfcbdae17ef7c026091de3927efad5c3624bb7003166d2ebadea6dd8828a0f1c41e0d3f16e7 WHIRLPOOL 18b5564fbb92030c28a2d18a46ea860d9f98d86ef136cbba25af7d769f6799e71bcbb6d7e1fc9983a6b40b350e4840d684716c21cb8d52fe8dd7ef2854f317a2
+DIST eselect-rust-20190311.tar.bz2 49358 BLAKE2B be8060638a7ee553275e230466de8bc5e3fb1059afb049b71b767794f4f8e3968af03a755270d892e20e5ca6aa3efc869d2fd031713f9e8ed516e6465aad19ff SHA512 98fb4502c1f5358e1a3fd2e91a0e9905aced990d62bb11414830b150e8d72fbab90c23518f9c30d04d015b4c303270a6332400bbb373cd4ea9dfbf0d0b3c942e
diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
deleted file mode 100644
index e80d4384c0..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="eselect module for rust"
-HOMEPAGE="https://github.com/jauhien/eselect-rust"
-SRC_URI="https://github.com/jauhien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-admin/eselect"
-
-pkg_preinst() {
- if has_version 'app-eselect/eselect-rust' ; then
- eselect rust unset
- fi
-}
-
-pkg_postinst() {
- if has_version 'dev-lang/rust' || has_version 'dev-lang/rust-bin' ; then
- eselect rust update --if-unset
- fi
-}
-
-pkg_prerm() {
- eselect rust unset
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20190311.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
new file mode 100644
index 0000000000..1fe212c520
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Rust versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Rust"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_prepare() {
+ default
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+ if has_version 'dev-lang/rust' || has_version 'dev-lang/rust-bin'; then
+ eselect rust update --if-unset
+ fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/metadata.xml b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/metadata.xml
index da4803e4c0..10efdddc42 100644
--- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/metadata.xml
@@ -1,10 +1,10 @@
-
- rust@gentoo.org
-
-
- jauhien/eselect-rust
-
+
+ rust@gentoo.org
+
+
+ jauhien/eselect-rust
+
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/rust/Manifest
index dfb3caadbe..c396c1c596 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/Manifest
@@ -63,9 +63,23 @@ DIST rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz 120518816 BLAKE2B 9666c809b8
DIST rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz 124278796 BLAKE2B cee79918a210c34918cf183c918099cd2c246d881576f80e960492c7d5ae1920a43f2d4424700543a7cf50cc5f18618b6d4abfac1e856c9e8711fb73429571b7 SHA512 058c1ebe58bb22e8ff791a74edb058e7494e2673dd1d91ffad646ec71cfdc240e934b44fbae6e58639143b33161d314224e7d1c7b2cc35677bf9eab901e130eb
DIST rust-1.32.0-s390x-unknown-linux-gnu.tar.xz 128857448 BLAKE2B ab0ce58315d116a0aaed007d03df7be4ecfeee01fd6e368173e8aa023b2ae1d922824e92b103aaf205ed2adf1f9da78abd229fff313c24e32ea3fad68f8bdda3 SHA512 4f32934472356d9b7e15abb0fa07be9eddccc7b9e0a1834bbee5ff279c6ece9174d942e2feed611f9b697613ee3b76f8a8ab68559b6d075e740aeab117223325
DIST rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz 147868652 BLAKE2B 616e69d80dd0e7de2ac86f2090825c8a991ad1b88155d21d0eef89b7aea418ba8bb0140eeb497c417c77afc770f51498020ee86cfd059533500c0cb88f0130b6 SHA512 5c5def0c415b0f34e1e7476841a0bd3f91fe4bde8321c7b06b1cd2a3d10a3d676ed16a26561929ce39c3c2cbcf7a16960c5decca9e385afe8295da32b4fb7a17
+DIST rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz 121877852 BLAKE2B accab68c374afe3eafa38e7ad33c32c427db8d0caab722461075c679af2406d991453a8e529a013b99a5841ef9a5e047cdc9ca88dbebab0c904f4afd99c2b851 SHA512 51f6ca909411fd3b3c05baedc38be8a29923966e7cd6960a10152886687132d4ef9750140c5121b9486d6f6ee1ed7ff35f8105c9f0731fe98ce750d0ea9c528f
+DIST rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz 122944304 BLAKE2B c9c29d9409d5829029ffc444c890c0bba0ea213c0a4eb169e65447b6183b0693ab26d48db2fb0be5a325f6ebb7588f90e18b8377f46276d519fcdf5a637ddae7 SHA512 7911dd32cb415d69c05041f450540312d6a78efea36646b4d409a01a0809d94c2eb6a20bfc27772f50cfa0cfed076c3cf5ce62509820819111226f6974f05844
+DIST rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz 123280648 BLAKE2B be19b75623995c0f986d56318887685e70b682caa735adeac259a3f4b67f56537dc43a2a5d696db66547cb523227498c9fcc4213b28df12e5d26999f3caaa7ee SHA512 a0850de543cd11efab4d67bde498e5897f66bbffa1671c4bb6d31fc709dc0869e322e18982dffd199ad6ff7cee282475b04a563fd11a4c7df86f872b02fcce93
+DIST rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz 125019964 BLAKE2B d5d25099719e4ba9bedeb1de89ec3ecb53cbf9d5540de83f723250f5c0130d0a8a7e7a1956cf1581fd709a806b7d42a55dcc94cf9d5e164cd0638a84f65f2f37 SHA512 25a16c576d826115fdac5a55b89bf3372dfb39c563f2ce7d39b0a7a3c9bdc43eaf10974dfa42e26c5aa04aee169ced3e797fa46fa82bd9f4ceddeddaf6687659
+DIST rust-1.33.0-i686-unknown-linux-gnu.tar.xz 168000488 BLAKE2B 62ee1355ddcc09723bd604faba92a602da68768ab741820905b473ff590e1bc7a2bd755db129d04efe9820326bfeb1b5ff54de37188e6b58ef45ec4144c05ada SHA512 f61f97c529232fd6d7587bbf34c41dd9cc334272b1d523464d7b964aba5a102edaff8d387445e3fdb2b9587c1cdd870e97b9572c9421e79ee047479443f1896d
+DIST rust-1.33.0-mips-unknown-linux-gnu.tar.xz 115251736 BLAKE2B 6785896dd969c52c49edb265d2883d48debb0bed77aecbec0a913ec0d7751d747d9a3d5db2b8fdbdec9a9f598bf13a2870987740f79a75042a030d549cb1d7a0 SHA512 17c76e83a6be9813b842909177dbab89abc2ffa4b97c32a45d8e9c0cb69311570d3797932d49b8c26522c812cb9fc86d00a3787a9a413d57140349d75dfd266a
+DIST rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz 123408336 BLAKE2B f45ed3ab2c899bbdfbdbd3f50f3db1aaeb0fab32f1693cd432132d6e5713cbea63876d7e506eba8c25f5f28a946b524438837c9342f7b7cdf446910698136a34 SHA512 40998fe7ea3f40bb39d7a6d2dc16043aaaf0cbd2cda912b6deeb42fe02da480d4a218810610fc6e31686ab89db1da0cddb6b2599e98c3ba6856fef7c0d64bae7
+DIST rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz 117489676 BLAKE2B b35648ede3694707cea887c0856e016ac98c53c8099202c30e819805564fcfa3d43410980980b8b9c977b4cbf97e185a4049311cda67e0dd5443136c6fe43ae0 SHA512 957a16738b3fc37b916593cb2e5a2d503da08bfe9517f3537483fa48781073e9f54eb14f8f9afc3d2e85fcd45ee0eb3fce1dc2680b5667e67520af363eeeb134
+DIST rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz 117067768 BLAKE2B a968d0eaa52edaa3b5f99d11b34b9f24930a1639277a92d5d68cf80007b8f026daabd07c5379fd18a82c904939172a677be6a0baa9c73785b1ee19d7d04fa66a SHA512 8129b248ea55e427d29d8a637081d1744c08368178ca55c5367c485959984d41d093044ced29825194287a5bda3d491148f36c4c16d6efac797bb8c3af9800e7
+DIST rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz 126030216 BLAKE2B b1d1b996b833ebf8e8fb29d1395192a4354cac4d5381a3ac4f7b8338a19b3b49e5bd318268ee6cd075fa7b69d539e8d2dc021eddfda794791cb1a154b7d2b7e8 SHA512 7d53501d20119ba8d9723650800cdbde17e4ed1719f6258c48c25113082e0400d9ac74ca1bfca54722dbb2049f7b5d34177bb613031c1611daa2545e1706c745
+DIST rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz 130922680 BLAKE2B db63d859631703e845efac57074e0f33f80a3b52b2e9dc8707b81892eee8fc922fa5a7d4b7b1f45fb5f19ea4d7f6fde9212f1c6e99e7e4c30dbc02aa87b0df7e SHA512 393c808e93792cf2b126d6111834932a55cbf18339942ac0d20fc4a3692b0ac08c21a3c8fd393795f7aafecac5a2c5d7c9415c18017a7453f759f746045f5144
+DIST rust-1.33.0-s390x-unknown-linux-gnu.tar.xz 134441220 BLAKE2B e6f0a6e54e4e1fde10f54f66615d44442b7cb5eb5bda43d55ee791328c7ecd61505b3d84719df82b7c5c7ae473b7041512f2cf346281518d7d78d0e22112fa05 SHA512 755a0203e2c143386cb3729faada4d2c38b254dfa7e6eeb722ec9847d6319a1d3d289c7b77a2bc478d79dbbabfcd826d8b015acd29fbdf5acb591feae1876205
+DIST rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz 155298128 BLAKE2B af5bc628bc054bd354d5af78e53cd2ffbfbdf2c2d3a3e58eeb593f148c54024fa5905aa53a69c514d6d41e48688697e1ce8adb866817c77cdf541399f6e7956f SHA512 b7f3087f34e99517cd729f5ff1f8cce3f3254cb36c734d5b90d878293e4406934c2f597bf7e2941e9257046f62c9274eb4769a64dabfbc5f0bbf2a1703f7fef8
DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7
DIST rustc-1.29.2-src.tar.xz 61888912 BLAKE2B f59b0bf45caa6f6136f92ffbaa612bbc6a340c8694ec69d75aadace9180c36753f985641915524388b52cc108f8f5b71840ee3a6c0b1fcff6decb61d2d8a161e SHA512 d8fa9501764348ace8f60f2069bcd016925abe56c8bbc2b87fb52ff796e4bc7284c1fccbb1671416437bb82fde7d9240eeae875d6099914e27e75cfe050e2d38
DIST rustc-1.30.1-src.tar.xz 96086232 BLAKE2B 170767b64efe670086e7c4e73838b489a155a72c703148f83cad29d401a825a94a1def3aa462ba527e1bd08181c7a9be0e404c25f012906541c3d739eb57e9e5 SHA512 e466db81b9a82239670c48b876dc7390fcdda28c6390308691ddf2e0c12a39b57bd5ddb18322d1b4cd58165f69a666c7d83bee6573049da3b94e401657459bf5
DIST rustc-1.31.1-src.tar.xz 96915864 BLAKE2B bedfe1d56e2f99bb43b4b652d540aedf0a86c47b8493f28fb29e5af3135ff469ed40775bc2ee25ac5bd28a264ecba0094d7c9b6aae25ea365ed3e6f354ffa40b SHA512 d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02
DIST rustc-1.32.0-src.tar.xz 99602696 BLAKE2B ab26247e3ecb75dbe373254c1c49f46c00a5a4db2b9cedffccb30122ea3b7de2761d6995b5423d0105caf85cc9542b4c21d487385faa34c835398c3320ccbd3b SHA512 487c405fed6430f62d2d0c38b65f6223b1c5074c7a0d3734dc8b3bb72fca255f5727e49541749569713a0c3e9a67eff574ba5698e8dceca6f0ef20b50f99aa42
DIST rustc-1.33.0-src.tar.xz 100635400 BLAKE2B 1fe8ffcfab8324a93a07b9b9ac9cd050fd9d660fb24884761e8ce5e5a67ce5b6df8513e1440090b39c3ced9cb5ced43f07cc9b0337d39625d2cf4aa9e083cfef SHA512 3291e4e19f75f44c81e6fcf4c01edc7c9d326eca43722381231abcf2e99f4314059ba59a29b79f5511ad9421c358c45e8fe18584d6954d17fe2aabad0f9d9147
+DIST rustc-1.34.0-src.tar.xz 95055768 BLAKE2B 5df848369e8087ac10c57d9818e644e51be1d4a89e68341a2a49a09f0902c153ba5fab2d82e4178742b3ac4205249347950d0685259f6b1fe0761ec4daf87518 SHA512 cf9952cafe42987f84a6fe9e351a401f2db35c33ddc87d2efb762c4c33a643ffe516f00d848a1ae759f48cea1504243b6169c29ab28ba2e6b00a51422c745861
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch b/sdk_container/src/third_party/portage-stable/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
new file mode 100644
index 0000000000..b33311c0de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
@@ -0,0 +1,41 @@
+From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001
+From: Michal Gorny
+Date: Thu, 4 Apr 2019 14:21:38 +0000
+Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist
+
+Modify the add_header_files_for_glob() function to only add files
+that do exist, rather than all matches of the glob. This fixes CMake
+error when one of the include directories (which happen to include
+/usr/include) contain broken symlinks.
+
+Differential Revision: https://reviews.llvm.org/D59632
+
+llvm-svn: 357701
+---
+ llvm/cmake/modules/LLVMProcessSources.cmake | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake
+index 7cbd2863500..d0be0e8b3ba 100644
+--- a/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake
++++ b/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake
+@@ -30,7 +30,15 @@ endmacro(add_td_sources)
+
+ function(add_header_files_for_glob hdrs_out glob)
+ file(GLOB hds ${glob})
+- set(${hdrs_out} ${hds} PARENT_SCOPE)
++ set(filtered)
++ foreach(file ${hds})
++ # Explicit existence check is necessary to filter dangling symlinks
++ # out. See https://bugs.gentoo.org/674662.
++ if(EXISTS ${file})
++ list(APPEND filtered ${file})
++ endif()
++ endforeach()
++ set(${hdrs_out} ${filtered} PARENT_SCOPE)
+ endfunction(add_header_files_for_glob)
+
+ function(find_all_header_files hdrs_out additional_headerdirs)
+--
+2.21.0
+
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.1-r1.ebuild
index 7e2cf61022..a1262c2608 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,8 +50,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
+COMMON_DEPEND="jemalloc? ( dev-libs/jemalloc )
cargo? (
sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
@@ -68,6 +67,7 @@ DEPEND="${COMMON_DEPEND}
)
dev-util/cmake"
RDEPEND="${COMMON_DEPEND}
+ >=app-eselect/eselect-rust-0.3_pre20150425
cargo? ( !dev-util/cargo )
rustfmt? ( !dev-util/rustfmt )"
PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.2-r1.ebuild
index 724b161b99..472f877be5 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.29.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -40,8 +40,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
+COMMON_DEPEND="jemalloc? ( dev-libs/jemalloc )
cargo? (
sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
@@ -58,6 +57,7 @@ DEPEND="${COMMON_DEPEND}
)
dev-util/cmake"
RDEPEND="${COMMOND_DEPEND}
+ >=app-eselect/eselect-rust-0.3_pre20150425
cargo? ( !dev-util/cargo )
rustfmt? ( !dev-util/rustfmt )"
PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.30.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.30.1-r1.ebuild
index 676b056147..425fdeb1bf 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.30.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.30.1-r1.ebuild
@@ -40,7 +40,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+COMMON_DEPEND="
jemalloc? ( dev-libs/jemalloc )
sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
@@ -57,6 +57,7 @@ DEPEND="${COMMON_DEPEND}
)
dev-util/cmake"
RDEPEND="${COMMON_DEPEND}
+ >=app-eselect/eselect-rust-20190311
!dev-util/cargo
rustfmt? ( !dev-util/rustfmt )"
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.31.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.31.1.ebuild
index a4074c8e23..21695617d4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.31.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.31.1.ebuild
@@ -40,8 +40,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
+COMMON_DEPEND="jemalloc? ( dev-libs/jemalloc )
sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -57,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
)
dev-util/cmake"
RDEPEND="${COMMON_DEPEND}
+ >=app-eselect/eselect-rust-20190311
!dev-util/cargo
rustfmt? ( !dev-util/rustfmt )"
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.32.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.32.0.ebuild
index 06578ddc8b..8a1990cfb6 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.32.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.32.0.ebuild
@@ -40,8 +40,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- sys-libs/zlib
+COMMON_DEPEND="sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
net-libs/libssh2
@@ -56,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
)
dev-util/cmake"
RDEPEND="${COMMON_DEPEND}
+ >=app-eselect/eselect-rust-20190311
!dev-util/cargo
rustfmt? ( !dev-util/rustfmt )"
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
@@ -107,6 +107,12 @@ src_prepare() {
"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+ # ugly hack for https://bugs.gentoo.org/679806
+ if use ppc64; then
+ sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
+ export OPENSSL_ppccap=0
+ fi
+
default
}
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.33.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.33.0.ebuild
index c853798a69..0cc4462509 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.33.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.33.0.ebuild
@@ -5,8 +5,6 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-LLVM_MAX_SLOT=8
-
inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
if [[ ${PV} = *beta* ]]; then
@@ -40,14 +38,34 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/libssh2
- net-libs/http-parser:=
- net-misc/curl[ssl]
- system-llvm? ( >=sys-devel/llvm-7:= )"
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
+LLVM_DEPEND="
+ || (
+ sys-devel/llvm:7
+ )
+ "${S}"/config.toml
+ [llvm]
+ optimize = $(toml_usex !debug)
+ release-debuginfo = $(toml_usex debug)
+ assertions = $(toml_usex debug)
+ targets = "${LLVM_TARGETS// /;}"
+ experimental-targets = ""
+ link-shared = $(toml_usex system-llvm)
+ [build]
+ build = "${rust_target}"
+ host = ["${rust_target}"]
+ target = [${rust_targets}]
+ 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
+ extended = ${extended}
+ tools = [${tools}]
+ [install]
+ prefix = "${EPREFIX}/usr"
+ libdir = "$(get_libdir)/${P}"
+ docdir = "share/doc/${P}"
+ mandir = "share/${P}/man"
+ [rust]
+ optimize = $(toml_usex !debug)
+ debuginfo = $(toml_usex debug)
+ debug-assertions = $(toml_usex debug)
+ default-linker = "$(tc-getCC)"
+ channel = "stable"
+ rpath = false
+ lld = $(toml_usex wasm)
+ EOF
+
+ for v in $(multilib_get_enabled_abi_pairs); do
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+ arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+ cat <<- EOF >> "${S}"/config.env
+ CFLAGS_${rust_target}=${arch_cflags}
+ EOF
+
+ cat <<- EOF >> "${S}"/config.toml
+ [target.${rust_target}]
+ cc = "$(tc-getBUILD_CC)"
+ cxx = "$(tc-getBUILD_CXX)"
+ linker = "$(tc-getCC)"
+ ar = "$(tc-getAR)"
+ EOF
+ if use system-llvm; then
+ cat <<- EOF >> "${S}"/config.toml
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ EOF
+ fi
+ done
+
+ if use wasm; then
+ cat <<- EOF >> "${S}"/config.toml
+ [target.wasm32-unknown-unknown]
+ linker = "rust-lld"
+ EOF
+ fi
+}
+
+src_compile() {
+ env $(cat "${S}"/config.env)\
+ "${EPYTHON}" ./x.py build -v --config="${S}"/config.toml -j$(makeopts_jobs) \
+ --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
+}
+
+src_install() {
+ local rust_target abi_libdir
+
+ env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || 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
+ mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
+ if use clippy; then
+ mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die
+ mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${PV}" || die
+ fi
+ if use rls; then
+ mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
+ fi
+ if use rustfmt; then
+ mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
+ mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
+ fi
+
+ # Copy shared library versions of standard libraries for all targets
+ # into the system's abi-dependent lib directories because the rust
+ # installer only does so for the native ABI.
+ for v in $(multilib_get_enabled_abi_pairs); do
+ if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+ continue
+ fi
+ abi_libdir=$(get_abi_LIBDIR ${v##*.})
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+ mkdir -p "${D}/usr/${abi_libdir}"
+ cp "${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
+ "${D}/usr/${abi_libdir}" || die
+ done
+
+ dodoc COPYRIGHT
+
+ # FIXME:
+ # Really not sure if that env is needed, specailly LDPATH
+ 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
+ echo /usr/bin/cargo >> "${T}/provider-${P}"
+ if use clippy; then
+ echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+ fi
+ if use rls; then
+ echo /usr/bin/rls >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+ 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}."
+
+ ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
+ ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
+ ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
+
+ 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/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
deleted file mode 100644
index 5d0d242c11..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst preinst prerm
-DESCRIPTION=eselect module for rust
-EAPI=5
-HOMEPAGE=https://github.com/jauhien/eselect-rust
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/jauhien/eselect-rust/archive/0.3_pre20150428.tar.gz -> eselect-rust-0.3_pre20150428.tar.gz
-_md5_=597c492942d13df020cbc55cba270148
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-20190311 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-20190311
new file mode 100644
index 0000000000..541058beef
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-rust-20190311
@@ -0,0 +1,10 @@
+DEFINED_PHASES=postinst prepare
+DESCRIPTION=Eselect module for management of multiple Rust versions
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Rust
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-admin/eselect-1.2.3
+SLOT=0
+SRC_URI=mirror://gentoo/eselect-rust-20190311.tar.bz2
+_md5_=65dd2c4186c2d9620ac18ea0bcc0d72b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.1-r1
index 398b77ce36..67645ba3cb 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.1-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
@@ -7,9 +7,9 @@ IUSE=cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wa
KEYWORDS=amd64 ~arm64 x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
PDEPEND=!cargo? ( >=dev-util/cargo-0.30.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+RDEPEND=jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) >=app-eselect/eselect-rust-0.3_pre20150425 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.29
SRC_URI=https://static.rust-lang.org/dist/rustc-1.29.1-src.tar.xz -> rustc-1.29.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz )
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=5831d3a5034102196141eb66a7671b7c
+_md5_=b348190ec3d527a3bc762b7191fd98c2
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.2-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.2-r1
index ec9d251a85..4a8566228c 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.2-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.29.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
@@ -7,9 +7,9 @@ IUSE=cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wa
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
PDEPEND=!cargo? ( >=dev-util/cargo-0.30.0 )
-RDEPEND=cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.29
SRC_URI=https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz -> rustc-1.29.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.28.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.28.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=4f081c3faf691766e5d647aeb92f734e
+_md5_=8a3d98fc8ec760fac43ba553a5eb19e9
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.30.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.30.1-r1
index c313ee0d5d..0f4b5de44b 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.30.1-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.30.1-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
IUSE=clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+RDEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.30
SRC_URI=https://static.rust-lang.org/dist/rustc-1.30.1-src.tar.xz -> rustc-1.30.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.29.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.29.2-i686-unknown-linux-gnu.tar.xz )
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e llvm 01fccd3367b527770b74bfbf59d616c6 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ffbb9fcfb04166eb7a141fc0780b75b
+_md5_=f195ce5d7cade9fdee2d48de12950c67
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.31.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.31.1
index 8f09c564fb..c2258681cd 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.31.1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.31.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
IUSE=clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+RDEPEND=jemalloc? ( dev-libs/jemalloc ) sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-6:= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.31
SRC_URI=https://static.rust-lang.org/dist/rustc-1.31.1-src.tar.xz -> rustc-1.31.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.30.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.30.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.30.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.30.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.30.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.30.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.30.1-i686-unknown-linux-gnu.tar.xz )
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e llvm 01fccd3367b527770b74bfbf59d616c6 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=403822944f56d1a33dd6fe0d0c7335c8
+_md5_=da88436eda12eb3b07462c79d83c9c9b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.32.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.32.0
index e3c24b5d24..819606749a 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.32.0
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.32.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( sys-devel/llvm:7= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( sys-devel/llvm:7= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
IUSE=clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( sys-devel/llvm:7= ) !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( sys-devel/llvm:7= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.32
SRC_URI=https://static.rust-lang.org/dist/rustc-1.32.0-src.tar.xz -> rustc-1.32.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.31.1-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.31.1-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.31.1-i686-unknown-linux-gnu.tar.xz )
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e llvm 01fccd3367b527770b74bfbf59d616c6 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e451ca35b04542c54aaf5888ed91aadc
+_md5_=3eb5cbd7f9e0a0ba240df2e3e47f2ce6
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.33.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.33.0
index 3fd329b306..79b7ac64a0 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.33.0
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.33.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-7:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:7 ) =dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
DESCRIPTION=Systems programming language from Mozilla
EAPI=6
HOMEPAGE=https://www.rust-lang.org/
IUSE=clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( >=sys-devel/llvm-7:= ) !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:7 ) =app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) x86? ( cpu_flags_x86_sse2 )
SLOT=stable/1.33
SRC_URI=https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz -> rustc-1.33.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.32.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.32.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.32.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.32.0-i686-unknown-linux-gnu.tar.xz )
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e llvm 01fccd3367b527770b74bfbf59d616c6 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bdd5b5727b3ae40896ecb1feb1966059
+_md5_=466f6e43619d859e53b8573e52617fd9
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.34.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.34.0-r1
new file mode 100644
index 0000000000..e44f252aed
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/rust-1.34.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] ) =dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] ) =app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+SLOT=stable/1.34
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.34.0-src.tar.xz -> rustc-1.34.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e llvm 01fccd3367b527770b74bfbf59d616c6 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 rust-toolchain f9b504d977266122e1891048638138c6 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6ca56c1e5462fe677a86307941dd42fa
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/cargo-1.34.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/cargo-1.34.0
new file mode 100644
index 0000000000..e8ca6e01c4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/cargo-1.34.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Package manager for Rust
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.34.0* =dev-lang/rust-bin-1.34.0* )
+SLOT=0
+_md5_=7d8f8fecda5039fddd85ab8a755d765b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.1
deleted file mode 100644
index 4c6ea87fc7..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=amd64 ~arm64 x86
-RDEPEND=|| ( =dev-lang/rust-1.29.1* =dev-lang/rust-bin-1.29.1* )
-SLOT=0
-_md5_=dad7178b61033a6b77ecc7b49f8a0ca2
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.2
deleted file mode 100644
index 0cfdb370cd..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.29.2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.29.2* =dev-lang/rust-bin-1.29.2* )
-SLOT=0
-_md5_=3c415d7d9908f5c90d29d966a1bf039b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.30.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.30.1
deleted file mode 100644
index 82c1b78959..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.30.1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.30.1* =dev-lang/rust-bin-1.30.1* )
-SLOT=0
-_md5_=c2c3e280932fdb5ce5cad68cd60f00d6
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.31.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.31.1
deleted file mode 100644
index 34b0f1506e..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.31.1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.31.1* =dev-lang/rust-bin-1.31.1* )
-SLOT=0
-_md5_=c2c3e280932fdb5ce5cad68cd60f00d6
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.32.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.32.0
deleted file mode 100644
index 1988420aa1..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.32.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.32.0* =dev-lang/rust-bin-1.32.0* )
-SLOT=0
-_md5_=318f6d0fe9e046185f85cbec4c8c6dd5
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.33.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.33.0
deleted file mode 100644
index ddf9247382..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/rust-1.33.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.33.0* =dev-lang/rust-bin-1.33.0* )
-SLOT=0
-_md5_=318f6d0fe9e046185f85cbec4c8c6dd5
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.33.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/cargo/cargo-1.34.0.ebuild
similarity index 60%
rename from sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.33.0.ebuild
rename to sdk_container/src/third_party/portage-stable/virtual/cargo/cargo-1.34.0.ebuild
index 75f8223994..5e73701929 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.33.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/virtual/cargo/cargo-1.34.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-DESCRIPTION="Virtual for Rust language compiler"
+DESCRIPTION="Package manager for Rust"
HOMEPAGE=""
SRC_URI=""
@@ -11,5 +11,7 @@ LICENSE=""
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
+RDEPEND="|| (
+ =dev-lang/rust-${PV}*
+ =dev-lang/rust-bin-${PV}*
+ )"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml
deleted file mode 100644
index 85cf4eb920..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- rust@gentoo.org
- Rust Project
-
-
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.1.ebuild
deleted file mode 100644
index f0bd8de3f2..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.2.ebuild
deleted file mode 100644
index f0642556ce..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.29.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.30.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.30.1.ebuild
deleted file mode 100644
index 8b9a42f1d5..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.30.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.31.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.31.1.ebuild
deleted file mode 100644
index 8b9a42f1d5..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.31.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.32.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.32.0.ebuild
deleted file mode 100644
index 75f8223994..0000000000
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.32.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"