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
new file mode 100644
index 0000000000..f9d87cdb21
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.54.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}]
+)"
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
index c22b297cb1..f9d87cdb21 100644
--- 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
@@ -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}]
+)"