gentoo christmass resync : 25.12.2020

25 files changed, 22 insertions, 465 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0090b9b4a789..c4fc2f388887 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index fabf8f3aa947..527505645e6a 100644
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -1,3 +1,3 @@
 DIST cfg-update-1.8.9.tgz 162356 BLAKE2B 2194b485ae17ee09fe212fb88fee0d3974bb7877b9bee6a243475f689e033e950d9d331108f9360a5bb65b40f2a83916fc9bd208b153d4eb2a6fac0bfb3f4c64 SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9
-EBUILD cfg-update-1.8.9.ebuild 2982 BLAKE2B 7d207ad3ced070ee9658c9934794bc7ff11850ea7fb444b3058e074bf80943897dd03c8e592814c5521417f575b3d9544c546b88087aef469054cb970841e5fd SHA512 dd6f446f105e70d047b3a8a486de57293c950e715a40b6553df1389240333de62122efac1357ff365e61947ebfd9f80045eeb5cc53bb5ae46dd69b932bba8710
+EBUILD cfg-update-1.8.9.ebuild 2979 BLAKE2B 4adf5840f2ee36aab0a60123c735366666a9406268baeed48d8c20f16e97028974d12578475bbe3cb5427bafa277d445028b4541dad6b69a84a0e04385fbef7c SHA512 89543556fa464f6d79d93fb435cf96126d6ac1d2d9a87780b481cd2bf2a497c54d2031198a348d4f184c0a8d8a5a20af99929f7e857b037096a4dc9a8f73e916
 MISC metadata.xml 305 BLAKE2B 7ee3e6df88046614c6b02661384885e8f61eb72b26555456e5fcb5c034777ad37567c5bc091337cc4aa5f36415bc00ec4b9edd9fbb78cf87f449af966158adb4 SHA512 e0e51a2923f24cb77e5a9dddcdb89b2c4301d3c1b34f6a71be1611890e91ecf8e890852307964594c3c09486aee1e6758ad6d59e902842dd9cb63c6168b6d515
diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
index d0afd7d9ead5..d899e6016d2b 100644
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index 96a8adc8de1c..737a57597237 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 662 BLAKE2B 124ab94ba6c49b11da24a465c86424abe8dae68d97da04b3c27895152c44fc2e091493d2d1ac8b920c77c8cec11794be035dd17304cb933bde025a226fe61cdd SHA512 b33e3dea9cdbe572cd3fed82175b00eff1af453aba2acf317a72a8dcf2a8b758c0182405e5bc647e590a54598a576a63daa47575505512de2c9340a9558c5de6
-MISC metadata.xml 489 BLAKE2B 8e711ca92c6c71f69ad71dbe4253ea4ff8444c5122e408c404d0adfa9b0cbcbe61df31a9ef7f58564109a4a655bcf3fe9d4cbb1e1c5b3d5b7bfff0318355f149 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a
+MISC metadata.xml 394 BLAKE2B ca169633fb98c169adab27303633191e2d7023fcc655035504dc06ebaee5349881a1cf36ce21faf0b716c21d6a14e52374b752503039e243ec2d66c25d717dcc SHA512 db7826f75a4bdd67ae6e268af3685fa6fce97bf24fedd027168060796cfa8520a7c5e01ab9902224c524d058c3aee06c44cfb4da45a02cb0356f81ad6b7cad43
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
index 523e39992295..16241be40ac4 100644
--- a/app-portage/distpatch/metadata.xml
+++ b/app-portage/distpatch/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>rafaelmartins@gentoo.org</email>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 895061a610e0..5175c629b89b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,7 +1,3 @@
-DIST eix-0.34.10.tar.xz 630356 BLAKE2B 6336652dbb3703295693dea40cb2d2a2d5c7fc17d28150faae07b566cccfddb8d103b83c5db34e839434b1fbbe0ff87a08c4af84d2f80c5e9b786d88d5743f96 SHA512 35270b7fafe6a13ebb33271b3baba07f61928d9c9c40aafabc47d8f7bd4a8d44e1013004361e9cf81e8517d5b1a8a3010d18c6fcac02dcc8b44dc443762f82a3
 DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
-DIST eix-0.34.9.tar.xz 629672 BLAKE2B ba9a5de98f74baa711e7483e284980c0fe5e956512de590954bf848f6cf6baad5db899256e927e7cb984d7276157fa9c42052cc8fb1ccc52e5e530cc31d39d84 SHA512 5cb00c813bc31971a0cfd77cae0c676040d33f24963cb241274918d2e381956ca949593e0637d81040a9751db0a925552913188cc25ada9a90c6007c31f72e43
-EBUILD eix-0.34.10.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.11.ebuild 2580 BLAKE2B f370999db6018cda3612760758cc62d9d1a58db2dce7b1527b9b9a72e60ece6e3d679cac33996a33da3ef9babd528d680cb4622fed3db4de26202fd55a8a447a SHA512 4bb9904ed6758bd410654bfabd7ae8e602bfab78c1b9109be9c8a72b92f33ac4a2b1a462bfc1ce1c7027abc122e9d0db297a1e8bd0c064de63ef8b634a0b8d84
-EBUILD eix-0.34.9.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
+EBUILD eix-0.34.11.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.10.ebuild b/app-portage/eix/eix-0.34.10.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	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.11.ebuild b/app-portage/eix/eix-0.34.11.ebuild
index 1a93f09d34fa..27581250b045 100644
--- a/app-portage/eix/eix-0.34.11.ebuild
+++ b/app-portage/eix/eix-0.34.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/eix/eix-0.34.9.ebuild b/app-portage/eix/eix-0.34.9.ebuild
deleted file mode 100644
index 27581250b045..000000000000
--- a/app-portage/eix/eix-0.34.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	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/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index ad53f4ec6e61..b02d8b4ba1da 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -3,9 +3,9 @@ DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b2
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
 DIST elt-patches-20201205.tar.xz 39240 BLAKE2B aa2e2377f0d0cba14f38c59664174d066eff04c9d2a71346c998c4324987fbce25cfd91b79e8e40bde0d81bf7d3c43126bffd0a6b0b219aaad11f4f9f22abde4 SHA512 67e199f060e2c93e01b7a7809f52c0a18d82e86f1b1eb34b965c2acd24e5538a874b820028e363d3002cf58b43c2fe3376ae28d2bef0ca81feabb90c83ae47c2
-EBUILD elt-patches-20170317.ebuild 688 BLAKE2B dc82f16dd1eaaf61d7d2230077510a3632fc5b3d7c290befb05575d45dafc2cbe43d46b6188d3239d8a2672e82935a5a53d7ddb14f084d99adcefa8859da4fb5 SHA512 86c30f567058d4f34fcea513e3a298e6967c4ef45b52f633a869b87193f590081e5e3a370f696386af3940c78db80517626d173d38a587084fd52ad0dc4b10ed
-EBUILD elt-patches-20170422.ebuild 811 BLAKE2B 2ca9beead59be64373e7fb7247918df0571f730ae785b291169240d30ede0ee0bc167ea62f0b634b4cbad3b81dc4ca4826d2a6f72128b2e491a39f3b8d8c5572 SHA512 48968fc8561592271e1a6ce56f87b1eaef6d568e164ae30c9f3932918dba02b5322a9274e155acd41ec3077ab1da216ac1dbf27789d09ed93e72a636ce8ab789
-EBUILD elt-patches-20170815.ebuild 811 BLAKE2B 880f672a9d36dc7290afe0e35eb5da5b1eb5a2fd8fd304f0213a1e3f5e661c65e02a4a106f248d08adf782089f4addd2a2f739180c04517c1cdf6ad4a8077d1d SHA512 b0f128a7b20a8d9805dbee6dc9020d6f72051bdc747f8899f58a7e206fcf6fe22400490b739397ce6c790c9b3752254355d911cc6efc39bec4e657ac5b24e6e5
-EBUILD elt-patches-20170826.1.ebuild 827 BLAKE2B ec1bfaea05b583ac7cd3034936d1451a059213b392fd69a8c702bd528bd3031eac0f064874f3a335eb371a914c906858229f692dc5f4c409f791ad6f896eaaa2 SHA512 06c13a2651b68a7784797b7a26e95ac940c15a48dfada95cf42b35dbe332e335008dfec83be0c6fe3e5e79910cc8fc379618cadf4d5912c8a124caa1d6b452f4
-EBUILD elt-patches-20201205.ebuild 833 BLAKE2B 006c131972a8965407e7e0a797082225aa7b030e5303faf70f111db7b8338f665d9f5efba9fbe6b80b366a9aefc943d77d33b951bea28803ca074fe8ccfd3286 SHA512 4679aa383025c68edad50012092034a076831d677184dbe489bc030f4c8a63d2c5005340ccb77f0507771d41f04856b9d00e00b7a914e44543bbd11dbf84c668
+EBUILD elt-patches-20170317.ebuild 667 BLAKE2B 8607d6cf8ecdb333c88f3f697169c606f4357d0422c71b5464262e414773571d635e7b82ea563f553f1851423bcc6b332e10a6abaab51bc96a8d14ca987a3de8 SHA512 d5825ea53c621119db8f5879930ca53b5b2802abbcd2b0a51ff474fc820d2daf4026fe3c302da397950546d40a03dffe629a731bcc0eb11bb880820b5d7ef15c
+EBUILD elt-patches-20170422.ebuild 790 BLAKE2B 03c4e24c70bd8960ed0b3345dd3d9f0716818bcc71f1a44d383d036b911995c68b960aa93331310fab4402740ad80e3300e59a5d6691d026f0cdc25444533f5c SHA512 29a8b5774b02af4dbf32ad82c64955d7be4a33575a544f038c7a208899edb21a77df4a5f1d1500daf1566de3be93a6a8b6ae2c568ae1eba452163fdf90826d9d
+EBUILD elt-patches-20170815.ebuild 790 BLAKE2B 06e38b8a2cb139859d8d8c7d24d541401285d4cf5899f67b0cf3b40b11ad5c66d620c4eaebfd5f525375d74ebbf1c8f038f4712e5e033097418cc9a07d886823 SHA512 efcd3b775027140488cda3c70ad534d0ec658e85531aa6c9e8272374e0c5fb02f8c14aa9e71f0983c732e38c2439e369f10d07037e7614bff49d51d7b49c31a8
+EBUILD elt-patches-20170826.1.ebuild 806 BLAKE2B 4175008ef440a7d27a343de5efabecbdf110ff2094491e07e9841fcc36c70c576ffc1eab1b2f40db5bb13bb2b1cb417c9ae96061a3e8c23f279e661395934714 SHA512 6f0924a09df82ca73b3ef699df73fa87b7275011e422da1b5e8113d6c80322d11b829947136376b20135be01e6d119c732c60e4aaf3c42d0c4a1f0cf4000fc37
+EBUILD elt-patches-20201205.ebuild 812 BLAKE2B f8bcd4ddd1dfc85a43b01344b945f53b0c70a1b5d78cc32f05e28b6b7aba9e102380c190e009fde8eb65266b07c377334da59e2025d0ba435bdbe806f5addb4a SHA512 b544f58ca8e639fa0cb81c4059eb707df5a19cf6880b01aa860cd6b7d9420d75ce78080244cfeac5d252e11c1a184eb8bfc7a5e2e90312166606fd1cffb2fd31
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index b3a68c92282e..bdc8efaf06f5 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index 526135456625..e9790fd876ed 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 8836b8a3c500..cb0a74970111 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 98f318e07e43..865b12a91085 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild
index e6ebc44e78a3..2f0742a48f46 100644
--- a/app-portage/elt-patches/elt-patches-20201205.ebuild
+++ b/app-portage/elt-patches/elt-patches-20201205.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index edcd378def93..a8506d391f5d 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -1,3 +1,3 @@
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
-EBUILD epkg-0.4-r1.ebuild 510 BLAKE2B 7de8601348f01f76424b5cd19fed3439a0fbe37772b37654b1ddb74696f3e3c9231ca640f06b6968abf43bae823037b7926d9df50f5e6a323447dd7047440d4f SHA512 83576320c955dd698468ca7dd4ad91d123edc3973ebe7b6425c1c500607424cfb5c85445b25f9c79b29523f9a1008421a06b6bcd2d882e10f059ae648cd579af
+EBUILD epkg-0.4-r1.ebuild 507 BLAKE2B e8b8690171597f12e44bc62efc24dc4899ba3808e7887dc1f36a284f0f838c7f9222b01588dfc28358563a2563b9a023130f70f601af10dd960f5ec055998e1e SHA512 37cec54872d5145b947bf4ea44d83e22edd244e72813c74ac5b292ff279e80fffda6f94047f6ab4251fde03efa114219a0d2283a13634858d513ebb45c190b30
 MISC metadata.xml 246 BLAKE2B 2812878244098c8405bc1bfae837862679724545e4d304175eb5e17525c0823abc3b9cb77fbeecf7af13c827137809dd1e382c0c8e9883fbf9e3abe99fe43623 SHA512 78a30e30902b935c2f311f0f974f444a618a2c75a32931ab36fcb68d9911ad143fbc278fda590c10a5fd3b5963b3e4f9ddd7b5684f2dba9462c96af2fd355391
diff --git a/app-portage/epkg/epkg-0.4-r1.ebuild b/app-portage/epkg/epkg-0.4-r1.ebuild
index 5e649a0fe789..9d9ca1ddef1c 100644
--- a/app-portage/epkg/epkg-0.4-r1.ebuild
+++ b/app-portage/epkg/epkg-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index 3b104639d0fc..a1d9f10f7ddb 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -2,4 +2,4 @@ DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4
 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 2431 BLAKE2B 927217b7a28d0b5471ff7e71dc71ce3cd923cc04e7b6fe4e407dbd795744a8c1ce877722e3979c6112402e408d15018a2ab16e42935d11573b374c730ec69f95 SHA512 14ae597435bf525773dc78b9a01cbe4cb9a635581f2fbf14806aab07148c09d46829001566dd5218467500c01c138ccbb511af7216aeec8d4865cb9574123258
-MISC metadata.xml 953 BLAKE2B c7df56688e694e153043051b897de819f4b43441399ce338d7b65a2bffa689c0c68bd03fed1ce10a5111e422e4e38c796387c8e52758d47b06a369fea10b22fa SHA512 2e9160dc06169653737491b25ac4f1e4ad4416a3a6d9789078021c8a501d67c07294a6360762beea1815608d1d2e92a089bcac4614113bfa8c9d312723bda20f
+MISC metadata.xml 835 BLAKE2B c4656445ea018a9f3ef19a8adee970c0143034f7cae4b9236fb3fbbca075e7fcc0c5aa70f883ca2ff257cf0cfd330f4a2c285d96438e14c6485172b0235b9562 SHA512 22a98ed66a1e86391788612390c8b78a05112b1928c0ee690396b1f82d8e244a37b602f49312569756b95bd025448126c2cd0065af83c5968b38b903ae19eb8d
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index 0ba35678266a..2c8e03f93628 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/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>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index fd49b224d4ce..e10f887d9255 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,12 +1,6 @@
 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.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
-DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
-DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
-EBUILD gentoolkit-0.4.6.ebuild 2251 BLAKE2B a49d44a874cff3792b16e920592362d5e5475906fa8b001d9bddb8212637581be38c2efbe7e368cf4f9cb024a2759788eff7723b3ce2106f21ea970cb66835d3 SHA512 f993a289c799aff739735f7c857eb9fc8e2af6efef8d8222d0d89990f5017f488d8f4571d88f0b5d68a6a709cbd78067a68995c14c1046c9d95da0eb1387c4dd
-EBUILD gentoolkit-0.4.7.ebuild 2268 BLAKE2B 6c746dfdbedee69288ec6ed230aac924a3012eb4431012e25ee4bf0d79ab8ea007cc60c06618d4aaf985260c1fa326a4843cee0e090d235dfd93bc86621bdf57 SHA512 53616edc36e0e7412030a93e1de75bfe664553c28e7e14a37b9b521f3fcf74ee76d1e59f375e3b9a604b219af49ecaca4efa3d4b381122b7743aace6c655ced0
-EBUILD gentoolkit-0.4.8.ebuild 2259 BLAKE2B 821ed9f054defc80e3603324c17b1670d610d4d7b8cd95d089554af8b92a83419a7ac05025d3b1afab1770b861700b2887d142247c52b87415d5442065968aa0 SHA512 1ba6938d7121e2eeb62956299eca6d50a7643f42e3e6a3473d2e99152468b867ed51684f67921bfa29d62c0b19055e24ed3874053ebf57ee8ffea49f3865bf89
 EBUILD gentoolkit-0.5.0-r2.ebuild 2337 BLAKE2B e1cb23e6df8ac2ab3540c78cf9aab8327dac34a2c44f396d3c8b7b871866124a4be65bb0132534cd5d79fb963214d5e190e96512aa60b9bbd24f44ee7fdac949 SHA512 dec299d0f23c1722ddf03ab89bbff38459ad76af3fc47963c47785b3ae1c5ba6b8aa6ea0f0c37405335176289bbc3aeb93b8b23d06b45ce0870e70776e77bfc7
 EBUILD gentoolkit-9999.ebuild 2019 BLAKE2B a3893445cfcddfef221bca63821fe3df94c56486bee08457ac7e9fc12e99fc496423b5265eae4cb3e37f9781602d1d595ff31654a965a7e97680272eb7c602fb SHA512 33169445760fb68d32fd428f90a886fd407d5c203b62f561966f7a86f784611c110d7ffbeaae525b7f7b44e582a18ee89faa03dc1946ce37bb9a3237d4943b87
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
deleted file mode 100644
index 1db74e52a9a5..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-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
-		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-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
deleted file mode 100644
index 318ac20f777c..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-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
-		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-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
deleted file mode 100644
index 36cbf7459fc6..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-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
-		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/hackport/Manifest b/app-portage/hackport/Manifest
index d2d4ef899fce..82e773366f7c 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,4 +1,4 @@
 DIST hackport-0.6.6.tar.gz 2079279 BLAKE2B 6e4084babb3fc036568387845ca2793d47a29ce94c24211259324d3040d0c0e15be028d0a9726ea8512dd518d7e9dd8447aba67725c0916418f523449f2179b4 SHA512 b836bd21e3713796feaab9ca830fdef80f52b9723d0fba6cfb60d802e038eaec2da8492eb025d6ae376aea69734c031e23c0887642675c4f767b1592d82c5523
 EBUILD hackport-0.6.6.ebuild 1333 BLAKE2B d13593e39d71f79435ddd627221fa9ab59e5e5caf8dc239878665bd40c3cd7bc04edb32754586f0debd737abeb832df2cb53086bff9435c071f2b6082d5ed126 SHA512 67d8164fd4e0b31317efd87c1127f2bf8dbcf57d9e4b638870a6ac4dc4f52d266c7860ef38caed2a4219132d01ca43e354351c0a9feecc9ad3507060e723ecaf
-EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
+EBUILD hackport-9999.ebuild 1384 BLAKE2B e451cae0dc1a4f626346fbddbf36459780114cb27834c69e5245a19012de4050f641afacccfce9fe83cdeadcb916fe2838a417f2813eab3f663ba6291af763dc SHA512 c46f0b1ce12d45f06833d9818dbbf441ec7dd94272342a047d7b90b82a524622a018a1a09370f02b26635927794283fac67433689eadd333a260a33265e5cc77
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-9999.ebuild b/app-portage/hackport/hackport-9999.ebuild
index a4c2d67ebcb1..6853550d5f1f 100644
--- a/app-portage/hackport/hackport-9999.ebuild
+++ b/app-portage/hackport/hackport-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6