gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-portage
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
69 files changed, 277 insertions, 772 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index db43689a058a..27afeeb8297b 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 2cb0b14f5b7c..8d9e2f65de7b 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,8 +1,6 @@
 DIST cpuid2cpuflags-10.tar.bz2 82756 BLAKE2B 144ccc9ffff9fdafa9d29628963143b3685421c3c96a81ab780d835c7e0d83fdfe02c720744f57f2947c6079af157c2b6d3e61277f5af734fdba08c6fec23b9f SHA512 c34feef1548b9ade349efbdb68880fea303dd9a8d361de017b925688f9b189602cb175e1699dbe7b48f6887f343fafca9ff0ac95b8eb174bf7201c8bb5978c98
-DIST cpuid2cpuflags-9.tar.bz2 82841 BLAKE2B 6f866a29680b53975359c56f54f3ecd8e978fe55297fdfcb84b25f57dc38bb0fb5c2169dde83e29235d13667a43faa11d75fa15e3d8fbef65a86cea2832363c4 SHA512 61a265abfd5b0920e1b3c18d322dceb416a6a353b3d3ef3f01ab1d02aab1b45dd1ec4eed4ccf667eae82c953830f29d22a671dd7d7c2b4d309050033af1fd5b7
-DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
-EBUILD cpuid2cpuflags-1.ebuild 1044 BLAKE2B ed9ea1bd60d8aea784c8d9a44263c17ca5257b10822415346aa21d670c98c07501bc27d44fa03e79b4a51fa5d9408df6f408933f522ba5771c8c68077137e727 SHA512 e20138a528d97615db610a61fbe77e3f4e8cb3c811a635fe4e17220c93548b4ebeb10c05075e3dedd32c79972e7164a5cbad68ebd5253470f308b6bcab6b75f9
+DIST cpuid2cpuflags-11.tar.bz2 83091 BLAKE2B 2225b6031505597050332d50f4cee69aebb263f9def8043fde64b61e7d06bd2b2ab306eab31701434435a5ede1da974004db3d800a9184011595ed5c16422c79 SHA512 0eeff4e6369eaca6ddb516ff95597c649a7619c1ad79b0d73f51ef9f903db55cb7a49c5ccec478c9a923abfcce63e4ee5b6436f08eb9092b0024c898e508750b
 EBUILD cpuid2cpuflags-10.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
-EBUILD cpuid2cpuflags-9.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
+EBUILD cpuid2cpuflags-11.ebuild 915 BLAKE2B 918ac0f1b1fb676d72a3dd6fd1dba344f25e575f845a2664e23b2ccdd000de06815c4530fe42f8854e764804b5fbd8ca682476e4780ea35728173fc6505ad6f0 SHA512 7ca191eb49f03a315a039358e1a67b3fd83266f8224fc72eeeeedc8b0bbb53510ba9c17d439f1893ef2644cba52fefeb4f9d1642a59c82da4ae3add72a0a9cbf
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
deleted file mode 100644
index 3ca2f491f50c..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PN=cpuinfo2cpuflags
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	python_foreach_impl python_newscript "${MY_PN}-x86"{.py,}
-}
-
-pkg_postinst() {
-	if has_version 'sys-apps/portage' \
-		&& ! has_version "sys-apps/portage[${PYTHON_USEDEP}]"
-	then
-		ewarn "Support for matching Python implementations should be enabled"
-		ewarn "on sys-apps/portage as well. Otherwise, cpuinfo2cpuflags won't"
-		ewarn "be able to figure out the correct repository location and will"
-		ewarn "require you to specify it explicitly."
-	fi
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
index 5914671097eb..365682172c57 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.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 5bfce0b75c12..80726ff28b66 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,11 +1,3 @@
-DIST eix-0.33.11.tar.xz 623256 BLAKE2B 756feed85cb4f40ef9228a03d2a8b8470eb6017b00d93b364d67e3d11ecaacce2bb9c6afed388d9f70dfcb7a0b9ece13ca6ee523f5839b7d9bf80cf3b2721524 SHA512 2829d1482abfe479ae71e8b00da07abe74ba3090ba2a3f9d9a93437cb2d4d64213968bcd6c082a6703ec1d9c36dfcfaa0850172f3ffd4d256f553b98eeaf29e6
-DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
-DIST eix-0.34.1.tar.xz 626484 BLAKE2B 3f33df9d3f45abc073d7b80a7a6b3574ef6c1372042cb1ec4f0b0213842bc48d8d5a76c005ece2c060a39b1c8778764eb1f6808e75bc10af6e366e33e10aa6c7 SHA512 86289d8dcb0cf87ad48c739aae637626f9e63200a48d019fc96e74f2851b2791a61741d5db72ceaf3e5a375fb0dbf9302b04f766c3def69bcaabb393545dc767
-DIST eix-0.34.2.tar.xz 626492 BLAKE2B 984411e459b18f0ade77569b1e972a8c59588a31ce6af4b998a5fa27f9d5a2cc75fe647641f0651f17b5e9b4dc5706444dc49bd09e9e070e666beb989403e303 SHA512 422123108c841dd7e02296fa38276e72c61c8cab5e9ebba1fd2cd23d2a4b2c68e1dc530e47428f0bc41e89983196c7b8319ee548789199e4673c04687bbc5aec
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f SHA512 a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d
-EBUILD eix-0.33.11.ebuild 2749 BLAKE2B dac326d96f83bb0f386c9ca28a73886d7a15e3b933c4237af307ded2e2a630232ea941ca5c4d14ca290fc03bcc317820d4debd3935786520cf9cf1682fcecba8 SHA512 c6eb8819f27226a211edf1dfd063877ea91f83b62cd8cffdc8b96d09cb290f4dabbc261ea0015f5faf4841792c39383ae041d5767299788419db0049c4f0c835
-EBUILD eix-0.33.9-r1.ebuild 2749 BLAKE2B dac326d96f83bb0f386c9ca28a73886d7a15e3b933c4237af307ded2e2a630232ea941ca5c4d14ca290fc03bcc317820d4debd3935786520cf9cf1682fcecba8 SHA512 c6eb8819f27226a211edf1dfd063877ea91f83b62cd8cffdc8b96d09cb290f4dabbc261ea0015f5faf4841792c39383ae041d5767299788419db0049c4f0c835
-EBUILD eix-0.34.1.ebuild 2907 BLAKE2B 96547286d1d02a4d5695dba21bdf9af4b247fb3510b5705c9c0c410ab10dcc750f5cebbc3df2306ba5798053c06fa28eae6e8431d521cc8c3e1315e58477d682 SHA512 42d66ce72344aad5ad0d3487b08b0621f4eec0ea3be2e88f4366b095d898ad12e6de3dac34cf68169c753c3f872c7f4b00eeb3ad203a6821c4f110f87235298d
-EBUILD eix-0.34.2.ebuild 2778 BLAKE2B c5c6f469bb658d97e4de9b81c7198af15b79e5c396b11b90ef227cf3b1515ec50dda2c1443809c2ca11a2303ee6ff0255879d9090614cee64a751d950a4cec40 SHA512 9ae426a79a06c44c8575f26fbcfb73b46d856d848986a70c1318814b58bfd5350c3bbf68364de48926f374de1906c431e51e200bfead1e1c6c7dd2c8a6a4e7e7
-EBUILD eix-0.34.4.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
+EBUILD eix-0.34.4.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.11.ebuild b/app-portage/eix/eix-0.33.11.ebuild
deleted file mode 100644
index d3a156ca40f5..000000000000
--- a/app-portage/eix/eix-0.33.11.ebuild
+++ /dev/null
@@ -1,107 +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)
-
-		# 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
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	# work around https://github.com/vaeth/eix/issues/64, bug#687988
-	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
-
-	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.33.9-r1.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
deleted file mode 100644
index d3a156ca40f5..000000000000
--- a/app-portage/eix/eix-0.33.9-r1.ebuild
+++ /dev/null
@@ -1,107 +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)
-
-		# 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
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	# work around https://github.com/vaeth/eix/issues/64, bug#687988
-	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
-
-	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.1.ebuild b/app-portage/eix/eix-0.34.1.ebuild
deleted file mode 100644
index d2aaec3c2f01..000000000000
--- a/app-portage/eix/eix-0.34.1.ebuild
+++ /dev/null
@@ -1,112 +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
-
-	# workaround unconditional protobuf use
-	# https://bugs.gentoo.org/724366
-	sed -e '/eix-proto\.cc/d' -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
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	# work around https://github.com/vaeth/eix/issues/64, bug#687988
-	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
-
-	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.2.ebuild b/app-portage/eix/eix-0.34.2.ebuild
deleted file mode 100644
index f6d4bed2e52c..000000000000
--- a/app-portage/eix/eix-0.34.2.ebuild
+++ /dev/null
@@ -1,108 +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
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	# work around https://github.com/vaeth/eix/issues/64, bug#687988
-	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
-
-	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.4.ebuild b/app-portage/eix/eix-0.34.4.ebuild
index f11bcd6edbb7..27581250b045 100644
--- a/app-portage/eix/eix-0.34.4.ebuild
+++ b/app-portage/eix/eix-0.34.4.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 26f823471db2..123fc9afc555 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,5 +1,5 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
-EBUILD elogv-0.7.8-r1.ebuild 1591 BLAKE2B 02a2079dc2bb538acce711cf185fdbae073af455262250eeacee9cf125ca0d8ec77b2636da279c42fef093654ab338f41553d387c1cbc1c543a644750f275c17 SHA512 c419b695f0db6cbc505eccc4225ee77a446b253a1997dc10f9b18d1bedccf3a6b2d46c9a87f7ecc13c7d5959a8c07ea9a5023ec89af964ab84081eada91c94db
-EBUILD elogv-0.7.8-r2.ebuild 1663 BLAKE2B d0945ca00a2a998ffc3a20e2ccd3a96fc69f609b6f640360f0302b621ce85734d79f88c61cd9796b2252292c5f92bad0458fac80e7830580004ac4362342bb4d SHA512 1706f0b8e7f3a0da7834f74d2245a7f1888c80f0ec93056526c6508e2300aa373f247db1139aa9d0d43482c1b476fae6b6566a85d17f78ef6712103286e33a73
-EBUILD elogv-0.7.8-r3.ebuild 1688 BLAKE2B 93ce28876bd8cde79d9b331acc059545b25d958f6d0c93995cbd401e74cca48e4508e3fd8e76c43299d40076ac45686e05f99fab5a259e4bd7c5ef3267f1d4f6 SHA512 c3ca6657969e198b1dfcce2495928f182d12da63fb5391d4ef129d0ef734524491504ab8b5e300d7b572c608fea523b216ccfdb77232b8aa954e8340ca046d4b
+EBUILD elogv-0.7.8-r1.ebuild 1492 BLAKE2B b4a8b02f1f814b4b932aaa1219b3e600be54216de4efc2eee9db3375cbb9f20ebfa61ac2427db6d39509dc6e4554d63ab3b2e27c057b24fb66b3cdac7df5ad32 SHA512 2d259d079d2d1499014ee832c3b39bcbb7e248116c05c8db02aeaac03f65be4da88e0f82d1f72310c31deb0e6bb1760c83f8734a6db9eb0f83d24ae6b49910e3
+EBUILD elogv-0.7.8-r2.ebuild 1564 BLAKE2B ccfc1ca21369973ec9f51f0c0f99a095685af0beb1343d60688a1bb0ff3dc74359d81ad130dd89cddcb4d8f66e8a40dbf3ac7b8c38c72008452d44c75fd7c208 SHA512 a2c4259c22f2c6f813e1c807a759b496e1f6e20ecfe18d93069a207fab70e81ae4f02c6258dd002f39bb612148de66abff504751effd6d73aeff8c51528d0c2b
+EBUILD elogv-0.7.8-r3.ebuild 1596 BLAKE2B 43143dc30763582eaf553c85ed62f008f4b760ae6526746bfb000f8bff3d055b394747ef34b0de5186b95aab807b76ba6ba0c04205349a30eb32c3fcd8252888 SHA512 87000f9ea98a2bc9240f85a679cdf9407901b74757386cf4a0c64ad76de0abfada762522838a386886b2d86a535a612bb91f0f0be2f523d602f570e4a4cc7ad5
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild b/app-portage/elogv/elogv-0.7.8-r1.ebuild
index 29847a895697..3f2657b5dd7d 100644
--- a/app-portage/elogv/elogv-0.7.8-r1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@@ -33,9 +33,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
 	elog "In order to use this software, you need to activate"
 	elog "Portage's elog features.  Required is"
 	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-portage/elogv/elogv-0.7.8-r2.ebuild b/app-portage/elogv/elogv-0.7.8-r2.ebuild
index 7dd9ad6ec418..061cb270c074 100644
--- a/app-portage/elogv/elogv-0.7.8-r2.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r2.ebuild
@@ -36,9 +36,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
 	elog "In order to use this software, you need to activate"
 	elog "Portage's elog features.  Required is"
 	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-portage/elogv/elogv-0.7.8-r3.ebuild b/app-portage/elogv/elogv-0.7.8-r3.ebuild
index af2d7a30cc5a..2b6d9c3fbcb7 100644
--- a/app-portage/elogv/elogv-0.7.8-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -38,9 +38,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
 	elog "In order to use this software, you need to activate"
 	elog "Portage's elog features.  Required is"
 	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index ec72dcb35a16..34e28d715746 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,6 +1,4 @@
 AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
-DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-EBUILD elogviewer-2.9-r1.ebuild 1763 BLAKE2B 86d38970ae69a6c698e200364048ac7d54c7c459d47a53e3c192efa5e0ed10d169d5a77a388884873d1980dde59c7cc515db4cfa91bf010343499e098614e3da SHA512 33d3557e382233aac8add44b6b4b306cbc36d4e38e13b0370f71ee22055bcf1317b74bbf2d1ba6b3ed2ed0681a88a1e0160bce72fb3f5d1696551fd840976cc5
-EBUILD elogviewer-3.0-r2.ebuild 1827 BLAKE2B 1cd1304da1087a41f182cba52ad49ccbfdd5769635a3919951f370d494ea177336d1e16ca5c9a850c38950d6a0de90e646fa2b105cf71df9e5e6ae1fc15e3006 SHA512 80c5355b63bf08752f795ee24178fb27a2a03a1ace735988f150e3045ac27433a7e6287da12039e5f102697069bccdbabc39ef0165b75f719d08fbb59b4ddbb4
+EBUILD elogviewer-3.0-r2.ebuild 1749 BLAKE2B 81143efacd189a2b8a92e561c468e25d8a09044cc3717df81f084a3fe266db0450695c400259be7f12133872f7d61064abc6e2f8e562fc39d9d724f7d74b461b SHA512 2e83067a40e7ac83846aebef400564b54e3646c65c2137ca9f71f70d30f9205f420481f5d10bef1a93831891072615f1fce1ad022812ddc2a0ca0981060253f0
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-2.9-r1.ebuild b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
deleted file mode 100644
index d4455cc879c6..000000000000
--- a/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
-	')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index 1ead5942775f..51a7bfb564bf 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -24,7 +24,6 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
 		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
 	')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	$(python_gen_cond_dep '
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index d584562035e5..24bde302bb38 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -1,7 +1,8 @@
 AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f93190586d9bfc4c84f451605d073372b8db528c6680616c2be3038e8fc58c26d134300862db17088591043eac55aa89eda6cabf20b SHA512 b136b610a87e61e2ca01956fc2ba444b25e26333ed973c0c779279203ddb1ab100ec7ca35c50f4aeaa950829438c7e7729aa95fa43efbd0b5eb3b6f31fce529a
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
+AUX 1.3-updatedb-quoting.patch 1409 BLAKE2B 6bd2401216d0394e155cad28386ba2235fd11ae5fd6f5ceb809afb4ca10033c05ee076829b003f40abe89c6d3062d41e13eeab3dc648b3a49ca457dc3a58e318 SHA512 fce5c139969e1f0ab448a985e00a1e9a38b426f28566c506ed63b4c99c69f8240e88179dabd814de687bfed2a3b6ecf5601f4eb9e54a2c37101e92177a3f6aab
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r2.ebuild 1447 BLAKE2B 5ec3becd143f78f6616fb59f01bf0760a1d046f5c60b8cfc8b34cc62baff102b822e02a4aa421e3fe7754b6988f8b49c1bf8ebb2ddc72428339cd97c0b60f3ca SHA512 a8fe9c702ae1689b84448fba4aac7c38e11ea5dfc5c7c82b0e906107b4cb8e00069e0859363b0c3c486658b596849e021f13c9b5b59c0e69c691c680e2b8821a
-EBUILD esearch-9999.ebuild 1038 BLAKE2B c27f36a3dc20dfb71cf5a04f041c47b73786235e7f6d69b30c9cec8ab28dc5be05ab4318de570467af15bfde089cc672b057fbeb1c13cbcf36d43167c692efad SHA512 0be5a5a9792dbe714de8b7585f94717a1f57a99c3b8ee8ddebe1df1ba8d0cbd0255d1f23716c1a31e8a1b4d6a5f2f02fda0586f8afd90a954f7349bbf56d29f2
+EBUILD esearch-1.3-r3.ebuild 1490 BLAKE2B 1912266af17afea2f01a23ff2656a752d26f59d037eb7df77b7c688fa247fa22bf9a3734dd3ff827356e9acdceb6a4f3098b1fa91b1a9437ec4e6551fc60050c SHA512 3b0eea2ba8cd52644d72a12d618831099529a5a24e59a9babc35f4febc7eb1dacc1023fc03146f4747c9c872b5af2d6d85a687ff7c2c09f924f91df997d20e99
+EBUILD esearch-9999.ebuild 1037 BLAKE2B 7f601b09809e8098c2bfba583281b5449fce0657e93c591082eba1d373e67cd5e9962d7176b62410e22bfddbbe0e5d6996f9a1fb2dc7f252c3a2c8d55a8a748a SHA512 3ce2fc7fbbcc7dfa41b7d57a4900a52597f5350e73914f21241713f67e62efd5bc9fb918f1f48ef8ca44922fdd8b28c33b8bb57559546e823e3d394c30d86abd
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild
index 39ad2fc4e7f2..026f4017bec1 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python3_{6..9})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-Fix-setup.py.patch
 	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
+	"${FILESDIR}"/${PV}-updatedb-quoting.patch
 )
 
 python_configure_all() {
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index f880bb7a1ad9..cb46da61322f 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python3_{6..9})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/esearch/files/1.3-updatedb-quoting.patch b/app-portage/esearch/files/1.3-updatedb-quoting.patch
new file mode 100644
index 000000000000..4f20634e6750
--- /dev/null
+++ b/app-portage/esearch/files/1.3-updatedb-quoting.patch
@@ -0,0 +1,39 @@
+From 8cbf59309a48327b74969bf402b415e389d79f73 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 16 Aug 2020 13:37:27 -0700
+Subject: [PATCH] updatedb: use repr for correct quoting (bug 670224)
+
+Bug: https://bugs.gentoo.org/670224
+Signed-off-by: Zac Medico <zmedico@gentoo.org>
+---
+ esearch/update.py | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/esearch/update.py b/esearch/update.py
+index f05d08f..b18070c 100755
+--- a/esearch/update.py
++++ b/esearch/update.py
+@@ -210,18 +210,10 @@ def updatedb(config=None):
+                 lastcat = curcat
+ 
+             installed = pkg_version(VARTREE.dep_bestmatch(pkg))
+-            if installed:
+-                installed = "\'%s\'" % installed
+-            else:
+-                installed = str(installed)
+ 
+             dbfile.write(
+-                _unicode(
+-                    "(\'%s\', \'%s\', %s" %(pkgname, pkg, str(masked)) +
+-                    ", \'%s\', %s" % (pkg_version(pkgv), installed) +
+-                    ", \'%s\', \'%s\', \'%s\', \'%s\'"
+-                    % (filesize, homepage, description.replace("'", "\\'"),
+-                        _license) + "),\n"))
++                repr((pkgname, pkg, masked, pkg_version(pkgv), installed,
++                    filesize, homepage, description, _license)) + ",\n")
+ 
+     except KeyboardInterrupt:
+         dbfile.close()
+-- 
+2.25.3
+
diff --git a/app-portage/fquery/Manifest b/app-portage/fquery/Manifest
index 74283d4a8d13..a687b2e92e98 100644
--- a/app-portage/fquery/Manifest
+++ b/app-portage/fquery/Manifest
@@ -1,3 +1,4 @@
 DIST fquery-0.2.3.tar.gz 14511 BLAKE2B ccc0162095cf270320c1e7a27ef6f19902ddc591ea04742b9645bbb80e67132d85c3f182d1f7fd536a819e96b64abc734b42728faf46a0f2ab01943f660705ee SHA512 0dc345b189bd18f5f1084ab2aea07390b547b6c663d03fa9cec968e5cef598fe58b6a294845ca12b020c78ff2a01ce7e5da0bb06a513c53b8b5aa357b071fb88
-EBUILD fquery-0.2.3.ebuild 589 BLAKE2B d267ee6f8d5086fac0b66c9498d674a12991a5872a6c9f80e56f72516b7638e710f31cc86bc3c680c52a76e9adc8d4da4018bed6bfb3ad681e537a9b62c710c0 SHA512 7fa67c7f57b30b750729cc8c01d207e4e54a0a622acac15b012d156e82b047f8fbc94221b595b899262545c55909cb1ced918bb0cf50fa85eabc210f85219905
+EBUILD fquery-0.2.3-r1.ebuild 900 BLAKE2B 6d7f41a8742d6aa697df33b265f7f336794a09ea6cbcfba21becbc92085b3cdeb11fc7da533258a982c281cd7d17205e6b25fee8f8a3d6919d3c7929cbad5057 SHA512 00d27f9f10488f18ba8f557b416e3f26d67a07fb6557b29f53a00d873a57a15824723e5875cc11304504d5b80ddc9226ba4cabfb3dbbc5e2ed9eeaf873c4eeb9
+EBUILD fquery-0.2.3.ebuild 590 BLAKE2B 2fcd689db12e27734eb0583c3bd6fc27c2748befe984aa0e2b04e46bb467e23be4f9580c18ca8ec53ed4de8a93707cc4bab85549b1bdd6a82363653a8aa30a1b SHA512 3e92dd3112d6ec34a04dd7bf4fd563b857307617e7246feb3f93e6a70f55c79fd01d67bee30b87c36a33d7d4e3503077a19d295e039a9fe4240508b0001f9d18
 MISC metadata.xml 290 BLAKE2B c5f2085bf717e6abb78ef95ec2221398667bd38a5bb4915ea6b89b17bb846f9b6ed47089c47b1f2c6baeab6147f8cacac9b4e913a20ac5d909432e6525863326 SHA512 89b8856e1eb7618964811ce381d36e758b17b7d3c9d364a1d715d31b4873599304c6f1883abf1f401841c760f7f7d6fa117bb1e0111702998ac79b6f08744874
diff --git a/app-portage/fquery/fquery-0.2.3-r1.ebuild b/app-portage/fquery/fquery-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..ca7f17065233
--- /dev/null
+++ b/app-portage/fquery/fquery-0.2.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="Installed package query tool for Gentoo Linux"
+HOMEPAGE="https://hackage.haskell.org/package/fquery"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashtables:=
+	dev-haskell/parsec:=
+	dev-haskell/regex-compat:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	default
+
+	# Workaround for Cabal 2.2.0.1 running configure with
+	# ${S}/dist/build set as the current directory.  This changes
+	# the script to prepend ${S}/ to the the paths.  The script
+	# then uses the ${S} environment variable.
+	sed -e 's@\(Adelie/\)@${S}/\1@g' \
+		-i configure || die
+}
diff --git a/app-portage/fquery/fquery-0.2.3.ebuild b/app-portage/fquery/fquery-0.2.3.ebuild
index ddd516e3ee51..431b0bba6dd5 100644
--- a/app-portage/fquery/fquery-0.2.3.ebuild
+++ b/app-portage/fquery/fquery-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin"
 inherit haskell-cabal
 
 DESCRIPTION="Installed package query tool for Gentoo Linux"
-HOMEPAGE="http://hackage.haskell.org/package/fquery"
+HOMEPAGE="https://hackage.haskell.org/package/fquery"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="ZLIB"
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 388107559790..4069c883a431 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,5 +1,4 @@
 AUX g-sorcery-0.2.1-py3.7.tests-fix.patch 4455 BLAKE2B 631c028024312fd25f5191191a953cb9db9eda0de2f97ee84c1e5266fea99ddedb2faa36f24740561f181b76d311c0997cf5c1c04fe3bf69df0828b0d3ed96cd SHA512 68674b89fe101770adf7de711f828207856d97ecb0f66d4a369c90136fc8168095b2d5548e5d722eebabb5a7ed2eb91832c2dbd2618c97fb5961ffd2dc4186df
 DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
 EBUILD g-sorcery-0.2.1-r1.ebuild 1056 BLAKE2B 90fff4ddb6e7f559e95e0ce943244c06207db6f89783d573698e671e6d0ae7057468da319dcc4ef8b41003288040f141b0553593430bd6b71e585cf55a2a8a90 SHA512 26a2f5e32f706fb192cf886cbe0f634a1fbf3a8816f333cf579e74841650e3b5665e30694d1f176da4edb42df33bc24d6dc2dc6160ec47a47896cadb850f26b3
-EBUILD g-sorcery-9999.ebuild 863 BLAKE2B 7082478f3614ef7cb55a51d5a1e916cf7d27e84d2978d60ce62df71080faf0df7a9c4639a4d96d73841a60382f703e4e410ddc2db95bd9f7fab4c6b8a327554f SHA512 673a78a06387d002a27271476fe12e61726bf9b7c7f949ae53d3d049a67ef7ca3a513ba2f791af44f9845970e4abb64ed03ecd6473b73e9d39ca3e0652a8751e
 MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
deleted file mode 100644
index f511341ccb9a..000000000000
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="git://git.gentoo.org/proj/g-sorcery.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson git"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	git? ( dev-vcs/git )
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	docinto html
-	dodoc docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/${PN}
-	keepdir /var/lib/${PN}
-}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 79eafb56be1f..6a3e9fa870ea 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,6 @@
-DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
 DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
-EBUILD gemato-14.3.ebuild 780 BLAKE2B 1ac922c75d8d39da0e49405369da67be4ceb80251f4587c340809b48191558bffe4d19ac7ef70c3c437a3d0bd90a23df3aeb48e5a16836eca50a8312491dfc58 SHA512 114486b6846c47d70ef8f038f2c777d323313af764b690e3ac736654d19c9d477761479c0101a8d34c2e6648d795e0dde4874b862b0ce47f451758eb5970fa75
-EBUILD gemato-14.4.ebuild 784 BLAKE2B 486b3f39b89142b5985c805d6f7186289b0b30677f981dde61cdbebb119fed9a93a6e441bca58c2bf3e3bb7063bfc721e6aa028f5b5267dae66e9dbf5bc4df43 SHA512 fe7878567b7880e91baf5d4aad9a1f8265a299c5c0b7a0255e7d9ab8819e0be267b047d6b0eca6b2906d71f13b8dda79ccb7fd1e8dce78908156c5eebd9e6c72
-EBUILD gemato-9999.ebuild 682 BLAKE2B c76c514445c1459ea22799e13905b51960e7fdb7ef6ef89e616226245abb511f183c4be47505e5b73fcfbf3887aad134284d28eb00bbe9810a403333bc114000 SHA512 62583ab3b00c75fabe12a460e54fa027b4b6b7bea9149a63d0c5a70252608624f09d3a4f78c058b5145b57d1c27991c8e4569395e9698bfe161f3c9f00c27248
-MISC metadata.xml 646 BLAKE2B ce8d4e7827c80e3df9ce44daf9172fe44250be5aedbaac1f4752b08d4e243ca07446361f51734816c9efa7718f21ceec436ac02684c48b4a3b8bf275a397d34f SHA512 b6518de76383e67810105503337e24ef252c0109afc395df30213ffa52279b6fea4981ff5ff87df773a6ed991c8028a653ed952cb86860236a7f463a74528adf
+DIST gemato-14.5.tar.gz 72752 BLAKE2B 61ca43c92556850afdc8ab1d027aa719d13e77727caf9660d1861b1cb07ab40c05bd0fab23f99eaa47252e09465813685c59d1ebb5cc89c2c3381e1571256836 SHA512 0979de8cb4fc51c79d5af485092e0b376094238d6bb67d44db96c66b1d5ee945f0ba82dc6f72bea1042b935029cb790c5cd87bc419ba82da21a972141f3690bb
+EBUILD gemato-14.4-r1.ebuild 787 BLAKE2B d4d4b1c7011ac007f52e1c2a54825bb479427b29b435516c93219cbef62413810dec626ef452e30a3ea39c1b8737701c86c83e928b324d7012a625e28ae6fca9 SHA512 8840b697663b8e1b38d49f9e9ed94a4e1851f256cd7d130eaeeee86f4b61c04eb320829f530a48b2f0a8da82bf24110add5e217f0a9104ba4fd228f52bef7636
+EBUILD gemato-14.5.ebuild 796 BLAKE2B f57c8485072e46ab7a35d1ed15d4d56fa73326073c5f6dc2ee892cc5b4da14ed965abfd64fe90ac6db13e0c994cde491c1e43f3100e2ed3fba0862b05008255d SHA512 2e0841d93405d2f42c4163cbbeea8bef31a6d3048d80cbbd4931d77c794d6f0643a37656b8bd0e7c1ac110df5a549f129da57955e06708160d2b6d85d6c2544e
+EBUILD gemato-9999.ebuild 694 BLAKE2B bf2acd0d9ba10d40289b4036d3abd6f2ebe2fdbfab893b695ef275b0f637f6c84b9568a80b18402eba2f026bd98318c0d6ebb951c105d7d2391bf380e5bb3764 SHA512 fcd80befddd73597b78b2fce5aee76bf53d1c57abb56f421798c531e9c50a19fe9ddfe8cf02be6972c9560a4af233203c8074962492efea8ecb4761d3ced2411
+MISC metadata.xml 670 BLAKE2B 227576c022fb4b2011152a3c423ecab3b8f7524e4e2ec07bb7e963c573fbc17d8b99c4123af93ab665f0e24690c1dd6394e2683bec3999112e1e2204293e91a4 SHA512 c45044a72c71f1e98245019db989a2222e9487cbfad87e7583c57964bb724b1947700497718035a726e4dfa4563dcd154c8ac9eeb43173b6a690037349e905d6
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.4-r1.ebuild
index 933874ddec7a..988fd3f61f4f 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="+gpg tools"
 
 RDEPEND="
-	gpg? ( app-crypt/gnupg )"
+	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
 
 distutils_enable_tests setup.py
 
diff --git a/app-portage/gemato/gemato-14.4.ebuild b/app-portage/gemato/gemato-14.5.ebuild
index e472f6f72173..a3227bbf179d 100644
--- a/app-portage/gemato/gemato-14.4.ebuild
+++ b/app-portage/gemato/gemato-14.5.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="+gpg tools"
 
 RDEPEND="
-	gpg? ( app-crypt/gnupg )"
+	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
 
 distutils_enable_tests setup.py
 
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 5b490f34718e..9e747002e740 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
 IUSE="+gpg tools"
 
 RDEPEND="
-	gpg? ( app-crypt/gnupg )"
+	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
 
 distutils_enable_tests setup.py
 
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index 4ad37c996fba..62b0e6ff165a 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name='gpg'>Install dependencies needed for OpenPGP
 			signature verification support</flag>
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 23e64ddd9c38..2e2e2cfc7fcc 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -3,8 +3,8 @@ AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1d
 AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaae7a71b73fbac55657c29973629fe580f8cf5901b0d37b3a2cae1f0405ad0a75820c45d7462c176cf06673dd29d91 SHA512 76b5663dd1c2fb5700e8519b303db82ee37e6567fa847251304eec10e04bbb0c83a13d09b47f3cc725f9196d3ad34147ae9781c1284d33820f859703399c2f93
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
-EBUILD genlop-0.30.10-r1.ebuild 759 BLAKE2B 9fc761292187aa6f21d34c5424cbeb99b7210bcb2efa17ab461c822fe7ecd0702c635a35a89fb0f799176ec30a34e63c08c3cca0e5198fc48f6a5799247e2b57 SHA512 777b6fad82012ed1bf6db16eda1d4ef89faa31643f9d4383fb94f83190a8debe6648152e6d4d311fdef985076ee1cc517e543e0bb5858eb80728cea2754ff807
-EBUILD genlop-0.30.10-r2.ebuild 786 BLAKE2B 305595717355e1d99ff7fd116ea2ca371d432f3156841da2740e9bda979be96b34e73142ac1ba33cf2b790296d4d4fc32ad3760f26bf29c00abf0e7b59e99112 SHA512 051bcf320d17e7eeb3eb36b5604e772565f9f46d104157e1dc6f0cacea9410a1b56489688f16a9df6cfb2232a87b61de5a92f72d231c3c0dfe0e9dd93d524762
-EBUILD genlop-0.30.9-r1.ebuild 702 BLAKE2B e392b47ab8c5cb156e84fa5105928d42a9be19b15b210209432c3f73be33ae5d6bb1f0dfb21e32b73159eb1693b861c48542d466972434687afd4d29c3596020 SHA512 fceba862a9ca2c9536ed191621d9d6e52b7d2d8839bcb804a7e03490f06d4d6a32c1009d9e4df36b63797f6c834d41e517b8e166bee99aa22b0cfd289e5163c0
+EBUILD genlop-0.30.10-r1.ebuild 740 BLAKE2B f8ab2a86287fb0abe5e775c2b592490611400376f71ac06f7aa5de6e9c64d3e5115409040810dc84c901778094d9ae7ff37ed7c5bafde5b875d07e9693ab2c12 SHA512 96ae19b2e28df25d022063ac2a53e03c4bae5a304e7134e58c886633d9cbb68d8cb8cf702dc512f73bd58bd1f204d1c07fa954796f035a5b1edd305e9654985d
+EBUILD genlop-0.30.10-r2.ebuild 767 BLAKE2B e91c41a62cb0c5338444e8b616325de77897f6e5104669f7cfb9104013440087c2499d906189da23087b73f6cd7ea317422ebc1d92efe81ccd3631018f1bb49a SHA512 f617a14b45bb3454541fd95509d9898fd127f709fd26385b9c363c9a46eb21e733daa0b8794b219d949728c7c1fbaa2e90c5d8b0277bcbf632e4b7813712c230
+EBUILD genlop-0.30.9-r1.ebuild 696 BLAKE2B 1555b239154537fa7addefe3a61a75545c805860aded62a2b38b480289f8f76614040136f8726261c57d4975f76ba9c8be136cfd29f1b036168aa4a7b474a8e2 SHA512 d1ced5041c28d6e551ce9c0f6ea159c011661509b18da4285234528960ee1e3add94c491c082aa14d16c3093ac4c1ee3fecd660e72803817a888cc08e399ebbd
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
index fb97cdbd841d..6f1e8c5d2035 100644
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 896d64531bd3..0d3926246aac 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
index c78322a58d09..87c68ed9ebab 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 087a0f94e100..2c786528bb04 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -5,6 +5,6 @@ DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384
 EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
 EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
 EBUILD gentoolkit-0.4.8.ebuild 2297 BLAKE2B 10d21be291c5222f70be925db74d50698d305cc591ff174842ad384a158f06d76e8b11e606bfe773970c2925ce7e15f0b2665a600bac98ae0642030aadff72b6 SHA512 6af0f28b49cde8aeba62e4f4a7d4d536609d38ec14c4d378b2e71deaca4a1b0442ba9f0b9d9dad853e7bba6d8ed7b3e099a1e7d723bbcbed7be2caa14fd0e30e
-EBUILD gentoolkit-0.5.0.ebuild 2280 BLAKE2B c98ef3c98a7a0f7e773e2ab3aa79ac92aceec9970e050c4b8302c029b80a1a4d665ac8cddb7a3cc9f5007d1dea7cf1db135622855bf5d978bf0f928ca134209d SHA512 7f23a153b8e85079099f272381813ca2b132325d1ce75a37a95ec2f7df87032898aa8dd02d6c36cae6fe7acb6f455c9a76132162fc63b3e4f63267dfcfb1440f
+EBUILD gentoolkit-0.5.0.ebuild 2274 BLAKE2B 2fefe9adc700ba67043566e09ee83cce021faddafa338a5a75f2550210e68ee151b8cd242a4f4e6fc7a9e1e1d3cd484bd589a520e577a1d3e0c00972ff221b8b SHA512 722c5c11ccb88aa1ab4c0d85abee2b421367852695b70f1427db2d3abe07613041256a40836b4345684bd24f1f21e1135a7421b2e987830e9260581ba306b5c1
 EBUILD gentoolkit-9999.ebuild 2055 BLAKE2B b5afb916af8f235a53452b1cd99b369438eabedd7bb4db23893ec29d30d26695cfc4328c8da559eb7c5c3b906a353ca001d79a5b6b67b0203276d2b2517b8351 SHA512 7e782f89a184ac8bd3f4a23513fe67069ab2d3d0e20338e5337793553df850409699e24cffac872335208b5237739b7ccc9938c05644fd9c806235b94b7a4986
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
index fff875e880ec..dcfacade2670 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 33d702b97c9a..5fba25bca0cb 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,5 @@
 AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
-DIST gpyutils-0.4.1.tar.gz 19444 BLAKE2B 20b9a3072337665a83e86994b4b0e5cc33673364320838ab3e56b87b06146d91d519f1b60023fa3e9be0bc6fc10a207a3fe87937158edb2c8607d8145022ee50 SHA512 c3420ec2c5fff39b32beb43b48eb06179534c359f755e5877d29ba4e3f393ce62c8ded48cd909bc69c20730d028e01c76375892ebb2a364017aa196c81865ecf
 DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87 SHA512 699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4
-EBUILD gpyutils-0.4.1.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
-EBUILD gpyutils-0.4.2.ebuild 530 BLAKE2B ad0dd68af616c72e6ea6ffd478a7ceea20c5fa84c093663e6001e950bcc1034360b1ee2490fb017e9b847225e8c24d4faaf74e1e824ff6460d2aa0b96786a859 SHA512 b678c80698024a1e50e6fc093c1d10adefc6c48e524be7bbe51d4eb0ea4321538cdc98a8a12458a3482a3778dab45645600fe4102575b05dd0b7965584a04c72
+EBUILD gpyutils-0.4.2.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B 12227a6eb086a0a1108d2029316d06f189a29399fd665deb3d5bfd53646606b3ec038ecbedaf7ec9c61e006fd405a11d95a5b2c33be64b156345face1d513a32 SHA512 9952706005d8bb34f65d7ef5dc238deb189fc01e1892d323da60f5cc4b6a404e26f3f99be25030aa70540e418086514ee9fbf264c4a47c84c97d153074a31f52
-MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
+MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.4.1.ebuild b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
deleted file mode 100644
index ac5c7dac4d64..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +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} )
-
-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.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.4.2.ebuild b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
index a519e2a5c0f2..ac5c7dac4d64 100644
--- a/app-portage/gpyutils/gpyutils-0.4.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
index 1d172ebd5f18..91decfc24b95 100644
--- a/app-portage/gpyutils/metadata.xml
+++ b/app-portage/gpyutils/metadata.xml
@@ -5,6 +5,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <maintainer status="active">
       <email>mgorny@gentoo.org</email>
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index ff21db46ae77..027f085266e0 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,4 +1,3 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
 EBUILD gs-elpa-0.1.3-r1.ebuild 618 BLAKE2B 91001b6852805e03172f1c4eca25bc528dd3963b8737face82ab2fdffded7155d2ad6b15b997da63f1dd6f19ff4d8581b4219f6c1a904ea074dd00173e44ff69 SHA512 63c853782d5cbe1ef69e52c254b905824f3f3b31898e81979908f707ba49fe15365d06b345ec54acfcf5067111ad9046ec6af9b283af4e8f8f9a367fe1802935
-EBUILD gs-elpa-9999.ebuild 593 BLAKE2B 23ef195780293ace28a7c6ca4c9729abdebaa11cfc661cb5316030ff4ef9cf98c4b6f600b817c491d9511c6df4a6cfe887eaab330e708582a7473fe326bcc6bc SHA512 f99650ffcc462906b7fd0f72a4c3b21ba6cd2a102a56feed7fdcd7a805bfd97ce6624d3105279005b1c72ed6acbc658f44f9281c3dea9c1f8d56bd79528f910c
 MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
deleted file mode 100644
index 8f1844ab7fed..000000000000
--- a/app-portage/gs-elpa/gs-elpa-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://github.com/jauhien/gs-elpa"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=app-portage/g-sorcery-0.2[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 6881c1c992a9..5eee19eec879 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -2,6 +2,8 @@ AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc59
 AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
 AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
 DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
-EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
+DIST hackport-0.6.6.tar.gz 2079279 BLAKE2B 6e4084babb3fc036568387845ca2793d47a29ce94c24211259324d3040d0c0e15be028d0a9726ea8512dd518d7e9dd8447aba67725c0916418f523449f2179b4 SHA512 b836bd21e3713796feaab9ca830fdef80f52b9723d0fba6cfb60d802e038eaec2da8492eb025d6ae376aea69734c031e23c0887642675c4f767b1592d82c5523
+EBUILD hackport-0.6.3.ebuild 1421 BLAKE2B aeda2039e186e495dc14a2d856aff1d1fbc24908f52e86bed06f8aa2247442041df8d79f80a0c6c9c4d6ce6349a6ca71443b39c23f760617a1860cd0f197de29 SHA512 7f0751b2812bb6319cf7c01a57b852f0f28e100b6b0cadcdcb89da65a99d3e9ad2d3c865834c3abf20f9385c1910c3c9e73f69370789dc52af7768846615ff0a
+EBUILD hackport-0.6.6.ebuild 1333 BLAKE2B d13593e39d71f79435ddd627221fa9ab59e5e5caf8dc239878665bd40c3cd7bc04edb32754586f0debd737abeb832df2cb53086bff9435c071f2b6082d5ed126 SHA512 67d8164fd4e0b31317efd87c1127f2bf8dbcf57d9e4b638870a6ac4dc4f52d266c7860ef38caed2a4219132d01ca43e354351c0a9feecc9ad3507060e723ecaf
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.6.3.ebuild b/app-portage/hackport/hackport-0.6.3.ebuild
index 5a74aa2efb67..7bfc0828b6b5 100644
--- a/app-portage/hackport/hackport-0.6.3.ebuild
+++ b/app-portage/hackport/hackport-0.6.3.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
+HOMEPAGE="https://hackage.haskell.org/package/hackport"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-portage/hackport/hackport-0.6.6.ebuild b/app-portage/hackport/hackport-0.6.6.ebuild
new file mode 100644
index 000000000000..149aa49011ec
--- /dev/null
+++ b/app-portage/hackport/hackport-0.6.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="https://hackage.haskell.org/package/hackport"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-portage/repoman
+	>=dev-haskell/async-2.0:=
+	>=dev-haskell/base16-bytestring-0.1.1:=
+	>=dev-haskell/base64-bytestring-1.0:=
+	>=dev-haskell/cryptohash-sha256-0.11:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	>=dev-haskell/hashable-1.0:=
+	>=dev-haskell/http-4000.1.5:=
+	>=dev-haskell/lukko-0.1:=
+	>=dev-haskell/mtl-2.1:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	>=dev-haskell/old-locale-1.0:=
+	>=dev-haskell/parsec-3.1.13:=
+	>=dev-haskell/random-1.0:=
+	dev-haskell/split:=
+	>=dev-haskell/stm-2.0:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/text-1.2.3.0:=
+	>=dev-haskell/xml-1.3.7:=
+	>=dev-haskell/zlib-0.5.3:=
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-2.0
+		>=dev-haskell/quickcheck-2.0 )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index ef279582f6d5..f1d819e97301 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,4 @@
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
 EBUILD layman-2.4.3.ebuild 2210 BLAKE2B f88284bd8845e8553b460d5d7ef44d57301eb5d3876c799c1276a9085c21aba374493cbe29dee540690f8983f10aee9dd91f8c53e38e060e042184a710e7fbf1 SHA512 1151cc36154d7dc9c9efcb00a5a0c16acef3bf5ee2360ace1d00ebd1f2c6fd39635703d63a2f4eefa6dc9173c39da127c37149d98ce2a7c6b924cda6d3e2632b
-EBUILD layman-9999.ebuild 2218 BLAKE2B 5f1e2636b90282fc21ca8b4bd4b845af373c1ae70a0506ab5c81d92674522094b69461120cb6cf661e5b64f36d3c1eecfd7da37a7b737ceacef19d01beeda66e SHA512 7a7899feea2426f6e926f31cde8ebe661bc4b6abe402acf6017b001d47963c262c9459f6ef2969216e2b8c448023ad2e3fe90609583b5109dc756e4ba3fb50b0
+EBUILD layman-9999.ebuild 2419 BLAKE2B 31ea816cd9f003498b2eed4ba09545400a4943617d8770dc8417a42156efe696b161177d36b4f6b08a910d346201850793efd9f30b67102d5010413e3bbf430a SHA512 fe974af2325127e4811c2bfd4dee2c664fb84d3bd864e29629a31330d65979c0dc47f06d7cda19b4361887bedae9a9edfb9cb6ba432f909249836e4e76476940
 MISC metadata.xml 1102 BLAKE2B 43b832918f1c938f9b8a7d8bd09869ab79c50b5c9c38faa73267db851deacbf9fb2a95fa34b7b90298134f1ec5b557adef10722c87ac34ff9b8784e5c2f8efcc SHA512 9025362fc830f889b90c753de3485917af23adcbdf6a567010e4d07570bbb51189039f8501d16ee1bd6ec094f2e163da5744f2a16bffadb4a7826f1b852ca88e
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index e8ba2aeb5168..b9c60ed0d3d4 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -68,6 +68,15 @@ python_test() {
 	unset suite
 }
 
+python_compile_all() {
+	default_python_compile_all
+	# Generate man page. only required for 9999
+	if [[ ${PV} == *9999 ]] ; then
+		# override MAKEOPTS to prevent build failure
+		emake -j1 -C doc
+	fi
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 91d8fbf608d7..ac99a594458d 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -4,6 +4,6 @@ DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.3.ebuild 967 BLAKE2B 984f1f693742988f6f4a585786ccbe1aabc7e0359651497dabb0bcaa300d5c3704148919e5f3e4d1bb2c38e0faaeb6bf28017cc1ba9a8f3d50972d691534dd3a SHA512 98ffc5154ef2b894e950417a0755a7a9af28601c36f248bfce6c387240f5f75c5414bf0c8c1a73aad464f29d50e17cfdb7524fa89554a42edfcb7bcff5edffe2
 EBUILD mirrorselect-2.2.4-r1.ebuild 955 BLAKE2B af1f82d9124117a757843678924f67ca558515f871103f66ff58d4382a2a7f755409fa6b78375e15ef36a5c0153c68f77be35e0508fec6d74495fe17510cd37e SHA512 d1c29f623719aeb6e6c95b03c7f46bf75caf668946f406149bb30ea0e0cb17aba32cd9c0f0b029c0c3fa402ca932027b9f1cdd74d5bad46a20c784cc1727f572
-EBUILD mirrorselect-2.2.6-r1.ebuild 1483 BLAKE2B affc56795fb7eb3f0ca93f20fce510e7b6ac920df4fd290225e72a58025c0fb471545a42e150072084d59d153d5a97d46f4a15b366df1f336a2ed3b570743104 SHA512 b79de2fd09a365441bbece931153fa6f8b07331f6c6cf2d3ae720db8547b1fd48165066f86f32b4502fa81248f27bb398a5689ba0c7346f16fffcbc51156d302
+EBUILD mirrorselect-2.2.6-r1.ebuild 1474 BLAKE2B 9f005d815ab46c44b9c19c6aa6ac3a23ca76394b2f39d37dd866d8f3ecd28031337a6e6e36d3b18d6820b7d6f1ee71abbf269bfdab80f931b54145eb9da4b19b SHA512 60afee632ab3e3162ebc91df722d48f9ff99957983ca9a9c2f2205f421bd08ad0e3e0e1dd8aef7948476eecf988c8ec01e4248f9ecf19d5787db5be0ebc25311
 EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B d62d53b4ea567ab380d3335a4cef175dd393767e593174d6163d5615f2eb8617aa40fe2670f95122bdd5384735fc72a5e732f8f0685c1d6f7864189c9496701e SHA512 1477928867032a8291e9aed8e5d10ccd4537d2cd3208789bb3f5acf3935ffe0559dcf4e3dc6c68cb9321f0a52bdf0bcfd8fe8ce30561f85730ecae41e2f5cea6
-MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
+MISC metadata.xml 494 BLAKE2B eac488423f418c6fe5ef0d4587a98897d9dfe5f2cfba0cc37c6770d66c9823c7cd5e31e9890246f83f39dff0c6c4ac886b4a57e6478384da58d42629802da576 SHA512 dbd7bb0614ca90644d52e0d923d37a73580138889590a485fa6d1f8621290e8aecab6d597304a071565c3ed013e884491ee4f51afd82239ce21126e78ce7bae9
diff --git a/app-portage/mirrorselect/metadata.xml b/app-portage/mirrorselect/metadata.xml
index ca6a7a138342..6028cea8fe03 100644
--- a/app-portage/mirrorselect/metadata.xml
+++ b/app-portage/mirrorselect/metadata.xml
@@ -5,6 +5,7 @@
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		This utility is used to select the fastest mirror (distfiles) and
 		provide a nicer front-end for mirror selection
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index 79815ece5cff..1d8e0c30f161 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ipv6"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index d5ab0a15a8a6..a575a7533781 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -5,6 +5,6 @@ DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efb
 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.9.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
+EBUILD nattka-0.2.9.ebuild 930 BLAKE2B 014af738c0295bb91a3e4beb5e41259365b9f7999c59403fba148f8c72e85f547614a3f853e9f68b32dcb1689ba8b83f9b0f235e10689fd606be8882ad6f06dc SHA512 b20a1221faa29863651d3a886f1791fa1e402603efe1458152733022e6166cce687d65bfbdbf72cae6d60f91dc13f9c93e37589b8c2d48fc5349ad9601c1e588
 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.9.ebuild b/app-portage/nattka/nattka-0.2.9.ebuild
index c2d438a421a4..50b3f5c466f6 100644
--- a/app-portage/nattka/nattka-0.2.9.ebuild
+++ b/app-portage/nattka/nattka-0.2.9.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/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ad75de232402..d8f344228eae 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,8 +1,8 @@
-DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
 DIST portage-utils-0.88.tar.xz 1776100 BLAKE2B 5165c99f163a39e2d8e9d503a43982999e70ff647af16acaae84279d17c327e78c2722fa9f332c570e8bfed7647ebb7f96281c3ed2c42948234fb23192e73ca5 SHA512 f5bddd170b66753bf3abd870add6f893e31ae971cc15f3b34366fbbd6d69848aa8aa301bbf3e4185f152ce110e890178828f867e64d8ede74c17e819c2961562
-EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B fd603d2da46ebb4b85e719119fabc82f09fde52bc3ab47704b711c4fbaede96818eace742c98bebd007c7b639634aad1b5690e249ecc5969902b38956235cc8a SHA512 67cd408528edabc58b78627bfe75676b6744b52f7b3269e929348f63390a08cdb9fa4672514b75f6e99915de38679f4ae7c573ae4ddc264e01cf47bdf33de042
+DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d SHA512 c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
 EBUILD portage-utils-0.87.ebuild 2171 BLAKE2B 5561831e035a2139060704c67366bb4b68a4a737fa405b22203696716bc8383177f740f4594de2d08be6622b702da68cbb18bffe047bac792db574c6fa3a5d57 SHA512 a73d4d44e24f616ee965f5663ce60df0287bd35d250470389889a5fa373471d2dc37c3eec1f1df7d9d2e6efe0d59ead2b683bce240a001e8b07ee809ff8c2629
 EBUILD portage-utils-0.88.ebuild 2179 BLAKE2B ecbd90f21ef26d89e423e198bd0e8e275aa63a8eabe515a0236c18370a755c18319c1b21c22b07a41eadf338a430bdeb13e753db0830b298853ed72b48aec6fd SHA512 401ce43ba8704b8d2936307e5250cf7335ad555fe4d8e9766ac7577a01540c1018252dc77c145913bb494891fae5f6860f33f80a17d58ab0b5bcd42e8c1652cf
+EBUILD portage-utils-0.89.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
 EBUILD portage-utils-9999.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
 MISC metadata.xml 573 BLAKE2B 7c24e5d74a38a20b0c79c228ca131ee5073cbf0fdccfc2b42221521ae684566b4bf7474743c0a9cd1273b59eb94e2eef63b1db70f0ffed7d688073bb3679e007 SHA512 85f32bcd860ab711ade03cdb4a241722efbba47396b736e302fa2282e363bc8e445daf9316996b1cedb420d2cb102fd416962f05e15a57c51b514d776ac7cd84
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.89.ebuild
index dfef3cd8c858..aa5f157c1b9d 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.89.ebuild
@@ -15,12 +15,10 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	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
 
 RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (
@@ -71,17 +69,3 @@ src_configure() {
 		$(use_enable openmp) \
 		$(use_enable static)
 }
-
-pkg_postinst() {
-	local pvr
-	local doshow=
-	for pvr in ${REPLACING_VERSIONS} ; do
-		[[ ${pvr} != "0.8"[01]* ]] && doshow=true
-	done
-
-	if [[ ${doshow} == true ]] ; then
-		elog "This version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 2e3c9804c7f7..8759ea798e63 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,5 +1,9 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
 DIST portpeek-2.1.29.tar.gz 13067 BLAKE2B c0385849738303a3fab8123f6af321bd000f88975b26d363c08aacf873b657b872a898af92a0396f1e3060b5b804fc9f2ddd8579101d2f5da18628080dc4e490 SHA512 3933b39c248e3758d67e0c1dd04cb93727eecbda4ae35d55fc266d01f01d7f87c535701cbc54d48a212e1c642a4447d487f2c62aa649f084e1d1fca458263b27
+DIST portpeek-3.0.1.tar.gz 12906 BLAKE2B bca14b3d1c82b270a5418ca3ff1e5422a16251bd5d7ef775311c9bf86cbb3b5c1304c688c0631247aa1e6f479d5e7eb5313c83fac5a9e197dc70bda6aa48b569 SHA512 8e0d71d71afb6b6d990e88f3c212a7e999b544cdc7a06d44cadb59ae3b70849fbbd864d855f014bb4090a031efc0713c84dc2a3079e37ab8967e546c8d165394
+DIST portpeek-3.1.3.tar.gz 13698 BLAKE2B 67b37e4e02a178076bfa57da850eff7cdf2664e34ffbe287daa92b5db924d17f486eae078b7d09e497a2a6e21588134e8167d113d6181d9b3760ba7e20fa6635 SHA512 31d85e9d8c742409a7429695dd73a49da6d4b3fce67716b2e8ea766df95e130e16ef5cc05c4cd27278d51956e9b78fd17eadbf615da1e237a15e0649dba6b5e2
 EBUILD portpeek-2.1.27-r1.ebuild 691 BLAKE2B 82344fbb0c1255de4d20baf9dfb62daabc77da8ef290bbd6b342195b50f7fc46132fd21b77eafc5fe5d5338618d6bef8fb4dd3f21f35e740d68213e1d71bd1fa SHA512 eb0f940e006a32796b8ea47b9deeec5795271846ac1678132d45abed8cb766d801583b4d735dff540176b0fa96b5e5cc4da386cb058c9d5bda17d57e5440e1e3
 EBUILD portpeek-2.1.29.ebuild 696 BLAKE2B cd0c7d39b0775ea6f7a566a9440467bf9d31eabc2cc4cf4f9a18ca676b466ebaf947816cceb988b79c66b5c3cdc119ffeb2e3525922d397d720367862ef75c9b SHA512 e3001270e57e40d89aaab66999d6b10e3b4347bdd17e35b90fce0a5bc0156bbec39fbd0550bb8fc19119c7f1643410b3f2cd97077e7d336c539eea035fcc8316
+EBUILD portpeek-3.0.1.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
+EBUILD portpeek-3.1.3.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-3.0.1.ebuild b/app-portage/portpeek/portpeek-3.0.1.ebuild
new file mode 100644
index 000000000000..9bda36898f42
--- /dev/null
+++ b/app-portage/portpeek/portpeek-3.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.8
+	|| (
+		>=sys-apps/portage-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-3.1.3.ebuild b/app-portage/portpeek/portpeek-3.1.3.ebuild
new file mode 100644
index 000000000000..9bda36898f42
--- /dev/null
+++ b/app-portage/portpeek/portpeek-3.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.8
+	|| (
+		>=sys-apps/portage-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 8e67d74d299a..b86ecb6300b8 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,3 @@
-DIST pram-8.tar.gz 7918 BLAKE2B cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc SHA512 bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
 DIST pram-9.tar.gz 8206 BLAKE2B cf490edd53d307e5d9c715d0ca68e38d04ebd5a1dc75f89232605ac5cc9cbc9567b3895b1e2445a14c5acf119f054dc2b982ea7b9949177519a70062e648272b SHA512 a9e718ca0cdc93a67f442f2db5dd6a854357aa493ad7836e5d75ede68c3fad06d2343f1ee34f00bb66203d41575c7773999772f9251a9a2d6fc74702ce875c4d
-EBUILD pram-8.ebuild 566 BLAKE2B c8b7c3ff33647d859ed2d79266d78000727d5e217c71d72ba1bb5beee97625c02e2b2dc8c867ed6620e7172cc469359d2b47f914a174a5d04638da4fb123b893 SHA512 9d8215fe1f697ed7083dd0793c7ac3d7f04dcfd31fd401aabe4ef0db95d398ff490a4a27744e6d23c5f4c5f9df9bb661502352272a7bdda53d1dbd00877eb95c
-EBUILD pram-9.ebuild 568 BLAKE2B 5b2e31f41cfe1b314bdf3ab1588a5275cf64d67ed4fc2cfa2480db5c3a72b81cb9cb6dfa44ee56fa96560e0c64b8314df5571f39c344c11084759cf56daef6fb SHA512 96c439e3b537d89c9907b9d13c58b8ee973f60692b6423ebade4731706022a85132c8d999425a29774184ed9fbfd1dad57b9f30a1ce7a23fe54327d123eeb8b0
+EBUILD pram-9.ebuild 572 BLAKE2B beef0bf65c487bfa734fefcd8cb173d6c9f8588614e70817afa94ea87b77178812ac7444ed1f99cad30cbc79b7d2d538990225e567df6fdf0f5dafb76f3b40c0 SHA512 d2019131959d4a8ed8da53cae76af7b2d7b562b23554b157d55dcf7011aaeca379d2063de63167f5b9c620f86741101ea129709244238b17dc6c8cee0051a5a8
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-8.ebuild b/app-portage/pram/pram-8.ebuild
deleted file mode 100644
index debf356c6ab2..000000000000
--- a/app-portage/pram/pram-8.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
-
-inherit cmake
-
-DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram"
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-vcs/git
-	net-misc/wget[ssl]
-	virtual/editor
-	!dev-perl/Gentoo-App-Pram"
-DEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gnupg
-		sys-apps/diffutils
-	)"
diff --git a/app-portage/pram/pram-9.ebuild b/app-portage/pram/pram-9.ebuild
index 651fd1085139..bf227cb8aae6 100644
--- a/app-portage/pram/pram-9.ebuild
+++ b/app-portage/pram/pram-9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 5600b6323710..ed9d68d492ad 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,6 +1,6 @@
-DIST repoman-2.3.22.tar.bz2 87026 BLAKE2B 52262339410b95d47df19e225493075d6e9f763e85b7fa9c982c47ed88b652620d3ab083781c9e4747d8e3659795de7a05163b00339065ce5d84f8babfadc1dd SHA512 8be75f58127452ed162b0f5feac96110b82f7a06fa904c65f6084dff4c542602870cde7fde5cf4108b04142d433c1167dc5bccdf839064dbce2278ea789f77ae
 DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
-EBUILD repoman-2.3.22.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
+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 1975 BLAKE2B 1254feab2dbd492db51c7b78af68455e55f3c8f24835dec1a745e483534e12d651f0f17fc18733897c876a7b3a66d9b625df358340f62a49c6a4b05483e3b4fe SHA512 4637d0365008aad5ee2015689e8d5dfdfb88c527040ae2800c9924f38698aac787884f43c096edd821a8941334ee515642dce6dfc1883f0b462e2b7d1c22b4eb
 EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.22.ebuild b/app-portage/repoman/repoman-3.0.1.ebuild
index 9dfe116e98f2..65985692edb2 100644
--- a/app-portage/repoman/repoman-2.3.22.ebuild
+++ b/app-portage/repoman/repoman-3.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -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"
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
+	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 1a0a66fea8a5..260859ff908d 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,4 +1,4 @@
 DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
-EBUILD tatt-0.7-r1.ebuild 833 BLAKE2B 951bd91fb0f9202504aac48491f622ee85b2c5354e041a688721070c54946bbc34b5cd0bf43986744981f065bf749ee6039fca7ca3eebcc45638a27f5dd13e1d SHA512 14039eec490259b7cc207d535b3111daced510f9ee74ab4d1a683630dfdd515925a3d118046e9f6c1803df94ab316c885895e53d24bae445d59d9d2dcddc6c01
+EBUILD tatt-0.7-r1.ebuild 831 BLAKE2B 89842ca9be4a6c16f2c0921365e522c935ffc705a24166c879ba264a6784c7e32a5fd33b580038f6f64070870bc32118af60e4ab9929817082dd43b23c4c1250 SHA512 2ef85bcd8ff1cd2d964d6cc5e814da50856964f80b245a9cc3fd833748515763fd188558ab63fbb24b65c655035e204d7a076bd5fc50c4b2dc6389281cfcb239
 EBUILD tatt-9999.ebuild 792 BLAKE2B 64a6200397abf180aa1231a54df06ed8f103ffdf3cb825bab8e2276ce6ca68eccedba067f530a9dd2ea77c7bbeb8e2986e16b9cca9a455ebd9502c4d717ebd36 SHA512 67e1a46312cf9c3f0bc36cb26650d48e769b9aa3c5d9d5468c86e1736a1a85415336dc508639b73e771a1dd4f47900d5d632e2f465322bba88b72e7963722a2f
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.7-r1.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
index 3a97fcb51d4a..04467f9671c8 100644
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ b/app-portage/tatt/tatt-0.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 5093b288609e..decdbd9583da 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,4 +1,4 @@
 DIST ufed-0.96.tar.bz2 48838 BLAKE2B c160192efb0b68f35454f210068763a54659a9a1904bff6b289aa449fb2ad1583ff727ec201581c0387f794391da9811e8594b57149f7cc47097211cf9bcd976 SHA512 4b4cdd44f793bf41f250e1888d8c2e49ef742ab0b3b3204a04415eea50d73dbdf001a373b125e6ef92450b1081609961d52fb8d98bb8c0fd9010aa549489e4b9
 EBUILD ufed-0.96.ebuild 957 BLAKE2B 0b94ee22c9ad017355fbcd618c2fe30b756bf7431a337a8d465d3d007b59fca5abc1d2d8927e59c466b59c99102a1436fa783c3c5619a6943b88f8a68da63548 SHA512 9177a978e55bfd831ebe63ffd7ddcd57781893fad4fc078fa44fac40204526a731a95efddcf9448456c9ba06705e1bba013798dc5c1d18b431e031383e54831d
 EBUILD ufed-9999.ebuild 948 BLAKE2B f20e415160ff62dcfcb4a601a40d2b94a017e772f26bf30331d80cb5e99bf4b4622c4a6901390bebd437669f02d3cb396d1a585c268872b903345c24498efddb SHA512 f78d0110f4b4f67ec6a015a8aa6a9f00b0f1fa9c263a353da89cf8b5ab78a2909b311b7380f6ad461c1736b309d38ccfca817e5487341e93cb3d67a66a1c703a
-MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
index f2984ddd5aa8..585b0dc75dda 100644
--- a/app-portage/ufed/metadata.xml
+++ b/app-portage/ufed/metadata.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>yamakuzure@gmx.net</email>
-		<name>Sven Eden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
-
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index d993d852cc35..ed708a4caf15 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,6 +1,6 @@
 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 722 BLAKE2B 6467f39323106ac2ccd42f5482516d5308b03987771617c35a400412f257134c7f98fe9e6ea600ff9fa947a46f761a19f5b6d9b66abb7f518edd1e692455aca1 SHA512 fbd74a9933e081211c171a0ce9b719f2d8968443c9a36aa76449382abaa330cad51524bfb9175a72ba505377a1538366233774964dffe886d6e99030b78f170b
+EBUILD unsymlink-lib-18.ebuild 721 BLAKE2B 72af9423a88a6fee47b8cdea1e348b184a0ba6a5ea30cdee2b5f413a2d218804ef4889a5974747842d1e5a3eda96b1257ac33a9d4115ca8c5d8a92d975c9629a SHA512 2d1d90f09583b7671c3fe4fe54d4c0f1da26c978f5e5d63e093a89cee0453aed8e2c3e00fa0ada0cc021bb822e1126e7c6c10bb6f2ade9ef1dcae8b26a46778c
 EBUILD unsymlink-lib-9999.ebuild 600 BLAKE2B 03a22788dc3ac143563e5cc893873b5803ca880a3d87de3935055eda21843c9d8a3d6d1c98f93569e5a4791e85eabc3ed03d210c5a8654a2436b15f0c743fce6 SHA512 ec387513392d16cee1cb58d3271b8e299a267b63ae35580424a7d4f48b7ff005b55b8f8f043c0250b1d4cc47285daaf1456979cd23451ca6dbdd480bacf84287
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
index 03c0f831738d..11089ce1b6eb 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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # tests are docker-based, you need a running docker daemon and you
 # should expect leftover images
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-portage
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)