diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest
index ecc5c5796d..648021aa20 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest
@@ -1,4 +1,2 @@
-DIST setuptools_scm-1.15.0.tar.gz 23677 SHA256 daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d WHIRLPOOL f185851ee05cc8dd538a6b81e2a17a6155aca5c091e9dac5c56937e559551106147e12df8ba1ff97217f1e411cb8d34eadd40220850dd3010e52ad96c5f8a93a
-DIST setuptools_scm-1.15.5.tar.gz 25752 SHA256 145b2a8a609e0fd66108a92a06fe62d0fb329c0eb944f2d5c7ae3ca24222f29e SHA512 4d6f648dbdb90845a8e61c58bde06f3ef65898f9195b4dc97c40662d4cbeaf952f35c29940acfac7315b6ce6201a3af1d2eeab11274a8eaa02c7429c646c369f WHIRLPOOL 4a96a69e92fc256497c1300bcac47615929776e88dafe0eaad670d9337e83aadf38f91fb856f4e518cb811f3cd0c07097820850730f49d828f6c4ac2078e4ebe
-DIST setuptools_scm-1.15.6.tar.gz 25779 SHA256 49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816 WHIRLPOOL dbaf70b0c09ef8b74d3cf114fb1f26032003f88c1081f28f0758ecae24722316e737ca5b404f6db287a85428a9121ff7ab6e13a41343e7ec277de9d85f16e645
-DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
+DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
+DIST setuptools_scm-6.3.2.tar.gz 57207 BLAKE2B 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 SHA512 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml
index 3aabcf5799..c5b76d7536 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml
@@ -1,13 +1,13 @@
 <?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>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">setuptools_scm</remote-id>
-		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
+		<remote-id type="pypi">setuptools-scm</remote-id>
 		<remote-id type="github">pypa/setuptools_scm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild
deleted file mode 100644
index 5b5c07439d..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild
deleted file mode 100644
index 92fbe871c1..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
deleted file mode 100644
index 4a9883705d..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
deleted file mode 100644
index 9362c8c2c4..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
new file mode 100644
index 0000000000..c333450a21
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
new file mode 100644
index 0000000000..1223736589
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial )
+	)"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+)