gentoo resync : 23.09.2020

45 files changed, 100 insertions, 962 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index bbb676d9051f..dad4f306d120 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 29c90d8fd6d7..a7f42fec543a 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,4 @@
-DIST cpuid2cpuflags-10.tar.bz2 82756 BLAKE2B 144ccc9ffff9fdafa9d29628963143b3685421c3c96a81ab780d835c7e0d83fdfe02c720744f57f2947c6079af157c2b6d3e61277f5af734fdba08c6fec23b9f SHA512 c34feef1548b9ade349efbdb68880fea303dd9a8d361de017b925688f9b189602cb175e1699dbe7b48f6887f343fafca9ff0ac95b8eb174bf7201c8bb5978c98
 DIST cpuid2cpuflags-11.tar.bz2 83091 BLAKE2B 2225b6031505597050332d50f4cee69aebb263f9def8043fde64b61e7d06bd2b2ab306eab31701434435a5ede1da974004db3d800a9184011595ed5c16422c79 SHA512 0eeff4e6369eaca6ddb516ff95597c649a7619c1ad79b0d73f51ef9f903db55cb7a49c5ccec478c9a923abfcce63e4ee5b6436f08eb9092b0024c898e508750b
-EBUILD cpuid2cpuflags-10.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
-EBUILD cpuid2cpuflags-11.ebuild 913 BLAKE2B 142f58aa114c78cffe57d0dca9b66d6344cfe02627baf2563368984b93cf6d34c01f6d0455795d62fd77c86778d9c32e52c3c8259ea191368ed435dfdbb2a6a0 SHA512 8c704d8d6891c463b92a0e1a896b2eeacc1f0ebe898c31ff251954efc2fb3fa7a7a7f7179cc3213718be15127ee02689c8022a71598f665e1a3db1206488394f
+EBUILD cpuid2cpuflags-11.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
deleted file mode 100644
index 5914671097eb..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
index 68febed6eb13..5914671097eb 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 5fb73d33ce0b..891e362945fe 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,13 +1,5 @@
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f SHA512 a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d
-DIST eix-0.34.5.tar.xz 629276 BLAKE2B fe686512e5061bdbc8e499542972f2a3e65e672b111c8d4d8c22b093c65fcf02e4de8ad41805b69fe52c0d962f660c787a7a2639341cd8fd59d03c94c2601b79 SHA512 b11744ea36c0771e4959de4925b3d74df8c270633a21c82ff27f4c91cc5a9281a85a594f0d20d5eb5c3c15a6c08e74232030687cc85f588545216438dc4ff7d7
-DIST eix-0.34.6.tar.xz 629424 BLAKE2B bad7bc0e9d0bb3752c1e4df4e267e3782b43b15445d0a6cb9554bff6811556edcb244deeacef5189477bb4bbf37a200e687dfa15677117766378cdb5ec40d9f1 SHA512 b9cae0c3be4ede9563da4d4eda61e26c83de449c27d5048e6611164ee2513d0ad729cfa3622ef74c5b1a77d12ac2ea8f7e7ae029d7cf04efae31ef054375eb78
-DIST eix-0.34.7.tar.xz 629380 BLAKE2B 307a97550540a4d9edf25a825cba816b275f07d2df665286fd475aba008d6938cc67725b1067ce9b1cb7af19aabe6f057ad5bd8a0cfe1c75c5d831b1638870ef SHA512 14ceae8658d53524f8ffa8bfc54284da6c39b731d04f1fe4ae33fcb23899a9e3ed93211a3e9546857c7ee1cf0d1baaaf52ebd2f0a5183753fe77671abcffdc79
-DIST eix-0.34.8.tar.xz 629380 BLAKE2B aa480c9228816dd795d82ee62a597d8171e1b861befdd3a5ad9daa634e337162a7074120b1649fd5962f67c3ef3decb0725492739ad62e5e824376e14b046b28 SHA512 9cbda3b2d449559063910a4234c26a5b8424ab244624ba093f7d5183600c53d0240948ffb891a9d94a961d3a32033cca374635992da6abf73d746f0356c1cc8e
 DIST eix-0.34.9.tar.xz 629672 BLAKE2B ba9a5de98f74baa711e7483e284980c0fe5e956512de590954bf848f6cf6baad5db899256e927e7cb984d7276157fa9c42052cc8fb1ccc52e5e530cc31d39d84 SHA512 5cb00c813bc31971a0cfd77cae0c676040d33f24963cb241274918d2e381956ca949593e0637d81040a9751db0a925552913188cc25ada9a90c6007c31f72e43
 EBUILD eix-0.34.4.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
-EBUILD eix-0.34.5.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.6.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.7.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.8.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
 EBUILD eix-0.34.9.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.5.ebuild b/app-portage/eix/eix-0.34.5.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.34.6.ebuild b/app-portage/eix/eix-0.34.6.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.34.7.ebuild b/app-portage/eix/eix-0.34.7.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.34.8.ebuild b/app-portage/eix/eix-0.34.8.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
deleted file mode 100644
index 9aae1da0057c..000000000000
--- a/app-portage/etc-proposals/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST etc-proposals-1.4.3.tar.gz 53696 BLAKE2B aa86d4b55d53ea269bfeb58cb1db9877fab224c5387fd91ac377d757814580b8c4561c868d9c2d97c465b332041c67fdfe7a5e196fe329b92a768d542257a9ff SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1
-EBUILD etc-proposals-1.4.3-r3.ebuild 1272 BLAKE2B b99b4f39bc3c08f433fd93d90f24f3f8e953bd1d4c091d81fcf8fcbda045b670bbcf93bca0835164cf3c0307fa43f3a1b688653f913b9d45f51eb93e69f5eaa8 SHA512 1d85af758807a3d7eb94041528c29c48566809a4c5a975562b153f62fe40a91d61c912629c4f9792ce53cecfa72a0e241c7b395d173509420d37ef48146ade07
-MISC metadata.xml 357 BLAKE2B 88bc360c88c0e4b9d32bd28923648fd27263bbdf753b3e6be5f3ec2bcf9cff590a9cff68a62bc1426fdd85e4f4aa8cfb8d818633304af9a13f5954da4b5f72a6 SHA512 a4c8e74227ed3eb52a28f7f44c5374368573f9ddb6760f673e6815aee796ee14d7ab011e0c4c8c7035bcfb7a2cce27f68e185e86100cc3868ed97d5763bdc10c
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
deleted file mode 100644
index 8ec312a94438..000000000000
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="a set of tools for updating gentoo config files"
-HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-DEPEND=">=dev-python/pygtk-2.10"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodir /usr/sbin
-	einfo "Moving /usr/bin/etc-proposals to /usr/sbin/etc-proposals"
-	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
-	rmdir "${ED%/}/usr/bin" || die
-
-	# Package has PyQt4 support no one ported to PyQt5 so far, bug #634956
-	sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
-}
-
-pkg_postinst() {
-	elog "The configuration file has been installed to /etc/etc-proposals.conf"
-	elog "If you are installing etc-proposals for the first time or updating"
-	elog "from a version < 1.3 you should run the following command once:"
-	elog "etc-proposals --init-db"
-	ewarn "A full backup of /etc and other files managed by CONFIG_PROTECT"
-	ewarn "is highly advised before testing this tool!"
-}
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
deleted file mode 100644
index 85162e1ca20c..000000000000
--- a/app-portage/etc-proposals/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">etc-proposals.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index d29b66b39163..65da66598f0d 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,16 +1,10 @@
 DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
 DIST gemato-14.5.tar.gz 72752 BLAKE2B 61ca43c92556850afdc8ab1d027aa719d13e77727caf9660d1861b1cb07ab40c05bd0fab23f99eaa47252e09465813685c59d1ebb5cc89c2c3381e1571256836 SHA512 0979de8cb4fc51c79d5af485092e0b376094238d6bb67d44db96c66b1d5ee945f0ba82dc6f72bea1042b935029cb790c5cd87bc419ba82da21a972141f3690bb
-DIST gemato-15.0.tar.gz 73757 BLAKE2B 1315e621ccd10db4b1dea159fe01386e51632716b02dc1a5e797296b506de14506691b4cf9eeb58b66081ae761c1926c1c7fc6f1c1543143fb64e9e5dc47984e SHA512 ed88961bc22df77227c46ff013bafc801f1648827085bc02845b4374f3a4e67cdc79b68cb2bcd31956ac40cb0014e0f5348d79d77394ceed9152b2a0aa30599a
-DIST gemato-15.1.tar.gz 71954 BLAKE2B 29a899eb215b78c608f6846c8978837c96df5a69c112c771e4c25c89df268ef22e02bcfb171e9a1b5b2377af101c1029638156c7317e6961133b5a9206747204 SHA512 3263c8e0bc74e1b031775cc37697be5f3214d09ce00ea922af00b8b46638756ee74ad3bc75e73fe8e3563a0ccd5b76986a8f5fc7c00423db863296d89dd233a8
 DIST gemato-15.2.tar.gz 72679 BLAKE2B 83e28fa3bc83976538610fec87c3a31e91a18847c107dc7793e16b5421eba69f7b60f8f05195f345ef6f4f8486203e4acbc01bad706b55c20a11480e85a3420c SHA512 5a98040dab0beac64e5e54bd54c6565cd301399709beda9e030ae9206111caf9e792260aa3c6586040060d4be71df3f1368e7554dff6affaa899c4157116faf3
-DIST gemato-16.0.tar.gz 78236 BLAKE2B d4c0d610eb2228be9c439036f7049b9c77d768e91bd30c32a072be5364dd94771dcad32f1194f69a195fb16182f8ecda8cf4769f61cf80e96d9737241ed4080a SHA512 73a1cc588d7541de466c9869eddc5f9347fd15eadeea0ed12c200a8bcf05a933969b80d66d1f61c8d73d9824b83986d4d93188105f047621d161454f22f02f45
 DIST gemato-16.1.tar.gz 79946 BLAKE2B 54452ae113cee98f5c8f9ebc880b4ae424510766eb7cd8bc2775c85573388005343061aa9de8f505a72ee92801756f3cb7b67dfd39d9923d0030a4da301f7ce2 SHA512 df21eb8784cc6724874e38ba0192e1e5657483aa031656855fc0c2396179f7352f9450df6b41205425214cf70f2c812a7ee6f55a25334f0fd012b7e710c1de2c
 EBUILD gemato-14.4-r1.ebuild 787 BLAKE2B d4d4b1c7011ac007f52e1c2a54825bb479427b29b435516c93219cbef62413810dec626ef452e30a3ea39c1b8737701c86c83e928b324d7012a625e28ae6fca9 SHA512 8840b697663b8e1b38d49f9e9ed94a4e1851f256cd7d130eaeeee86f4b61c04eb320829f530a48b2f0a8da82bf24110add5e217f0a9104ba4fd228f52bef7636
 EBUILD gemato-14.5.ebuild 796 BLAKE2B f57c8485072e46ab7a35d1ed15d4d56fa73326073c5f6dc2ee892cc5b4da14ed965abfd64fe90ac6db13e0c994cde491c1e43f3100e2ed3fba0862b05008255d SHA512 2e0841d93405d2f42c4163cbbeea8bef31a6d3048d80cbbd4931d77c794d6f0643a37656b8bd0e7c1ac110df5a549f129da57955e06708160d2b6d85d6c2544e
-EBUILD gemato-15.0.ebuild 934 BLAKE2B 63a94374190e1792ce69087d10b48fca4bb183fbfa03d63c4d9c4e9969bf17ca9f8ccdb55ac412fdd9a08d2a6dbf789cac24c7089d769eebfde6ebec8fe87058 SHA512 a9ed3673f74d60864e0892b6101756ae021329392b73ee029febe2725fd2efb26e9cf33e325fc513a590230e95ba1c1495342372f8bd60dcbbb86b22940b685e
-EBUILD gemato-15.1.ebuild 988 BLAKE2B b085021b27dd2ea1708ed595f385efda9e03476fd63394b9bafd140f9ec2fce188ce0b441850fdff11f51a45ed8b033b14a937aaefd6bd36a60e73ed2a7b4c86 SHA512 b73be3637f33912433a0aa0f966a4a8bc2365d79224148006f1b0606f3044fe6e72711920e178044d79516c65592bf467c97f566b26dff7bc5a090d9c4cadec5
-EBUILD gemato-15.2.ebuild 999 BLAKE2B ccc88123c6601945bf7db04e4d3950903ed1fc6aca240fc4e17be19b806ee008e0df862d8569255ab1daad60ab4dce19572cafb0fd966da0a86fce4e5d46bd80 SHA512 043039314c1d652b389d05de2beb852d4652c70894f4f3816b9a19d8cc8c19025c3a5009a02f2b01c27b5767a1ed29ef254fe79685b88eea2ec58be2785e7eb4
-EBUILD gemato-16.0.ebuild 994 BLAKE2B fd9e1d4de6bc0a705842052ed2c72fca13f03550b7e559e4b6484cfd06b5466fb5b504ba7a206026485007e4036dc8f543abaa6174ae0a1d8da921e50265deec SHA512 396db0386572a9b351a942dde2e0475738355d15a9af3e028e9b3e67015ae208498e118e8157a4993a39f34d20ecd94b5acc6b8d1cbfe78fc014ac7701cc6e09
+EBUILD gemato-15.2.ebuild 992 BLAKE2B c790af1b29c2a16400b90de18601065dcd945ac8f6c5844dc775fbab8cd58b992f2150c5ef8af4af7ee4d681ae962367025478fa79162dd839b0750644d38f34 SHA512 74d537c7c139d11f25d68058077ef36632ba85a9587b2fe8705fcdf3731cb2b3a985467a4d0f0c08fe28f4dedc8b1ea380128f33557ec8ab1a544434f9a4633d
 EBUILD gemato-16.1.ebuild 999 BLAKE2B ccc88123c6601945bf7db04e4d3950903ed1fc6aca240fc4e17be19b806ee008e0df862d8569255ab1daad60ab4dce19572cafb0fd966da0a86fce4e5d46bd80 SHA512 043039314c1d652b389d05de2beb852d4652c70894f4f3816b9a19d8cc8c19025c3a5009a02f2b01c27b5767a1ed29ef254fe79685b88eea2ec58be2785e7eb4
 EBUILD gemato-9999.ebuild 911 BLAKE2B 842be0a9be8c293c514a37bd3342f2cc75bdcaf053a1115e069f463460619dc6688a25c45db327e5917c68f6683f08b75094ab07a3995605bf118c937dab5066 SHA512 ed4b3eb1d7f0876e4605fa2694bccabc5dc38cee75d0de663d77e901a6f1e1f24bc5fa66e5689c6b8c1e94a2d9961ada6e7f130583a538e75c3254d381222237
 MISC metadata.xml 670 BLAKE2B 227576c022fb4b2011152a3c423ecab3b8f7524e4e2ec07bb7e963c573fbc17d8b99c4123af93ab665f0e24690c1dd6394e2683bec3999112e1e2204293e91a4 SHA512 c45044a72c71f1e98245019db989a2222e9487cbfad87e7583c57964bb724b1947700497718035a726e4dfa4563dcd154c8ac9eeb43173b6a690037349e905d6
diff --git a/app-portage/gemato/gemato-15.0.ebuild b/app-portage/gemato/gemato-15.0.ebuild
deleted file mode 100644
index 6e3922e1c1a0..000000000000
--- a/app-portage/gemato/gemato-15.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-15.1.ebuild b/app-portage/gemato/gemato-15.1.ebuild
deleted file mode 100644
index 318247f61623..000000000000
--- a/app-portage/gemato/gemato-15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
index fdff5ec75554..1ab542e69972 100644
--- a/app-portage/gemato/gemato-15.2.ebuild
+++ b/app-portage/gemato/gemato-15.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg tools"
 
 RDEPEND="
diff --git a/app-portage/gemato/gemato-16.0.ebuild b/app-portage/gemato/gemato-16.0.ebuild
deleted file mode 100644
index d4dfe160f0cc..000000000000
--- a/app-portage/gemato/gemato-16.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 1eea4614657e..0efd48fc80d8 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,6 @@
 DIST gentoopm-0.3.1.tar.gz 37897 BLAKE2B dd5499787bcc5c46ae3b559f3af4a5af5b4ca81a312e926149c587cac0391c51dbe61ac42d2bc19eb83cedc168486e9c30ddd6fbf4ae10ffd9719aefa2f54cd3 SHA512 e1a3a7929ae83d813dd0b03f0548f033e8e51b766aaddb653027398fb618819de6237e2ba1c0542defc9d62e71e8495aa10152cbc47a4e521f7cbaeda3ea4354
+DIST gentoopm-0.3.2.tar.gz 38430 BLAKE2B df8536b384cdad754894d65b605ab688cedc09430bcc3cd0821ed1ae9a93d0cb5e7b076715edf6eaed6bbf5ffc9088fb14d8bd5a04c3809c38ce05c6ed106bb9 SHA512 d99034af2efada3647117c75d5602bc5878a8f0e79d1c6b502fdb0fa272f7b9148afbbe4d379a2957a7db6694b4001158e2dfce8e3a4f97692e20a803417f571
 EBUILD gentoopm-0.3.1.ebuild 645 BLAKE2B 273340ee2ad51a1ff16cefd80659ff40bf824ad37c115a0f4089d05f28100c417ab440ae9e6b6e0f094fe7c536ae39d8e0fdc03712e67da52f4de1072426d53b SHA512 8b5e849fc5ece7c9c14a0ea9aba599bf07d00f1ddd3d8b39be2e745854ece327645d1465104b33b58726e19d073eb816839de5adc3c265fb0db24bff5d728278
+EBUILD gentoopm-0.3.2.ebuild 648 BLAKE2B 34cf1c517003981aa2e61c3808ce15a99a93f2cea48cd767be6d6985de6fb23dabf92493ed96d4e67c90d758de891d3f055cf449f495771aa13dc36eb7a554db SHA512 c51a3cf64d89b8d19ad4e0c88a82b0fe1c927a1687c50cd66a67d5809988e3e6b388397e3b545aa5c6636341bacdeed50a8ca93885cd0db15bdaa0ca46578964
 EBUILD gentoopm-9999.ebuild 617 BLAKE2B cd8cd7946383e5b04e32cfb1bbc3531cb0ccee2c434b49c41fb5927e499a8e184fd9fa311c4507df9b150707c3bf16a5a98a9e1a14a0d9ae5f7c8ab18eb97dcf SHA512 aa1fc2c225e10b52e03561dff3ab128d3c1eb1c3ee82b2448c20e4577a79fc6ac710f537e05e6a44fb524f02bb466b0bb0ba629f3a9c8cd2f3e3189409cc078d
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.2.ebuild b/app-portage/gentoopm/gentoopm-0.3.2.ebuild
new file mode 100644
index 000000000000..5582cd45b7ef
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.3.2.ebuild
@@ -0,0 +1,28 @@
+# 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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}] )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpytage/Manifest b/app-portage/gpytage/Manifest
deleted file mode 100644
index 92813cd955c3..000000000000
--- a/app-portage/gpytage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gpytage-0.3.0_rc1.tar.gz 45470 BLAKE2B 19198581088ee8e6051404e6ed412773bd6522ea19127e432286443aa6f939a11d7a2323907e6d5a5b141e53d8dd698b23a9f3bfd9a74893abf362a82478f5dc SHA512 82f6ecdf5a5710c5f11a22401f46dbb50410f78101086f4ae727b09e6a022065c83b1ceccc3cf6771b5b09c37fabedd9ba58a01121c941c55d0fe9185ae9d0b7
-EBUILD gpytage-0.3.0_rc1-r1.ebuild 430 BLAKE2B edd432ebf0351b8e4b8a3e8317cf93788245b2e8211fe2a033dc105613be509a8c532cf5abc60883635fa2818e203bbcc19c0afaba8635761ebc4ac6021be329 SHA512 15613ea9f3abdf7b9928845312e2f6bd0f3ffab857c9818a4016c3d5d08bfb20ba9c5a279f8cd52e30bebcf77138d213d5b32e8654bec8155c7476efca6b4000
-MISC metadata.xml 266 BLAKE2B 75815a801df3e14d69c6810b6cf13de3679f3ca9a0c3a260b2d1bf6dc83e0384a1008cfeafd03bf6d360234597edc078b4604bc308b331e07fc8fdf0290fca70 SHA512 cd1fc3249f6de3f67db01b9aaf228ac3230f3748e884c85217239ed372091cc8c266c7e617be8f2cad290a5bebb1311f604bbe3e6ede91ab430d8d1dec770a42
diff --git a/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild b/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
deleted file mode 100644
index 4f2a875c2724..000000000000
--- a/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GTK Utility to help manage Portage's user config files"
-HOMEPAGE="https://gna.org/projects/gpytage"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2.14"
diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
deleted file mode 100644
index 210b750f9c7c..000000000000
--- a/app-portage/gpytage/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index e238ac65d303..9ebd6d3d12f8 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,11 @@
 AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
 DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87 SHA512 699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4
 DIST gpyutils-0.4.3.tar.gz 19951 BLAKE2B 2d15c6c714a7f75be4a5398b7287d6281a201f1b5806c6cac34093cd74ae3449fcd103d023edc54ab088807e8a7b24e08bb223ae9f40d156ade97706cf4b9355 SHA512 02067d6d075afc6670eea75a0e9ed12bf02eecb623accd010701c45d4176bb23b1dd0fb9eda3a4e899d3fb90581c5f3fc46b5fc8760b491c31fddf592aa7a291
+DIST gpyutils-0.4.4.tar.gz 20030 BLAKE2B e94e8472b92835400c6d4b1ec07ec810eec88b0ae8160621fe329b4c7c4981f4c4cad45c4f2e7f70bd80a4031d5bbf8ffefe9614b94f255fbc39ce87411ab8fb SHA512 94b941220e431ea4f45b2824e3d58cc2d7571ab87c15a77217293afa68e2b9a7f833d5ed47f28cc5eb35a62415ae03618dcc2b96ee015a685314ef6be6350eaf
+DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
 EBUILD gpyutils-0.4.2.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
 EBUILD gpyutils-0.4.3.ebuild 530 BLAKE2B ad0dd68af616c72e6ea6ffd478a7ceea20c5fa84c093663e6001e950bcc1034360b1ee2490fb017e9b847225e8c24d4faaf74e1e824ff6460d2aa0b96786a859 SHA512 b678c80698024a1e50e6fc093c1d10adefc6c48e524be7bbe51d4eb0ea4321538cdc98a8a12458a3482a3778dab45645600fe4102575b05dd0b7965584a04c72
-EBUILD gpyutils-9999.ebuild 510 BLAKE2B 12227a6eb086a0a1108d2029316d06f189a29399fd665deb3d5bfd53646606b3ec038ecbedaf7ec9c61e006fd405a11d95a5b2c33be64b156345face1d513a32 SHA512 9952706005d8bb34f65d7ef5dc238deb189fc01e1892d323da60f5cc4b6a404e26f3f99be25030aa70540e418086514ee9fbf264c4a47c84c97d153074a31f52
+EBUILD gpyutils-0.4.4.ebuild 534 BLAKE2B 421744cef93f1e1b7a34b1c4f1c84f8be4efe6025987e9b0f223c58f4f32229a5f292a34dba732f1b2e576b3fb85f98584346d1a46f84dc63f5afe6d84b8b507 SHA512 7bae4b1634cedd42bef9c3917e2393721ecc21c6e387416ce8123b5852f600a6e693eb950cdbf8d63872eb96844046f8f4b18ac2624bc8c9d9a56b3dde17ce78
+EBUILD gpyutils-0.4.5.ebuild 534 BLAKE2B 421744cef93f1e1b7a34b1c4f1c84f8be4efe6025987e9b0f223c58f4f32229a5f292a34dba732f1b2e576b3fb85f98584346d1a46f84dc63f5afe6d84b8b507 SHA512 7bae4b1634cedd42bef9c3917e2393721ecc21c6e387416ce8123b5852f600a6e693eb950cdbf8d63872eb96844046f8f4b18ac2624bc8c9d9a56b3dde17ce78
+EBUILD gpyutils-9999.ebuild 510 BLAKE2B ee67e58eba05af164ce97e357aa8f53ec680b2a7ce4a00f4c5183755b3580bc0d98d10ee4624742239bced94629946761d4e596a2b61c442d58005ece5162fef SHA512 16c9139b8bfacecac83e0aa5e2a1bd49d3d481eb417746f98018e38eab7b76b2237459e0cf6d7ae698cf979592ac45a9652af8ef53f894c59cad32faf975e107
 MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.4.4.ebuild b/app-portage/gpyutils/gpyutils-0.4.4.ebuild
new file mode 100644
index 000000000000..fa25bd96a86c
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.4.4.ebuild
@@ -0,0 +1,26 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/gpyutils-0.4.5.ebuild b/app-portage/gpyutils/gpyutils-0.4.5.ebuild
new file mode 100644
index 000000000000..fa25bd96a86c
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.4.5.ebuild
@@ -0,0 +1,26 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 8bbbb4c17b65..41621a1faf25 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
+RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
 
 python_test() {
 	esetup.py test
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 4b73ad5c3c7c..cc2b3c5032d0 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,3 @@
-DIST mgorny-dev-scripts-4.tar.gz 6702 BLAKE2B d816e0d15004d21f595e6020d146aa1babfe238b325afb1523bfae60786c067c8591fa5b046f7b18520f5334e0d0506d9d0c919c2ec6a55a85bae09441d1f45c SHA512 0b165f21930ad29de92a715fab27174e2bf2e16e6b52dac2d5bf6ae59c68163f30de955703c2c37a9a799fd4409d1b602d417100a4787787f4b48fd71e6391e3
-DIST mgorny-dev-scripts-5.tar.gz 6834 BLAKE2B 652db4d1be6c5438b9b71fb814cde2424c92fdf1aa88266761beb899a782df34a5f02c39a4f18d1cac471aaee2d0ad8f94a960e86b09144494db0e4438505b1a SHA512 fb1fd66ea8d8757bb0b81285c6d821cf8548001d39c47d028e8367865b67c594187086ed18b21c8f87e0d702d879dcf55c043404f3337b27a1d943cae78b0765
 DIST mgorny-dev-scripts-6.tar.gz 7270 BLAKE2B 30945ccc04111c91dcf22d180b0f653606910a0f13d3d2c2acdb037a51bc6490917d8dab91580c27caf492487dca7ec575c5d59181ce622dd67dada49e653462 SHA512 b46d6919cea7233131e90c423392bfdc8a560800adc05e164ef88351d84d51a73dfd982fcaf12bd9519219bc08b84b6a1aa3dc078bb30d35d57847ad1b22efa9
-EBUILD mgorny-dev-scripts-4.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
-EBUILD mgorny-dev-scripts-5.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 EBUILD mgorny-dev-scripts-6.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-4.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-4.ebuild
deleted file mode 100644
index 43affbe632d2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-portage/gentoolkit
-	dev-perl/URI
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild
deleted file mode 100644
index 43affbe632d2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-portage/gentoolkit
-	dev-perl/URI
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index f04cc3135789..b8fdbbde0092 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,12 +1,6 @@
 DIST nattka-0.2.10.tar.gz 90745 BLAKE2B 8553b0871fd96e64af97e68cb6164dd71dad17c542191d98b6e61039707b39a98bd8e2ff7e24da4aa167b61c9b8b4d01260df90a28d05809c1fdc61d9c06b8a0 SHA512 31d4ef6162e42f25c807728fa4ec580ac048138a26a97216976d1ddc2901bcf9674f75bcce2da81f350c4f3da863c9cc45d5cbeeb4dae42e7e5da24b190c58b8
-DIST nattka-0.2.6.tar.gz 90276 BLAKE2B 622ec99e276a8bcdd3972859fb41656e1a86cec62a0f571665fbfe350a467720dfa098f4d4afcb23554540118151776283b5947bcd9c4bd013b025a657c2bd75 SHA512 bc62a51a86e90834975d9bef6f65adf9b3620a19c0c98cd878ff19d0b9cb5679ecf68ee31984bfbfcd9d009420377cfcd57a9561f2eda967f5108bcaf8518ab9
-DIST nattka-0.2.7.tar.gz 90560 BLAKE2B d97cea754108f004c7d09417fd3ac82bd77941ece9fe9a8ef273af420cd058bcd81a95039b9ba4615d7067015863297c241d9871079237152f34682235de5fbc SHA512 bc06303df642cfa59a5f5fc319e23f7fd0fa47f608677eec235de614042b9e4804261d08df24f8578f5a444f621671e51ecd6f0487702255df56f19aef81dce8
-DIST nattka-0.2.8.tar.gz 90715 BLAKE2B 90403452714b11a7248a57efde511a989754ccf406c9d1049e0f0d47dc469c9235fb3c842422bd720aa6135b1a00a46599ff08db5602e84d5a349d8face7649d SHA512 45f59034b09813d78a9741d95cbdd5eea82b923bcf5e4771b36b73ed6b8ed9aa3c348d8af9d42d51d50fedba842b39aeb14abb9fe3cd488dfb56f493934c1345
 DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efbee908fafaeea0492537d10d308020d1badb8fedb6f1baa327d26ad1126f26090b6cab9c75358247cdd47ffa SHA512 73208b15c2787965acd5cd2b14614ee8390da65924d7e3fae66c64a47d697f638df710f7053762e1f77d861e3b84bb18dae454446da698e5b52c1a0b1591bbd4
-EBUILD nattka-0.2.10.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
-EBUILD nattka-0.2.6.ebuild 987 BLAKE2B d5960c7995290e5f7083d76762c56bb0cf651df6377f3be076ed98a8d5f20fdef6ede487d7c9bf46dc5e492a2920c9c4d0031f0533cd5cdee5e1f1d25a5b693a SHA512 0419b7f478d373819fc3b929fdb41462c5224ceecb479a19b43479e124588b7729f9f00f15143d093d8a9186adc692c496cd54a19a7275eff166f2f0003e8bf4
-EBUILD nattka-0.2.7.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
-EBUILD nattka-0.2.8.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
+EBUILD nattka-0.2.10.ebuild 927 BLAKE2B 6e5b6533128c694166d6eb1f8bfd0fe2eecfe8a3af14f167d0294abb65ccfdb656b6a3598939a8b2e86a1a2ae537581c8bc01bb42ba992f7c233c8ee7c7b2e9f SHA512 1643baee9ce48e80cb02a6d9607827c1d175ced75eba7ac414cfb8e398e8647772b96c7b0ae544b2e8a384c8c1967e260b2d46a09137f0fc57a69ffba0f2a292
 EBUILD nattka-0.2.9.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
 EBUILD nattka-9999.ebuild 887 BLAKE2B 79540de21b995147dc8b7c7d43e3ff14a685bdaca82b667b8a1ecc61643341f34e422d7f710a098854faa445242f2a0f8161df58371b9a4412dd9a27c8073644 SHA512 6ebd99d4f683bd6e217b076303d4e3cc46bba3d09e3265b8a9f7a42ae7d8456c37699e405ae3fc60c0adcc9340881ff6beb7ac1bc8757fdb1c32e842f620e33a
 MISC metadata.xml 360 BLAKE2B 81f9162a3ddac3a0f333ee1e33f3012305054a7039b3bab7dedc68caa08d44c355aa40a2e9f61e789ba28fc0c28829a74024fa72476281dc492ef5d39ec62eed SHA512 674f911e11525336a229d3fe80baafa37963479e582ab847d74f70c817b126a10a602ef3f6bf67529b6b2b3d3e576afdc92ab3d2c1e8d1e75407db7a2007f01b
diff --git a/app-portage/nattka/nattka-0.2.10.ebuild b/app-portage/nattka/nattka-0.2.10.ebuild
index c2d438a421a4..86c9d5d1a714 100644
--- a/app-portage/nattka/nattka-0.2.10.ebuild
+++ b/app-portage/nattka/nattka-0.2.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-portage/nattka/nattka-0.2.6.ebuild b/app-portage/nattka/nattka-0.2.6.ebuild
deleted file mode 100644
index 348897ce331c..000000000000
--- a/app-portage/nattka/nattka-0.2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "NATTkA can optionally use:"
-	elog "  dev-python/networkx"
-	elog "to sort 'apply' output in dependency order."
-}
diff --git a/app-portage/nattka/nattka-0.2.7.ebuild b/app-portage/nattka/nattka-0.2.7.ebuild
deleted file mode 100644
index c2d438a421a4..000000000000
--- a/app-portage/nattka/nattka-0.2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.2.8.ebuild b/app-portage/nattka/nattka-0.2.8.ebuild
deleted file mode 100644
index c2d438a421a4..000000000000
--- a/app-portage/nattka/nattka-0.2.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index e46fe7aa16d0..99cceddbccf1 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,3 +1,3 @@
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
-EBUILD pfl-3.1.ebuild 1231 BLAKE2B 49432a8ae9ac598d73f73ec792bdf7bf070a1c3f4e2b8e3ca31b4cce56b2a9aed8f391f7da34578882b3653efaad4186fa118cba9b4d91741e815f22684aaf3d SHA512 f1aed97f935e219e4482911f8d27c71ede6ad34b0d85621deafe3fbaafe5b2c535bb5467c07e1516748e7f302b7b486d109fa311e48fea335201e48d89e3da88
+EBUILD pfl-3.1.ebuild 1230 BLAKE2B b8944a8d97a6639678432f31b7378c679d9cc51b31e797aaeef21a47a3b662ec78dd73120a019bf74ee669cd6eac857a5a8adc252baf0559c079c8a5040c15b3 SHA512 e310428a00cc34c438584e0bce74789cc9fc77ecc6b575b2c9f029190772a8d5bb88689398ce73e340e1cba68995f8de688596d74011f3e0d8c6c39994964360
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.1.ebuild b/app-portage/pfl/pfl-3.1.ebuild
index 2f56537889c6..3a7b609facc4 100644
--- a/app-portage/pfl/pfl-3.1.ebuild
+++ b/app-portage/pfl/pfl-3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
deleted file mode 100644
index 4a0f6e5e00f5..000000000000
--- a/app-portage/pqlop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pqlop-0.02.py 14920 BLAKE2B 0fb3f11a928ac0997094e95d676bba0df19738006e7475332c9dcd207fea3296b5839fd259cb2240c093fb28c0721f4a73331e1ab6083c2fbf0eee5d425ac50e SHA512 6c2cca73b5280ac8563573a81baff56cf43420c18688fae497ff014ec5668806d589473a2cb8093fdc07675761e8c4124f18eb568a74e1816f573541459d633f
-EBUILD pqlop-0.02-r1.ebuild 633 BLAKE2B f4453c8514e0f7d237ab76a94f02510d15325c684f9c808b10e24cb68098f562bb9d4a5843327e71ad15c27c452e57458d71250c8d1db97ab4ad7c2e7787b785 SHA512 aab6f30101c7b73a6c9ac040a33ba1c67ac25e720bc91c9ff0ca4147f9352b775c29919cf1b7bfcbdcb34fcb6b25e14b99eda51007ba8d5cf1f35dd84cacf1df
-MISC metadata.xml 328 BLAKE2B 1d54242b34507f9e056c0948f164b1766fc4f0a89c48ff7be9b9f4872869312f951f2705516bdffd30ae87313c60103a4eeafc7f46cfcf597088f9716b3d768d SHA512 653d8afce656d149a859cc3565346e38de8d5188d4f94464eaed6802aadcca41eb44d8dccabf7040d1d06a483f28f57f41fb54ae8bf4c37726eccecdd60961cd
diff --git a/app-portage/pqlop/metadata.xml b/app-portage/pqlop/metadata.xml
deleted file mode 100644
index e9a94d23548d..000000000000
--- a/app-portage/pqlop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">LK4D4/pqlop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
deleted file mode 100644
index 14838c555a87..000000000000
--- a/app-portage/pqlop/pqlop-0.02-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1
-
-DESCRIPTION="emerge.log parser written in python"
-HOMEPAGE="https://bitbucket.org/LK4D4/pqlop"
-SRC_URI="https://bitbucket.org/LK4D4/pqlop/raw/${PV}/pqlop.py -> ${P}.py"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P}.py ${PN}
-	python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed"
-}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 7c6301c24df3..0ee35e53858f 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,6 +1,6 @@
 DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
 DIST repoman-3.0.1.tar.bz2 88134 BLAKE2B 270eb8c6220360d32076a402795df9bb1c7ce7ca6509707fc2b9307ca94b59131da3100b51519bed2f76dde703782db6ed74a052b51ea48c690e6558ceb9d24f SHA512 2da130a5dba547390151620f7e944de45e0a880165ab138000870661778f54c6f6c2e0eb61bab961a0cf17642a96fc8a2e5e508bb16cc1adfcf103074838196c
 EBUILD repoman-2.3.23.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
-EBUILD repoman-3.0.1.ebuild 1967 BLAKE2B f57320c2c5800e90677378566f854c77b3ad1790b670a46fc195c12adc006acdebedfeee3227a4d457800489f15037e0b8f3baa572b1caf1eb7538209c6ef268 SHA512 57426ae78a735742f8f8416ec24fdd478313e11487f6527d9f521de18d79f66c1585ca6cd9539673971ac5ce1194f09a488c2fb86397ec93bc098369357fc36b
+EBUILD repoman-3.0.1.ebuild 1966 BLAKE2B 5ba6c949afc14e8e64d4266211ee056692efb471f2dacde9312d0eb528e414ce662dcca99cc9407dd77203a85ccc93278362bec3bd64f32fe8be2eef60ab88a6 SHA512 243d1ddde363813e591e22f53177df59d200324e2861beb6aa036c6c4dd9bd9a78fe2eea1ecb82106cf94d8796e65a9e1301e07d10bfafb0c3e847603589ff77
 EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-3.0.1.ebuild b/app-portage/repoman/repoman-3.0.1.ebuild
index 6507d5a05cb7..7d7c4645d606 100644
--- a/app-portage/repoman/repoman-3.0.1.ebuild
+++ b/app-portage/repoman/repoman-3.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	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"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index ed708a4caf15..43cd9b0218d0 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,6 +1,3 @@
-DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
 DIST unsymlink-lib-18.tar.gz 10807 BLAKE2B 0c15ba8fadc96641139db68068c6402f24bd9129b452a8996c393ee899b274e7a5c96d58c2745b74ec3dbb469008a6756041b153abbbe3f29aca5f93c8700834 SHA512 bb08f1c35046d756aee752c7cd28f8eb93c562587f2fbc0070817c11fd42f3d12fade9c8ad29c508813e10993f5b622c9d33da52e49dfa7e16b1997a72d491f5
-EBUILD unsymlink-lib-17-r1.ebuild 659 BLAKE2B d8396c5b6fd4b449bc94164b2a5dedd945f3a780b093b4b79a609e8358a43d9f44997f70d0d90d6d8cb0c0e13364365791bead7b619a638725b4541e78e7ab51 SHA512 e21c2a9383653cb2568e036ffe086bc4c95e783fb1b2ab309e25ba8a23171778650a92898c1d98719cb7fc98195bad9e09a472fae93d54d5fd680aebd5c27e11
-EBUILD unsymlink-lib-18.ebuild 721 BLAKE2B 72af9423a88a6fee47b8cdea1e348b184a0ba6a5ea30cdee2b5f413a2d218804ef4889a5974747842d1e5a3eda96b1257ac33a9d4115ca8c5d8a92d975c9629a SHA512 2d1d90f09583b7671c3fe4fe54d4c0f1da26c978f5e5d63e093a89cee0453aed8e2c3e00fa0ada0cc021bb822e1126e7c6c10bb6f2ade9ef1dcae8b26a46778c
-EBUILD unsymlink-lib-9999.ebuild 600 BLAKE2B 03a22788dc3ac143563e5cc893873b5803ca880a3d87de3935055eda21843c9d8a3d6d1c98f93569e5a4791e85eabc3ed03d210c5a8654a2436b15f0c743fce6 SHA512 ec387513392d16cee1cb58d3271b8e299a267b63ae35580424a7d4f48b7ff005b55b8f8f043c0250b1d4cc47285daaf1456979cd23451ca6dbdd480bacf84287
+EBUILD unsymlink-lib-18.ebuild 728 BLAKE2B 9d452fd9349f3454cc6f5c5958d9c09b910bf9d48c6a30391f9ba0662802064b9a941db005c007aaa0c0a3c2e8be786d5ae48a250610876bbe4cabaa405a0eeb SHA512 3350181f6b4bfb6ee4adde99dd576f014543b2d7649849ffd9df12954731f6f1718c0513c9ae3f983e07284d35d0fe55b27d58a58ca62fdd1b6bb65fe6334e87
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
deleted file mode 100644
index ed7fca696e94..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
-	')"
-
-src_test() {
-	# tests are docker-based
-	:
-}
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
index 11089ce1b6eb..f14dec289d35 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ppc64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # tests are docker-based, you need a running docker daemon and you
 # should expect leftover images
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
deleted file mode 100644
index 82f1121193da..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit git-r3 python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/unsymlink-lib.git"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
-	')"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}