diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest
index 937a5b56c8..025020f048 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest
@@ -1,3 +1 @@
-DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
-DIST repoman-3.0.1.tar.bz2 88134 BLAKE2B 270eb8c6220360d32076a402795df9bb1c7ce7ca6509707fc2b9307ca94b59131da3100b51519bed2f76dde703782db6ed74a052b51ea48c690e6558ceb9d24f SHA512 2da130a5dba547390151620f7e944de45e0a880165ab138000870661778f54c6f6c2e0eb61bab961a0cf17642a96fc8a2e5e508bb16cc1adfcf103074838196c
 DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2
diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-2.3.23.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-2.3.23.ebuild
deleted file mode 100644
index 9dfe116e98..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-2.3.23.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.1.ebuild
deleted file mode 100644
index d850a86e96..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-9999.ebuild
deleted file mode 100644
index 74e5a63301..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}