gentoo resync : 30.05.2020

41 files changed, 401 insertions, 160 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1b1374f127b6..81e07ef8d3c9 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 9ddb87b585fd..cb3a8743501d 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,9 @@
 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
 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
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.1.ebuild b/app-portage/eix/eix-0.34.1.ebuild
new file mode 100644
index 000000000000..d2aaec3c2f01
--- /dev/null
+++ b/app-portage/eix/eix-0.34.1.ebuild
@@ -0,0 +1,112 @@
+# 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
new file mode 100644
index 000000000000..f6d4bed2e52c
--- /dev/null
+++ b/app-portage/eix/eix-0.34.2.ebuild
@@ -0,0 +1,108 @@
+# 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/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index db025a7443e3..a543188e86b6 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -3,4 +3,4 @@ DIST g-cpan-0.17.0.tar.gz 38786 BLAKE2B 3f4a165920c7c075919f0eeca9554fe32bd3f72c
 EBUILD g-cpan-0.16.9-r1.ebuild 1503 BLAKE2B 300235c17ab66b2e1964966edaa09e475ab6d5bfd0fd41bd9ff09af41194e2d5b6e4819256bc35af0571b41ad6d7517cf28045b19b828db8e1a6f3662b137644 SHA512 8689b0c723e2e7d668a5759f05ac7fb8245dbd47523418b682718f216154d18fe7355a1d1c478b9371bdbd331cf63ffeb23052d219677045fb3aa251b2ffe2db
 EBUILD g-cpan-0.17.0.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
 EBUILD g-cpan-9999.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
-MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
+MISC metadata.xml 479 BLAKE2B ce787097f0e4f1e46c60a7b1cdd7a32e488c2e64866508048814e3c0a617bbe87216fd088b6088b3a7240df9fe41162b9d8594dc09d4a657acd79e1546b42dca SHA512 112013c62fe26315fd665f60f11b6e29d5890a62a9c648da8de91407f167cb490ed644775ec3fe26b5d358afd4cd599622af63dcc106949874d35c72b7201484
diff --git a/app-portage/g-cpan/metadata.xml b/app-portage/g-cpan/metadata.xml
index 67070ea1bee7..fa5a8f4c1891 100644
--- a/app-portage/g-cpan/metadata.xml
+++ b/app-portage/g-cpan/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>Sergiy.Borodych@gmail.com</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
new file mode 100644
index 000000000000..0e0f88c0d316
--- /dev/null
+++ b/app-portage/gander/Manifest
@@ -0,0 +1,3 @@
+DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
+EBUILD gander-0.0.1.ebuild 831 BLAKE2B a4aaa20b08377cbd52303b93c727d26b6abff406549f16b66ba5f6fad8b4d0a301c5dfbe89e9431547730370e1e0ba1072a71ed042013162177afb7378ae5bdb SHA512 e73fe28be8c95fb27a0cd458f7f30b760934900f204dbdf22256f723b56023864554e374a9f5f1239e107850496aedee82cc61e439bc9d3c1ea08985b3ab2189
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gander/gander-0.0.1.ebuild b/app-portage/gander/gander-0.0.1.ebuild
new file mode 100644
index 000000000000..e843e0ceb21d
--- /dev/null
+++ b/app-portage/gander/gander-0.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
+HOMEPAGE="https://github.com/mgorny/gander/"
+SRC_URI="
+	https://github.com/mgorny/gander/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Portage exports random configuration options *overriding* its own
+	# behavior into the build environment.
+	env -u PORTAGE_REPOSITORIES pytest -vv ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-portage/gander/metadata.xml b/app-portage/gander/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-portage/gander/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 68213f0ed8fb..79eafb56be1f 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +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-9999.ebuild 687 BLAKE2B c8e143e634db7c8303840c4c8f873b0bb93d23146b98ab10a127a6695c4973b4ee7dc06045723c8cb2d0ca6c7ce1fb0960636ad98d31efc47c01ed0f67304610 SHA512 c6c10008ca64470bc06f29b0cde937541e9d26530048c03d23f961d3709c2f4983c63e88a20627aed5e1db6990e69c9e21dda07287d43bc1e4b7a48b19e94f7a
+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
diff --git a/app-portage/gemato/gemato-14.4.ebuild b/app-portage/gemato/gemato-14.4.ebuild
new file mode 100644
index 000000000000..e472f6f72173
--- /dev/null
+++ b/app-portage/gemato/gemato-14.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+gpg tools"
+
+RDEPEND="
+	gpg? ( app-crypt/gnupg )"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 9dbc15846eda..5b490f34718e 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.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 git-r3
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index ff3aa70ff61a..1eea4614657e 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.3.1.tar.gz 37897 BLAKE2B dd5499787bcc5c46ae3b559f3af4a5af5b4ca81a312e926149c587cac0391c51dbe61ac42d2bc19eb83cedc168486e9c30ddd6fbf4ae10ffd9719aefa2f54cd3 SHA512 e1a3a7929ae83d813dd0b03f0548f033e8e51b766aaddb653027398fb618819de6237e2ba1c0542defc9d62e71e8495aa10152cbc47a4e521f7cbaeda3ea4354
-EBUILD gentoopm-0.3.1.ebuild 650 BLAKE2B fdc7d613e9f023c41b8f030d781200335194d364db4666af4220cb6697b786224a54f9d4230b0ac71792234eb51c34dd583333a1ec71ac71aa976b537c120f7b SHA512 20547e37bd06fa34c531795ac88c8c0c3035c0de08772113cf62c2bd001bb82f8e334d9e0ea99dad7e6f43b82e14b65a716c1d201c955addfddd103f36ee5305
-EBUILD gentoopm-9999.ebuild 622 BLAKE2B 7ce099378e1b31c4b2331d638b4180ccc26c1832a1a5b50126591a1a97667e5e54921c0ed3dd2c7e0e97a8a67960af1442e4b59a1ebbb4de1ef90be311037f21 SHA512 3df74bd57e124515f1ecdc784469dd40d4549dd41459097b2c8f143f7d8ff08eecb8ec5fb778c7e2e42272741ee9464ca3e77a4e07748e166ee0088360bbf661
+EBUILD gentoopm-0.3.1.ebuild 645 BLAKE2B 273340ee2ad51a1ff16cefd80659ff40bf824ad37c115a0f4089d05f28100c417ab440ae9e6b6e0f094fe7c536ae39d8e0fdc03712e67da52f4de1072426d53b SHA512 8b5e849fc5ece7c9c14a0ea9aba599bf07d00f1ddd3d8b39be2e745854ece327645d1465104b33b58726e19d073eb816839de5adc3c265fb0db24bff5d728278
+EBUILD gentoopm-9999.ebuild 617 BLAKE2B cd8cd7946383e5b04e32cfb1bbc3531cb0ccee2c434b49c41fb5927e499a8e184fd9fa311c4507df9b150707c3bf16a5a98a9e1a14a0d9ae5f7c8ab18eb97dcf SHA512 aa1fc2c225e10b52e03561dff3ab128d3c1eb1c3ee82b2448c20e4577a79fc6ac710f537e05e6a44fb524f02bb466b0bb0ba629f3a9c8cd2f3e3189409cc078d
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.1.ebuild b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
index c79f519324ee..b4fdefc2f9f3 100644
--- a/app-portage/gentoopm/gentoopm-0.3.1.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 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/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index de49913038de..2dc9a2c3f698 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 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/gentoopm.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index e2b556a3fa0a..349cbc1cf7a3 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,5 @@
 AUX implementations.txt 808 BLAKE2B c209c676d85d731c901cedcd8b59e1710f0ef8b20a849bf065770ff56178a2c1e4ee4a1702bff31c28b277b04f54a6f15b523bc59e3c4b41a3b9fb4f967fcbc1 SHA512 9d4edbb1c1298d6be268deef382a662211ae53efe52444d27e603c2fd3e116caf8e0e939e2d67cb6c12e81dbed192fb8a41b4f6b6a5fe9afba4c64996127edb6
 DIST gpyutils-0.4.1.tar.gz 19444 BLAKE2B 20b9a3072337665a83e86994b4b0e5cc33673364320838ab3e56b87b06146d91d519f1b60023fa3e9be0bc6fc10a207a3fe87937158edb2c8607d8145022ee50 SHA512 c3420ec2c5fff39b32beb43b48eb06179534c359f755e5877d29ba4e3f393ce62c8ded48cd909bc69c20730d028e01c76375892ebb2a364017aa196c81865ecf
-EBUILD gpyutils-0.4.1.ebuild 529 BLAKE2B 2bb4e7e8fb9757d7e5d8cdffcbc2b28ca8be55e98f85e744e85dd7a1625b79dac0adacb4441cd07193c6712e67276aee9d725738e5ba60acd6d7aa9bc6660525 SHA512 d232b04b53d6f5f1345399d3be805ae1712401bc15c3b058108a43290c8f5f4edca835ab4fadc289bbfdd8c72b71a6753d7045d8429d10c419008c5de5392a7b
-EBUILD gpyutils-9999.ebuild 511 BLAKE2B 836d36e3fb47f57d07729559df12299d1b26e8ce862f01266a5f2b503afef814248a1a3d20e88daa52f84a4038488e2b4cd4f2b34b38015e41c8dfa0de5b5521 SHA512 24e9bf1bb78be5c87a385589858d5d9c9a808a51fff99f4b1aa73bd48b5da9f3750a5625a5cffe4f145749c760b075dec09957de687fe7c34deb4c1d8bc67199
+EBUILD gpyutils-0.4.1.ebuild 533 BLAKE2B 92ede730c98c285fbcc66d67cece9075442ef4faf13f78b92fc374bdd4a54254e23c98490ee5760d62f69b093d9acc150b5ad04bdb2d9024a9507a298bed9f75 SHA512 7a4cc1a5100d279edae76f9ff22559d9a475db0eda6b2c15cc1fba7e82e88c3979c8d69cf2ff0e9035d64b44fc0f7c4591371731c18dc8029f8ad2ba3570ca13
+EBUILD gpyutils-9999.ebuild 515 BLAKE2B 71b752f95b923b7640c1ebd7fa50749787cf7b16c2480553b460ac21acd7a1d7280aac61e235c9ecf2bbbd38d91cd0f4fd8f83f7db62fae20a2efb603c89ae46 SHA512 305779136d3f455a6406cfd4e1e4a468c5e8659cd88881cbcd290c4ad220a79a75f6d8e62a255599c5c50f0ce7c88b39f3e8afa6b8067cfdf0e62cfa2e24f44a
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/gpyutils-0.4.1.ebuild b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
index e73c38ff958f..e53246c0e37f 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} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 6c4f2aa07f73..6f927d086345 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} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 0fbe08d5cf96..ef279582f6d5 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 2207 BLAKE2B cc85e64ce5df75a68c46e57216a7fd1fb90f077717c12c8c308d5caa7a4718c5e53d7f4b3bf4ccd46dbdd42d9321430ac1b6f1a2a8783d90f4289dadb64a0623 SHA512 70734126db021ec6942e2427e0c5f0221c09a87d1bbac050f26696739ed0ca53bf1f62934978ebc7ddf2416216fcdb92ea22945392e0958b33ec4d4ccb2dc179
-EBUILD layman-9999.ebuild 2215 BLAKE2B b04e0bca7c19751b787a70af3ca00974bc4eade5c682524dcd0332015f6bf63efc1ffa7c473633cf7c736c0fd7886a4f3954d66401db995fb42fb0c97f7486bb SHA512 5b77a9aaaae63877163df6f9d03c0ec70c8182cf93699306809502f26a08b72abce4129d1fc816ca3217996d7938704329ce7ac1838e62166ed2d65b02685d6a
+EBUILD layman-2.4.3.ebuild 2210 BLAKE2B f88284bd8845e8553b460d5d7ef44d57301eb5d3876c799c1276a9085c21aba374493cbe29dee540690f8983f10aee9dd91f8c53e38e060e042184a710e7fbf1 SHA512 1151cc36154d7dc9c9efcb00a5a0c16acef3bf5ee2360ace1d00ebd1f2c6fd39635703d63a2f4eefa6dc9173c39da127c37149d98ce2a7c6b924cda6d3e2632b
+EBUILD layman-9999.ebuild 2218 BLAKE2B 5f1e2636b90282fc21ca8b4bd4b845af373c1ae70a0506ab5c81d92674522094b69461120cb6cf661e5b64f36d3c1eecfd7da37a7b737ceacef19d01beeda66e SHA512 7a7899feea2426f6e926f31cde8ebe661bc4b6abe402acf6017b001d47963c262c9459f6ef2969216e2b8c448023ad2e3fe90609583b5109dc756e4ba3fb50b0
 MISC metadata.xml 1102 BLAKE2B 43b832918f1c938f9b8a7d8bd09869ab79c50b5c9c38faa73267db851deacbf9fb2a95fa34b7b90298134f1ec5b557adef10722c87ac34ff9b8784e5c2f8efcc SHA512 9025362fc830f889b90c753de3485917af23adcbdf6a567010e4d07570bbb51189039f8501d16ee1bd6ec094f2e163da5744f2a16bffadb4a7826f1b852ca88e
diff --git a/app-portage/layman/layman-2.4.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index 6b6d71a01b39..4feaf210d2e1 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	g-sorcery? ( app-portage/g-sorcery )
-	subversion? ( >=dev-vcs/subversion-1.5.4[http] )
+	subversion? ( >=dev-vcs/subversion-1.5.4[http(+)] )
 	gpg? ( >=dev-python/pyGPG-0.2 )
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 691cdb324f88..e8ba2aeb5168 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	g-sorcery? ( app-portage/g-sorcery )
-	subversion? ( >=dev-vcs/subversion-1.5.4[http] )
+	subversion? ( >=dev-vcs/subversion-1.5.4[http(+)] )
 	gpg? ( >=dev-python/pyGPG-0.2 )
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 5fb532b7798e..3c34faaa8e06 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST mgorny-dev-scripts-4.tar.gz 6702 BLAKE2B d816e0d15004d21f595e6020d146aa1babfe238b325afb1523bfae60786c067c8591fa5b046f7b18520f5334e0d0506d9d0c919c2ec6a55a85bae09441d1f45c SHA512 0b165f21930ad29de92a715fab27174e2bf2e16e6b52dac2d5bf6ae59c68163f30de955703c2c37a9a799fd4409d1b602d417100a4787787f4b48fd71e6391e3
+DIST mgorny-dev-scripts-5.tar.gz 6834 BLAKE2B 652db4d1be6c5438b9b71fb814cde2424c92fdf1aa88266761beb899a782df34a5f02c39a4f18d1cac471aaee2d0ad8f94a960e86b09144494db0e4438505b1a SHA512 fb1fd66ea8d8757bb0b81285c6d821cf8548001d39c47d028e8367865b67c594187086ed18b21c8f87e0d702d879dcf55c043404f3337b27a1d943cae78b0765
 EBUILD mgorny-dev-scripts-4.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
+EBUILD mgorny-dev-scripts-5.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild
new file mode 100644
index 000000000000..43affbe632d2
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index abff4b1bd7f9..68fca1652ee0 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,8 +1,4 @@
-DIST nattka-0.2.4.tar.gz 88803 BLAKE2B eb94d2d1386fac4c18088b20f185542129f24ae0e14dd59ee6ec8bbc066d5a9903453c87f5b24d96d9ded5182a2bb0757420ed10be7eea3cd5aad6efc76dc874 SHA512 dcac731c8a3cd4d8823a9df819643a6ff4f1fdcd1ab7a81b0fa74026df37d17834f4bc983ae25b27a047c1b2b9cd1c31d5063ee54b161725c119584336426b03
-DIST nattka-0.2.5.tar.gz 89831 BLAKE2B b60866cc6c0d7eeb780a2d4c7e200f1b730030eb2ea11ba1003c192fc2a4bf3312a9b33f668aadfef10fa43b059f32cd10e3568f786cba3365cbfd0df0e81aad SHA512 ab1e51df59a1b9c537dae04c67f65f7993f804ea1da196246113ad140876b6e35badca6f7fceb0f02f51362c46572b6665e6fc27f379005d4cbed6c5f2a3ed15
 DIST nattka-0.2.6.tar.gz 90276 BLAKE2B 622ec99e276a8bcdd3972859fb41656e1a86cec62a0f571665fbfe350a467720dfa098f4d4afcb23554540118151776283b5947bcd9c4bd013b025a657c2bd75 SHA512 bc62a51a86e90834975d9bef6f65adf9b3620a19c0c98cd878ff19d0b9cb5679ecf68ee31984bfbfcd9d009420377cfcd57a9561f2eda967f5108bcaf8518ab9
-EBUILD nattka-0.2.4.ebuild 962 BLAKE2B e203fe87ed20d5caf9990733046bc329962708fb1efc06a37d7fbd2ccda74e3deee910715befafc831d04c730821b8e28abcfa0eff9d486fd7aa808e3deaa200 SHA512 a207ebbea79b849d97c653c547b360d9eeac431596f8eed60d3b6b1b11ff7b1f2c2775433e3ccdb126fb3b96a8d139c7932b094c1d4eddfe8604db0526b42e9b
-EBUILD nattka-0.2.5.ebuild 962 BLAKE2B e203fe87ed20d5caf9990733046bc329962708fb1efc06a37d7fbd2ccda74e3deee910715befafc831d04c730821b8e28abcfa0eff9d486fd7aa808e3deaa200 SHA512 a207ebbea79b849d97c653c547b360d9eeac431596f8eed60d3b6b1b11ff7b1f2c2775433e3ccdb126fb3b96a8d139c7932b094c1d4eddfe8604db0526b42e9b
-EBUILD nattka-0.2.6.ebuild 969 BLAKE2B af3059cfbe9036e9a93d208528de968705424229de57e4e3eae771ab875d794929d2ff8abea4941149dcb6121c475ac3b286a34a0f980306bd2eb36944d2dbc3 SHA512 efe0e3cafcc61044297888c8c7b3700308921fa878bd7a8cbbd5034991f64bc2fc1726376651f49b539231a3431a9856d35c69857bf8b40e72f044c3976b0b8c
-EBUILD nattka-9999.ebuild 901 BLAKE2B ab2eeec84d3d42bf4ff13b9331fd281057e901b618e97003d54e8d6d615c08cd11af73ef3b68da7e59b84e391bf99dadc4edfafbe2610fe159983cb1faf01c28 SHA512 c472b49493336aee8a9efee0b8857bac0c66b1a4fe56e337b456575979d9158024d770f97eaa2c0fa6f392d3b6e6fd782f5529cbb0841ad40f5567c75293f072
+EBUILD nattka-0.2.6.ebuild 968 BLAKE2B 42063e5d869a34e0999557a5678a331fc01afd62ed03c4c862ca861eba93a994e4e3297ff34ca093e71fee89ae9939dd5d40d2292f778616d7d1ef22f6f32622 SHA512 e00d1094af2bb351ed9e2995d0e15d50b02bce699f9450fff5610d8299f213dca41ddb30c8c633b4358167d585abbad77f071b5babda27058f34fd409dec7953
+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.4.ebuild b/app-portage/nattka/nattka-0.2.4.ebuild
deleted file mode 100644
index b3077c8bda28..000000000000
--- a/app-portage/nattka/nattka-0.2.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "NATTkA can optionally use:"
-	elog "  dev-python/networkx"
-	elog "to sort 'apply' output in dependency order."
-}
diff --git a/app-portage/nattka/nattka-0.2.5.ebuild b/app-portage/nattka/nattka-0.2.5.ebuild
deleted file mode 100644
index b3077c8bda28..000000000000
--- a/app-portage/nattka/nattka-0.2.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "NATTkA can optionally use:"
-	elog "  dev-python/networkx"
-	elog "to sort 'apply' output in dependency order."
-}
diff --git a/app-portage/nattka/nattka-0.2.6.ebuild b/app-portage/nattka/nattka-0.2.6.ebuild
index ddb28dfc1c25..f98f14f77558 100644
--- a/app-portage/nattka/nattka-0.2.6.ebuild
+++ b/app-portage/nattka/nattka-0.2.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/app-portage/nattka/nattka-9999.ebuild b/app-portage/nattka/nattka-9999.ebuild
index f575cbb977e6..8e021291c6f7 100644
--- a/app-portage/nattka/nattka-9999.ebuild
+++ b/app-portage/nattka/nattka-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 74e6277c41c2..6e4b793bc20f 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,8 +1,6 @@
 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.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
-EBUILD pfl-3.0-r2.ebuild 996 BLAKE2B 43675b3f64c07d6c6231a9726ec9f5fad4a61a143dd54aef849826435fdab90232a20538b29a0175c6e24fbfed8fc90b5488a1273816dc5f9d2610d9cfa48520 SHA512 419871bf91008cfd15d1f6f6209562f13553225087d460eeca7098a2b62867694dddd321b3ed49d227f1aad2f8fb5b04ff4d51a0bdb340c5abd5932cd015b232
 EBUILD pfl-3.0.1-r3.ebuild 1109 BLAKE2B 20ed3547c9a661f6e280fb9eed4c4c763531922c1f727178472a34a4bbde48e107debab695d23768f2f09ae68d9255ef17c68123a513a62021cdaafe96686053 SHA512 33a6b3284da802b61bd68890b95d0d16e32eddce93887b79fb9b7d7403a00100a8328d5f4842cc63c6e6c988b1851ffe2db2b658120ad21324715744bd3b7f99
-EBUILD pfl-3.1.ebuild 1237 BLAKE2B 0a63a468a07b5a704dabca539628a21ff9dff04ee48ebbc825bef5d7474a2a1d63a4997945feffb5de1c1a9531541e42a039d232889d57cad234c8fb525cd674 SHA512 d01b7805e9d1c16bae89e0424feee284586b39fbd06e7affa24bc0a431bdfbed8a0f2509203660eb2e1f5aed1fd122abe11318b68d09ef4d72f7d3338ef5479e
+EBUILD pfl-3.1.ebuild 1231 BLAKE2B 49432a8ae9ac598d73f73ec792bdf7bf070a1c3f4e2b8e3ca31b4cce56b2a9aed8f391f7da34578882b3653efaad4186fa118cba9b4d91741e815f22684aaf3d SHA512 f1aed97f935e219e4482911f8d27c71ede6ad34b0d85621deafe3fbaafe5b2c535bb5467c07e1516748e7f302b7b486d109fa311e48fea335201e48d89e3da88
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.0-r2.ebuild b/app-portage/pfl/pfl-3.0-r2.ebuild
deleted file mode 100644
index d55b0bef6c6e..000000000000
--- a/app-portage/pfl/pfl-3.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Searchable online file/package database for Gentoo"
-HOMEPAGE="http://www.portagefilelist.de"
-SRC_URI="http://files.portagefilelist.de/${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}
-	net-misc/curl
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-"
-
-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
-		chown -R 0:portage "${EROOT}/var/lib/${PN}" || die
-		chmod 775 "${EROOT}/var/lib/${PN}" || die
-	fi
-}
diff --git a/app-portage/pfl/pfl-3.1.ebuild b/app-portage/pfl/pfl-3.1.ebuild
index 0704d5f48fa5..2f56537889c6 100644
--- a/app-portage/pfl/pfl-3.1.ebuild
+++ b/app-portage/pfl/pfl-3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d3de213018bb..7c02618fabbd 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,6 @@
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B fd603d2da46ebb4b85e719119fabc82f09fde52bc3ab47704b711c4fbaede96818eace742c98bebd007c7b639634aad1b5690e249ecc5969902b38956235cc8a SHA512 67cd408528edabc58b78627bfe75676b6744b52f7b3269e929348f63390a08cdb9fa4672514b75f6e99915de38679f4ae7c573ae4ddc264e01cf47bdf33de042
-EBUILD portage-utils-0.87.ebuild 2179 BLAKE2B ecbd90f21ef26d89e423e198bd0e8e275aa63a8eabe515a0236c18370a755c18319c1b21c22b07a41eadf338a430bdeb13e753db0830b298853ed72b48aec6fd SHA512 401ce43ba8704b8d2936307e5250cf7335ad555fe4d8e9766ac7577a01540c1018252dc77c145913bb494891fae5f6860f33f80a17d58ab0b5bcd42e8c1652cf
+EBUILD portage-utils-0.87.ebuild 2171 BLAKE2B 5561831e035a2139060704c67366bb4b68a4a737fa405b22203696716bc8383177f740f4594de2d08be6622b702da68cbb18bffe047bac792db574c6fa3a5d57 SHA512 a73d4d44e24f616ee965f5663ce60df0287bd35d250470389889a5fa373471d2dc37c3eec1f1df7d9d2e6efe0d59ead2b683bce240a001e8b07ee809ff8c2629
 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.87.ebuild b/app-portage/portage-utils/portage-utils-0.87.ebuild
index 30461bad45eb..63fa3bd137c3 100644
--- a/app-portage/portage-utils/portage-utils-0.87.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.87.ebuild
@@ -15,7 +15,7 @@ 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="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 9caf92524fbd..2e3c9804c7f7 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,5 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
+DIST portpeek-2.1.29.tar.gz 13067 BLAKE2B c0385849738303a3fab8123f6af321bd000f88975b26d363c08aacf873b657b872a898af92a0396f1e3060b5b804fc9f2ddd8579101d2f5da18628080dc4e490 SHA512 3933b39c248e3758d67e0c1dd04cb93727eecbda4ae35d55fc266d01f01d7f87c535701cbc54d48a212e1c642a4447d487f2c62aa649f084e1d1fca458263b27
 EBUILD portpeek-2.1.27-r1.ebuild 691 BLAKE2B 82344fbb0c1255de4d20baf9dfb62daabc77da8ef290bbd6b342195b50f7fc46132fd21b77eafc5fe5d5338618d6bef8fb4dd3f21f35e740d68213e1d71bd1fa SHA512 eb0f940e006a32796b8ea47b9deeec5795271846ac1678132d45abed8cb766d801583b4d735dff540176b0fa96b5e5cc4da386cb058c9d5bda17d57e5440e1e3
+EBUILD portpeek-2.1.29.ebuild 696 BLAKE2B cd0c7d39b0775ea6f7a566a9440467bf9d31eabc2cc4cf4f9a18ca676b466ebaf947816cceb988b79c66b5c3cdc119ffeb2e3525922d397d720367862ef75c9b SHA512 e3001270e57e40d89aaab66999d6b10e3b4347bdd17e35b90fce0a5bc0156bbec39fbd0550bb8fc19119c7f1643410b3f2cd97077e7d336c539eea035fcc8316
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.29.ebuild b/app-portage/portpeek/portpeek-2.1.29.ebuild
new file mode 100644
index 000000000000..286c861fe894
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.29.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_{6,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-2.3.99[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index a570c90cffc1..b20197a0d13e 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
-EBUILD smart-live-rebuild-1.3.6.ebuild 810 BLAKE2B fd41d18f1e0724fd02581e42c2a5fc8b253ca71edf961e1eefeb447af72de0b1fd82ff1a8a625d3378e315c1aacbec1d1ddef580cb700cf0ad849e9d08a9e43f SHA512 2f268b7fcd6b87a1127bb3db5cbbf48f254d3e7ca6a38af5ad67f4615374bf205292bd6058fa9ef8140f3b4e86253e2e58c21148ab951659cdcab5fe27b25304
-EBUILD smart-live-rebuild-9999.ebuild 729 BLAKE2B 82fbdf2a8a63f7b1ffc97fe917cd00b1e172eb9bd5fc7816c26e877f999265f4acdaac7bcc5bb01e58ba0405dbb294b14454b890bebc5c7fd304db616703d178 SHA512 e979399a9857d0f8d92d093ad59f8e42dac7a806d6075c7b6fea2faa4f5a3e5c0b8455f8b0f4ef3b94307e8326141b30c2b4fd7df49d1671f16e81016b8fae8b
+EBUILD smart-live-rebuild-1.3.6.ebuild 834 BLAKE2B f3940fd9523cbb5cf435efade947186a53746cdbcafac1e4456165d471471ab7958c08fa62efd2dce3efa9e3c80784988e10c2adadcb8e49cd73902b55fd86cf SHA512 e226174bcc63cc5be09812bb8b2727f116442716fe7c6f5d332654cc9b1f45ed3848d617d719451e077dbd773c5ca3ba0908dc88337e9bda5593fb5b0fed8b9c
+EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 588296dcb808c927331821d7473fcff22587c71a20adbe903ff7a1fd49453837e486059154b0659457e088cfba7ed8e6ebc873e8b42e153c3e9701cffe77c182 SHA512 a894151cfd2e9e81899f9ec6762b095b9e605e06cb1dc4bb21968995565afc7fb292d03442ea71ed1eeb263082ba9584cd9c1e5066d47537f64604d891420792
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
index ae9763d9f0f2..0520c1b1ae4c 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index a3df3de1d410..1f974965eedd 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index e63f5ad70ac0..5a2df1ddc45c 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-17-r1.ebuild 657 BLAKE2B 2b9be8bd43f046c52b9cf8ac09da43170fd8c77c1c4815e3f8c06329ad6953a5266b3b2ad9858fe49c0bc710cc4807eb622f89d6f36f0c5db26869df22711b82 SHA512 33532a1fe671cc03cf6b848d2de1e4c7cdeb1cef8e1b43bef024f66d587a7911e6247b939ca3012191eef06a12221aed6eacb5171fefd6a85c2b27705440de20
-EBUILD unsymlink-lib-9999.ebuild 594 BLAKE2B 28667fafeb47bf7109b95c8de17805a375586ec4202387dfb1ad9b81835608dd7bb777c43057eda8a7a507a203eb22442d240077f95ae6f9d65b04ad981b88f3 SHA512 d3138e0bbd1c530d9ff8f046f9e2153153136afe96ba6edd3f89aa17f34f8cbdb84bfde09681dd03d8ea82e50b5be920a74d531bc1768caa53f732904be616d8
+EBUILD unsymlink-lib-17-r1.ebuild 659 BLAKE2B d8396c5b6fd4b449bc94164b2a5dedd945f3a780b093b4b79a609e8358a43d9f44997f70d0d90d6d8cb0c0e13364365791bead7b619a638725b4541e78e7ab51 SHA512 e21c2a9383653cb2568e036ffe086bc4c95e783fb1b2ab309e25ba8a23171778650a92898c1d98719cb7fc98195bad9e09a472fae93d54d5fd680aebd5c27e11
+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-17-r1.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
index e70e33b01d94..ed7fca696e94 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index 2e579b57e72e..82f1121193da 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit git-r3 python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"