gentoo resync : 15.06.2021

41 files changed, 532 insertions, 250 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3bfc6394e0e6..32f18b28f1bb 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
deleted file mode 100644
index 5b0db6982e60..000000000000
--- a/app-portage/demerge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r3.ebuild 1313 BLAKE2B 00518ffb80e18c6e1e8ed3870c93f1a38219ca899d4d228fbd45c881e8bf2f0481513c5e485cbf689bb3e0334c848b432a272f208838149835b1afe36638a3fa SHA512 db2746ee1cdff08f192a2466a3c5c9cf0d37b89d63ce792a4740bafeb4907f81a30dad2d61ef9a291448df8ef72c6bddae3416f9fcb227a90c9a5b07527537d6
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
deleted file mode 100644
index fcd36913797d..000000000000
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DESCRIPTION="demerge - revert to previous installation states"
-HOMEPAGE="http://download.mpsna.de/opensource/demerge/"
-SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/PortageXS-0.02.10-r3
-		virtual/perl-Term-ANSIColor
-		dev-perl/TermReadKey
-		dev-perl/Shell-EnvImporter"
-RDEPEND="${DEPEND}
-		sys-apps/portage"
-
-src_prepare() {
-	# Fix path for new make.conf location
-	sed -i -e 's:/etc/make.conf:/etc/portage/make.conf:g' demerge
-	default
-}
-
-src_install() {
-	dobin demerge
-	dodoc Changelog
-	doman demerge.3
-}
-
-pkg_postinst() {
-	if [ ! -e /etc/portage/postsync.d/demerge-record ]; then
-		mkdir -p /etc/portage/postsync.d/
-		echo '[ -x /usr/bin/demerge ] && /usr/bin/demerge --postsync' > /etc/portage/postsync.d/demerge-record
-		elog "/etc/portage/postsync.d/demerge-record has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x /etc/portage/postsync.d/demerge-record"
-		elog "If ever you find this to be an inconvenience simply chmod -x /etc/portage/postsync.d/demerge-record"
-	fi
-
-}
diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/app-portage/demerge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e286b7b6468a..24da4d4bc259 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,9 @@
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
+DIST eix-0.35.0.tar.xz 636432 BLAKE2B 8a880cde56c0010f193445d9813c533effd59b8ee570132a0c40d62de827968839d99ee16981d152e737b881519e9f73d4ddac5375b6339dd480064deefa6149 SHA512 b9a6e59e666ec6015a612e083839a11a77e1d649262a802a9c8684fe25abbeda7a2c51ea629f1bb85ddc77fccce42b577178284763668bb2d1bcc85df5d68f2e
+DIST eix-0.35.1.tar.xz 635996 BLAKE2B e8afb4d33d8e0525471e396e752859ab5fb165df8b1519cfa9ded1a3ff287059d9c647d744ec095eeec92d01f25330cced3ecefdb3d399ecf513d8aa5f14e9d3 SHA512 2812406f28994c133f9fe3dfe53bc0495f5bb446e2f0ac69f070632d0f357044c1c334e5ed2344a81dd8e3ba100fb427c161201e488ef2581717b55a712f3908
+DIST eix-0.35.2.tar.xz 636616 BLAKE2B 22c9ce54bd612ff7b8a085d91727ee7b472b9c3ba71568f23b4cfc5e2c4d9b0a68e2df377d4c4101c53e193864418c11b0c76830b5b6044588dcf3882b164e3d SHA512 39ff4c4f31be3c40a17a77626c25550a3881d8c405ebd9e7a361252cb729f9c0fc40831bc41e503fdea9f05684ad0eaa1aceabba1c6e4067a33a8581bf5a9625
 EBUILD eix-0.34.12.ebuild 2539 BLAKE2B 9df22e7365f6a7352edf3326d405135fb2e2ef0f2efbed1b90f0ce2e5c834a4868e30f5db1b2ff3219bdbda16ef9b557c616fce63b24d7d9379a128391982f25 SHA512 af74697e0c3da63302d117405b77b3d85cd4c27feceb1af72e3ee7d0bd7fa51e64ede71c9327de7abcdb3e32baeb54cd7c58b265d59554360d08bf378f38bddf
+EBUILD eix-0.35.0.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
+EBUILD eix-0.35.1.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
+EBUILD eix-0.35.2.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
 MISC metadata.xml 1065 BLAKE2B aba22801b07a7346aab81b420cc8eadc9aabd68f27b5943b9f5be4f98bc435bd4db09fca13356e09ca16b753e7378459001501112e8358ff552e9efc46569626 SHA512 3524a0ca51ca92fcbdb2c7b4c862d8f71da8041fc8c968cf63840266d79c52b7d5632cfc479c4e9171ea4b680e986b10861afb3e49598e1e10327587937690a9
diff --git a/app-portage/eix/eix-0.35.0.ebuild b/app-portage/eix/eix-0.35.0.ebuild
new file mode 100644
index 000000000000..a13024c139e6
--- /dev/null
+++ b/app-portage/eix/eix-0.35.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.35.1.ebuild b/app-portage/eix/eix-0.35.1.ebuild
new file mode 100644
index 000000000000..a13024c139e6
--- /dev/null
+++ b/app-portage/eix/eix-0.35.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.35.2.ebuild b/app-portage/eix/eix-0.35.2.ebuild
new file mode 100644
index 000000000000..a13024c139e6
--- /dev/null
+++ b/app-portage/eix/eix-0.35.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	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/gemato/Manifest b/app-portage/gemato/Manifest
index ee0fd5c420b6..b4ff9b3c8c27 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,8 +1,4 @@
-DIST gemato-15.2.tar.gz 72679 BLAKE2B 83e28fa3bc83976538610fec87c3a31e91a18847c107dc7793e16b5421eba69f7b60f8f05195f345ef6f4f8486203e4acbc01bad706b55c20a11480e85a3420c SHA512 5a98040dab0beac64e5e54bd54c6565cd301399709beda9e030ae9206111caf9e792260aa3c6586040060d4be71df3f1368e7554dff6affaa899c4157116faf3
-DIST gemato-16.1.tar.gz 79946 BLAKE2B 54452ae113cee98f5c8f9ebc880b4ae424510766eb7cd8bc2775c85573388005343061aa9de8f505a72ee92801756f3cb7b67dfd39d9923d0030a4da301f7ce2 SHA512 df21eb8784cc6724874e38ba0192e1e5657483aa031656855fc0c2396179f7352f9450df6b41205425214cf70f2c812a7ee6f55a25334f0fd012b7e710c1de2c
 DIST gemato-16.2.tar.gz 80178 BLAKE2B c973c36bb1277d07618ba8d90f7d6820508d78aedae200f0678c8b2e1dde38e3b7f4d7dc24791dedb9c88791d3b71711c9bdeb749b5fc091a20aa87f71ad70d3 SHA512 9d59ba360afaf237e47c5ded0e5bc29ec44d5b1d73eadadc19ff834a1966e1e620da258eb7a1b6afbff5c66cbd7e39454fd5920f2f82fc510c2f8836c0b80462
-EBUILD gemato-15.2.ebuild 991 BLAKE2B 89614394644c40af00e4e5b4d367a0a4f31825ef57312f1813ede9ce5cb8e42c21fb1616af315846f0dcbb0603df469795ff7d5af6b9d05fde6bbf84583c82f7 SHA512 7f71c916d42547298832ae2b7af01d5b2489ff00a3b0e2e91abef68f28aaa1b0ec21114c23f0aeb717254e75544c366d7e1d1d3766bbe8480be11fa643b01a54
-EBUILD gemato-16.1.ebuild 1013 BLAKE2B 0600d2f8da39cdc285917fb5a7e597f466c79935527d7caf8901d0003594c65383efb425fd681402cdd9776da0b2329b7a9878cbbcd9f09243d2003c66ae1674 SHA512 9d109978e005dad29756fdd9276140ee316a2939fe45ae19e23e48d7af210abf25da1d841f0c9b8838592db4a117f38fc1d508759b8f45aafcc664d923d72911
-EBUILD gemato-16.2.ebuild 1005 BLAKE2B e03f5005f000f9a4b773791948d365ca98c5f9da2b5f42a304de18f4200ffadbb88a604e95f54df1c8485dfc283022adfe96535ca69ead1ba15be8c48bce6fd0 SHA512 281772fd77ae89a3108c5b9cc6d44be0b9cd39535e43a9008cfa3f4944941dc19202b5a56c88a004a90fd314b1680007b6a7e5d4170bed41f45a880ca70c75e5
-EBUILD gemato-9999.ebuild 911 BLAKE2B 617c87c98594611df16447cb1d295177b37a524ecef4e4193f78ab633876d10875b0831c8be9f4976e052051102028327ba9e8e3fa1528e9fe73b5ceb2609a5d SHA512 80da873f4a456b62779895f19f713f679ed168fdb404b395698d3c2b4b596d1de797a0fdb2ba7afcfef4b20c5d59d46f750a7b3120fd1e029f84e97e2266b59d
+EBUILD gemato-16.2.ebuild 973 BLAKE2B 2c3eb36f0ac1b45df2f654e1357ab3e05749ab8a372ab9eadfb55f490dcd7578440a8d6b6741d243ea5e94c266a8562fddf9ab7d93eb2024a73a1c99e7f2c72e SHA512 9b265c81c6c0eb3cdece5be52818949ce55b915449a81820a6e9ad11ee229a36c0288319c1b0ce27ddb04d48d01014ed94b982dc1efa8db04359a0068f5b8336
+EBUILD gemato-9999.ebuild 879 BLAKE2B 4f2a575ca2a5e13f7887280c71d7e9e50ed07d3f188c998caabce40b37e226ab66e632c1f4b045bad77cd7b34f26bc110619ef87393860e815a353bbb53c01ed SHA512 d5e7ebd0cdf6bbec6ea33f713b6fc168a9b65256a511fba130ab6010c9126b61ccc999c924c5c427052c8095de1de00a5abc75a6f2c784eef04c7bcf489897d9
 MISC metadata.xml 670 BLAKE2B c6cfaad2f460b24af8c5f2f126edd38c873c8cd9cf2c4594594d20c70eed4d6c7851a1f3c4e8bf9b6a4787cb13d838b47bad9e0a05c92e876ed70ed6dee7e6f4 SHA512 9f180e86c3d52bd9d7fa3e7fa48812a3af7327dd1200498148153fa5722758364eb4a318e87134d0027e5d0efc6c90ee6d8c58fb8eca4840e5c93e7159540ce9
diff --git a/app-portage/gemato/gemato-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
deleted file mode 100644
index e742c325bf45..000000000000
--- a/app-portage/gemato/gemato-15.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-16.1.ebuild b/app-portage/gemato/gemato-16.1.ebuild
deleted file mode 100644
index 6509f88aa2a8..000000000000
--- a/app-portage/gemato/gemato-16.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..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-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
index 95426f14b479..206c761c09ca 100644
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ b/app-portage/gemato/gemato-16.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 7c6e729f5e7b..5d6009149ea0 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 55bf393f8aa9..e05f38b2572e 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.3.3.tar.gz 38624 BLAKE2B 018be741c6970b17525e56d5acdb23e15c8f78016fddda50ef329ea65b84e085a928e1e5e95c69757530c067c28aa578e9c56b8bd7546d7249a75e9c3cc3b57f SHA512 91ea07035b25bdccd8072c5691690ae0b40b6220a2ea29e4b051aeb8455f200e94569036af42ff2f5d7714344d332e5d71e3ff8dfde811f2aa6b6c1b3a895b21
-EBUILD gentoopm-0.3.3.ebuild 669 BLAKE2B 3cd6ece409f2f7ba307187cee03c69531b5cadc88100d4205839664f1c34a6baa40ead8cb354b97cf15f5215b313f54df029e5fcdce23f0da921f9680b9231a3 SHA512 81f8db9658172a17513c1edd89553a4bdbdce515fc30fd7830422e41bd5ab51e0ea55dc7c192a0434c4bfeebd25153073f0a5deb808d4ed2a05442281934f621
-EBUILD gentoopm-9999.ebuild 617 BLAKE2B f51639ceb38c9a47c654ddf939a661610add943e51f0ed5f60185f4a24654bd424dcc382cabafad72dcc640d52159678fbb8dfcdf868f023084020a3010ea535 SHA512 bb56a8288bc78a5be1371e03eb7bf685aae5783715f32662a81de1662a7168ffbf4723dfb02fb154fde3f4f08ec33880e700748856e6a3a5784e64ee6cf43ccd
+EBUILD gentoopm-0.3.3.ebuild 670 BLAKE2B f9165305085974f4d359db7d45276cb8174c327f1d5e8b13260974f74e098d63babcf9e0e3c2e67520793905ad1618dfcc349536450cf8dc13dcd43381a80083 SHA512 91b500dbd24e4631290f95d6060a708abadf9e6cb65cd4d9c2581a07b72dd120177c8d08253ea91a4293c9bd1ae6c587ed6bf10ffa31c4109ec68bfd11b2d97c
+EBUILD gentoopm-9999.ebuild 618 BLAKE2B a3bdad7c8ad96eeb9fcd123859c6868dd104e0130f76d9b5c21cf63a8d91e405b9b7527378de5e8715040525058be03dd92e812b781b96b7f379cf6a095c681c SHA512 1f4031557dd08aa9ab0da28e38e183843a58071bec302d3f85838747af69b65733b8a94c1fb8d03be2c7b09cd6695d199fdcb320000a083762e0100fba3f153e
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.3.ebuild b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
index bf6318cf270d..a97e106c1412 100644
--- a/app-portage/gentoopm/gentoopm-0.3.3.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 787c12954d99..840415f2aa12 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 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 d55abb893b70..101dd2b3f0dd 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,4 @@
-AUX implementations.txt 849 BLAKE2B a1f00e70488afc1bb98b86316af963d80953ad57cf8851aa624148c8c622613aa3b2b2824776ab0bfa0ddff985d472f47dfda2a203f2b88945fab4f4d38e308e SHA512 72e73b2397dc2cc0124986bd8ec7b4f87fb6af56a87bf32939c53615d3043ed2f58aaf41f2da5b63105bb5a5286e4a6d5e860a9cf1b5ac40a53db11521e5b866
+AUX implementations.txt 841 BLAKE2B 39905bcb29eb443bc236cf892693d94fa8e94c5054522f8bdab67943c5596d4d88ab26add84a2625d0856a9868ecb6712f4c2217790c01664eea9da8b1faa596 SHA512 75950abad00292ec125c7e22ea46263c608f0dec35d74dac31a418c3b1a8419132ca981ebebc3b8f2a03d70bfa056c4416d8c2d473281dab2bdb7fccee202425
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
 DIST gpyutils-0.5.1.tar.gz 23480 BLAKE2B 90e7a0f54526ede6a3c0342558cbbc379a8e8453aca1bc79751c12e292322d3cd3da8dad69f8a6aed7704bf043fe9e2324b567b3b6f7eff49c0e7a3e2bb2ea31 SHA512 5be4e4e03a5fef746eaf9bfed70f58801ed0dcec34cfdeef8d0936b92690b9519802fa3cdc3ca446ba688c4ff1604b5819d14b723c7ed2e6dd8f5b39ee76996f
 DIST gpyutils-0.6.tar.gz 23862 BLAKE2B 6992aa6260dcb495bb6d1ec3615d9acbb60d79bdaa50f2ba29da0ee1ed9f0931726a2e71cce296eb05d37715b94386352137e86072a7ced789c53dd1dc9e9a2c SHA512 1174ed9f645eb0e7b435677c0f8ad19eeae54479f319aa1d192215e2c83642df68ba37d9e0113a505468f9e05f8e6822ae32b5965e8d7601a545f4d0c9387231
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index e4f2de735fbc..f8f378e84459 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -16,10 +16,10 @@ python3_3	3.3	dead	3.3
 python3_4		dead	3.4
 python3_5		dead	3.5
 python3_6		dead	3.6
-python3_7		old	3.7
-python3_8		current	3.8
-python3_9		supported	3.9
-python3_10		experimental	3.10
+python3_7		dead	3.7
+python3_8		old	3.8
+python3_9		current	3.9
+python3_10		supported	3.10
 
 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/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 91acb4aaa37c..682973572a92 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,5 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
 DIST gs-elpa-0.2.1.tar.gz 15808 BLAKE2B b37c8d8ecb57277db89b399dd9151348a46269054722f5f29aff6b04511e098a6ddfadc163130d7f9dfbb1af6ff2d76feda695717e021a44422b67a3f335a15e SHA512 d17dab0a0dcabcd3b9fb0fe1a81dcd175808033b46cb7368c017561c060110bd39998117f6feab3e16ace7304e9dc3cf10e684efd0e77b252d8b249317c37475
 EBUILD gs-elpa-0.1.3-r1.ebuild 642 BLAKE2B 7bbea1856876e9fbd605f34cb565fe54f1cdf3c4f33c18cd77832a17ce187b7006fb08e3e6a801108e3f92e842d8223b2b7b77b98a098799ce6277469647a16d SHA512 12dcded1712ace296e6d3737d7b972185037bc6e9fc08d9cc1ebcc150ebdbff1c3b96ff1421699156452192e4a623aca62b7906dd6c4254285cd3787312506ed
-EBUILD gs-elpa-0.2.1.ebuild 679 BLAKE2B 2ccc8c17302ed204584b9dd9446c82e240a23cd9e9debf7d8cc5566ba07c7c5de5aa7c82fca90e3e92388beb9ac339a935d952843f4b84dfbbda8f2b4775d916 SHA512 7ca34267be0644b61a4ecd566af33a2620222f6e2b1735ffc214813e6e19e7deed0847344094494c363827dedb160f2ec07bd55873fa72bffd7ba9f2211657bb
+EBUILD gs-elpa-0.2.1.ebuild 679 BLAKE2B 34287423a0cf612f1cd993e9c07df0e001634f5a924f0257000deaa2e0b840a78a5507866d3a0e1554115788dd7044b78946e4983ca56e34e3fcb0362fe6b13a SHA512 077f0b063604782937499a5ed9264e1f966c88293e1b9fdad161547b7cb0f669781356d65376f3b3135d2ace6476380b76305430f0dc3b65b73cc4b540e4bb11
 MISC metadata.xml 374 BLAKE2B ca92264ce6ed20aabad6c30f6d7f87ec140b984e04aed7746934543f6de80faa4c954069cb66d17bd0ecb5f4e774ffbac97c4c5cb5980e9346e44c0f6d70b9ed SHA512 283d51c14188adcc55e916cd48831aadf66a0b78d7d8c7775feada3ef6ea941dc58dd94ea7b45025a4be88c8faa34ff684950eb7ed3e870bb3d23e1ebf43e65d
diff --git a/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
index 2fb307534535..a523564f65f3 100644
--- a/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/app-portage/kuroneko/Manifest b/app-portage/kuroneko/Manifest
new file mode 100644
index 000000000000..4449fc6da3d0
--- /dev/null
+++ b/app-portage/kuroneko/Manifest
@@ -0,0 +1,9 @@
+DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
+DIST kuroneko-0.1.1.tar.gz 10223 BLAKE2B aad046291218139662e74c653241bfb36180a0f7fdb4e3571c4d3c8787c41032c48a96d7b02f612e957b2a0eca9fd880daa03c31302d2e92eb6dec5df1b18aab SHA512 c4f29cb5244e659f2615cca706d002c9f20b200b51c964250da8c915d45bcaca03eac2a2dbc19e1d9b6a6374b7458b2c9e0a004e0fa14b1655e8c2c9ce8268a9
+DIST kuroneko-0.1.2.tar.gz 10279 BLAKE2B 9c468e17a1ca566a0bbdc65a3b4d8f5e08e188b2d999c9ee94187ee072f627f34dad9c965d67fc58108585cf05b876158b12b0c2c6043e0a1f5f16ed2cfe929f SHA512 9fff9b65fdda9a48d6c2b40b84fce5af811b288b0da08aee50ab2d393826dad2bfbd2250875b2dc40c55e417c7f8bff04bf7f4ad1b5f2adbee26a0bc94b9955f
+DIST kuroneko-0.1.3.tar.gz 10872 BLAKE2B 3dc85e92a4490501897e25949d258341e661672a2bd1fbce2673d3be6ead3599269cfc93884ad05da9ee41f90b60d17faeebb6b806da870458c8cf13e33fe58e SHA512 b388e0c19faae282b158e63a2ef3f54af98932e5f0efe96dcdcbd0ace509a22a1f7887834c94813912a03734448bc230767ab8e1367545f5cc877d778954fa0c
+EBUILD kuroneko-0.1.0.ebuild 790 BLAKE2B 4d5b1b9aa95ac1a1ed215e08690fa3b5b4d5f6a183c9d52960d2cb6bccd825e2d9a30c688f4b9d203571bf3ee63ffbbcfd7888182d9a02518ab0c33833005ea6 SHA512 52e2fa14d8baf97817e400170bc452a105a3b677ac91b9ea16654272f0076fbc25eb1fb2b1e6c77adbd08e632e6084059984e6215a91ae1ee3033101c8a9ff73
+EBUILD kuroneko-0.1.1.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
+EBUILD kuroneko-0.1.2.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
+EBUILD kuroneko-0.1.3.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
+MISC metadata.xml 357 BLAKE2B 901f6d525dc570d6137f33509e6fb3d973f256abc53a394b12d63c88749af811bccd6b4a9c0f862d37c23cf2d7605f90452cbae2c92dc508e035165a386db0cd SHA512 6ded3806aef8698d4c83afb22f7bcdf9899a68b697442a00067da7552750ccffc34ce055568cea416a4ce3eb11d845dd471448392ed1347c93cf672dfd788ead
diff --git a/app-portage/kuroneko/kuroneko-0.1.0.ebuild b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
new file mode 100644
index 000000000000..0bd9b554e20a
--- /dev/null
+++ b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
+HOMEPAGE="https://github.com/mgorny/kuroneko/"
+SRC_URI="
+	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scraper"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	scraper? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.1.ebuild b/app-portage/kuroneko/kuroneko-0.1.1.ebuild
new file mode 100644
index 000000000000..9b74e4af13e3
--- /dev/null
+++ b/app-portage/kuroneko/kuroneko-0.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
+HOMEPAGE="https://github.com/mgorny/kuroneko/"
+SRC_URI="
+	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scraper"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	scraper? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.2.ebuild b/app-portage/kuroneko/kuroneko-0.1.2.ebuild
new file mode 100644
index 000000000000..9b74e4af13e3
--- /dev/null
+++ b/app-portage/kuroneko/kuroneko-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
+HOMEPAGE="https://github.com/mgorny/kuroneko/"
+SRC_URI="
+	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scraper"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	scraper? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.3.ebuild b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
new file mode 100644
index 000000000000..9b74e4af13e3
--- /dev/null
+++ b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
+HOMEPAGE="https://github.com/mgorny/kuroneko/"
+SRC_URI="
+	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scraper"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	scraper? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/metadata.xml b/app-portage/kuroneko/metadata.xml
new file mode 100644
index 000000000000..b09f3f81a528
--- /dev/null
+++ b/app-portage/kuroneko/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<use>
+		<flag name="scraper">
+			Include the dependencies necessary for Bugzilla scraping.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
deleted file mode 100644
index 39e1806c6d76..000000000000
--- a/app-portage/perl-info/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
-EBUILD perl-info-0.16.ebuild 556 BLAKE2B 7da91dc3415ea85cea7b5d7ec3db1c909a0f3fa4a0b60857c8191be0fe9e6ad7929d2ef974724fd97f06db76f2c68d330e2c0effa1a25931ad5212ea2ae3567b SHA512 138a2efb6ff916249b5670a4a73bfa8304a3730bc85e73aeb727fc5d43e2a37e24310dd8cdb9fc31e77dc66feb474968e40183d92273492225d415315c379931
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/perl-info/metadata.xml b/app-portage/perl-info/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/app-portage/perl-info/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
deleted file mode 100644
index 546636434b50..000000000000
--- a/app-portage/perl-info/perl-info-0.16.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
-
-DESCRIPTION="Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	https://dev.gentoo.org/~tove/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/PortageXS-0.02.04"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index aa97f601aa53..38c7179cc580 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,5 @@
 DIST portpeek-3.2.0.tar.gz 13793 BLAKE2B 224ffff46090ee8c6ddc338623a5a1b4323ad2104514f0be8962b5af9070ab8217d76e3b19fdeac148b13cee77531ddb0261b89e563bb9a999b895b2a2475c69 SHA512 2b0592b92ce122c53c687e1897e1a51319527dca70c16ca38564dde870a05ccd0f4a00de88b53194046c9b2a4fef3a3ccf1a5fb84777de8437f66bb6cc25da94
+DIST portpeek-3.2.1.tar.gz 13538 BLAKE2B efd8566b0fd54cc9f76eb05d330a566999c2e301c2e62e38b12d6fa7063d57cf4803db0e1ca5fe3067a31075294e4c4e5f794acc914f2ed2abfc340c6bbf8278 SHA512 f5888f63c5683e48d601c6560800566586c1558541f928aacb0476cb7534e8e6910517d96c083519747d6074e1ee2739780f050fdffa6e5a1913399e2b2d108a
 EBUILD portpeek-3.2.0.ebuild 688 BLAKE2B 89745986a59dd306ba764cfb20c909941dde1d3a2954968b946dc33825bee67ca30e930d45c879e5f45f534d2207c6cfde5edcbb4da1f986f47cdd271802e8af SHA512 be3aec7962dbfed55235a811224c7573242ab9c958ec328f1f0738f5b81c31230d793687ddc52d01f9fc257967cdfca783c9e02ad95b5186c07253d9f79812e7
+EBUILD portpeek-3.2.1.ebuild 694 BLAKE2B b6fa9e7c0dca5352d44bcd9bc5d93a41119ed76a05c512cdcb7490cafec6383ee25e565213cebab2eda76bb1fabb98ae0c26d730da5194ddd4d077ce3c1e0f03 SHA512 afc05882d8434214bd28279fcf81c1c94a301419a2af3226353b2b3e7a5c23b2ac6d06918f4b77ffafc4f7647f8b4b83cc4a8c2aaf8876c895d4dbc7340e2eee
 MISC metadata.xml 247 BLAKE2B d6a36f1ceb3124edcff52b16e0893bf1984a3615da55fa5d160ae6faf816680dd7e735c3b9c5088ea101aa73501b4492553003771190867e35dbba8413d5ea7b SHA512 992dfbcdbf5401accacff7c9506d06cfd10555546cd041211755a90664a107ddc99d5d6b2b429a241929fe8895a0d5d571e3821ac0395dda10ed22cad60cb1a9
diff --git a/app-portage/portpeek/portpeek-3.2.1.ebuild b/app-portage/portpeek/portpeek-3.2.1.ebuild
new file mode 100644
index 000000000000..420753cb6a25
--- /dev/null
+++ b/app-portage/portpeek/portpeek-3.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{8,9} )
+
+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.5.1
+	|| (
+		>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index e6767da77b88..0094afa8943f 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,3 +1,3 @@
 EBUILD prefix-toolkit-8.ebuild 19916 BLAKE2B a73107d1ad5fdc1d48a8b33b3d2acc279ee969510cba65cdfc34a68fde496b0487a8ff570d6bf8153e90d8e7d6d96ac62c3c011211c73d94ebabc7bbec4cb43c SHA512 3d8593aa527cf4ea5197d60380c673b6e5b24a6e6cac542298af3da8cc403578b17f174e69b3a72dcdebe19bb465ded79869501c35a0d17f8323d6235b13e79a
-EBUILD prefix-toolkit-9.ebuild 20274 BLAKE2B 18aa4844ba8e32421eb329bed218eed149924057a7ae7f74635faa4507452fd9a46392198171312ca22639c0ea886401452e600109eedf8240d87f226e230070 SHA512 e5f8b532a0e4add2406fed6508f03dca2deb49c811086a56f2bed8ffc90e9c36b2949abfaf5454c82b5e6e20b7e87b49275987c74289d312397b6cc97177fb6f
+EBUILD prefix-toolkit-9.ebuild 20273 BLAKE2B de6f03b25024d408008dfa605e9fca1ca0e75ba76aba1996d4c6333d402b4b17dfda24e4dfefc5719b4bdc28e58b2fbe4c49881e7d220e3638c331c3a6b7bb9b SHA512 2c09618d7e698b7f5b68ff730a68ad91c073f10e72bb3914dccd079c193b55fc7307ed8bc9596f39a896b059e821fa8f5fed7e0efdc67e426d1cfb78bffb674d
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
index 36e3ea4ea0e2..46aec0c1fb3e 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="
 	!app-portage/prefix-chain-setup
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index cd8f5beb9d05..6887ccf7f1e7 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -6,6 +6,6 @@ DIST repoman-3.0.3-version-bug-779508.patch 1887 BLAKE2B bc3a49266fe64d55ec95537
 DIST repoman-3.0.3.tar.bz2 90373 BLAKE2B a4ea542c452d44b1f4aef235d67390b0a0f139f32da33ab9ad8992797965724f4ef8123a49b681e9205b6e3fe279dd248b65b0119659b7a0038fe9884bec0797 SHA512 09855a8a0098482c1ce0a7f50d2481528e713fb6796a4004475c841de59f9df8d264f2e9342fdaee87c71d275137234b7e3adc3454f7f33dcf75e32a0ae3f0e9
 EBUILD repoman-2.3.23.ebuild 1938 BLAKE2B 54c79d7a62e3ef16ef068c6e09cfde0193dcaf3521e662386726457ec95be61fc51d2e5aa3e227f2054b2d646e75ea6cee484be0b9a8c61a55297dc96c1e363c SHA512 2cc9e9f701c97e4caae34950249920a380d86be7268241faea551d6b198049fbfe9fc623a8905861533977000c9b4f45fcaf12edd03007b6fa1508b1d3ac2c94
 EBUILD repoman-3.0.2.ebuild 1944 BLAKE2B c277bf0e07c9c24fd74689ace176c50c1eaf68b86d813fedacef3fdc681e961260175494affaa8c9d923466ebf598bf79ceac2680652645296909467aa7a39b4 SHA512 cdd803942694a76f348a6214599dad241462f6a85446d8cf841e5c2b7772ff417c824db7121d3b2160f1fa26b0e16f3bcdeb6590e43288b324753f7547e3ec59
-EBUILD repoman-3.0.3-r1.ebuild 2644 BLAKE2B 10bb0421a97be44db4f319ee722b86a5bbe72bd6b4adcfe95210bbd38a29659fc3fcfa37404f4d1f20801814ab407a630a944123539df0ec175214faf1c35d6f SHA512 a9c4d3207c280ede534845fc4b64868fa49e4c18d1bec4e1f96fe84541882111d5d57985e021ad09db8e56ae4f4ab2e39bc15052bd1e21340865345883458771
-EBUILD repoman-9999.ebuild 1951 BLAKE2B 734234a6e5793ca63b8e84f80fd6c2c3b556c4618abe766a82863855596c446a5e18d27c41c9e56af9649b0c5c4c20f375ccdbf94ecba1f1bbfb55dd431c6b2a SHA512 72c97210d7536bcfe01448b157881a62e4508ed6dbc2fa5dc2942022f9cdddac93cbd5436b701e7769986cf23bf4c09a8c5e8225426335bb05f6d32a65be77a6
+EBUILD repoman-3.0.3-r1.ebuild 2645 BLAKE2B 5f49cf6ca7b35fb6ad06cc7dad22a114ec6dce8c7f5b66b8ba60d6d59c156deab4399f3cfd65e3ba3d8404f0da023f02ba781a15ef8c64bba6ac0fcc0386e8b4 SHA512 1b2ffa126b294c227baf2c4c30cfb58182b2c5596e63740d06baa6aa3a841f94ea208750e266913125b45238d781eb68ab3b79d3b2e042b22d072c7fb90883e5
+EBUILD repoman-9999.ebuild 1986 BLAKE2B f392c8de0be23a3161eb0141afb91d6669b050f83835b948283f6dce6d367a0cd5f1a7d5f27484f07915fa6caf1313d30a60424330703cdfb46715af32c4538c SHA512 7c3cacbca70f4660f5621d8227d96920c1b8663adcd45cd18f04781e799d910a6fd6e16cc50d606b9a68a84c6d0e9b2e2a39ca2194bffce346982b5a120fb8c9
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-3.0.3-r1.ebuild b/app-portage/repoman/repoman-3.0.3-r1.ebuild
index a7bb7dee6d44..3d9ec6752cfe 100644
--- a/app-portage/repoman/repoman-3.0.3-r1.ebuild
+++ b/app-portage/repoman/repoman-3.0.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 5db2b94f6761..0ba9ff39dfda 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -26,13 +26,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
+	>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
 python_test() {
+	unset REPOMAN_DEFAULT_OPTS
 	esetup.py test
 }
 
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 3ba58c3b369d..6d07b31af0e4 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.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
-EBUILD smart-live-rebuild-1.3.7.ebuild 858 BLAKE2B 4dd1985c9a9bc1bbc326898807ccdd761067fb362fd988d537445f902785e0649b7ec43ef504004c5e80d1e11929a7b4a6355fdae7016b6ba116da930d38bc43 SHA512 ee57a67b50c7e15010d2f952f984be8d9c0889ccc38427e9c1f06f4d4445c2690d703d1ef4a88a62c973bc25e01dd31b9d181859f2147663231fb7e2a75da18c
-EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 6213e113179dc428d5f5fb5e72a3a3560c8d52c5361655828e709c97c3cec4d9ad3f5590a839bbfc7ca46ddca9548d3f00949e6c6b4d1e8e480c6c883a1f89a0 SHA512 9f3cd7437a551bdf8faa57990143ca422d30f3a5cd5de58e8cfcac701d553df1d2b3cee5c5aba41501d79b3b49f4ccb6abc67be845675376a9285a7e33866b78
+EBUILD smart-live-rebuild-1.3.7.ebuild 859 BLAKE2B 0ff1fcf38ca8e6f17da63a34e8c4540c930678859ea1abea10e46d5cfc08322190b7f3f86cd4d4da4a86ceebe643b4a98dcd554a55ad4d3816667a452b279cb9 SHA512 6ea06a8f46cac40967e3b20d956c9780e78208a4cee52cbadc0d00db86b1f9c78428f39a242ff3e21378c17ec44892ed33864bbf4e5728f6d6586a0843e558d5
+EBUILD smart-live-rebuild-9999.ebuild 754 BLAKE2B 3059fb3c3325ba070f24084b5d62e008582b69bc55e2bce58a3a3c013f80424abc93452846dc2247e3c9bbe2bb8de05ce97114ad2419f59150b8c9d9c1c03193 SHA512 9733aa8e3bfacaac9aea937fe0ededfa6f6cf605a1376eacfcbf722c8a89695ebed0e57ed227e53b8743632842e2b29c6ee69a83cb32a459966fb699ed5d1aa9
 MISC metadata.xml 793 BLAKE2B 2a6117b00b5818a17925bf108428153f0171cb60cedb167d8608d67aa7c18c81f1b603f131d6e4fadb52ceec7116daf0c9977c4f6d5ce7eca8c5dcd814eb29dc SHA512 256a28aa2319add0633a5f5fa5c65550e071cb3206e94db358cf932c00c3aa4ab908b97e50f66d645b92671b75d9aa0a504b1d9dcdedeb649d2bbb52042ca1f8
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
index 7180a55364f3..8dfa9ae35508 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 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 adf1f7f98aec..22d242d6b73c 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 90579d8245e0..f2db32164bd8 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,4 @@
-DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
 DIST tatt-0.8.tar.gz 22215 BLAKE2B 6c21acb9378045679c4a03badcb7c60638c4007ba19857d7519f68d4d658cd1418e952cf15a64679c6a9b28090856a588e60e9db1abb360d0625a633491deb3d SHA512 31be6573e3d7c9a690e57d64adcbf87983d5dd226afd162c7bfa425847a84705beda530cd5b648ac85cf8cd3907d46ae638bb0ca0d903d8d1968d0ac30703703
-EBUILD tatt-0.7-r1.ebuild 842 BLAKE2B 6fd0771afdfeaf9e486c48d432aa1d5ae55a790d27f574fa965df898e7fe7a7c44f7ac04a3f476b7148047475a5be4d0a23a28d38efcf6f32a3094bf5af513e8 SHA512 3a0c4970b0ead9c0c2b8ff524a2f71e30c63cc8c41db1c0d77acb4ada8a47b2620bb5ed8f57ba6510f722b7d85959ccc0c21f2b6ff2db5d570de057079e9a30a
 EBUILD tatt-0.8.ebuild 825 BLAKE2B 77c5f43f27e9559a38b378a162fd52d9b5bd9c71ecc68965282f36fc8167b13e664edd907a5e8a8c4277f226351be882e153538f8d76b6ee23a6eb60561ccc45 SHA512 c05b802f73e050e8cec6e32373b791d684f9c77318fc26e0c69728952e1156fe6adb24b0e022e3994de5a95cbf91ecb744618b5ca0ddba97943678c166cd1974
 EBUILD tatt-9999.ebuild 763 BLAKE2B 04c33f57cd3af03a13e6e96453f6a18d017bafeabef27449714ff185a9ce7df61f3f488b6345f622b14c94238450f4b46692718a682750a97e7e45377c7029c0 SHA512 4b97ef44e12c8c2d3d70dd15dd57a3cd317beb3024f8b4e3042a599f8aa032c399471e02395f04c5e5cbc16b38aa2ecedef339afd747353e2b35bb8eec726b90
 MISC metadata.xml 661 BLAKE2B 1b520ce91684b655f849ab8dd0b53c6224b54a8152e7a3f65707384ca9133682c25244a86ab272b8c0b350db99a40e89d66a206bac9de21afded39b1a2be0b4f SHA512 872ebc25ebd0c9ed90544990f3ae5301b7e81fae733085d19e74f6f46743046b785fa1ece3aaec57db72f343ed222d6e555369c326a9781cbabe3a399278cdba
diff --git a/app-portage/tatt/tatt-0.7-r1.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
deleted file mode 100644
index 96b1744dab86..000000000000
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-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 ~x64-macos"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}