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 15c64eb2fb..15244489dc 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,2 @@
-DIST eselect-rust-20190311.tar.bz2 49358 BLAKE2B be8060638a7ee553275e230466de8bc5e3fb1059afb049b71b767794f4f8e3968af03a755270d892e20e5ca6aa3efc869d2fd031713f9e8ed516e6465aad19ff SHA512 98fb4502c1f5358e1a3fd2e91a0e9905aced990d62bb11414830b150e8d72fbab90c23518f9c30d04d015b4c303270a6332400bbb373cd4ea9dfbf0d0b3c942e
+DIST eselect-rust-20200419.tar.bz2 50278 BLAKE2B 5d5e773a0e0481403e1645cb5fdf642e1ce5d1819e9699a79fcaf822ff3e6f258b2d1958548e00df200d9aaf061be1d3b1773e6b0e92b498fe75316ac13ff235 SHA512 68db32df19864a8365e272946161966b9cb513d7403dd1df7a4c7d87fba3b8bfcad59b407dca7dd6c8e0756f2e5cbde367ade69629eaa78d019d2b524051f741
+DIST eselect-rust-20210703.tar.bz2 4253 BLAKE2B 1d04c00db1794148b6d908c44172b8958f5ae2c7753875675387eea175ce914b7315452923a819d1b77bf22f10493ba9704c70d48388faa080b6af49efccb956 SHA512 b8f4f03f299a8415019746964347dffc5520dfcf79fd9d059bf600f63045ab80f8692509f0358be427c676ce98692ac8342b6f447aef21ce4d7ca048741b5e47
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-20200419.ebuild
similarity index 71%
rename from sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20190311.ebuild
rename to sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
index 1fe212c520..2934b8564d 100644
--- 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-20200419.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 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"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
new file mode 100644
index 0000000000..210ce3086b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Rust versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-rust.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_prepare() {
+	default
+	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 10efdddc42..0e253718b2 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,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>rust@gentoo.org</email>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jauhien/eselect-rust</remote-id>
-	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
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
index 85cf4eb920..f51288e196 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>rust@gentoo.org</email>
-    <name>Rust Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
+		<name>Rust Project</name>
+	</maintainer>
+	<use>
+		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
+	</use>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild
new file mode 100644
index 0000000000..b6e4774761
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.52.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild
new file mode 100644
index 0000000000..b6e4774761
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.53.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild
index c22b297cb1..f9d87cdb21 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,11 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
 
 BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.55.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.55.0.ebuild
new file mode 100644
index 0000000000..f9d87cdb21
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.55.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"