diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest
index 7640968ec1..a8393e15ac 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest
@@ -1,2 +1 @@
-DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
 DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild
deleted file mode 100644
index c78d9961bb..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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=no
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=certifi-shim-10001
-DESCRIPTION="Thin replacement for certifi using system certificate store"
-HOMEPAGE="
-	https://github.com/mgorny/certifi-shim/
-	https://pypi.org/project/certifi/"
-SRC_URI="
-	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="CC0-1.0"
-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="app-misc/ca-certificates"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
-	distutils-r1_src_prepare
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r1.ebuild
similarity index 80%
rename from sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r1.ebuild
index 9fb5fa1b80..6019af2a84 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r1.ebuild
@@ -5,6 +5,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 MY_P=certifi-system-store-${PV}
@@ -19,17 +20,21 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 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"
+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="app-misc/ca-certificates"
 
-distutils_enable_tests --install pytest
+PATCHES=(
+	"${FILESDIR}"/${PN}-3021.3.16-setuptools.patch
+)
 
 EPYTEST_IGNORE=(
 	# requires Internet
 	tests/test_requests.py
 )
 
+distutils_enable_tests --install pytest
+
 src_prepare() {
 	sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die
 	distutils-r1_src_prepare
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch b/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
new file mode 100644
index 0000000000..57154fd0ee
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
@@ -0,0 +1,21 @@
+https://github.com/tiran/certifi-system-store/pull/17
+https://bugs.gentoo.org/822777
+
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 23 Nov 2021 15:56:33 +0100
+Subject: [PATCH] Add missing install_requires on setuptools
+
+This package is using pkg_resources explicitly, it should therefore
+declare an explicit dependency on setuptools.  The missing dependency
+has lead me to actually miss the runtime dependency which caused issues
+for Gentoo users for whom setuptools were cleaned.
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -40,6 +40,7 @@ zip_safe = True
+ setup_requires = setuptools
+ # hack to prevent installation on unsupported platforms Windows and macOS
+ install_requires =
++    setuptools
+     certifi-system-store > 4000; sys_platform == "win32" or sys_platform == "darwin"
+ python_requires = >=3.6
+