gentoo resync : 13.06.2020

23 files changed, 179 insertions, 140 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 81e07ef8d3c9..26d4987f396c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 0d6246a32cb0..2cb0b14f5b7c 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,8 @@
+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
+EBUILD cpuid2cpuflags-10.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-9.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
new file mode 100644
index 000000000000..5914671097eb
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v%-r*} -lt 2 ]]; then
+			elog 'Please note that the output has changed in v2. The new format is suitable'
+			elog 'both for Portage and Paludis. To use it, e.g.:'
+			elog
+			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
+			elog
+			elog '(you may need to convert package.use into a directory if you want to use'
+			elog ' separate file as presented here)'
+		fi
+	done
+}
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index cb3a8743501d..5bfce0b75c12 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -2,8 +2,10 @@ DIST eix-0.33.11.tar.xz 623256 BLAKE2B 756feed85cb4f40ef9228a03d2a8b8470eb6017b0
 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
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.4.ebuild b/app-portage/eix/eix-0.34.4.ebuild
new file mode 100644
index 000000000000..f11bcd6edbb7
--- /dev/null
+++ b/app-portage/eix/eix-0.34.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 349cbc1cf7a3..33d702b97c9a 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,7 @@
-AUX implementations.txt 808 BLAKE2B c209c676d85d731c901cedcd8b59e1710f0ef8b20a849bf065770ff56178a2c1e4ee4a1702bff31c28b277b04f54a6f15b523bc59e3c4b41a3b9fb4f967fcbc1 SHA512 9d4edbb1c1298d6be268deef382a662211ae53efe52444d27e603c2fd3e116caf8e0e939e2d67cb6c12e81dbed192fb8a41b4f6b6a5fe9afba4c64996127edb6
+AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
 DIST gpyutils-0.4.1.tar.gz 19444 BLAKE2B 20b9a3072337665a83e86994b4b0e5cc33673364320838ab3e56b87b06146d91d519f1b60023fa3e9be0bc6fc10a207a3fe87937158edb2c8607d8145022ee50 SHA512 c3420ec2c5fff39b32beb43b48eb06179534c359f755e5877d29ba4e3f393ce62c8ded48cd909bc69c20730d028e01c76375892ebb2a364017aa196c81865ecf
-EBUILD gpyutils-0.4.1.ebuild 533 BLAKE2B 92ede730c98c285fbcc66d67cece9075442ef4faf13f78b92fc374bdd4a54254e23c98490ee5760d62f69b093d9acc150b5ad04bdb2d9024a9507a298bed9f75 SHA512 7a4cc1a5100d279edae76f9ff22559d9a475db0eda6b2c15cc1fba7e82e88c3979c8d69cf2ff0e9035d64b44fc0f7c4591371731c18dc8029f8ad2ba3570ca13
-EBUILD gpyutils-9999.ebuild 515 BLAKE2B 71b752f95b923b7640c1ebd7fa50749787cf7b16c2480553b460ac21acd7a1d7280aac61e235c9ecf2bbbd38d91cd0f4fd8f83f7db62fae20a2efb603c89ae46 SHA512 305779136d3f455a6406cfd4e1e4a468c5e8659cd88881cbcd290c4ad220a79a75f6d8e62a255599c5c50f0ce7c88b39f3e8afa6b8067cfdf0e62cfa2e24f44a
+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-9999.ebuild 510 BLAKE2B 12227a6eb086a0a1108d2029316d06f189a29399fd665deb3d5bfd53646606b3ec038ecbedaf7ec9c61e006fd405a11d95a5b2c33be64b156345face1d513a32 SHA512 9952706005d8bb34f65d7ef5dc238deb189fc01e1892d323da60f5cc4b6a404e26f3f99be25030aa70540e418086514ee9fbf264c4a47c84c97d153074a31f52
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index bb8d5e39be6e..231c94cd335b 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -15,9 +15,10 @@ python3_2	3.2	dead	3.2
 python3_3	3.3	dead	3.3
 python3_4		dead	3.4
 python3_5		dead	3.5
-python3_6		current	3.6
-python3_7		supported	3.7
+python3_6		old	3.6
+python3_7		current	3.7
 python3_8		supported	3.8
+python3_9		experimental	3.9
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
diff --git a/app-portage/gpyutils/gpyutils-0.4.1.ebuild b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
index e53246c0e37f..ac5c7dac4d64 100644
--- a/app-portage/gpyutils/gpyutils-0.4.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-0.4.2.ebuild b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
new file mode 100644
index 000000000000..a519e2a5c0f2
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
@@ -0,0 +1,24 @@
+# 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-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 6f927d086345..8bbbb4c17b65 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index c23a23b537aa..3b2a88e9f866 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,7 +1,5 @@
 DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
-DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
 DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
-EBUILD grs-0.6-r1.ebuild 1100 BLAKE2B cbc9af805c9f14f7721767a88ff36b3a849741cc6d94673629cc5d62f470ce0e0c12e8cf758fb84cb737e331f5a81e4668215b7749a1c945ea3b59135ecc2a3b SHA512 d867611fa3ed67bd5de17aa20c3a7467bb5ce269ec9440645550e91966c979df39bdd719cb3d43e287afb56d771b99614cf32e31880c659d1cc521ebcc59cc7f
-EBUILD grs-0.7.ebuild 1327 BLAKE2B ec38cbcb9e9edb74b50aa50b0170f11ebbefc2285b59e02d346c653a7de73ca580b401c3217970865f2789c619ad29c2495d56fe612243be9d92ceb117e8e0a9 SHA512 bf0c20ed65a8dd981cba776ed9464d8c79f020e13cc867680ea61bfddf7669b7db42188871c564ceee5ee985e714da8e871d7e26053b5a8b5f053786cb8f2718
-EBUILD grs-9999.ebuild 1331 BLAKE2B 5b74d0f2e1c3f32dfdfc2e00ea0e274273f55797838f37a03243bcda9434a208c0cd958f00dc1922a52528b967b7091c46e1238c961dc1c9900fe9ce0eac6ed0 SHA512 acd5b469ba6cee1e3b6d1dc48ba381661780c0580e912907daf7cd57b54a64deced6c53b0e0bb9e8ce9ece91be26518147447945b33a9b8decbf642e17e6103c
+EBUILD grs-0.7.ebuild 1331 BLAKE2B 3d240b30094732d53ae5d24751d43bacd75ad4434c1ec98963d89e1c26e09cca5e9d10d3bf69ed3b1a8d8a1356fcf671d2bcca2f7505639aa9e5cb2b8571531a SHA512 17e1e636d2664d42afe5dd4f7c57432ad0e31d0063b4b0caf3ce2a557c29995cc3650845168fb5811729f3bc2f17e4356a6e75e7c74b355d5c5429bb3d410a87
+EBUILD grs-9999.ebuild 1335 BLAKE2B 56a6ba0592ebcbe99a1ffd26782c91152117dfe7caba3fa1544e658aa8eb74ee33ae9277e30b9808b3d883fc8313836e939812c1f456447dd859bca7582761c5 SHA512 a1ea4639031316a2d6f125b1cd436118da04957624858e5bed825b838d8a0849939c40fa5152ddb72fb43a85303d0469fd710fdee9aa533a021ae3b484fb203d
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
deleted file mode 100644
index 287a6c73de68..000000000000
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ /dev/null
@@ -1,53 +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 linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 x86"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/grs"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="server"
-
-DEPEND=""
-RDEPEND="
-	sys-apps/portage
-	server? (
-		app-arch/tar[xattr]
-		app-crypt/md5deep
-		dev-libs/libcgroup
-		dev-vcs/git
-		net-misc/rsync
-		sys-fs/squashfs-tools
-		virtual/cdrtools
-		|| (
-			sys-kernel/genkernel
-			sys-kernel/genkernel-next
-		)
-	)"
-
-pkg_setup() {
-	if use server; then
-		local CONFIG_CHECK="~CGROUPS"
-		local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-		linux-info_pkg_setup
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index aaaa51e6533a..c0dd4da74b1a 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 linux-info
 
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index d586cdacd930..04dfe2966f17 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 linux-info
 
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 1d0f9b7a120d..a66915c06e2a 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,4 +1,4 @@
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
-EBUILD metagen-0.7.2.ebuild 730 BLAKE2B 4b265935398f3f5b27736304b5545049edbb22dd27c63423bc7083b4245cae876d9bacca4c47ae31063a0cb593c5dab53d2e497b5aa8958c2a70fa2ea4c06b0d SHA512 e2b747d555c2231bfc4779d848fdf0c3448eebb3eb8c9674d2738c379f32f04e5cbd2ab69156af10af4b3202490ea3fdb4e81665d38ae37cfa2e71f7813b2695
+EBUILD metagen-0.7.2.ebuild 737 BLAKE2B 0e4d08e342baa06db9772962a416c21e4e3eeaf5fb4f40eb8a779e320ea8b654da4b0c8561084179874baba0ae0d510518973220d531470194dd17ed51631174 SHA512 d1a92db31acb6a3941dff8b007ec812e938ced5967cce23b25fc8a1dfb86089d1ca949b5d29d125bd27267016db6a0b0cdca77360d5e40a4cc6a2ab329ebb992
 EBUILD metagen-9999.ebuild 869 BLAKE2B 17339843be940be20017abeb86081af08fc1008ecda6a4d50fc74d7803a9869e2312d8d6c569d34ecfc8d70e21678b4b478b55eb9bb587d361c5624c98858531 SHA512 7369044720654c1b23bdae57dfba9f8a523372c6773926cf5ffefb3575c1a8969bc530ada279d364bd1f5c177a6000eed67c716ce17f81d7dccce6f4c64a4bb4
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
index 65ff4f6e164a..ea76c3c225c9 100644
--- a/app-portage/metagen/metagen-0.7.2.ebuild
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 68fca1652ee0..c920c3453745 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1,4 @@
 DIST nattka-0.2.6.tar.gz 90276 BLAKE2B 622ec99e276a8bcdd3972859fb41656e1a86cec62a0f571665fbfe350a467720dfa098f4d4afcb23554540118151776283b5947bcd9c4bd013b025a657c2bd75 SHA512 bc62a51a86e90834975d9bef6f65adf9b3620a19c0c98cd878ff19d0b9cb5679ecf68ee31984bfbfcd9d009420377cfcd57a9561f2eda967f5108bcaf8518ab9
-EBUILD nattka-0.2.6.ebuild 968 BLAKE2B 42063e5d869a34e0999557a5678a331fc01afd62ed03c4c862ca861eba93a994e4e3297ff34ca093e71fee89ae9939dd5d40d2292f778616d7d1ef22f6f32622 SHA512 e00d1094af2bb351ed9e2995d0e15d50b02bce699f9450fff5610d8299f213dca41ddb30c8c633b4358167d585abbad77f071b5babda27058f34fd409dec7953
+EBUILD nattka-0.2.6.ebuild 987 BLAKE2B d5960c7995290e5f7083d76762c56bb0cf651df6377f3be076ed98a8d5f20fdef6ede487d7c9bf46dc5e492a2920c9c4d0031f0533cd5cdee5e1f1d25a5b693a SHA512 0419b7f478d373819fc3b929fdb41462c5224ceecb479a19b43479e124588b7729f9f00f15143d093d8a9186adc692c496cd54a19a7275eff166f2f0003e8bf4
 EBUILD nattka-9999.ebuild 900 BLAKE2B 8a7b18f5c65dc833b61ed76e311760c92e9e6ffa119e813804f3fbc3082dff9f37a7e92b27176f6bd70aeea8a5ec9fbf5eaada155241e1d1456263b34e6104d7 SHA512 b23be4293592695e66d7a7d2924ff6216907046596ecf39c7b1c53c817897938e59594b749e3c72cf175175833c27bca1132a1b034fcf38df14741eb966fc6d4
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/nattka/nattka-0.2.6.ebuild b/app-portage/nattka/nattka-0.2.6.ebuild
index f98f14f77558..348897ce331c 100644
--- a/app-portage/nattka/nattka-0.2.6.ebuild
+++ b/app-portage/nattka/nattka-0.2.6.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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 6e4b793bc20f..e46fe7aa16d0 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,6 +1,3 @@
-AUX e-file-function.patch 535 BLAKE2B 507a9a8a83585613e37fb9810ad65c04f0d78be5fd24cb8cacf41cd56c4bc878b1562dfd65c65a0d0f8e59dd112d20b7f62ab62acfb1a3a2420b9da2f3433c5e SHA512 23b7b4b8d3d894b79973b4c5484bdbeeae13398b33d2316774e9da43e072da0d5a55d47774e3f201e71147a29857818b4b3a40cf9f7b868d642bf5db72eb4dbc
-DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b179c2618c3c7d508b90ecb21b0fa566eef54e6a24957251934b04b0013af41b88de57e7e1db558831d883 SHA512 f045ca21360f33f87816e72a4564d862275ea1415b3a79e32815aaa20d7548da3f38ca9ee9247db3150adbdd54155b330c4ae6d3bee878db6cd5cf78dada81b5
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
-EBUILD pfl-3.0.1-r3.ebuild 1109 BLAKE2B 20ed3547c9a661f6e280fb9eed4c4c763531922c1f727178472a34a4bbde48e107debab695d23768f2f09ae68d9255ef17c68123a513a62021cdaafe96686053 SHA512 33a6b3284da802b61bd68890b95d0d16e32eddce93887b79fb9b7d7403a00100a8328d5f4842cc63c6e6c988b1851ffe2db2b658120ad21324715744bd3b7f99
 EBUILD pfl-3.1.ebuild 1231 BLAKE2B 49432a8ae9ac598d73f73ec792bdf7bf070a1c3f4e2b8e3ca31b4cce56b2a9aed8f391f7da34578882b3653efaad4186fa118cba9b4d91741e815f22684aaf3d SHA512 f1aed97f935e219e4482911f8d27c71ede6ad34b0d85621deafe3fbaafe5b2c535bb5467c07e1516748e7f302b7b486d109fa311e48fea335201e48d89e3da88
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/files/e-file-function.patch b/app-portage/pfl/files/e-file-function.patch
deleted file mode 100644
index 2f554c926b37..000000000000
--- a/app-portage/pfl/files/e-file-function.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pfl-3.0.1/bin/e-file.old	2019-06-22 20:32:10.437137086 +0200
-+++ pfl-3.0.1/bin/e-file	2019-07-13 14:19:47.383823446 +0200
-@@ -3,10 +3,10 @@
- #License: GPL
- #e-file is like apt-file in debian,it's used to search package name via filename for gentoo
- #thanks for portagefilelist.de and Daniel
--VERSION=20110906
-+VERSION=20190713
- 
- coloropt=always
--function usage () {
-+usage () {
- 	echo "This is e-file ($VERSION)"
- 	echo "Usage: $(basename ${0})   [-c] [-h] filename"
- 	echo "  -c color output could be either [always|never|auto]"
diff --git a/app-portage/pfl/pfl-3.0.1-r3.ebuild b/app-portage/pfl/pfl-3.0.1-r3.ebuild
deleted file mode 100644
index 65b5caa69759..000000000000
--- a/app-portage/pfl/pfl-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Searchable online file/package database for Gentoo"
-HOMEPAGE="http://www.portagefilelist.de"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+network-cron"
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	net-misc/curl
-	sys-apps/portage[${PYTHON_USEDEP}]
-	network-cron? ( sys-apps/util-linux[caps] )
-"
-
-PATCHES=(
-	"${FILESDIR}/e-file-function.patch"
-)
-
-python_install_all() {
-	if use network-cron ; then
-		exeinto /etc/cron.weekly
-		doexe cron/pfl
-	fi
-
-	keepdir /var/lib/${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
-		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
-	fi
-	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
-	chmod 775 "${EROOT}/var/lib/${PN}" || die
-}
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 7e91264767d5..8e67d74d299a 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,5 @@
 DIST pram-8.tar.gz 7918 BLAKE2B cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc SHA512 bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
 DIST pram-9.tar.gz 8206 BLAKE2B cf490edd53d307e5d9c715d0ca68e38d04ebd5a1dc75f89232605ac5cc9cbc9567b3895b1e2445a14c5acf119f054dc2b982ea7b9949177519a70062e648272b SHA512 a9e718ca0cdc93a67f442f2db5dd6a854357aa493ad7836e5d75ede68c3fad06d2343f1ee34f00bb66203d41575c7773999772f9251a9a2d6fc74702ce875c4d
-EBUILD pram-8.ebuild 567 BLAKE2B deab4cc1384177a5b0d7a2ceeaa0c400262c616cee0a8dd70668d635d5f748fd9515c816c9f303926ab8eb38b6c2828c2b18472eb7ca1d59a71ecdc8c6f32040 SHA512 a89b7018accdb5d2a27ac58a45025e9a1343feae7efa251738a53aacf99f008c3f2f83d2b91937c95098956cf424313b44942c0bead8276ce481b68b0a6944cd
+EBUILD pram-8.ebuild 566 BLAKE2B c8b7c3ff33647d859ed2d79266d78000727d5e217c71d72ba1bb5beee97625c02e2b2dc8c867ed6620e7172cc469359d2b47f914a174a5d04638da4fb123b893 SHA512 9d8215fe1f697ed7083dd0793c7ac3d7f04dcfd31fd401aabe4ef0db95d398ff490a4a27744e6d23c5f4c5f9df9bb661502352272a7bdda53d1dbd00877eb95c
 EBUILD pram-9.ebuild 568 BLAKE2B 5b2e31f41cfe1b314bdf3ab1588a5275cf64d67ed4fc2cfa2480db5c3a72b81cb9cb6dfa44ee56fa96560e0c64b8314df5571f39c344c11084759cf56daef6fb SHA512 96c439e3b537d89c9907b9d13c58b8ee973f60692b6423ebade4731706022a85132c8d999425a29774184ed9fbfd1dad57b9f30a1ce7a23fe54327d123eeb8b0
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-8.ebuild b/app-portage/pram/pram-8.ebuild
index 89db02183b63..debf356c6ab2 100644
--- a/app-portage/pram/pram-8.ebuild
+++ b/app-portage/pram/pram-8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Tool to ease merging Pull Requests and git patches"
 HOMEPAGE="https://github.com/mgorny/pram"