diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest
index a7de31a5e1..112a1e13f7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest
@@ -1,7 +1 @@
-DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8
-DIST mccabe-0.6.1.tar.gz 8612 SHA256 dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8 WHIRLPOOL fb57eebe4b20af1dbd81f0e62d00ea64b3e998f1549de3f06ed65d3c244f671d0668fc630c3105639fd351534f8dffe3c093d7e32a3f17400f210b1f286f38bd
-EBUILD mccabe-0.2.1.ebuild 546 SHA256 a6a753ae048a3968192f822a7145866af4f13f632f923666a292b4631279b5e0 SHA512 55402e8f18c4756761c676a7fed84e61f796206f9dda89f187b832d8a5cfbeecda65a685f529f3b51c71a691a6d4f0e5dba2ed19fa1bbbd0e14bbead186fdc96 WHIRLPOOL 3b2bb441ce671d12cd24644c282fcb9df4585013532c85bea92b8928d844a1b560a2e0d9fd3e7844899fecca88c3d67dd5b7809ec6f550d7f6b9d514ac4b5c20
-EBUILD mccabe-0.6.1.ebuild 847 SHA256 f429c078cf0634b1074e4aa5d3b971a2e4755948a6c102fd440554040e94bc41 SHA512 7979b717ddad2625f5d514b9e388cf28816736717cf819ae230dfc5c652cb9c6455493654f8ecadf8f08db214da88263ec2e85f3e149dc4ee7525f5997e61ed5 WHIRLPOOL b215d80c27e4f3d19a63817126a14470f3c82d2822672c6d4a4bb9d30506e61b0c8df382c9c2171883dbc8fb37f571c5f6a5c8e43b9dbad8391b01e29c41e23e
-MISC ChangeLog 5326 SHA256 da0302c36de232263f4df3926a59c9a333221872701aa68e6dd51db68708e911 SHA512 6ae42559bfa0a25f9ad480aa86d9f7b2557fc9588d6f1e4302bd221196e83212c5548d046d0e0aef3673eea6ce8ae09984b7a8ee7364aa0326fb423f4c7a5f6f WHIRLPOOL e216053bd6bd616c5422cbd454d55801bf9a6642b9a1347661da892cd374058ace55a130eccf12576c3cda9d2a30b77729c9a3b390122f11b28ca0d660e93409
-MISC ChangeLog-2015 2635 SHA256 a7564701320834f2d40712d217a850d3a1191f9f3d2e1ce2583099d056ee41bd SHA512 c3f477111f68a99d86bdc497df25c56ad9b7f9013b78a976229b9a4ead982a9bb18279435c8f2cf94fd79b4e72ef8aaeb1b6ae82a41bc6e561c62246bdd6de32 WHIRLPOOL d756c83ddf1b53bf7593f1f56155462a62a2228dfad9fe21655f12daab6e09b7ed0e0e1eb2e2360e9b36d44762d71e178d2bfd9c1ef8701ef444e030e3e63043
-MISC metadata.xml 373 SHA256 69afc3321198c6b7781eb225e356124b73a62600c685f940a0d4f1a59b009a15 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1 WHIRLPOOL 5b0e2890ca15e8d14eed0e6c5eed63b7bbf5b7b4ab05de5d326b911fccd45f065affc025969e36f2c1da241d51c7e159ded75c724bec3e45f51daff2a4587ceb
+DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild
deleted file mode 100644
index 090e4ca9a3..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
new file mode 100644
index 0000000000..4a2bda6049
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.ebuild
deleted file mode 100644
index 95e58ed951..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.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{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml
index 4e85351888..3c742067aa 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml
@@ -1,10 +1,11 @@
 <?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">mccabe</remote-id>
     <remote-id type="github">PyCQA/mccabe</remote-id>