gentoo resync : 03.03.2021

36 files changed, 291 insertions, 324 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index bf74c739102b..6bed2953f2e3 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index 6a47690a5087..5b0db6982e60 100644
--- a/app-portage/demerge/Manifest
+++ b/app-portage/demerge/Manifest
@@ -1,3 +1,3 @@
 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 357 BLAKE2B 5504d99190aae9f6b2d480a7a98476ef29503da873efd34bc51dffc1f3c4cf9049128dbaa31b63a13a8078463eecaefd7a1daf71fb3527d2148d2450eebda2f0 SHA512 7ef62a53bd595c8f69a3fcbb0b7d0db7eacfec1a7a725a51fd1db3a1d7dfac34cbfeafcfd3e9ec0a30494a06b65b203ca1b1684d1173f3faca521c713f2bae94
+MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
index 0b051a38ce84..51930499ab60 100644
--- a/app-portage/demerge/metadata.xml
+++ b/app-portage/demerge/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kentnl@gentoo.org</email>
-		<name>Kent Fredric</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index fbb7e846809e..f1a07017875b 100644
--- a/app-portage/distpatch/Manifest
+++ b/app-portage/distpatch/Manifest
@@ -1,4 +1,4 @@
 AUX distpatch-python3-support.patch 15542 BLAKE2B bd0e0ca9d1c77c0ddcfa254f723488ce44002258988854b5a4d911e6d919d93653d07a66f43dec63ede94d914ea98e72e8fba4f7f2510e2bae23f75447cb71ae SHA512 1384cbe023f8cbf6dd67990c1a2bc6b80c9ef9a19082e76353dc3079dbdd4e2e330b344e7292cece4587e1dccabba58fdeb4aa1cadaf2425fe143fec223c23ee
 DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2-r2.ebuild 658 BLAKE2B 44ebda904368b18680c389c4214c550a6702d25179f7852a98e740a3d2d65dff225703bd6f08eb50a1b98af6b8937dd8e5694db4e4e832f7c5424d08c492a20f SHA512 f5ef83f2caa568424898036aea2b48de1d7440ed4544a0d29a0713cef52b4b299f3881974a337d9189bdb0861c59c0db78084dbe8bd57edb32d3ce5852a06292
-MISC metadata.xml 394 BLAKE2B ca169633fb98c169adab27303633191e2d7023fcc655035504dc06ebaee5349881a1cf36ce21faf0b716c21d6a14e52374b752503039e243ec2d66c25d717dcc SHA512 db7826f75a4bdd67ae6e268af3685fa6fce97bf24fedd027168060796cfa8520a7c5e01ab9902224c524d058c3aee06c44cfb4da45a02cb0356f81ad6b7cad43
+EBUILD distpatch-0.1.2-r2.ebuild 601 BLAKE2B f9b9cb09f9e220dc380f8419835bda0a2117dc05350d7c21b3cf73035d3e8e1fef2c051c1314b14a45571023ba58527b748001042a7923ac56646bce7bb15ad4 SHA512 cbbbfee60e37288e286e440cc1134b94c977c80810cff7c2bd8f07d0074cc5321cd9933a078fb13c7ba1d9b6073c5fa6e724a8bd26b10147f8a200832d4a54ad
+MISC metadata.xml 419 BLAKE2B 162a67605e4675ff42efd5af7d3aff609944a9d6765afffb3a7190d6dc61c8900bacb9d65effe437dec78c73ef40116362e26283dc4549d3a76b9671a1ab154f SHA512 c652f3322dc70a9db065b52834c82e6a86e0f565c0500fd861bb240a9f96079870f0e2bf80a18ee294bf22498168bcdfb5bc6d80c6d59e8a59fdcbe9cb145022
diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index 1db970970d75..782930fad490 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -1,11 +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
 
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
@@ -15,12 +13,10 @@ SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
 
-DEPEND="
-	>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
-	dev-python/snakeoil[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-util/diffball-1.0.1"
+RDEPEND="
+	>=dev-util/diffball-1.0.1
+	dev-python/snakeoil[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]"
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
index 16241be40ac4..23d2bc12f72f 100644
--- a/app-portage/distpatch/metadata.xml
+++ b/app-portage/distpatch/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <stabilize-allarches/>
   <upstream>
     <maintainer status="active">
       <email>rafaelmartins@gentoo.org</email>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 7bcf23a51366..3857e66d5855 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,3 @@
-DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
-EBUILD eix-0.34.11.ebuild 2556 BLAKE2B 4f5b498031917eeb4340217b9c7b1de4c1cd48d3f9fc838618dbf10d6668fea35b5f156b00a1861e1b85d54b917a4d59d63a1a525d49f62a24d40991a0a07eff SHA512 6a5a6aa6b9fd6b165a55ec11640d0131906de890cd1bb91c117a640e41a025815c928525064944212947ee8ab5da0ff40938c3cfb9eb81c83e634b9b96533274
-EBUILD eix-0.34.12.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
+EBUILD eix-0.34.12.ebuild 2538 BLAKE2B 8b9edcca404e1b1ce0269a58731e01b6c1fba3ab6396057bb37be6a33d40eced8c83ad3512c21863f530ed83575196dcd68c9331b56c467e210895453203c1a3 SHA512 2af3a5b54e2111795d8135ea35bdf71d500780b6511ddf55ebf89bf3b28610f0c436975cccd88c89dcfca8f4447ba7e45540a476a4512583f722bfffd9a4acc8
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.11.ebuild b/app-portage/eix/eix-0.34.11.ebuild
deleted file mode 100644
index 430eb3dd9e8b..000000000000
--- a/app-portage/eix/eix-0.34.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.34.12.ebuild b/app-portage/eix/eix-0.34.12.ebuild
index a13024c139e6..e192a95b4aa1 100644
--- a/app-portage/eix/eix-0.34.12.ebuild
+++ b/app-portage/eix/eix-0.34.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 22536c3cdedb..c943d48f7f1d 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,5 +1,5 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
 EBUILD elogv-0.7.8-r3.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
-EBUILD elogv-0.7.9.ebuild 1604 BLAKE2B 34b28b70bd7c5f3157ef6296a8e955dcd33e68cdcd10e0be13374973be2a5950edeab3e8b9cbda6ec756ff3b4f7428126fe42b664e3074b73794e8ba203d7e0a SHA512 b19650ad238fb053ec857b1503c2c1fbbebcfb350124dc040a066b3db373123bc6301e3c1235d94d8d537a67cbab2693561b71f0c9d2f9621105b70f088ef82a
+EBUILD elogv-0.7.9.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.9.ebuild b/app-portage/elogv/elogv-0.7.9.ebuild
index 776e36f32b31..4ca848e032c6 100644
--- a/app-portage/elogv/elogv-0.7.9.ebuild
+++ b/app-portage/elogv/elogv-0.7.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 3b4eab0077a7..6f65f2c40c8d 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,4 +1,8 @@
 AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
+DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bbd999d89b7f90bed8ef9739182c8e4af0033aee92453d6b0731ac5d8c168e3900abe0a4466d584bfd9bc64917a SHA512 b99bc165ab08755273ead73fdd3602c9266a9bb243c46d99805c1f8b07f7e8ea9b0583aedb9b7ab717461f2ed3bd27dcf0a5677f2d908d3fcc03769794a64d5b
+DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
 EBUILD elogviewer-3.0-r2.ebuild 1754 BLAKE2B 9dc22d3007857eea1581084249321f1079095995fa67581a1ee87ee00ed529587798a9e588e4f1e5901f54d5cabc3af4d6c5bf23041e74e3131f2fe83a3ded38 SHA512 8dd610e4dc94ff1fd69d2db221e8494ec136fc1813a04fad8fb36d335406ce623052a4c9aabd46aa8740dbd9925884b686ce82c212cd62472def108ac0e2fae8
+EBUILD elogviewer-3.1.ebuild 1750 BLAKE2B 3423aea8fa75f784ba54aa0c491ba75dfa57b8dd65e88c5f636d1ecd5ef19c56b98a7b06580837ee3a7b1cdb8e82be017245dfbd7b0296c71b66548942f8d463 SHA512 abaf4d80987e50f9299e5ca9568fa81a7e8aa820e7cee5b2d363d9c47be74c1050c0ee3c2eec6aaffca85b866cc139a2cf10dc90c9a2ed005746c7730d3f054a
+EBUILD elogviewer-3.2.ebuild 1693 BLAKE2B 8c0959871e7a5ac538ca75e55fa74adc9455eafbfdcc51d55d4275dad3fc47c9028b0bb6412ea95087509782a364bdb26be2cc254791a8e56408ea4b59d4b20f SHA512 de8d6a336f218a7f4b8fa8f58e0361bc882ee0f9293b88ffca2be5a92b191632e47290a3cac20e3bed14bf91319ae174110d7261cdbd6dbc2bb2f2e45b0e626d
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.1.ebuild b/app-portage/elogviewer/elogviewer-3.1.ebuild
new file mode 100644
index 000000000000..7e2097ac19e0
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit desktop python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://github.com/Synss/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+PATCHES=( "${FILESDIR}/elogviewer-3.0-segfault.patch"
+)
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
new file mode 100644
index 000000000000..281fda711797
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit desktop python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://github.com/Synss/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index 0c8ac6cfecac..78bbcb288571 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -1,5 +1,5 @@
 DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
 DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
 DIST g-octave-patches-0.4.1-r7.tar.xz 8800 BLAKE2B 514b154d7cbb816f15d88a2efe0d0b8503a5a09dedfcc79ab61fdb2fca8be193752ffb477ad7ea7be167e341a91e8d83c5b70fa20ed9d55da6f668acc8743e6c SHA512 cb03afd16bb7f2f0ddf2c4f11bdde2748b8ee0124642cfed4697e19adda30b141b3217afa55e996acf3e295d06af0636ba235a631039e65ca7920eef3243e267
-EBUILD g-octave-0.4.1-r7.ebuild 2427 BLAKE2B 6351f1f751ecfe12c45ccacd70658cbd01f8db452ed160fa38f1447ce55202e4fe27c1b148c8502e2689632be4a6e1476511aca0d470d6a25c84b61f5e0b33e6 SHA512 2adc632409f237b3e423b01309e0c8827a4888a1c57aa9475613e6f2eb143e770c61449bd040b955f093598be5a0c1d799c5a93bbd96ab930a91865169a34744
-MISC metadata.xml 835 BLAKE2B c4656445ea018a9f3ef19a8adee970c0143034f7cae4b9236fb3fbbca075e7fcc0c5aa70f883ca2ff257cf0cfd330f4a2c285d96438e14c6485172b0235b9562 SHA512 22a98ed66a1e86391788612390c8b78a05112b1928c0ee690396b1f82d8e244a37b602f49312569756b95bd025448126c2cd0065af83c5968b38b903ae19eb8d
+EBUILD g-octave-0.4.1-r7.ebuild 2380 BLAKE2B daad561ff18de84570b805e94b501c63a0757f49291c4b60d95d233030904407aff5277599b676268a5b3bbe2c0d55604df4335a7da327c305550f1c867eb0ee SHA512 ae0f74c39d02da1857fd6b98f1899130037fa2a0d01377d60935cf5d8cd014b5662476c1047a69d4ee1de3ce768efbcd8f54f794faf72ef39edb05ea99dd0267
+MISC metadata.xml 859 BLAKE2B 7deb4a0fbf17966cc542be834ff5b244e6780f6ec9d5aeaa3d12dc99809d33d455a31e4ab49721e9b4619db06a4cab8c429fd3e755117f5ecc9a0b9e95248799 SHA512 fc820b2f527eab6b30bf6e8d45d30d3f43233e701c353610c2d0b164c10c1293de4bbe770f946e88d86b36c5c1ca9edd2f01e315fcf5e818a004c3ff77f50346
diff --git a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
index b3e0f8d8643c..d787f7309a5d 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
 
 DB_COMMIT="bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed"
 DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}"
 
-inherit distutils-r1 eutils
-
 DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
 HOMEPAGE="https://github.com/rafaelmartins/g-octave"
-
 SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
 	https://github.com/rafaelmartins/${PN}-db/archive/${DB_COMMIT}.tar.gz ->
 		${PN}-db-${DB_COMMIT:0:7}.tar.gz
@@ -22,23 +20,20 @@ SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
-DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
+BDEPEND="doc? ( >=dev-python/sphinx-1.0 )"
 RDEPEND="sys-apps/portage"
 
 python_prepare_all() {
-	eapply "${WORKDIR}/${PN}-patches-${PVR}"
+	eapply "${WORKDIR}"/${PN}-patches-${PVR}
 	sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
 		|| die 'failed to patch the g-octave main script'
 	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
-	if use doc; then
-		emake -C docs html
-	fi
+	use doc && emake -C docs html
 }
 
 python_install_all() {
@@ -49,7 +44,7 @@ python_install_all() {
 		HTML_DOCS+=( docs/_build/sphinx )
 	fi
 	insinto /usr/share/g-octave
-	doins "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz"
+	doins "${DISTDIR}"/${PN}-db-${DB_COMMIT:0:7}.tar.gz
 	distutils-r1_python_install_all
 }
 
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index 2c8e03f93628..b4cf5cf18289 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		g-octave is a tool that generates and installs ebuilds for Octave-Forge
 		packages "on-the-fly" to Gentoo Linux, using Portage. It's capable to
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index ade620a0ab22..566323e53dda 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
 AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
+DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
 EBUILD gentoolkit-0.5.0-r2.ebuild 2490 BLAKE2B a14343782b8f6943d974f423f656c60de63ba4c2a7b6a1345d15c41bbc29390e7b8b71a4ba247450265dfd1e53af9209d7a73e40ecc1aa84ceb209693fa4bbac SHA512 e4b719571a47baa440f08cf1224a21a9a2b6b5227cacd038bab27b0ac0b6494739b233d423c363d406d9a198d556fedd7851dee3cee8c4de651e70de58cf1569
-EBUILD gentoolkit-9999.ebuild 2203 BLAKE2B f85d7c8e23d2aac60af447dc089e74c2d37ef4a853fd7bfdcec94c92706c76e336cc6b893621ccc563822a9cd59a3dd60ca4bbe78823d93ed25859ea70fc222f SHA512 97df6852f611332ef5dd73909af693053ee37bfa35bea6b35ee32323936c5abbf912af089a37b5c819b6ddbbdfa1169a52f75378ff0b6581541c7886c5fad7f7
+EBUILD gentoolkit-0.5.1.ebuild 2026 BLAKE2B ab662489907b94e807f76f01fd03538ec2e6621a14dacd421040a4ff458eb67adb32720a62f03960eed46427cf3c65d47c2dae4c967340545bfc0f1939685ae2 SHA512 911fb664006315a3a2610d70d1019317c4b5c9ee1bfcaa81b60dbc714d0a297040127d8e24354d57c872f9e240e2247912c386ec7a9a5d4fa0eb1c085f1c9828
+EBUILD gentoolkit-9999.ebuild 2026 BLAKE2B ab662489907b94e807f76f01fd03538ec2e6621a14dacd421040a4ff458eb67adb32720a62f03960eed46427cf3c65d47c2dae4c967340545bfc0f1939685ae2 SHA512 911fb664006315a3a2610d70d1019317c4b5c9ee1bfcaa81b60dbc714d0a297040127d8e24354d57c872f9e240e2247912c386ec7a9a5d4fa0eb1c085f1c9828
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild
new file mode 100644
index 000000000000..a05cb33f75d4
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+	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"
+fi
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+
+	if use prefix-guest ; then
+		# use correct repo name, bug #632223
+		sed -i \
+			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
+			pym/gentoolkit/profile.py || die
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 53c6017a27bc..a05cb33f75d4 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -7,18 +7,21 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+	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"
+fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-KEYWORDS=""
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
@@ -42,25 +45,11 @@ python_prepare_all() {
 	fi
 }
 
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
 	mkdir -p -m 0755 "${EROOT}"/var/cache
 	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
 
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 1c1678f4cc37..338af4b4fb4b 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,5 +1,7 @@
 DIST mgorny-dev-scripts-6.tar.gz 7270 BLAKE2B 30945ccc04111c91dcf22d180b0f653606910a0f13d3d2c2acdb037a51bc6490917d8dab91580c27caf492487dca7ec575c5d59181ce622dd67dada49e653462 SHA512 b46d6919cea7233131e90c423392bfdc8a560800adc05e164ef88351d84d51a73dfd982fcaf12bd9519219bc08b84b6a1aa3dc078bb30d35d57847ad1b22efa9
 DIST mgorny-dev-scripts-7.tar.gz 7262 BLAKE2B adae301b7a3707aed052e11227f792e247b8e55f56dbe5b07ecfd7c37b1bc401f7f7110c2e38703d8c0f77926374193fd21dd803a60c3300990b85974e084ac8 SHA512 24b7b03bfa5ebac91a19470a49c5df6b4ff808876d8fa3e95adc243542f9b215f4c5b4cf3a3df48bae4386be570948d2976b6d50e1144469690a73bd5c119a6c
+DIST mgorny-dev-scripts-8.tar.gz 7264 BLAKE2B 70825cbfc00c2d15bcb5533bdfa6c3ac4eb6555b6e0ce6408cd74b2f8e81c04c72360fa02b6c11c31d18fb27f9f30c54103ecd3613b9e53a6d77a902fa8c27a6 SHA512 e2905485348d4ed85e620e8242bd0cf0a14a0604299a8a47ab9b27d888b87429bf55cceb68f55dea5ebd5ffd8fbfaceca72eac181fd28afa473bc50d07a52a32
 EBUILD mgorny-dev-scripts-6.ebuild 603 BLAKE2B eaa3b41806bc9e16eb74173e3a69c4426220ddae73f62e089deb0eef98d55e2df080064a4f64e53dc01c3baec06af6ff5a7926cb3cb4fb6bda62bdce2c157948 SHA512 3f75ac80f219d8f366a60043c0aceb3553a506baa5c9fdfbf50ccfa2611dd16789edbc2605c501b3037253d8ffc9e4bc427e24aaafbc95813086c16363f08d50
 EBUILD mgorny-dev-scripts-7.ebuild 603 BLAKE2B 129885a428e34844ecf0c42270aa4d1b712da7f99b706d91f25e09cce68ebd918e80c4e2da455478c55fc21879f1c57c3c477def155fad21f02a97f9a9343267 SHA512 f52a8b9b0fa466ff28bb8379ae81208c2cc3e29a21d4c7bbfba59f1b03528a0f89d6cae51ee8333f4bdd82c97004c7af96b80b2031939c1ed203fcfdd48929c2
+EBUILD mgorny-dev-scripts-8.ebuild 603 BLAKE2B 129885a428e34844ecf0c42270aa4d1b712da7f99b706d91f25e09cce68ebd918e80c4e2da455478c55fc21879f1c57c3c477def155fad21f02a97f9a9343267 SHA512 f52a8b9b0fa466ff28bb8379ae81208c2cc3e29a21d4c7bbfba59f1b03528a0f89d6cae51ee8333f4bdd82c97004c7af96b80b2031939c1ed203fcfdd48929c2
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-8.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-8.ebuild
new file mode 100644
index 000000000000..5e039f280997
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 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-util/pkgcheck
+	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/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index d588fc55000e..e280bbf75a1f 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,5 +1,5 @@
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.6-r1.ebuild 1501 BLAKE2B b50546b032774dc0d7d676cfd3ba953a5a43e3a7246be2d08f2a4a2e75e63bf7984e57ae323f0801e21884de61a9ae5b1fb92c903925252c4d8c66de3c4d5ffa SHA512 4e3a88c43f1d3d809c11d6dcca15f965a32118a6a0973a14dd7b3582ed6c6aceba8c6ce6b8e306791a8c3d5af629223177040376c0195065f07f12de80cd43c8
-EBUILD mirrorselect-9999.ebuild 1150 BLAKE2B 1909c0dfe73f0c6b6a6c667351cc6efb71db6cd7aa9969aef91a3b249b75568c395d123cb4404e571bb386744af385f7961ed36128b1ba094706fc17af6e4fea SHA512 3c08661c0448a676227f85e035929efdb14d9cf64e8b5cb8b0b7f4be2cc2a3c14911d0a51c42acfc0fb698101485a89d5987c63787cf0834863c21d2d098305c
+EBUILD mirrorselect-2.2.6-r2.ebuild 1500 BLAKE2B d5bf2a651036a820bcf3eae80ab227f3012589744ab5e8bcd3d3b213bae3b8f20de5fe07d2b41f07a36705bc834d878b02dc2e70650348ca43f57af9feec939c SHA512 0e89a3a454b304c59002fd50959f9f6d41ef6b6287bc7c3b34336c0508f4b6efef3a20ddc3790db4c223b03633934997f2636ee8dbbabfee40f9d9c6091b441b
+EBUILD mirrorselect-9999.ebuild 1150 BLAKE2B 56f4db2c456ab3e0d8e279e506c1336c414716418792c9c4213181d0042a99318b955d3eb8c4d68d61f609fbac5926545cc8ec81212909ba3f79db22447de83c SHA512 5cf53b2d002e72c7723d56e217bc96ea90e3819ec6aae0413dd81f73428c9fe3d1d29c14ec5a656c7ec9fcad8a70f9145c1b4aff42a100342478abdb38b367b5
 MISC metadata.xml 494 BLAKE2B eac488423f418c6fe5ef0d4587a98897d9dfe5f2cfba0cc37c6770d66c9823c7cd5e31e9890246f83f39dff0c6c4ac886b4a57e6478384da58d42629802da576 SHA512 dbd7bb0614ca90644d52e0d923d37a73580138889590a485fa6d1f8621290e8aecab6d597304a071565c3ed013e884491ee4f51afd82239ce21126e78ce7bae9
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
index 7dda1fef15da..0b265a74e52a 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
@@ -1,9 +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"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -13,19 +13,18 @@ DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
 SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
 	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
+"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6"
-
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+IUSE="ipv6"
 
 RDEPEND="
 	dev-util/dialog
 	>=net-analyzer/netselect-0.4[ipv6(+)?]
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
+"
 
 python_prepare_all() {
 	python_setup
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index dc5ffaaf50c5..6f0ad3e3f064 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +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"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -17,15 +17,14 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
 KEYWORDS=""
+IUSE=""
 
 RDEPEND="
 	dev-util/dialog
 	>=net-analyzer/netselect-0.4[ipv6(+)]
 	~dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
-	"
+"
 
 python_prepare_all() {
 	python_setup
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 70596ad4a47e..62786031e08f 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1,4 @@
-DIST nattka-0.2.11.tar.gz 93992 BLAKE2B ad088de5f96ec5f7f8b0922420d22ef507e1e79ef3bc3161e6a88cd4714f1007a000ab06a7e21245b2792fd3056474459bf424da0560b8666c5cf46f04a2d763 SHA512 5d9de9f437a15e149ce58348f40f86101c10fe1f4c4ce869e7038ba25fc212c22e024a9999a6197179a0a1e1e82380356d304841c33333e04949caaadef96db7
-EBUILD nattka-0.2.11.ebuild 942 BLAKE2B bedbc2c2306b19a18f3971ef21962bfb64c74a13bb624e7ba458b18cf032015a70a2ecef2e64098775f69569b61f70f3c85d4c6de9d8327c1a216f4c28c62b18 SHA512 7b4283778561eaad03f333e6d7900ffec1cc10e8b957a7300ae108a2ec4a6a0a80ac7273c7b33547a70c357bbe32f282bc614e2d72bf2727dd89c60e91a03db0
-EBUILD nattka-9999.ebuild 892 BLAKE2B 1e802a330372653ecc4831fa5beb0787ff575ee9be6e3acebdadc3f33fbe4f4945478fc6d1252ae6589c1420bb07e91c184f60847c4dba9ae72fea8ad709654a SHA512 792f5ec4761a0589941c0f12dcb50e5d42b6e11a8dd53576f36f8e49a939fecd9d0a5966032aefe8371469ae5adc19db41b61e97b987769b14b12b708b44bf2a
+DIST nattka-0.2.12.tar.gz 92954 BLAKE2B c4ffd44030da0224963d7fa367336d7ab9076b17f03292f5e65b7855823b34374b8d7626c4b97c155d10797f2d550f3c20cac39f68cfbfc4b8038406f37b21b0 SHA512 f1e775895d66505b09a3098525f998f87bb1561538f0e75b993b264f87f61937d7d5c71999018fe93c683366ef81dff5b7fef1e1d44af63153003f70d7933273
+EBUILD nattka-0.2.12.ebuild 901 BLAKE2B f3d6838efeb395764fe0e1c98792e6061fe6b015f81ff325cfd0ae743a3bd10e20759822246b4bfedbbfc519e9645b18625a08d08a83aeff4621249f9f498abb SHA512 9734db90cc7964e6c9b274a41dd8be93380b632e936bacdf27e250f837042a866bfa113237ebe5e8e791cfd826af0739474903fa4883ba65c2930ca4aadc1f2a
+EBUILD nattka-9999.ebuild 851 BLAKE2B f451fe8c8b8b742e217607780e1f3f34e8ce1f3dc3f2dde019b79807fc802284906c40e42fd7ca7e33ac3ddd117117cb5e05b806baed2e54485a9d63351ccd17 SHA512 9dc88faf76c7c84e49ee69b9e899547c215fc86823c446a5bba052d9d4eb11f537578f1063b2d4fa9a4f5122ba157e8226514c913d7080eab52424d7a7446f50
 MISC metadata.xml 384 BLAKE2B a75502a1e8d6cbe02ddc6c56505790fe6ab3110797d9d50631650d38c83cd04bcf6eee6d8d1b2db5e092f7721626312ba2f1623e680c5d8bd1aff3feda5fd5cd SHA512 3a6e0ed25d2650d1dc81e3d243726abcfe5a9f8d47feff6f89346df85b425d85369bc03ce49bcb1fc49086ab3c8fa394fb3578618d1bf4c019737a9f7cf17004
diff --git a/app-portage/nattka/nattka-0.2.11.ebuild b/app-portage/nattka/nattka-0.2.12.ebuild
index 023dbfd220b5..eb769b185026 100644
--- a/app-portage/nattka/nattka-0.2.11.ebuild
+++ b/app-portage/nattka/nattka-0.2.12.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 	)"
 BDEPEND="
 	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
 	)"
 
diff --git a/app-portage/nattka/nattka-9999.ebuild b/app-portage/nattka/nattka-9999.ebuild
index d5f99963fc50..d25ba4e093e0 100644
--- a/app-portage/nattka/nattka-9999.ebuild
+++ b/app-portage/nattka/nattka-9999.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 	)"
 BDEPEND="
 	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/networkx[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
 	)"
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 13e6c8a77932..27fc713b8cd5 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,10 +1,10 @@
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
-DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d SHA512 c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
+DIST portage-utils-0.91.tar.xz 1783048 BLAKE2B cb93f29b8f7402b745ca0d191c8c02c75ab6a4a9fbe54b8d1ea60d1a2917a8ba2f6ff88e2c211b957ace1916307c38308ff355c7cd9a8db8876aed8f235a841f SHA512 f10c1653af44e9907bea5245b65127f047f8cd48c30a5d0252f514c759b6fdb83fbf036ba7297c926b6ddd3ca34c231717e78378dfd709fab699012ab5a67450
 EBUILD portage-utils-0.87.ebuild 2140 BLAKE2B 184c2904596b63e799e6dd0a456b5b266935623f0589e78628dfc9d1db79c43ece44e5d7a439d4a24c15c657b68cfc58d4f494fe4487da72c8f5ad7325f67cef SHA512 f8d317f0952b593dbdc701c2a37c5da441220e79af57246d04636ee31cccc0bf1eebd2cbd06ab0b188824ac893a64ab79222de8d43af83ff4819c7d51b26e149
-EBUILD portage-utils-0.89.ebuild 1775 BLAKE2B 4c4e52807d5e0ebfd07b236d260e5e14abb563864f660e93fd02247e280bd106333019e89b278a8968522a310062dbb95a3fa747f580e30590baa45687364314 SHA512 055d3f1a06722adb7800f3fbe8c995ac79e3b25380e3a7b4c4a247ef3c0407dad4fe22eff72c90dad7e51f5a4b007de25416fa2616f729b263c4f164f63ae54e
 EBUILD portage-utils-0.90.1.ebuild 1770 BLAKE2B a8507a54b09b2e65d11ea19ae59eb6123d4a97ad2da77d2392ebb5c87b038d4c308b86f5bb00bfe392c8e4d1ed2de7db7c825620a34cb0477cbbe354f7e62d0f SHA512 f6dbacd94a564053506f2607575abb0f7268713588504705f41cd9eb1bb00f9eb09803e653a503c6f24c9af7f9ac0391cef2b03cf6fa7280ddc97d6b8a3ec7e6
 EBUILD portage-utils-0.90.ebuild 1771 BLAKE2B 7f41bcd459e5e681cc53e79bbb5a8643e8fefab6d4923a8b6a937dc5cf13bfdb870f108eab5b6739a4f48e87d2d7c030c6678cecc015ebd50441d6307b7da9a9 SHA512 b9211a98241073dd7c7eacd4ea0c1733085262b51b5579644a9f84ce6d5d9ca083b38b4c6b2eada9737df6710d882dd19d59e4bfb7c4b225c42b5273f87c47e6
+EBUILD portage-utils-0.91.ebuild 1775 BLAKE2B 4c4e52807d5e0ebfd07b236d260e5e14abb563864f660e93fd02247e280bd106333019e89b278a8968522a310062dbb95a3fa747f580e30590baa45687364314 SHA512 055d3f1a06722adb7800f3fbe8c995ac79e3b25380e3a7b4c4a247ef3c0407dad4fe22eff72c90dad7e51f5a4b007de25416fa2616f729b263c4f164f63ae54e
 EBUILD portage-utils-9999.ebuild 1775 BLAKE2B 4c4e52807d5e0ebfd07b236d260e5e14abb563864f660e93fd02247e280bd106333019e89b278a8968522a310062dbb95a3fa747f580e30590baa45687364314 SHA512 055d3f1a06722adb7800f3fbe8c995ac79e3b25380e3a7b4c4a247ef3c0407dad4fe22eff72c90dad7e51f5a4b007de25416fa2616f729b263c4f164f63ae54e
 MISC metadata.xml 573 BLAKE2B 7c24e5d74a38a20b0c79c228ca131ee5073cbf0fdccfc2b42221521ae684566b4bf7474743c0a9cd1273b59eb94e2eef63b1db70f0ffed7d688073bb3679e007 SHA512 85f32bcd860ab711ade03cdb4a241722efbba47396b736e302fa2282e363bc8e445daf9316996b1cedb420d2cb102fd416962f05e15a57c51b514d776ac7cd84
diff --git a/app-portage/portage-utils/portage-utils-0.89.ebuild b/app-portage/portage-utils/portage-utils-0.91.ebuild
index 50b348199614..50b348199614 100644
--- a/app-portage/portage-utils/portage-utils-0.89.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.91.ebuild
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index f1ccdc4f761f..278ab7cacc3f 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,6 @@
 DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
-DIST repoman-3.0.1.tar.bz2 88134 BLAKE2B 270eb8c6220360d32076a402795df9bb1c7ce7ca6509707fc2b9307ca94b59131da3100b51519bed2f76dde703782db6ed74a052b51ea48c690e6558ceb9d24f SHA512 2da130a5dba547390151620f7e944de45e0a880165ab138000870661778f54c6f6c2e0eb61bab961a0cf17642a96fc8a2e5e508bb16cc1adfcf103074838196c
 DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2
 EBUILD repoman-2.3.23.ebuild 1937 BLAKE2B 11a5267afe464191df4aa0788e22e2b9cacf7df513883fdf4dcfade2a5db54e536dfc548ad866217762c172c35f5d72b5affc68b951d4d6041d1deb020d09c21 SHA512 dcf174e7a28c550f0e8dad655a2a6c67dff1151227ff00a7ce0d76e894845caea7722663657951daec27f60a7b70d34afb4f514ec40de35a032f4bbc5b8c1782
-EBUILD repoman-3.0.1.ebuild 1943 BLAKE2B 15055f8d19fc4171c531801b613f5dc17f9d7510850eea43e1b84cee0c2fdf7680cd39c1e9937d5b5bf3002f101b497ddb847ad8da7bb744ee708afc13bf0be4 SHA512 01bc0f76d0d6b094512cf91add04f69237db70bf985627aa2412ec3e3631ac6352b7f0914edc7963396cb1b49b30dd0277b51380f64e21a50fbaa17b397bb375
 EBUILD repoman-3.0.2.ebuild 1943 BLAKE2B 15055f8d19fc4171c531801b613f5dc17f9d7510850eea43e1b84cee0c2fdf7680cd39c1e9937d5b5bf3002f101b497ddb847ad8da7bb744ee708afc13bf0be4 SHA512 01bc0f76d0d6b094512cf91add04f69237db70bf985627aa2412ec3e3631ac6352b7f0914edc7963396cb1b49b30dd0277b51380f64e21a50fbaa17b397bb375
 EBUILD repoman-9999.ebuild 1951 BLAKE2B 734234a6e5793ca63b8e84f80fd6c2c3b556c4618abe766a82863855596c446a5e18d27c41c9e56af9649b0c5c4c20f375ccdbf94ecba1f1bbfb55dd431c6b2a SHA512 72c97210d7536bcfe01448b157881a62e4508ed6dbc2fa5dc2942022f9cdddac93cbd5436b701e7769986cf23bf4c09a8c5e8225426335bb05f6d32a65be77a6
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-3.0.1.ebuild b/app-portage/repoman/repoman-3.0.1.ebuild
deleted file mode 100644
index 5b7a22311567..000000000000
--- a/app-portage/repoman/repoman-3.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 13084b5ab7e8..399dcb4a1a06 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,7 +1,4 @@
-DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
 DIST smart-live-rebuild-1.3.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
-EBUILD smart-live-rebuild-1.3.6-r1.ebuild 844 BLAKE2B a48e2bc621ef29569abe187caae14d1d55a6ffd0e3555c4e7c31d4ca772d694d52dcbd1ba0e4f3d9bda906bd58ec313f93751596bce6841c5c87127bd137fab7 SHA512 3ee649d13cbc69afcc2956fd401fedb8916099b71f0b1ee4ad128bdcd93445dc8c2153d1f024144ddddf564085f09972960625fa675824f2b2aced85ab05edda
-EBUILD smart-live-rebuild-1.3.6.ebuild 841 BLAKE2B e341e55ee6488272115a3f7f3561fb27a06c1a1152f4cd8a1e4a241aba01ead069c7402d30ad298e9235015b007c637d5a00f72782d6e68afb204ef22c193841 SHA512 3b5739119269acc773e730ed1d9ee5fbb645d99afac9b1234f9f81349bbb2622bb0fed6375a1c0008b269b8187b8a1a63f6d22823b18a373a3585f113cc917bf
-EBUILD smart-live-rebuild-1.3.7.ebuild 844 BLAKE2B a48e2bc621ef29569abe187caae14d1d55a6ffd0e3555c4e7c31d4ca772d694d52dcbd1ba0e4f3d9bda906bd58ec313f93751596bce6841c5c87127bd137fab7 SHA512 3ee649d13cbc69afcc2956fd401fedb8916099b71f0b1ee4ad128bdcd93445dc8c2153d1f024144ddddf564085f09972960625fa675824f2b2aced85ab05edda
+EBUILD smart-live-rebuild-1.3.7.ebuild 841 BLAKE2B f9f404f5fb7702eea3ba2f4a4ad3b88ecfa0e91cb30dadeea0f10a9bc3887c6a1f01240a10516d9eb77f591252515b70db1661790455a7050da37357098ad9c0 SHA512 89b6af48d6e93ac7229816c587ce6f65b1945b1cb16fd68f60534f7bffb7c0349c0e3176fc6d8ad4c00f325965bac5d5f9f0101d9e62ae4fa1f970d58151979b
 EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 6213e113179dc428d5f5fb5e72a3a3560c8d52c5361655828e709c97c3cec4d9ad3f5590a839bbfc7ca46ddca9548d3f00949e6c6b4d1e8e480c6c883a1f89a0 SHA512 9f3cd7437a551bdf8faa57990143ca422d30f3a5cd5de58e8cfcac701d553df1d2b3cee5c5aba41501d79b3b49f4ccb6abc67be845675376a9285a7e33866b78
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6-r1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6-r1.ebuild
deleted file mode 100644
index ccc36895bd2e..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-# Tests need to be fixed
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example smart-live-rebuild.conf
-}
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
deleted file mode 100644
index 0a55f33381ca..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-# Tests need to be fixed
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example smart-live-rebuild.conf
-}
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 ccc36895bd2e..263ddfda8d92 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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"