gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-portage
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
99 files changed, 773 insertions, 756 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 428fe508fece..aeac37831f1e 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 1f4682332940..783949cc1b99 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,6 @@
 DIST cpuid2cpuflags-8.tar.bz2 82432 BLAKE2B c4284106a4b1433e266e364b40dd50cf801f6b4afcb6928b13c1ac58ea1c3854b4a952f6ac914ef995aaa8bc9cfd8a4428c84386eb2949f83228a5b9d9781ada SHA512 167ee1620d6d726ef849d265785b568bb72a1aae15f5f0c527a903424c8ce9519033c49e8a143ae093b56e25fd71b4746793fb825233173fe60ac29eeecca20c
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1044 BLAKE2B ed9ea1bd60d8aea784c8d9a44263c17ca5257b10822415346aa21d670c98c07501bc27d44fa03e79b4a51fa5d9408df6f408933f522ba5771c8c68077137e727 SHA512 e20138a528d97615db610a61fbe77e3f4e8cb3c811a635fe4e17220c93548b4ebeb10c05075e3dedd32c79972e7164a5cbad68ebd5253470f308b6bcab6b75f9
-EBUILD cpuid2cpuflags-8.ebuild 912 BLAKE2B 22e60d74fc8488858a7e43c05da0b51596a2a8e3a8465baa9288ea10312fd698b66a9fff3a0c00df3478e1450184a6c33835c747a3c8bb6a5da47cd463a99118 SHA512 ae3e68689ae5619463813d6eab98cbf24bd2a35aed71dc6e272747fed786b09ffe5a97fb16d1ae21d4856c50ee090bead74b15c66663e66d74c57374078c840a
+EBUILD cpuid2cpuflags-8.ebuild 911 BLAKE2B 90b427fc9798c9d679686ef886ee4439f59804536926afc49eca9851dfd9a2128578cdb10c415542ec830cbd0c69c74ebe11646654f2a32884be8a3c56772124 SHA512 2b9f8cbf9d72156d32428db5bd1e4a457bf7c77f8ea0e16e40e9a6553348b260c163a3aa02ffae2ddba8e68273634585dc9db0aa662f3342441bd87c3938f3f6
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
index 269ffe7851c6..9c7976f33b93 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index c9288f058d81..7cb0025d8263 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 1316 BLAKE2B 404086220db1b67c1d9acf2347a24242eadbb9961be35a50327a0967664e8833eb75d8f79a1deddb608ab3780b83e928415535445040a930f5fb3cbf77bccf8e SHA512 2368762754bd9d0a98dcefc84539750e751d79a0186c99063af4aa77fecf605d9d0390e7fed1680cead598bbbc185a0dbdca18497a647a6f2f072ed19113f542
+EBUILD demerge-0.047-r3.ebuild 1313 BLAKE2B 00518ffb80e18c6e1e8ed3870c93f1a38219ca899d4d228fbd45c881e8bf2f0481513c5e485cbf689bb3e0334c848b432a272f208838149835b1afe36638a3fa SHA512 db2746ee1cdff08f192a2466a3c5c9cf0d37b89d63ce792a4740bafeb4907f81a30dad2d61ef9a291448df8ef72c6bddae3416f9fcb227a90c9a5b07527537d6
 MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index cfcc30cb01d3..fcd36913797d 100644
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index f1f6ba946b15..a8807c86e964 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,5 @@
+DIST eix-0.33.11.tar.xz 623256 BLAKE2B 756feed85cb4f40ef9228a03d2a8b8470eb6017b00d93b364d67e3d11ecaacce2bb9c6afed388d9f70dfcb7a0b9ece13ca6ee523f5839b7d9bf80cf3b2721524 SHA512 2829d1482abfe479ae71e8b00da07abe74ba3090ba2a3f9d9a93437cb2d4d64213968bcd6c082a6703ec1d9c36dfcfaa0850172f3ffd4d256f553b98eeaf29e6
 DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
-EBUILD eix-0.33.9-r1.ebuild 2751 BLAKE2B 27c90574b7c05483ceec0d9985ec31988310f54d13a607175855adfc26ea0d46d55bc6a09fb20f129855ca2010253595fedc092b59b9a35c9f2aa6ee65530463 SHA512 3327c42e8156f7f8fbf29fc0844e9e9cda86b69414440891792a2a92d625b8ac30e848a20311cc0586df24523f77b9260b241558182291a96fb4aacca31b4e75
+EBUILD eix-0.33.11.ebuild 2758 BLAKE2B ddc7cac8477ca415c0b7f23e543412e31b2588113c9f43b13fb7021bd127d6ca7f7c3e0f11cd4c34ba83023e05c191fcfd1ad54ebd9c98a7d9176fe87d79164e SHA512 338c4fde1c41bf2f4605cfea0d1fee46b2b381897adbff2fbbb31ddd87bff54de8e081df803345daf98752925d06a81809543bd19ad2a7e7506df8156bafa26d
+EBUILD eix-0.33.9-r1.ebuild 2749 BLAKE2B dac326d96f83bb0f386c9ca28a73886d7a15e3b933c4237af307ded2e2a630232ea941ca5c4d14ca290fc03bcc317820d4debd3935786520cf9cf1682fcecba8 SHA512 c6eb8819f27226a211edf1dfd063877ea91f83b62cd8cffdc8b96d09cb290f4dabbc261ea0015f5faf4841792c39383ae041d5767299788419db0049c4f0c835
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.11.ebuild b/app-portage/eix/eix-0.33.11.ebuild
new file mode 100644
index 000000000000..1f78164374e2
--- /dev/null
+++ b/app-portage/eix/eix-0.33.11.ebuild
@@ -0,0 +1,107 @@
+# 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)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++14
+
+	# work around https://github.com/vaeth/eix/issues/64, bug#687988
+	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+}
+
+pkg_postinst() {
+		tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/eix/eix-0.33.9-r1.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
index ca0dba09d33b..d3a156ca40f5 100644
--- a/app-portage/eix/eix-0.33.9-r1.ebuild
+++ b/app-portage/eix/eix-0.33.9-r1.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 sh 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/elicense/Manifest b/app-portage/elicense/Manifest
index defa3dca0745..9988d444b0d0 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,4 @@
 DIST elicense-1.0.2.tar.gz 9262 BLAKE2B fd1e808f577269758ed46c8e8965dc1be7649c825a094ff5b2e09dba12af5249a5a73dc5489ed131c8221e88642f92ac8b859ad5185d3a0c095bd1485178cd27 SHA512 ac6788e7726d962e72855da053be0c44722a013dfa7f500dc137ae46d946c176a285455ddaa5eeee1f6e224d5960aa2a578caa7c3182a5f93d3bbfae8cfd4a93
-EBUILD elicense-1.0.2.ebuild 921 BLAKE2B 994967a63554451cc09d3543e5c75cc594273bd4d02da16a3877f5fd5985155efa8c14408e6b0622c1758a63a15fb62e0afb3edb278c58c4e97a8e5bb23cf47f SHA512 a50a028e7e276047074e82adf7d596b9d052d0d5e6adccdc76203ad4bbc5f8bd570513bd5b963c5baac66c397b447cf6974dd1d60c991d20ec3a73ef85caf865
+EBUILD elicense-1.0.2.ebuild 922 BLAKE2B 5ba4a0fd82080472a7f03f5a817b2f0d436c781d1e4d1a0573d9b73b72a62fe676fe7194496ca8e3765f088644ccac7886f901d375951bfab04044c0d060bdab SHA512 bf81b1a3c03f1ba20a5747dcb68844d756761c17f2626588b86b2729907a2d743a7fe05c24664cc5a6fc2e649439f3feac9f90c911ac5b263225221cdfffde32
 EBUILD elicense-9999.ebuild 932 BLAKE2B 1f9f4285c096e0d3264568c94937531862e23a1500c0646ff9710998b29b03ca76685facc7d0b7b20f0171ac15b35a3425fa75ce3ea2f83f86988fe1d1efdb4f SHA512 9c0bc250d83215590db6f5acc50f2c9bf7b8955cf5bf3c9f56554d8a3ca0c36a663bbecb048cc68ea47a92d4bf9df54db24e5cb958665090253918b401f1a3cc
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index 4589986419d8..f671d14c41e4 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 0746033e48c3..b794f996eb52 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,4 +1,5 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 EBUILD elogv-0.7.8-r1.ebuild 1591 BLAKE2B 02a2079dc2bb538acce711cf185fdbae073af455262250eeacee9cf125ca0d8ec77b2636da279c42fef093654ab338f41553d387c1cbc1c543a644750f275c17 SHA512 c419b695f0db6cbc505eccc4225ee77a446b253a1997dc10f9b18d1bedccf3a6b2d46c9a87f7ecc13c7d5959a8c07ea9a5023ec89af964ab84081eada91c94db
 EBUILD elogv-0.7.8-r2.ebuild 1663 BLAKE2B d0945ca00a2a998ffc3a20e2ccd3a96fc69f609b6f640360f0302b621ce85734d79f88c61cd9796b2252292c5f92bad0458fac80e7830580004ac4362342bb4d SHA512 1706f0b8e7f3a0da7834f74d2245a7f1888c80f0ec93056526c6508e2300aa373f247db1139aa9d0d43482c1b476fae6b6566a85d17f78ef6712103286e33a73
+EBUILD elogv-0.7.8-r3.ebuild 1692 BLAKE2B bd822694ff56a02720cef2d647991b5db8b3cd390742a433d632856a33097c13f4a1e7718c38820f4114ceea58f5aba0790596272ccc9d98ac36298cea747530 SHA512 b2b411f8e526ad9d950dc7db9f7043f9c84a8187efa498d6bc60bca958a1c0c0540caac8683d421845310c6e426e1003a9cc0eb33b9bcbc5cb01027ca21c09c3
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.8-r3.ebuild b/app-portage/elogv/elogv-0.7.8-r3.ebuild
new file mode 100644
index 000000000000..9bb9e95bbc71
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.8-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
+HOMEPAGE="https://github.com/gentoo/elogv"
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+DOCS=( README )
+
+src_install() {
+	distutils-r1_src_install
+
+	# unset LINGUAS => install all languages
+	# empty LINGUAS => install none
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(ls "${ED}"/usr/share/locale/) ; do
+			if ! has ${i} ${LINGUAS} ; then
+				rm -rf "${ED}"/usr/share/{locale,man}/${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  dev-python/pyliblzma (for xz compressed elog files)"
+	elog
+	elog "In order to use this software, you need to activate"
+	elog "Portage's elog features.  Required is"
+	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
+	elog "and at least one out of "
+	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+	elog "More information on the elog system can be found"
+	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+	elog
+	elog "To operate properly this software needs the directory"
+	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
+	elog "To start the software as a user, add yourself to the portage"
+	elog "group."
+	elog
+}
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 3184256fcfc3..b88c0f089bb3 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -2,8 +2,8 @@ DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf9771
 DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
-EBUILD elt-patches-20170317.ebuild 689 BLAKE2B cc50b0c5cb4de2fb47462db6d33fe1fca56979c629a12a372750ca1c9885e4ebbe990fbde6ee2cbdbcb49b6e6721d71913103cb054df9fcafe560ad5da5ce9a1 SHA512 5a0338f71b3588d32d93780aba6824c63132b578cc7962f4b7800f8067d2a5cbe22b6ae0b0c9e2306ebdd27e3cad0e751b137a002c09894b6f08dd3ab5ce2770
-EBUILD elt-patches-20170422.ebuild 812 BLAKE2B ef65a5930b606dfd62a43d13a1d1e4d52075c4b33afb2a611dc45e75ec1fa5c25b2aed4f07f119b9f356f5a160f3772e1b5d8bfa43d4ed6a5f5dcc606286d78c SHA512 19b5703a9b00ceea345216aa278687860e4e0a03ec88d79b9b1d95073b089d6ca13f63ba011cc8e9f578656e3572f9830f5d21994b9b418301d2ed101c607f11
-EBUILD elt-patches-20170815.ebuild 812 BLAKE2B 6b2beae3eb5eb7d0885752179e090abe1eb3563e8c36dd2b8712eac0db9e5bb28227b3467ec169ff5230f8a68371694a615443790769ed3bf632e9b5bc961554 SHA512 276c5bef3fe3db1108dc09c1c9ef007b5a2ce0988617e9401ad86a8dab803d5d6d891f4da26bc0b2ef5f85e9c1cb19bf212fe863904f277f6b429369d6270b88
-EBUILD elt-patches-20170826.1.ebuild 831 BLAKE2B a081b3df2475b4437ab28116bfe0ebf9a547a3b3e1f1bbd58738d4a249a2cdd730ece8dfc9ddca910134dc8ffe40e4d5c7bfdf60b2f019b070b6999d75ca6ffa SHA512 5532ddd8488ca589e6efe304a963909a4e095f6e01f2d41413ed2cf69c6c1d9f4efe1504cef39c5f304862714d7b61ae41f821da15d2e12ee756c2c0c94640c7
+EBUILD elt-patches-20170317.ebuild 687 BLAKE2B 51066d0ac625802b23e8e98af3549357b060b66c78c777f3a675e0a7a711879eb23dea328e300f3ce9db8a22e539f341b39bc3f84955715a81a9de04bbf1b06e SHA512 f5f1d5142a29947066e8b80109669950e20135764ecba4633ebcd0144e4f2cbe323acb2e6c86376bbed7d4f1cf54f2c34ac548d65bf9fe1b551d1aace25fa487
+EBUILD elt-patches-20170422.ebuild 810 BLAKE2B 4c09b2ebc994004a107cf086842637e354ba1ee932f013045735aa0c6186114b614f46f59a6f4d53c3e61890bd5046efd53ed4b9406e702b0864aa7b53cf0644 SHA512 9b3911105ee19e6887ba32ecef0648d3c6a7e665173da22e83519cdd1b35352a563b008620cfef744e71ff5e7d8ea307d3e02646827393d09ee13d3ee8bbd9e3
+EBUILD elt-patches-20170815.ebuild 810 BLAKE2B 209b56985f82d856ce3135d097d7011c9c585f3615f6b4e8dbd84e70ab28c0492ca30bc41137a94afeffdb3665845d40d746052dbb6892d5edd14e0d545f99c2 SHA512 5e2175073c5918d943c4066b3f63fb30c9da82364ec04f80180ca99d8264b5fa9c33f1ac23a8e555c4d89c202c09c7eaf233c243369a64c259492b1229791a1d
+EBUILD elt-patches-20170826.1.ebuild 827 BLAKE2B ec1bfaea05b583ac7cd3034936d1451a059213b392fd69a8c702bd528bd3031eac0f064874f3a335eb371a914c906858229f692dc5f4c409f791ad6f896eaaa2 SHA512 06c13a2651b68a7784797b7a26e95ac940c15a48dfada95cf42b35dbe332e335008dfec83be0c6fe3e5e79910cc8fc379618cadf4d5912c8a124caa1d6b452f4
 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 fcaf698769c4..c14e604cccd1 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 sh 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 ~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"
 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 da5a31790d9c..ab89d3f87f08 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 sh 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 ~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"
 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 eecac5fc6f17..5d74337968bc 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 sh 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 ~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"
 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 c5db7595bccf..98f318e07e43 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 ~sh ~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 ~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"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 41d68d3e3630..6084a64fe4e9 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,5 +1,5 @@
 DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
 DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
-EBUILD emerge-delta-webrsync-3.7.5.ebuild 1099 BLAKE2B 9a48bec8a5daf211b09d1602941347b6cdee31b7e2006e24a5d556bfe8d66d678a8de7f6d83d0c73b64614f8d86ce6c8de1424811d03e2b374e391830700243e SHA512 7004b2ab30b90e54adc40197a69a46746531f93ce9ac439a81daafed2afc7fe57e249e6a5319b0474ee72f5749e15957bfc76856d5e4675021b19c0821cc5b84
-EBUILD emerge-delta-webrsync-3.7.6.ebuild 1099 BLAKE2B 946f469c69e8a87fa1a19a774a726af20d81a1763dd17918d44b94d121864311ad7adbe2d93c48e0c7d4420b83e85913ae5ecfb6f5147be33e410b3f1385a240 SHA512 cbc3cc26bca2f596fb7a7107a5e09c881765dfc4d9a3b83a491ca8e3890735781bb7ee985f10c8db728395a34b228ac6c1878bca86161eb3ecba72cb57c560cf
+EBUILD emerge-delta-webrsync-3.7.5.ebuild 1100 BLAKE2B 2718003fa19a72f893c4cc411da9403cf01fccd64b42c014d7d0fda048de0b1a272c8c8676187a1a5dd847819eb5c6f31a2f4f8db3dcbb47f6b9e7936ff1835a SHA512 332ac5a442e175991a02599c98055e5fa7c44b990e3db539f4e17c8bd5d36bbf77f0ce479a3f14ee0e2039b01300581cc976d60577abb01c5ee42c82243fade8
+EBUILD emerge-delta-webrsync-3.7.6.ebuild 1100 BLAKE2B eb9919b9a415e2e326bb5ea077e8d58435dd791ca5ccf79ded6062e63df6c3fdbda3af533779249f95e11f97e1c8c96a3523493ebc6b4025f66cc6d737bce2cd SHA512 76c501eb8b1692d1dce2305ee50b43626ce018cc50d328f30facb3b9ca410cc2d229efa6f839f3eb7d2b3c12484b19ded326db61645a0aca3633ac6697f7b762
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
index f2985ca03ec9..43d5e557ab7c 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index 613fcc4a4f9e..91e756876aae 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 98fce252e84d..d584562035e5 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r2.ebuild 1449 BLAKE2B de13d61c406b5934a5020641bac74ab315f9fad35774162c989d12c4c86d7156386afe8dd9e0355988abb38786886c577166eae1d70aa84eacb885ecee9362b6 SHA512 cf4b4c35acf463c5c14e57633c44d0c731f4beb7d44ba372524cee293c3ac4ef797bd951c8e651d6f4c997bbabb24ec9d585025e37dcf9c1a18bd6d8120000b0
+EBUILD esearch-1.3-r2.ebuild 1447 BLAKE2B 5ec3becd143f78f6616fb59f01bf0760a1d046f5c60b8cfc8b34cc62baff102b822e02a4aa421e3fe7754b6988f8b49c1bf8ebb2ddc72428339cd97c0b60f3ca SHA512 a8fe9c702ae1689b84448fba4aac7c38e11ea5dfc5c7c82b0e906107b4cb8e00069e0859363b0c3c486658b596849e021f13c9b5b59c0e69c691c680e2b8821a
 EBUILD esearch-9999.ebuild 1038 BLAKE2B c27f36a3dc20dfb71cf5a04f041c47b73786235e7f6d69b30c9cec8ab28dc5be05ab4318de570467af15bfde089cc672b057fbeb1c13cbcf36d43167c692efad SHA512 0be5a5a9792dbe714de8b7585f94717a1f57a99c3b8ee8ddebe1df1ba8d0cbd0255d1f23716c1a31e8a1b4d6a5f2f02fda0586f8afd90a954f7349bbf56d29f2
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index ec4868bfb1b4..39ad2fc4e7f2 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="l10n_fr l10n_it"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index 83ed44d217da..fe1ab138b4c1 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,5 +1,7 @@
 DIST fetchcommandwrapper-0.8.1.tar.gz 3579 BLAKE2B c2bf9bf5c463c264ace781a513e4943c4dc4196bfbef1e14112f673d0662c89b947daa860abe3b9b4a2cbf88d5cf6743670da7dbcec13876db7fdad2051e8e7f SHA512 087cbeaeb3126fe43708e453bc1a21a8957c47a9dedaac336bc9e6222191bf8aaafea17031b3e6d011b8bfd34483b521410eb84be43d226e5fb1ce1eccf4d4af
 DIST fetchcommandwrapper-0.8.2.tar.gz 3878 BLAKE2B aefedc663cb59190353b9148807466cc26855ff2c9693e6152cac3d4137e3f0426d2f2787d34a5f3c620f4014e5cd7fbb11463929a635e8e0d261e2e487b8921 SHA512 b6417aa0db803f00591d07fcd065ec769cf8de307e59b91690b7bbb671124ce143f29776498fada873aaa234b714cb6eefb5578333f91ce74cf76d98d62d6da7
+DIST fetchcommandwrapper-0.8.3.tar.gz 4467 BLAKE2B c6ad1d6ccfc7bc320836a371899cf43496138398a8ade7d47f8b1d8bbd8b2b7c7203c378f5628438b3a831b5a24c7b761ed9f7dbe96a21a2ddc50a8f5ba21905 SHA512 7aeb1eb55c63b7f68b4c99c5d10a102d130cccd6cd13d4012afe2d2a3a63e170457e93ff532634837cf16c625618e639da2e977cf0589a5c677ed69d85109653
 EBUILD fetchcommandwrapper-0.8.1-r1.ebuild 695 BLAKE2B bbc52a8d1c841d987596f79d96c570ab00c4e4b7b01e29df76989923e3140a2cf1ed34ad5b82a9348f2b183db01056d45df323231d89199c0d0033296d421902 SHA512 dd20ab0510d06f89da9632b526ee5f5ad27c7b43d911c3ecf3853c591727cd8c74f9b329e65532f2bbca52ac14b7ec6e93a2fd6d5c6981cc682abd0fe73d52cf
 EBUILD fetchcommandwrapper-0.8.2.ebuild 653 BLAKE2B 8b64f128d353d76d89a9e9d5f1b5e922ed7a49857f37214d3ae77e521eacae010c2a783687da6abd821548d6192b31a4fb4920d43c8a03f75166750e0c292c6a SHA512 249b6f3b142e3f93670e8d6a4647ee4f6dcab48ceb4711512295452a3ae535944658f6f73724d7c645ad191bb93cb83994cb2d78f6a96591f58ebd2b668599c8
+EBUILD fetchcommandwrapper-0.8.3.ebuild 688 BLAKE2B b43f32c8600b0ee77d4114fd2e2f6f95659d1f140f7f14a33069998387e7a4b292915b8bd7dbc620998da3b424a5dc5a560004ddef477fd098a244053ee6e66d SHA512 e12d411061eb17d14b5be69dbd1059e6ff8061c0e7bfd025786c8765ae775c436f93be6b8b8c9876fec6624575035c23155eab0b5c1153fe34277f74afb959f4
 MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.3.ebuild
new file mode 100644
index 000000000000..652f95666cd5
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index f3dc5694715e..db025a7443e3 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -1,10 +1,6 @@
-DIST g-cpan-0.16.5.tar.gz 33894 BLAKE2B e5ffee0086b9a2dcc5bd32ae21f13f01464756d2483e21bdd5e455ff0044d864767f7bfef9ad7bf6618126e921784fa08162400e6b44014d70c3f35265a0243e SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b
-DIST g-cpan-0.16.6.tar.gz 33844 BLAKE2B 3c8b4b39fbeec4e15aa49db877e24a99883112fb79538b5d94a87b60dfea436bffa6f50cbbb97f759c4a2ad75e254d30913105f3f1ee87628cbc9291be69ba87 SHA512 f8e9e211ffc09ca42d1444a42ad2b8111beb8988e4a01387cf8788f7e4a52e6133168820c2800ac82429fa022e2ff473a774c48ac140b5cde184b3d77cd6e1b1
-DIST g-cpan-0.16.7.tar.gz 33621 BLAKE2B 531c2668756b8f31dc038136580dc5fa26b4bb20307b72b4b15202f6f1135824271ae031113fbad71e6096e916d2e10c28c02d5c869d7cfa51ffb04b5a73a9a6 SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
-EBUILD g-cpan-0.16.5.ebuild 1058 BLAKE2B 161e1060a549998941598ee286e180130d4d64decf909357f6000c1d635d8b462ef37399454c0209d2a28f4c926669fb7207195be012ef0e175605184f5e2c8a SHA512 cf243233ca7352e5bd3be468622e7866d9f420ef406c899cc4996ca07880e9d0f9b03157f98c72395ca17e551b879b03b6bd8c22678cd705698656c31102214a
-EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
-EBUILD g-cpan-0.16.7.ebuild 1468 BLAKE2B f8ba91e84563aac09c7266d1d9d2bf9c30162d5752355af3b63f4b759783eadfd37b5f35d68e49e34a11af25c51deb6edd11a8a1355bc4e2318b075e4d44c615 SHA512 7c0ed9ec7266b95e827265754ea1c81e9fe746769bad46ee9d5a24043e368afe30bcd5b987df07925a97482d6cb8af8c287b2533275426d2b964eb2dc299287f
-EBUILD g-cpan-0.16.9-r1.ebuild 1454 BLAKE2B a0fa8d0befd69c47bd988298d161b374ab0b250aa5a88ed79582e578e7d9ad7ab81a5bd6fff2ef72892d9424b3379750cd84a94c656bd43e68a04a8d437da6b9 SHA512 2e961379a457dd0a8ce6ae64bbb1cdadc21060813fa07aa05e07ecc35cdc984734abeb5749371b7cde8e38a1d2b0514a700a2d6085d310db2d25d5946b26dc61
-EBUILD g-cpan-9999.ebuild 1504 BLAKE2B 7f81cadbbe38dd2b0249d81502a69727d29b20ab1961af4a8ce8ae6cd896408b77db96a9f29b564c456ea654aa6463dc578f2a9013400929bd2ab62b9ea5c43c SHA512 cbfab6a500463cc1c471e81bf5cf941d02ff0d00d07d9233f6bdf94c9cf1d6d4ceeaac3f68dd33496652797b91c1b6d6fd5be82cf06107bff773c79cf62a2cf8
+DIST g-cpan-0.17.0.tar.gz 38786 BLAKE2B 3f4a165920c7c075919f0eeca9554fe32bd3f72cd8010fced4d7e45aa44e80de7800fb78587d1429ac88643dd812d58725b66fbbdce305bd762db8d4ca2f0720 SHA512 80475560a00fddce31f8a92dd460bd22e0de57445a56628ad76f35ab3fc4d2f801ebd2a2a9542ed675245a994e53bb7ae842f714c35ab1f6bdbc40dd49ce2d86
+EBUILD g-cpan-0.16.9-r1.ebuild 1503 BLAKE2B 300235c17ab66b2e1964966edaa09e475ab6d5bfd0fd41bd9ff09af41194e2d5b6e4819256bc35af0571b41ad6d7517cf28045b19b828db8e1a6f3662b137644 SHA512 8689b0c723e2e7d668a5759f05ac7fb8245dbd47523418b682718f216154d18fe7355a1d1c478b9371bdbd331cf63ffeb23052d219677045fb3aa251b2ffe2db
+EBUILD g-cpan-0.17.0.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
+EBUILD g-cpan-9999.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
 MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
deleted file mode 100644
index 2d33871b8624..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-		 https://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		dev-perl/Shell-EnvImporter
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		keepdir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
deleted file mode 100644
index 876c6180f0f3..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		>=dev-perl/Shell-EnvImporter-1.70.0-r2
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index 97bac08d3294..8bf683d29b85 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -41,7 +42,11 @@ DEPEND="${COMMONDEPEND}
 
 src_install() {
 	perl-module_src_install
-	diropts -m0775 -o portage -g portage
+	if ! use prefix; then
+		diropts -m0775 -o portage -g portage
+	else
+		diropts -m0775
+	fi
 	dodir "/var/tmp/g-cpan"
 	dodir "/var/log/g-cpan"
 	keepdir "/var/log/g-cpan"
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.17.0.ebuild
index c8552409d5f7..fca42099a130 100644
--- a/app-portage/g-cpan/g-cpan-0.16.7.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.17.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -22,11 +23,13 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
+	dev-perl/Config-Tiny
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
 	dev-perl/Log-Agent
 	virtual/perl-Memoize
 	virtual/perl-IO
+	dev-perl/Path-Tiny
 	dev-perl/Shell-EnvImporter
 	virtual/perl-Term-ANSIColor
 	>=dev-perl/YAML-0.60
@@ -40,11 +43,15 @@ DEPEND="${COMMONDEPEND}
 "
 
 src_install() {
-		perl-module_src_install
+	perl-module_src_install
+	if ! use prefix; then
 		diropts -m0775 -o portage -g portage
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
+	else
+		diropts -m0775
+	fi
+	dodir "/var/tmp/g-cpan"
+	dodir "/var/log/g-cpan"
+	keepdir "/var/log/g-cpan"
 }
 
 pkg_postinst() {
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fdd2d32c2860..fca42099a130 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -43,7 +44,11 @@ DEPEND="${COMMONDEPEND}
 
 src_install() {
 	perl-module_src_install
-	diropts -m0775 -o portage -g portage
+	if ! use prefix; then
+		diropts -m0775 -o portage -g portage
+	else
+		diropts -m0775
+	fi
 	dodir "/var/tmp/g-cpan"
 	dodir "/var/log/g-cpan"
 	keepdir "/var/log/g-cpan"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 66241362b149..6f70bbd3e7fb 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
-EBUILD gemato-14.3.ebuild 1187 BLAKE2B 1232ba399701e147cb5e450f6b41cf974de27c72a591782fb05f0c4f0ee3e78b1d8ce36d14f944691decf8b62bed1685f842bcb3da05076f50dfebc1c8a2a76b SHA512 a9eb6e3b068f3b9888fafc8cb2f0c0a1cfa290a916660997329cea9d53256ef6c99945443c24aefe9e1fd67b75f3f5f08ea7b08988d3419324aa234e6ff95289
+EBUILD gemato-14.3.ebuild 1185 BLAKE2B 484392bcb86f29d07db7c5e55ef2688ddfec501753887deb4a47ad4a20fecc7964d3342b4a4d9752a5a063d92f101762712a68b362e4c0dffce904e913e97ce0 SHA512 1650bf34a200d1448a2e5631063a01a0d2c4b8cf85077a18dfefc0f5717118f9ee2d1fe66774d8c348430c809efa547c64195068d394821181a55ef6c73d7f98
 EBUILD gemato-9999.ebuild 1125 BLAKE2B a49efe2a16ad0d96457d76f75795b0f6777a4b277148db9eef515cd0239c91659387e8e58a70f45feed1605b7c6e5bbe9eb3693436fc97a02c2c212db7952998 SHA512 2b1471e8edcd22d39cd00b053c26e90434e4498805d86ceb2d719817be987aebca98499d9bd8de4568945950229ffa3a9889fb457a1eb8fb99e2f9d1ce19056e
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index 7903d882e703..e27830de9717 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 tools"
 
 RDEPEND="
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index f2c8700a0551..30c4d7df6f29 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -3,8 +3,8 @@ AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1d
 AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaae7a71b73fbac55657c29973629fe580f8cf5901b0d37b3a2cae1f0405ad0a75820c45d7462c176cf06673dd29d91 SHA512 76b5663dd1c2fb5700e8519b303db82ee37e6567fa847251304eec10e04bbb0c83a13d09b47f3cc725f9196d3ad34147ae9781c1284d33820f859703399c2f93
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
-EBUILD genlop-0.30.10-r1.ebuild 763 BLAKE2B 6b3449fe92fece540b2e68ebfc56ed24eb4c0247885eb089e93cab2adc75656d511d61e14ffabbebb6547987b2fb66b718e1f0960f8fdeb9c4d82e8289209d75 SHA512 a09435ea347bc23d6f6525aa09adb139df36d031b5e968313797895042e2e181b0a36dd3906db2b604f03c4b741df44d8c4fed2b4feb97f51f4448140fa9b60a
-EBUILD genlop-0.30.10-r2.ebuild 789 BLAKE2B ca358263ec04c1d4b09b62c42f49b7cbfbd16f06a21cd534e26f16827a82847c92117a397d5659c5b56a67020cbfb4228c0c1abeb22a542eeb0733748494aede SHA512 08f4a3cb623a5cf9b937f672f2acf99d383070c65280b85174b6d89f92cde5cc18fb5484c6b4f2844cc397747103298011a964c5c4ca1f910e69d9b8c4f7c11d
-EBUILD genlop-0.30.9-r1.ebuild 703 BLAKE2B 734e21565861d3f0d61fb8d0e666a0787204531aa042298ce86197130539618b3c61b54346f9e16f7bbac5531ce9edb2db154e609356350f112e12e2972a3adb SHA512 1845c9fcc3ced5018206edf9ce66124f6df65705b6317b716cc969fe6bcf8b195df1ae03d564448930f565091ae0ee1bdd5c20356fc71107039a88ff1d5c7852
+EBUILD genlop-0.30.10-r1.ebuild 759 BLAKE2B 9fc761292187aa6f21d34c5424cbeb99b7210bcb2efa17ab461c822fe7ecd0702c635a35a89fb0f799176ec30a34e63c08c3cca0e5198fc48f6a5799247e2b57 SHA512 777b6fad82012ed1bf6db16eda1d4ef89faa31643f9d4383fb94f83190a8debe6648152e6d4d311fdef985076ee1cc517e543e0bb5858eb80728cea2754ff807
+EBUILD genlop-0.30.10-r2.ebuild 786 BLAKE2B 305595717355e1d99ff7fd116ea2ca371d432f3156841da2740e9bda979be96b34e73142ac1ba33cf2b790296d4d4fc32ad3760f26bf29c00abf0e7b59e99112 SHA512 051bcf320d17e7eeb3eb36b5604e772565f9f46d104157e1dc6f0cacea9410a1b56489688f16a9df6cfb2232a87b61de5a92f72d231c3c0dfe0e9dd93d524762
+EBUILD genlop-0.30.9-r1.ebuild 701 BLAKE2B 171f8b5d936238577bdc14e9fd0a57f4c6df83f2015953582a8a7846f8e878431b65b3010edc0c498946ca1a7eae9de8ca94c8e173bd320ba990495054f716fa SHA512 bdcfc06754cbec91ec69f6a6938be7a8e520586c4933343add24f78d4cb4209a2a620ab27c0d5128521e2b538bad74cae9f8c11d5178b946904b10cedfa9f727
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
index 07c073cc8881..fb97cdbd841d 100644
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 7db93fb7ad02..896d64531bd3 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
index 0121d8a678a9..98a1a12f4c9a 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6ed189539f18..2416223782f2 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
-EBUILD gentoolkit-0.4.6.ebuild 2292 BLAKE2B 12263be3d543b2e3c69edbcab38af14dd6217c0c4ede6902ce69339bf98e63020f0a2e1e617ed48183b5d2aae5ab8f8960d83864ee55cdd3b6a494d9e198cc21 SHA512 541d311ff54b41832d005fa4b1317fda10ac24a0709b84daafa4e0c962378bef9828c34ea7bfb96556e6245d3655eed17c9f0f115c6a8142008c2c4016e2cfb7
-EBUILD gentoolkit-0.4.7.ebuild 2310 BLAKE2B 343f4afd25c4b7a48cc5ce3b6018ff0d50ef548c54283b1a96f07b39dc1080363bbc8a37bc4e1c8ce5eb0e418d5ff8cbc3841a66fdb5c9d8e9c5f1f5b6405333 SHA512 2fbf333a7aa03111bb41a7b38f93fcc7aef15159a22c6ba3a8415c0d5d2ba06a40c096ca186828510c74e38219857b82606193519e1b269a88fa89da36e382ba
+DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
+EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
+EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
+EBUILD gentoolkit-0.4.8.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
 EBUILD gentoolkit-9999.ebuild 2079 BLAKE2B d9907f6e1a70545548ad15f74c247f7d59fb03e692dac268934d966d63a3340db301b4a1d3d58e804e948bd5d18bd5b4af1956eaf5d66f31a515fcc5b6a2dcbf SHA512 c526f20479299dc0849bc3cc55b540c4713e0220a511aba0668b6e9fdb781b52fb3ba51bf9940bde1615ee98a8042b325f0158c412bc002825b44ee3a7e34009
 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
index 46a21780e945..3c9347c0e93c 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index e4162f133220..34ae357f65de 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
new file mode 100644
index 000000000000..34ae357f65de
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -0,0 +1,75 @@
+# 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/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 277f70bc4f96..ff3aa70ff61a 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,4 @@
-DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
 DIST gentoopm-0.3.1.tar.gz 37897 BLAKE2B dd5499787bcc5c46ae3b559f3af4a5af5b4ca81a312e926149c587cac0391c51dbe61ac42d2bc19eb83cedc168486e9c30ddd6fbf4ae10ffd9719aefa2f54cd3 SHA512 e1a3a7929ae83d813dd0b03f0548f033e8e51b766aaddb653027398fb618819de6237e2ba1c0542defc9d62e71e8495aa10152cbc47a4e521f7cbaeda3ea4354
-EBUILD gentoopm-0.3.0.ebuild 617 BLAKE2B 7ff4654863a2b49f71c2d72261d08e61d9084640f4ae546b96b0aadd2101d8fb464a88daae7f7ec00492437801c6262807387c0c36639e6542cb26331aac719a SHA512 5b9e939eee9a0ab667d52adce456eea9e49a63357bc4e4eea0a2232c86b9a422500386b760e5efb0b0ea9e488f154422347cf0ac8cb7dbbc3cb157735625fe87
-EBUILD gentoopm-0.3.1.ebuild 653 BLAKE2B e6f0bf73a1d4e8e64862fed5c88c6228bdf667ec1aacf436ae4ee2c7ab01764303b5c820f4888eef6472b2a15b5fb43e92c3c37f2b33da0061f6a20042814b04 SHA512 77836da8774e18ee669a2ca00c946406e9ec9230bf5f486612f69378fc0513713f34626a18b695c8bcf6dae16f394737ab8a126c54678fea8270615c8f365f7f
+EBUILD gentoopm-0.3.1.ebuild 650 BLAKE2B fdc7d613e9f023c41b8f030d781200335194d364db4666af4220cb6697b786224a54f9d4230b0ac71792234eb51c34dd583333a1ec71ac71aa976b537c120f7b SHA512 20547e37bd06fa34c531795ac88c8c0c3035c0de08772113cf62c2bd001bb82f8e334d9e0ea99dad7e6f43b82e14b65a716c1d201c955addfddd103f36ee5305
 EBUILD gentoopm-9999.ebuild 622 BLAKE2B 7ce099378e1b31c4b2331d638b4180ccc26c1832a1a5b50126591a1a97667e5e54921c0ed3dd2c7e0e97a8a67960af1442e4b59a1ebbb4de1ef90be311037f21 SHA512 3df74bd57e124515f1ecdc784469dd40d4549dd41459097b2c8f143f7d8ff08eecb8ec5fb778c7e2e42272741ee9464ca3e77a4e07748e166ee0088360bbf661
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.0.ebuild b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
deleted file mode 100644
index abd20a56c46b..000000000000
--- a/app-portage/gentoopm/gentoopm-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}] )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gentoopm/gentoopm-0.3.1.ebuild b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
index e484c87c1b9a..c79f519324ee 100644
--- a/app-portage/gentoopm/gentoopm-0.3.1.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 arm ~mips x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 25d8eb2417b1..e2b556a3fa0a 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,11 +1,5 @@
 AUX implementations.txt 808 BLAKE2B c209c676d85d731c901cedcd8b59e1710f0ef8b20a849bf065770ff56178a2c1e4ee4a1702bff31c28b277b04f54a6f15b523bc59e3c4b41a3b9fb4f967fcbc1 SHA512 9d4edbb1c1298d6be268deef382a662211ae53efe52444d27e603c2fd3e116caf8e0e939e2d67cb6c12e81dbed192fb8a41b4f6b6a5fe9afba4c64996127edb6
-DIST gpyutils-0.2.2.tar.gz 19646 BLAKE2B b5c24817b8a5ef3122d46330d2311a328ffa9c936878f494586ed62fd9fa9d54210c4edcbd9d07f61af7c27faf410e0abf60943188e8340ea52f06d95359c6b1 SHA512 28ca27b3688b593665037bd7a811014a11b3192bc0acc4568c3e70d13cf7a163b41ba3ffd9d8caaaaf4de2758e1cb68b7dcc255d9fb26ca8448a6bfd6416e66e
-DIST gpyutils-0.3.tar.gz 19322 BLAKE2B 0b761139f803e1c36d2d9bc8c8e77a8606697a5f872f8eece4bc130657918e639ff82dd275d4553c92a2f1f8a9fe66687e6dce4de40450af435d52fd1ddb91a1 SHA512 2481ccca1390cf65f7a466c7742869977156eebb5d7ab6fe8a421c53dbe1e971e59fce8b4544396fd8682bf9ce73f245d611f2527725cae7253d68ebd2d9b1a2
 DIST gpyutils-0.4.1.tar.gz 19444 BLAKE2B 20b9a3072337665a83e86994b4b0e5cc33673364320838ab3e56b87b06146d91d519f1b60023fa3e9be0bc6fc10a207a3fe87937158edb2c8607d8145022ee50 SHA512 c3420ec2c5fff39b32beb43b48eb06179534c359f755e5877d29ba4e3f393ce62c8ded48cd909bc69c20730d028e01c76375892ebb2a364017aa196c81865ecf
-DIST gpyutils-0.4.tar.gz 19463 BLAKE2B 4f7a0a474c0c5dcb3afec6ccfb920df17d23eb91aba21765626a791cd7fc533b4165e5aa97df7def2dd5464a2558026378262dbcec48915252ceabb4e37511aa SHA512 02c77cc894adc0e81815777bfeb5f003d74e4b8c54b0f8701c4ada924f09f7f50128d1e842d138f90529f93eef959adac5816d662009bf5e8ca99fe528b35ae0
-EBUILD gpyutils-0.2.2.ebuild 500 BLAKE2B 770b246114c21b67c98b24314e117b0517b4a272bb1a30578e5ae0b034eecbb96771f06f86dd58ff64c7e3d69ba79a6e48c908f010664fbc68c4a08eaa259eeb SHA512 bcd2e79f5a4ddcbb6f58510242bed32d8a4c3b1c685dd0c7c0a6490020a039f9b88e0714a39b9e450e71f7658b318325590570074fbad59f8504ce473b03875f
-EBUILD gpyutils-0.3.ebuild 531 BLAKE2B b07f1ffca9cf12a2ca1cfd8b58b33653cecc1d26d492f39fa61010c3811041992b91d30bae46fe594c6b02093f3d4049cdfd71a9dabe0a196b63aaa3dd8fb06e SHA512 0f1f06aa89dc150ed2cb58c23be234efb457b3bde4a9290425e579ab54b9a2bcaaf0ccde86cc2c380ea7f3728f3cab6bed10caa178cbb679dd08c0a1c92e778e
-EBUILD gpyutils-0.4.1.ebuild 531 BLAKE2B b07f1ffca9cf12a2ca1cfd8b58b33653cecc1d26d492f39fa61010c3811041992b91d30bae46fe594c6b02093f3d4049cdfd71a9dabe0a196b63aaa3dd8fb06e SHA512 0f1f06aa89dc150ed2cb58c23be234efb457b3bde4a9290425e579ab54b9a2bcaaf0ccde86cc2c380ea7f3728f3cab6bed10caa178cbb679dd08c0a1c92e778e
-EBUILD gpyutils-0.4.ebuild 531 BLAKE2B b07f1ffca9cf12a2ca1cfd8b58b33653cecc1d26d492f39fa61010c3811041992b91d30bae46fe594c6b02093f3d4049cdfd71a9dabe0a196b63aaa3dd8fb06e SHA512 0f1f06aa89dc150ed2cb58c23be234efb457b3bde4a9290425e579ab54b9a2bcaaf0ccde86cc2c380ea7f3728f3cab6bed10caa178cbb679dd08c0a1c92e778e
+EBUILD gpyutils-0.4.1.ebuild 529 BLAKE2B 2bb4e7e8fb9757d7e5d8cdffcbc2b28ca8be55e98f85e744e85dd7a1625b79dac0adacb4441cd07193c6712e67276aee9d725738e5ba60acd6d7aa9bc6660525 SHA512 d232b04b53d6f5f1345399d3be805ae1712401bc15c3b058108a43290c8f5f4edca835ab4fadc289bbfdd8c72b71a6753d7045d8429d10c419008c5de5392a7b
 EBUILD gpyutils-9999.ebuild 511 BLAKE2B 836d36e3fb47f57d07729559df12299d1b26e8ce862f01266a5f2b503afef814248a1a3d20e88daa52f84a4038488e2b4cd4f2b34b38015e41c8dfa0de5b5521 SHA512 24e9bf1bb78be5c87a385589858d5d9c9a808a51fff99f4b1aa73bd48b5da9f3750a5625a5cffe4f145749c760b075dec09957de687fe7c34deb4c1d8bc67199
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/gpyutils-0.2.2.ebuild b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
deleted file mode 100644
index 9d2a031d5cb7..000000000000
--- a/app-portage/gpyutils/gpyutils-0.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.3.ebuild b/app-portage/gpyutils/gpyutils-0.3.ebuild
deleted file mode 100644
index 07d1c4984b1c..000000000000
--- a/app-portage/gpyutils/gpyutils-0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.4.1.ebuild b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
index 07d1c4984b1c..e73c38ff958f 100644
--- a/app-portage/gpyutils/gpyutils-0.4.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/gpyutils-0.4.ebuild b/app-portage/gpyutils/gpyutils-0.4.ebuild
deleted file mode 100644
index 07d1c4984b1c..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 51b3ebda5f58..1d0f9b7a120d 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,19 +1,4 @@
-DIST metagen-0.6.2.tar.gz 6100 BLAKE2B c5e3fb2e3b6c2f5624923a161e7a22d4b81dd1e084b68152d312dfcb73a6b96face64fe6918fc66d7f87d2d7114725028d82d1e74d72f6b7ebc1a499f0fce268 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff
-DIST metagen-0.6.3.tar.bz2 6118 BLAKE2B 1356111b23a96c6435bd997ff824682fd76074d004cc32f8af2fdff766e16eb70f395bfaa9fd9555397cebcb7859e87b16988b63fe7bd35684ca95e8cb12d9c3 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd
-DIST metagen-0.6.4.2.tar.bz2 6837 BLAKE2B a9595045fea006e53fd23e3b96da0acd884b6f33e0089fc56bc7fb118ba1d205ddc81754a8cc2bc3e5207ad9cd9f537e1a3e7b25be0e5c804ebed5e66b481abc SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c
-DIST metagen-0.6.5.tar.bz2 6973 BLAKE2B 2cac99056bde1e6420ef3bb54e6655b17fb43b27dc0024cd3eb2b5c09dcb05b5db318dc4f52c3389d562275e46c901fab863ab50bd0555a6409a8fe5c0bd8de7 SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0
-DIST metagen-0.6.6.tar.bz2 6341 BLAKE2B e45e06570cbe6c690b4fdfef036282c5828ec1c86b1773c35000f19c557df7784e777a59e20f1c27fc5ae0edf5169a6d1ebcfc2d08ffa1cc4ab77265041550ac SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca
-DIST metagen-0.7.0.tar.bz2 6367 BLAKE2B 939fff83d9b6af7600ab7a89293d12fdcc79fb5ca47c5285989af31a6d0ea2ba539f7bb56489f50d6b8272afcf956b6e5a71b98a952ba829de60dde5766c820b SHA512 a41b8d0fb401b7fd8e2a3899cbe2ba95e42acae9dc274923b25a2933e12587838c6d599045c16387d895df0a5823ebf7b4b71ca383a75cb714959baa8355a77e
-DIST metagen-0.7.1.tar.gz 8276 BLAKE2B 7445e9729e8f7eab7d808ad95c3ee775bfb90c9264feabbc31d77d65a9eda7b61f9d7dded8c54e1b5cad5a5577cb0ef31b8d5fafd747804b957c8890ad0a7fea SHA512 7532c6a82fac10bc775b990605a8b5d23dab14e1d8a7f166c37640ffb6bebdfff57885e129a727e78ffb926b164f716f5171ea333d640030316271d0b354af88
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
-EBUILD metagen-0.6.2-r1.ebuild 827 BLAKE2B afd29b67e0a12245aed69718d6aff71771c33214768d32b9ef6c6a362e07bfd0769ac3aa86302864aebd20e2412f0d649e9524b83cad81f7de8596db77b3fb59 SHA512 e856e57d1cec091360241cc19e6273396af76ef10e84cf0691af6daec509546a79864a1850fd8fc37ec1e3acc6e6ae4552dfe02bc3846aa8dc6c5c7b87740c17
-EBUILD metagen-0.6.3.ebuild 825 BLAKE2B a4a5044861e9c83e27b449648616853ca2703b2a804f9b1017f0aed460c2cc3e177fddc2de2c400ae7259d4ef912d0fcfd5afb23952662a97bf29df3e04b11d2 SHA512 9b2089d4723b1542f8cb1cb44f39eb56e46bec7fff835e47c90fc5f8dae1d4bd66af142f9d5714da6887a757e3c2156e7a96ee12c87ec09bb1ee800d8e44504c
-EBUILD metagen-0.6.4.2.ebuild 829 BLAKE2B 0abf87e7e3e3be9bc00248fbb09a1fbff50cd4eee23dad358b02566a5c1e6a7de201eb6af364246db40f7b33b22ee062327d9e7f7e10c128f8d400d9542c8212 SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760
-EBUILD metagen-0.6.5-r1.ebuild 882 BLAKE2B 65e2033758c982cf7ffe0658988e88e1e3032ce307197543a50c79f6b438c51acc1d1f4431f1e740c6daa2a21bb9c331ad000624245b8f9571c1f4d66bc35027 SHA512 846e0aebd1433b283c34ae0324b76c6dfe20edfaf5a7aeffeacbada9f51d5aa7a52ce49131122172f55b60f3352e89d6f5025aa336a9a6e879b3d35e07cc7e17
-EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7157c953af8c64a93e223b8efcbdce79a08688bb220c7ae2aa5a19dce52c02b87d9f7108be4b39abc7dcebc4f SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402
-EBUILD metagen-0.6.6-r1.ebuild 818 BLAKE2B cc65686fab9403da53a80196cac102d6bff698c740d00830babc7b13d0f9f9b442f9062ffedf75ecec251bb576ef8a3d98b1a444ebd548aa4ebfa854f6b58565 SHA512 96a7ce22921e7729b18f5b80213cdd09b015b0ad3aa69484f2d49a062bd247b686559f8ae629f1a5fe2c4e1f229f06980286a74f387370aa283dcc8f04f13396
-EBUILD metagen-0.7.0.ebuild 759 BLAKE2B 8b5bd111e2853060aa740f37c26f025c41741f53e3b16d0ac12f8ee012f8c117bf0e2f91152a5036996b1e4f38237f6ff7f12f628d161127a0d05a5849e9ab63 SHA512 89a29aab9f4c403c7ffcabd7a5842df93baea90195d6bc1d35d72dc9c5c1ccee80e3e2549e2b75523733ccf50f4bb47359f29a3ba75b5dd89cd20c675486309f
-EBUILD metagen-0.7.1.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
-EBUILD metagen-0.7.2.ebuild 738 BLAKE2B def89921299a2b6aa8c5735466c22f61a5c3334c00c2fca84a1d83d386d0ecff9562f9275deb628ac11e4443309fe84ab5522b593fe35ddbbcef692bb14800b3 SHA512 f5f2431b6eee31b08600af03b167f3caadea61cb90f2655afb96300f43521f4209c68996db315d8dea7de25b318fe306c9679ba1e814628c474c6c724491f8bf
-EBUILD metagen-9999.ebuild 875 BLAKE2B 9a188abcd348c848793c87acb0ec7fe1386a60de9fd8e11feabb8827d28ac880c221881a208388f4b8c304bd34c3b2911f9bc58c829a534171eaae7d4ea23f61 SHA512 c89c02b942df1df8058c4bdbe170d47fbc73e7887892fd1266a59947ff38e867f538e677bf61160ab62eae1c671f7c8929cd1bca0bff46b1277f84faad36ff02
+EBUILD metagen-0.7.2.ebuild 730 BLAKE2B 4b265935398f3f5b27736304b5545049edbb22dd27c63423bc7083b4245cae876d9bacca4c47ae31063a0cb593c5dab53d2e497b5aa8958c2a70fa2ea4c06b0d SHA512 e2b747d555c2231bfc4779d848fdf0c3448eebb3eb8c9674d2738c379f32f04e5cbd2ab69156af10af4b3202490ea3fdb4e81665d38ae37cfa2e71f7813b2695
+EBUILD metagen-9999.ebuild 869 BLAKE2B 17339843be940be20017abeb86081af08fc1008ecda6a4d50fc74d7803a9869e2312d8d6c569d34ecfc8d70e21678b4b478b55eb9bb587d361c5624c98858531 SHA512 7369044720654c1b23bdae57dfba9f8a523372c6773926cf5ffefb3575c1a8969bc530ada279d364bd1f5c177a6000eed67c716ce17f81d7dccce6f4c64a4bb4
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/app-portage/metagen/metagen-0.6.2-r1.ebuild b/app-portage/metagen/metagen-0.6.2-r1.ebuild
deleted file mode 100644
index e8a7369e1a69..000000000000
--- a/app-portage/metagen/metagen-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
deleted file mode 100644
index 46e06ca46727..000000000000
--- a/app-portage/metagen/metagen-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
deleted file mode 100644
index 6ae80946042b..000000000000
--- a/app-portage/metagen/metagen-0.6.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5-r1.ebuild b/app-portage/metagen/metagen-0.6.5-r1.ebuild
deleted file mode 100644
index e02882e2ab73..000000000000
--- a/app-portage/metagen/metagen-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	|| (
-		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
-	)"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5.ebuild b/app-portage/metagen/metagen-0.6.5.ebuild
deleted file mode 100644
index 3eb87efbb6ec..000000000000
--- a/app-portage/metagen/metagen-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.6-r1.ebuild b/app-portage/metagen/metagen-0.6.6-r1.ebuild
deleted file mode 100644
index 6616bbef45e4..000000000000
--- a/app-portage/metagen/metagen-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.0.ebuild b/app-portage/metagen/metagen-0.7.0.ebuild
deleted file mode 100644
index b1219098e37f..000000000000
--- a/app-portage/metagen/metagen-0.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.1.ebuild b/app-portage/metagen/metagen-0.7.1.ebuild
deleted file mode 100644
index dff9c50a5517..000000000000
--- a/app-portage/metagen/metagen-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
index 4b92f833bb10..65ff4f6e164a 100644
--- a/app-portage/metagen/metagen-0.7.2.ebuild
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 9880fd95a4b3..5ac50c432b42 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 70ccf0b44e65..5fb532b7798e 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,5 +1,3 @@
-DIST mgorny-dev-scripts-3.tar.gz 6671 BLAKE2B 6e0cc8edd55fd175e6e2516bad6d0505da813fc905d12563d97b0ee327a019dd264c886884360dfe6235ecfb8d19fe5d982edf623cfa9019ad132f6cb0f4bb49 SHA512 22a8dae123d87461f07d12b7aad58775201de4dd72ffd354116bfde2bfb6d413b3c68fbf848e651b5a4eeb3df2afe9a10f8ae1a28be0ed077d1c0aa19fc91066
 DIST mgorny-dev-scripts-4.tar.gz 6702 BLAKE2B d816e0d15004d21f595e6020d146aa1babfe238b325afb1523bfae60786c067c8591fa5b046f7b18520f5334e0d0506d9d0c919c2ec6a55a85bae09441d1f45c SHA512 0b165f21930ad29de92a715fab27174e2bf2e16e6b52dac2d5bf6ae59c68163f30de955703c2c37a9a799fd4409d1b602d417100a4787787f4b48fd71e6391e3
-EBUILD mgorny-dev-scripts-3.ebuild 579 BLAKE2B af6419cc6d068cf7c57c350cbb428fa52fd55297e9de7f2cfc2f079c5362bfccec49285bb0ff39814e10a12031ca90e5b2c13bf65ecc684f3133a30e3154efde SHA512 639b6c1a42555def0c1ffcfbbed931e9573be78c832d3110737ff62d44f9f396967e8f12083ce18e3417e513637e645c3974adbff1a81665a0beaaedf884cd5b
 EBUILD mgorny-dev-scripts-4.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
deleted file mode 100644
index e62d0a3b74df..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-portage/gentoolkit
-	dev-perl/URI
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index ccb75da423df..8c4e473088af 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -2,8 +2,8 @@ DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.3.ebuild 968 BLAKE2B 8d1496d99821bfcbbc16d1563e8e4a8fdf2a24fcf4fd2ec5bab24ce2f93db17a56575103321d4beb08f961d84807b8722b633d6f14dcf8d73583f08356373afe SHA512 21d7dcfb4e8caa301c832e8e3c8a8b684036cb6302e23030a33c4bd5eee4c709a9f0940ff13a49ac143b5cf05b69d7294734bfecae26098296550a4685efec97
-EBUILD mirrorselect-2.2.4-r1.ebuild 957 BLAKE2B 9a3f83cbd50ce0a859ca410739915584bffca4ec68561fea8870211259387dec9dc05f62bea615e817a3ffb87f44a412de9706107e82d91ebe64a8a52c11e4dd SHA512 502491164b5ea2cf4d35d9f2154af43fc95960737d53f8769d1966fdf083f04538dd33df2f83442fb0d93f30ea1146c3e2a12c74dc74b2afd0911a3e3e5ee486
-EBUILD mirrorselect-2.2.6-r1.ebuild 1487 BLAKE2B 1ef84c57d6c369c4d22627441d91ca8e81672edadc733da55077eb6473421d6490510f9bbb47c7e66477488bdaeafc56ea5e55750759fa850033fb2d7491b991 SHA512 0139e14a10599a3915b62083a9abba8d6d5df8f1a91cabd04278741db94793d7c09210642e9493859d2342584267c4a0ed4698c9559d664547214d7ed7ef31c5
+EBUILD mirrorselect-2.2.3.ebuild 966 BLAKE2B 4a278535f80b1898145a7907337d5ef1f6338e7fcbe3911764c60f34d6f234f254c6e6043d7a9d03c1eb99a1c0db8c58f30c31a7eaeadd5bffbf9c0ee9c2f42a SHA512 39cf152886e81046caafe57c2819c999c5eceb743b947d294c7e841eca9c9899fbb10475c1ba12adab02e7e4d9f5bb3913a6715538c0e03c7c3dec74b5db45b0
+EBUILD mirrorselect-2.2.4-r1.ebuild 955 BLAKE2B 59e18454b543436aa008ad34e67cb9e5685f824a3f9ea046faa3bcf8fc20df5cffee5abb6b02a93f140d1f25f1a7084911822cd10aa5f1adab795647ebff9602 SHA512 e67fc6886d86a488e8b019a68738320dd87c7daafdc9e639653b54b894c3db95d7e7e437529e779ce730abb66cf587d575e6aafb18b85aec97291e28f8d1b509
+EBUILD mirrorselect-2.2.6-r1.ebuild 1483 BLAKE2B affc56795fb7eb3f0ca93f20fce510e7b6ac920df4fd290225e72a58025c0fb471545a42e150072084d59d153d5a97d46f4a15b366df1f336a2ed3b570743104 SHA512 b79de2fd09a365441bbece931153fa6f8b07331f6c6cf2d3ae720db8547b1fd48165066f86f32b4502fa81248f27bb398a5689ba0c7346f16fffcbc51156d302
 EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B b5bc70646394397d5460aeb2cb3f43bcb2ec7134640c69ee22f189434470ca10091b82c82b544a1a96c2f5af9f22fe66b4c74928510cb399be46d55fb100d736 SHA512 d07b7665c53147c268eb77f276e8ad63c876e938b58781e440efc9cd3c336bd0cd291db6cf6bb5bba5f6bf3db988b0ef917014ab29f5789a4d6df86b5c990ac3
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index 9558fdd285e7..f8fec29fc941 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index bfbde93a0843..2551b0b8b953 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc ~x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index 38b3bb9d9f51..79815ece5cff 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ipv6"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
new file mode 100644
index 000000000000..4fb6e193bf45
--- /dev/null
+++ b/app-portage/nattka/Manifest
@@ -0,0 +1,6 @@
+DIST nattka-0.1.2.tar.gz 73791 BLAKE2B 9e4d59f72b2e657958f7a8ac4b7d059079ab1c3ef6aea6544d4988aaa4acb3e09d6cb3a7cfcd7a01a4e7d891d7f2e544e3739470b0dbb961702e4c02575915b4 SHA512 1ef5af9b4c14dad5dce3eca427e77ec1f9f13137698a4cdb53dca58b1ff9f66d79508f69091ee96829a8d2703ebe7189a57e8257e20e586b90f2bf46a999cd0f
+DIST nattka-0.1.tar.gz 72870 BLAKE2B 0d4750a0367b3c00ee0de3eb37a7b15bbdc84ba693c2e3cb3a7baa1684c062f58458ded01b63afffe128b8d003cb14460bd60da91e61b100913801a3bf0d42ff SHA512 536be042d384f99631587108e2dfb24a3effbec1cf547b7f546fd8cbe736fa2e76ff1e9ca751ac7633fa34bea887da3ebe5967e915434ec8d8f6bd9c49a5a21f
+EBUILD nattka-0.1.2.ebuild 883 BLAKE2B 39711636bc65b43b1fabb999f698f64d475bb7416537280de4a6a0841ebbca10c265dc31cdd9483246685b48a9d527de81b49ad401564568535da03017d33b4e SHA512 1e0c4ac0434cd38cbf21e19c50b2760fae13a56ffd1f302a5884b4b172ef9c046ff6d2e408e63edcb9944652aae403059279b2ddfb2aa067bf9d36668de79f26
+EBUILD nattka-0.1.ebuild 883 BLAKE2B 39711636bc65b43b1fabb999f698f64d475bb7416537280de4a6a0841ebbca10c265dc31cdd9483246685b48a9d527de81b49ad401564568535da03017d33b4e SHA512 1e0c4ac0434cd38cbf21e19c50b2760fae13a56ffd1f302a5884b4b172ef9c046ff6d2e408e63edcb9944652aae403059279b2ddfb2aa067bf9d36668de79f26
+EBUILD nattka-9999.ebuild 822 BLAKE2B d9e20d954921bdb43253d93f6eee963f45b9ada0ac51263fb145337cc503ab014befdabcf7a7522280c2664e7b3227186588487ce44013b6f7dc72faa0fe35af SHA512 624d6b7a9ed6f1f0a1642dc452123022a9cf82c4aa954e2a9393f832cd0800b738d6c5bf13587eca73ba71f1bb217bd935cd4d687959ca8a4c5df2a300186eb6
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/nattka/metadata.xml b/app-portage/nattka/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-portage/nattka/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/nattka/nattka-0.1.2.ebuild b/app-portage/nattka/nattka-0.1.2.ebuild
new file mode 100644
index 000000000000..e8440d1114c2
--- /dev/null
+++ b/app-portage/nattka/nattka-0.1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
+HOMEPAGE="https://github.com/mgorny/nattka/"
+SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-util/pkgcheck[${PYTHON_USEDEP}]
+	dev-vcs/git
+	sys-apps/pkgcore[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "NATTkA can optionally use:"
+	elog "  dev-python/networkx"
+	elog "to sort 'apply' output in dependency order."
+}
diff --git a/app-portage/nattka/nattka-0.1.ebuild b/app-portage/nattka/nattka-0.1.ebuild
new file mode 100644
index 000000000000..e8440d1114c2
--- /dev/null
+++ b/app-portage/nattka/nattka-0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
+HOMEPAGE="https://github.com/mgorny/nattka/"
+SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-util/pkgcheck[${PYTHON_USEDEP}]
+	dev-vcs/git
+	sys-apps/pkgcore[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "NATTkA can optionally use:"
+	elog "  dev-python/networkx"
+	elog "to sort 'apply' output in dependency order."
+}
diff --git a/app-portage/nattka/nattka-9999.ebuild b/app-portage/nattka/nattka-9999.ebuild
new file mode 100644
index 000000000000..8d274617226a
--- /dev/null
+++ b/app-portage/nattka/nattka-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
+HOMEPAGE="https://github.com/mgorny/nattka/"
+EGIT_REPO_URI="https://github.com/mgorny/nattka.git"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-util/pkgcheck[${PYTHON_USEDEP}]
+	dev-vcs/git
+	sys-apps/pkgcore[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "NATTkA can optionally use:"
+	elog "  dev-python/networkx"
+	elog "to sort 'apply' output in dependency order."
+}
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index 408a6db62f3d..2b1b01615a23 100644
--- a/app-portage/overlint/Manifest
+++ b/app-portage/overlint/Manifest
@@ -1,3 +1,3 @@
 DIST overlint-0.5.3.tar.gz 2706 BLAKE2B 78c76a72556213bbc84b91ada3ea1d71ad045fe4498baab1f6710190a55802e5ffee14d652540d2cb7caaecd407963f7bad9682cb72e5e6571597983384bf019 SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149
-EBUILD overlint-0.5.3-r1.ebuild 476 BLAKE2B 97b10ed97daadb399df5b10a7a63832457e5890ac4d1ca40913bc3db9d8a6941982cacba2a0967da80abc6e90153475d5613c4faf756fccb9c36fd02d84699a6 SHA512 472238a36de06c78f0b34615ac5abfc7fcf2abb299ddcbfacd979567aadb60217711949aecd273c3b7284dffa7cf7659334ede60caca46cacc4c19a05aa2c616
+EBUILD overlint-0.5.3-r1.ebuild 470 BLAKE2B 3146ac2cacd8414f45fd24defded68eef79c7f5df7e0e610b3127b3cdab35cc0955857f6d4fbed5d28c458a87304476ee51c04ef8c24ea5756ac7bee779993b4 SHA512 031951143a76dfb005de2eb1ba9ba4329e4877fc8413ec3b85c84f517477898654233baa12c961ca75e5161a535289d4c59e36f1b6d95e4fd9c6b02c5fb90c64
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/overlint/overlint-0.5.3-r1.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild
index 644952c2c6d9..e43431ab544c 100644
--- a/app-portage/overlint/overlint-0.5.3-r1.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index cde06d18b506..efa217caa390 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,8 +1,8 @@
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
-DIST portage-utils-0.85.tar.xz 1773300 BLAKE2B ba1482fc04e590612331e7dfdc0a330f81aba919fad21918912f490529cbab5f4f173cdefe70e0e40267f8cc7f64afd3c0e2a39e1b234034187f5bc75d10d9d1 SHA512 56b2cfa0fe6f7c5da0e7e7095568902173a7a976a5fb71b286e3269ac3c8f2fc878089d4c676d8ff2efd86ff150392c3407c838019e3846abef158f236d23830
-EBUILD portage-utils-0.74.ebuild 1052 BLAKE2B 894d5b6b6f9f28c9a1c6b5589265cd98f25388660fed867e4e71a9e7a551e0b47c9f35085703e42581078ba252ed1ec34bd5fb7496e7c43d2cf0311b031005e0 SHA512 5f214c1defddbefa723a0c8b47e05c7e6686d51baab4330635ad62952052cea4d87602cb9c16f1d1d40b5c9c7ba43aa2f9f61f7ec0520a61765626ee9fbe0ebe
-EBUILD portage-utils-0.80.ebuild 2252 BLAKE2B 014b26a4183653e9ad84179d321c77ce545d7d2c58c318010e2ec2428639518821fab815b6d2d81db2396e4649a8fa4d1c76dac8fcce5fb7bb75c8fffdeceecb SHA512 b19851b98c3312d7407ce4b9116c4c22eaf790de5e636d6d51644884aa7fd77e1cb1107eae2b12da43fb7b6bf9a6b42327d2a78ada872a88daac5ae13976f002
-EBUILD portage-utils-0.85.ebuild 2183 BLAKE2B 37dfa27802791a8f0488b31b0b378698f4d43dc5682e859696430aaa5ff3cf83d527d421e3fb2851159b4af50ff67aed9acae91e11f2da922f0483912cbaed5a SHA512 cd25ee41e03afb0c70b726afe0cebce0d71befab9b3944b0fa45b3eef400390ba15c583204bf9c24ad960e7ffc6bdc1b9086ad18d9bc7ca8ffa7813c38d814e6
-EBUILD portage-utils-9999.ebuild 1810 BLAKE2B c79ed6af9cf0c65fb1752011bb1909959960a3f02c0a4e6877f6dff9876a1661d32ba7f70964a9b883acd157717b307ba4c1ecbbcd79ef265a0cbe5955831131 SHA512 c1b7f25e06d30c34aa34deb82ae7dd60c379218669cde552be43c7b8dcf50623b38cfd4d54d055013e93b7e538221ce4e00cf6d19737bd69f600de59811d13ca
+DIST portage-utils-0.86.tar.xz 1774232 BLAKE2B 57971b2157050d7b086aee5a7b26bbe6396609476fc66d443c9b7f0b4ea27123bc569acb822f666f4901d4c8c26dcbf49dc2760f8938162fb9ad8c548e661f5a SHA512 46edfbf8062654682f2fff38db2e2ae54965f7b0e4e7077154771e1a1105cc333a01002b9b8db483b7ed9a6e692128a6a0f9d4f222aaaacb09f3a6e3589b31c7
+EBUILD portage-utils-0.74.ebuild 1050 BLAKE2B 684e5579c453eb22e719826ada74e446859fae46227dd2f3af3c78dd165810cd25cd9067fe9c223eaaf86a48dc46c7c125b3573364f07dbf8bee2324b465913c SHA512 524900b75ab3d60a4880ffc64734341c6eadeb0ff1afe0b9cba8464989c56f17ae1cdd681a4003f2b4f3c7f316093ba0627e9b48039661c8c43206a5680b6a58
+EBUILD portage-utils-0.80.ebuild 2250 BLAKE2B d188c4013a60dec7f23f01c3ee677c89da07098a058639e026e2b2c16fbf9e5a5fa301ace8052578b34ffb93ae60dd37d55e94571edca828df9b9caa7bdcd19a SHA512 6441d11e256944715b3edd18291cbd8e9059420a0cff093efe5d019db63d56dbc39c714c84a7dc996e04af478b4add2313d4c5eff89299a8b670baba8b24f792
+EBUILD portage-utils-0.86.ebuild 2179 BLAKE2B ecbd90f21ef26d89e423e198bd0e8e275aa63a8eabe515a0236c18370a755c18319c1b21c22b07a41eadf338a430bdeb13e753db0830b298853ed72b48aec6fd SHA512 401ce43ba8704b8d2936307e5250cf7335ad555fe4d8e9766ac7577a01540c1018252dc77c145913bb494891fae5f6860f33f80a17d58ab0b5bcd42e8c1652cf
+EBUILD portage-utils-9999.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index fb7c02833136..a15dc1f84af1 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild
index bd869d8d1f05..0fdb639693f6 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-0.85.ebuild b/app-portage/portage-utils/portage-utils-0.86.ebuild
index d1e5d7ff75ff..30461bad45eb 100644
--- a/app-portage/portage-utils/portage-utils-0.85.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.86.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 16f7d2ac6596..aa5f157c1b9d 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
deleted file mode 100644
index e623d77a3125..000000000000
--- a/app-portage/porthole/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX porthole-0.6.1-masking_status.patch 485 BLAKE2B 92188c56635ab69207dcee949303a09dc9d962bb6d0118205a4ec66d01e05f2d66f761f12ccf648230397a65772f0515460b373e526bbb368344f4d2d7030dd6 SHA512 5df59b9ceb47c8e6c5a3ca3c4777efcfdc7ee52e43f0a2121299ac777e2ecbbe707cb330a13355d35862dc5de7fa193fee846063e4825c4537d6c0b6d790bbbe
-AUX porthole-0.6.1-missing-attribute.patch 665 BLAKE2B ac282d0f7ef0f94d125520d25c3171b3f05bf42338f399b6bd7b82f09e9f6d0740e6df06c256b7179d9889b4c361b0ffa2954fd14f9a835d024feaf71499105a SHA512 e450d7d188b7762cebdfd33e6bc586c38e63fec80fe51fd500559587a85e6f5632ad3279d8e8a4bc37781e77f3f6f3df9af8b013f1725dbb47877642177d27d2
-AUX porthole-0.6.1-missing_import.patch 858 BLAKE2B 6b338ff4425d533e6f5a7033f2372032b7184ef3119a95cd5251ff92430223cbef3e95922850ee62416f9d7f2e0dde6df015a5cad1146e227c120c2e4a902630 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd
-DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
-EBUILD porthole-0.6.1-r5.ebuild 1993 BLAKE2B c9b9d8983e21a7e5f9cf5081426143b1fad88ceb1b6c4cdb130d9e12cf80e3b4418859cd904fd29081e8f6536110c0cdf1feb32dd2171e6e60257dd64d0477db SHA512 87c1671e2aad7bf62bb8c603d4dbf7080d16359a3d181c6d99f8dccf066a7d6642e7c119dabfb2cfa667b8e2df3269807c28fd59e5a7ef1d8fa791b64778d320
-MISC metadata.xml 344 BLAKE2B 5a339a4ff73fed112ccb83ade8e56658473c29b3a0e168af830ad8e230f6703c2970da919196a42e438ab619c6a65432b1404b5657153fdb32a4215906aee00b SHA512 0d2dfde092b1691cdf45572b7257183625dd2fb11b0990840235b365483d87780caa3be5df6807b5b64e9502dde452bf589a3551967e97eec32cc0de77577811
diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
deleted file mode 100644
index e626fbb3c58f..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: porthole/backends/portagelib.py
-===================================================================
---- porthole/backends/portagelib.py	(revision 1209)
-+++ porthole/backends/portagelib.py	(working copy)
-@@ -452,7 +452,11 @@
- 
- 
- def get_masking_status(ebuild):
--    return portage.getmaskingstatus(ebuild)
-+    try:
-+        status = portage.getmaskingstatus(ebuild)
-+    except KeyError:
-+        status = ['deprecated']
-+    return status
- 
- 
- def get_masking_reason(ebuild):
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
deleted file mode 100644
index aa011a174b17..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
-
---- porthole/db/user_configs.py.old	2010-11-27 13:34:35.000000000 +0600
-+++ porthole/db/user_configs.py	2010-11-27 13:31:24.000000000 +0600
-@@ -364,7 +364,7 @@
-             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
-                 "%s,\n remove: %s " %(str(add),str(remove)))
-             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
--                comment=comment, username=privileges.USER, 
-+                comment=comment, username=privileges.user, 
-                 add=add, remove=remove)
-             self.set_config_callback()
-         else:
-			 
-\ No newline at end of file
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
deleted file mode 100644
index 33c9e4ee3353..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- porthole/db/user_configs.py	2010/03/20 12:32:29	1217
-+++ porthole/db/user_configs.py	2010/03/20 14:10:46	1218
-@@ -36,6 +36,7 @@
- from porthole import backends
- portage_lib = backends.portage_lib
- from porthole.utils import debug
-+from porthole.privilege import controller as privileges
- 
- ## set up this module to act as a user configs data server,
- ## watch the user configs for changes and auto update
-@@ -363,7 +364,7 @@
-             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
-                 "%s,\n remove: %s " %(str(add),str(remove)))
-             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
--                comment=comment, username=priviliges.USER, 
-+                comment=comment, username=privileges.USER, 
-                 add=add, remove=remove)
-             self.set_config_callback()
-         else:
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
deleted file mode 100644
index c49c4019f904..000000000000
--- a/app-portage/porthole/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">porthole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/porthole/porthole-0.6.1-r5.ebuild b/app-portage/porthole/porthole-0.6.1-r5.ebuild
deleted file mode 100644
index 8dbd7c1237fe..000000000000
--- a/app-portage/porthole/porthole-0.6.1-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="nls"
-LANGS="de pl ru vi it fr tr"
-
-RDEPEND="
-	>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	gnome-base/libglade:2.0
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-masking_status.patch" # bug 307037
-	"${FILESDIR}/${P}-missing_import.patch" # bug 323179
-	"${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
-)
-
-src_compile() {
-	# Compile localizations if necessary
-	if use nls ; then
-		cd scripts
-		./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc TODO README NEWS AUTHORS
-
-	keepdir /var/log/porthole
-	fperms g+w /var/log/porthole
-	keepdir /var/db/porthole
-	fperms g+w /var/db/porthole
-
-	# nls
-	if use nls; then
-		# mo directory doesn't exists with nls enabled and unsupported LINGUAS
-		[[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
-	fi
-}
-
-pkg_preinst() {
-	chgrp portage "${D}"/var/log/porthole
-	chgrp portage "${D}"/var/db/porthole
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Porthole has updated the way that the upgrades are sent to emerge."
-	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
-	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
-	einfo "Other options recommended are '--noreplace'  along with '--update'"
-	einfo "They allow for portage to skip any packages that might have already"
-	einfo "been upgraded as a dependency of another previously upgraded package"
-	einfo
-}
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index 70f5ae7f94de..36c4161d5840 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,3 +1,3 @@
-EBUILD prefix-toolkit-4.ebuild 18535 BLAKE2B 836627d06a4740707af1e7f31f1cc6e0e280f1eb1a3e573621d471038e6470a9c599eb2d4ff37120636a395d5db7a1d20b88d204302f9a8772522ca2b551c6b9 SHA512 97efb29fee5db4f6442847eddf0ca9ec975887122861a6faeb55950019cb2c4dc128822e253adfc920f7dd96b0877f70fa35eda54dd8f1da750c5baffc72a99c
-EBUILD prefix-toolkit-5.ebuild 19268 BLAKE2B 541668fe2a2e61ce4c5e0cb58457a57a468b470fa39e55cb4232d4920e4b9c99855d15031e251737e5c24096395ce7a0f2c83057fc9f4382b35e1741e6aa281f SHA512 87b7d304843460e9f5186641a9e4dbc16ec69271cad386d33c93821d93752db2eae8a60f3c432465f0fb1d2222d8b945f96cbaf1adf99c1ea0faa48620cd82d9
+EBUILD prefix-toolkit-8.ebuild 19947 BLAKE2B d32f9ff7edb08edf8d236c92037654fe68ba1f2b263e2d8bef3a6065fd242fadbbfab0fbe24300412c81d4915221183171520342d72e2c35643624fdec734730 SHA512 fcc6df990c48b7b7508493b7aab82bd578df5fe6d06fa8cfb100264b8fce6b268f5e2770f5dd88ef9c44bd504180ae67b8fb3c4a66b4e73a17d75da3a7f39560
+EBUILD prefix-toolkit-9.ebuild 20305 BLAKE2B 6417c15d1611ac471672a1082e1ae2427842ad5983ec2c1f3f39b0a961dc4790fab50e13f1e7ce9da28f6b9563be207489336147d016d724a241030c1b652a14 SHA512 0acdc25b3e8720ce993d6514b3bb17791404527414e4ca172aada36f94cbfddc449543c80db433858efb52445d1725b81a30ec7b627d0691a43b74258594c480
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-8.ebuild
index 61ea23e6a37a..96f9ee699661 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,9 @@ RDEPEND="${DEPEND}
 		app-portage/elt-patches
 		sys-devel/gnuconfig
 		sys-devel/gcc-config
+		elibc_Winnt? (
+			dev-libs/pthreads4w
+		)
 	)
 "
 
@@ -131,6 +134,7 @@ src_install() {
 		newins prefix-stack.bashrc bashrc
 		newenvd prefix-stack.envd.99stack 99stack
 		doenvd 000fallback
+		keepdir /usr/share/aclocal
 	else
 		dobin prefix-stack-setup
 	fi
@@ -175,6 +179,12 @@ pkg_preinst() {
 	eend $?
 }
 
+pkg_postinst() {
+	use prefix-stack || return 0
+	[[ -x ${EROOT}/usr/bin/gcc-config ]] || return 0
+	"${EROOT}"/usr/bin/gcc-config ${CHOST}-${P}
+}
+
 return 0
 
 : startprefix <<'EOIN'
@@ -316,6 +326,7 @@ EOIN
 
 : prefix-stack.envd.99stack <<'EOIN'
 PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+AT_SYS_M4DIR@=@"@GENTOO_PORTAGE_EPREFIX@/usr/share/aclocal"
 PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
 EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
 EOIN
@@ -547,6 +558,10 @@ ebegin "installing required basic packages"
 		sys-devel/gnuconfig \
 		sys-devel/gcc-config
 
+	# get eventual dependencies, add to world
+	emerge --verbose --update --deep \
+		app-portage/prefix-toolkit
+
 	# select the stack wrapper profile from gcc-config
 	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
 		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
@@ -572,6 +587,7 @@ fi
 
 myself=${0##*/} # basename $0
 link_dirs=()
+linkopts=()
 opts=()
 chost="@GENTOO_PORTAGE_CHOST@"
 prefix="@GENTOO_PORTAGE_EPREFIX@"
@@ -586,6 +602,18 @@ orig_args=("$@")
 
 for opt in "$@"
 do
+	if [[ ${chost} == *"-winnt"* ]]; then
+		# We depend on dev-libs/pthreads4w, no?
+		case ${opt} in
+		-pthread | -lpthread)
+			case " ${linkopts[*]} " in
+			*" -lpthread "*) ;;
+			*) linkopts=( "${linkopts[@]}" "-lpthread" ) ;;
+			esac
+			continue
+			;;
+		esac
+	fi
 	case "$opt" in
 	-L)
 		link_dirs=("${link_dirs[@]}" "-L$1")
@@ -648,7 +676,7 @@ esac
 [[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
 
 case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" "${linkopts[@]}" ;;
 compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
 version) exec "${myself}" "${orig_args[@]}" ;;
 dirs)
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-4.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
index cfe11c4c353a..05ebbcc42e84 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-4.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,14 +23,21 @@ BDEPEND="${DEPEND}
 # In prefix-stack, these dependencies actually are the @system set,
 # as we rely on the base prefix anyway for package management,
 # which should have a proper @system set.
+# Strictly speaking, only baselayout and gcc-config are necessary
+# (and pthreads4w for Winnt), but it is easier for now to install
+# elt-patches, gentoo-functions and gnuconfig as well, instead of
+# fixing all uses that expect them in EPREFIX rather than BROOT.
 # See als: pkg_preinst
 RDEPEND="${DEPEND}
 	prefix-stack? (
 		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
+		sys-devel/gcc-config
+		elibc_Winnt? (
+			dev-libs/pthreads4w
+		)
 		app-portage/elt-patches
+		sys-apps/gentoo-functions
 		sys-devel/gnuconfig
-		sys-devel/gcc-config
 	)
 "
 
@@ -64,7 +71,10 @@ src_unpack() {
 	else
 		my_unpack prefix-stack-setup
 	fi
-	my_unpack startprefix
+	if use prefix; then
+		# does not make sense on vanilla Gentoo
+		my_unpack startprefix
+	fi
 }
 
 my_prefixify() {
@@ -131,11 +141,14 @@ src_install() {
 		newins prefix-stack.bashrc bashrc
 		newenvd prefix-stack.envd.99stack 99stack
 		doenvd 000fallback
+		keepdir /usr/share/aclocal
 	else
 		dobin prefix-stack-setup
 	fi
-	exeinto /
-	doexe startprefix
+	if use prefix; then
+		exeinto /
+		doexe startprefix
+	fi
 }
 
 pkg_preinst() {
@@ -175,6 +188,12 @@ pkg_preinst() {
 	eend $?
 }
 
+pkg_postinst() {
+	use prefix-stack || return 0
+	[[ -x ${EROOT}/usr/bin/gcc-config ]] || return 0
+	"${EROOT}"/usr/bin/gcc-config ${CHOST}-${P}
+}
+
 return 0
 
 : startprefix <<'EOIN'
@@ -239,6 +258,15 @@ RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
 [[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
 # if we're on some X terminal, makes sense to inherit that too
 [[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+if [[ -d /proc/registry ]]; then # we're on Cygwin
+	# crucial to Windows but cannot be restored, see
+	# https://cygwin.com/ml/cygwin/2019-08/msg00072.html
+	[[ -n ${SYSTEMDRIVE} ]] && RETAIN+=" SYSTEMDRIVE=$SYSTEMDRIVE"
+	# COMSPEC is to native Windows what SHELL is to *nix
+	[[ -n ${COMSPEC} ]] && RETAIN+=" COMSPEC=$COMSPEC"
+	# some Windows programs (e.g. devenv.exe) need TMP or TEMP
+	[[ -n ${TEMP} ]] && RETAIN+=" TEMP=$TEMP"
+fi
 # do it!
 if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
 	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
@@ -307,6 +335,7 @@ EOIN
 
 : prefix-stack.envd.99stack <<'EOIN'
 PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+AT_SYS_M4DIR@=@"@GENTOO_PORTAGE_EPREFIX@/usr/share/aclocal"
 PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
 EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
 EOIN
@@ -412,6 +441,7 @@ eend_exit() {
 ebegin "creating directory structure"
 (
 	set -e
+	mkdir -p "${CHILD_EPREFIX}"/var/tmp/portage
 	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
 	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
 	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
@@ -427,11 +457,11 @@ ebegin "creating make.conf"
 (
 	set -e
 	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
+	echo "# These are sane default compiler flags, feel free to adopt them as you like."
+	echo "# Extending the flags is done to respect flags probably set by some profile."
 	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "CFLAGS=\"\${CFLAGS} -O2 -pipe\""
+	echo "CXXFLAGS=\"${CXXFLAGS} -O2 -pipe\""
 	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
 	niceness=$(portageq envvar PORTAGE_NICENESS || true)
 	[[ -n ${niceness} ]] &&
@@ -445,6 +475,7 @@ ebegin "creating make.conf"
 	echo "EPREFIX=\"${CHILD_EPREFIX}\""
 	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
 	echo "BROOT=\"${PARENT_EPREFIX}\""
+	echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\""
 	# Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6.
 	# We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only.
 	echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\""
@@ -466,6 +497,10 @@ ebegin "creating env/host-cc.conf"
 cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
 	CC=${PARENT_CHOST}-gcc
 	CXX=${PARENT_CHOST}-g++
+	# Inherited compiler flags from parent prefix,
+	# as the child prefix may have a different compiler.
+	CFLAGS="$(portageq envvar CFLAGS)"
+	CXXFLAGS="$(portageq envvar CXXFLAGS)"
 	EOM
 eend_exit $?
 
@@ -532,6 +567,10 @@ ebegin "installing required basic packages"
 		sys-devel/gnuconfig \
 		sys-devel/gcc-config
 
+	# get eventual dependencies, add to world
+	emerge --verbose --update --deep \
+		app-portage/prefix-toolkit
+
 	# select the stack wrapper profile from gcc-config
 	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
 		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
@@ -557,6 +596,7 @@ fi
 
 myself=${0##*/} # basename $0
 link_dirs=()
+linkopts=()
 opts=()
 chost="@GENTOO_PORTAGE_CHOST@"
 prefix="@GENTOO_PORTAGE_EPREFIX@"
@@ -571,6 +611,18 @@ orig_args=("$@")
 
 for opt in "$@"
 do
+	if [[ ${chost} == *"-winnt"* ]]; then
+		# We depend on dev-libs/pthreads4w, no?
+		case ${opt} in
+		-pthread | -lpthread)
+			case " ${linkopts[*]} " in
+			*" -lpthread "*) ;;
+			*) linkopts=( "${linkopts[@]}" "-lpthread" ) ;;
+			esac
+			continue
+			;;
+		esac
+	fi
 	case "$opt" in
 	-L)
 		link_dirs=("${link_dirs[@]}" "-L$1")
@@ -633,7 +685,7 @@ esac
 [[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
 
 case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" "${linkopts[@]}" ;;
 compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
 version) exec "${myself}" "${orig_args[@]}" ;;
 dirs)
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 3e5483b4d0f6..eb8f0d7611d2 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,6 +1,10 @@
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
-EBUILD repoman-2.3.16.ebuild 1949 BLAKE2B d151104eea493157f9f1df62f38659bc8b94c12fed5faf7625b3415394d62ec6ff0054ca0e342754c09f4a391b80c3e26e9404f690dac598151d3cfa22426451 SHA512 34ae347c6981cc9cd397d67af870b4b4da40998b521a736b59e8af261c03da115de4d2cab2914838cf9f90f8991603042741ffb95b09e04904cce3552efcfbbb
-EBUILD repoman-2.3.20.ebuild 1982 BLAKE2B 81b6067e4ece8b9cf0149a222973eea8e690e7783d55d834d4e74b05b0631942e17bf72734dc168c6eaacc37e58adb5b2a269f2cc67b228775bd9e4d98f3399f SHA512 d4c71ba888148160cfc4240c1e312888580d925ae754f49d7ca0f1463da36b41185c36f92fbd9be45d1c3e2b46a9ca508deede1a8a91bc60ccf7f134cd6ae1c2
-EBUILD repoman-9999.ebuild 1988 BLAKE2B 9f52d6cdd535e510127b092728c3acfd1fbea560399a7caa0ef58c9f975d2296eb5310faa5062b6f31be215f633e34525a113e6cd71a6a91d0dd0b615a31727d SHA512 374298336d3a8a1ec10b199040f10ff410ef450e4048024962daaebafa8dbf4611265081f14fe8699ce8eee2eda6fc424c897ea1d05b44a0c851f1fd59369ee9
+DIST repoman-2.3.21.tar.bz2 87094 BLAKE2B feb972d9585440d2a5ed6800146a1d7027fde4c5e7a70904905837261776b9c09bc9bfc6c4da8248a1420635ad8443b31d7716990e6425db3403c8bb74ddca5d SHA512 537c6f6152134df4cd99321b812a1e02608ef0621e674214789dc79ca6540ff1ddab05d100e2bbc2fd0d85664cd92549fb39f8da3cf6850c1a190a88a95814e5
+DIST repoman-2.3.22.tar.bz2 87026 BLAKE2B 52262339410b95d47df19e225493075d6e9f763e85b7fa9c982c47ed88b652620d3ab083781c9e4747d8e3659795de7a05163b00339065ce5d84f8babfadc1dd SHA512 8be75f58127452ed162b0f5feac96110b82f7a06fa904c65f6084dff4c542602870cde7fde5cf4108b04142d433c1167dc5bccdf839064dbce2278ea789f77ae
+EBUILD repoman-2.3.16.ebuild 1937 BLAKE2B ae27dff19630b29f47d1ce5a74857fab402d5b083b8f55d7788ac8e1b7cd44e39740e7903a7dbf925c4dcf1c3a1e06cd51e799ca29dfb897863cddfe870acb94 SHA512 62f3f17d006ce2001b1350d3fed012f2ea42ee47c7e47880cbe345de453616ef948bac529c34d410b702e7f8215de7eb2e62be6c98093d42f319f1b2e69800da
+EBUILD repoman-2.3.20.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
+EBUILD repoman-2.3.21.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
+EBUILD repoman-2.3.22.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
+EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 900147ef47e0..702a174e214f 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
index f9fa01c1f198..9dfe116e98f2 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.21.ebuild b/app-portage/repoman/repoman-2.3.21.ebuild
new file mode 100644
index 000000000000..43a2b3082a48
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.21.ebuild
@@ -0,0 +1,64 @@
+# 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_{6,7,8} )
+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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+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-2.3.80[${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/repoman/repoman-2.3.22.ebuild b/app-portage/repoman/repoman-2.3.22.ebuild
new file mode 100644
index 000000000000..43a2b3082a48
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.22.ebuild
@@ -0,0 +1,64 @@
+# 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_{6,7,8} )
+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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+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-2.3.80[${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/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index b19cdf422382..ac8c1532d0ef 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index cb43d72804ce..fc68f588dd48 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,8 @@
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
+DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
 EBUILD tatt-0.5.ebuild 817 BLAKE2B 2cfba9753e8489dfbe47588eb61a74aba5bdee846bf3d7dbf4a10c10e61a23dfa8271a807573511cfc5af465c760fda81bbf0973cbbffa02f27dbce6915e6a58 SHA512 783889f0ab7c3b2ca88a0861dce022639c5f389802e5e05bcc3d6a1b1d4a3798d599a5436e5506ffd0c741d8ce654f8d80aad1a1c7f28704da19d0df56625cbd
 EBUILD tatt-0.6.ebuild 819 BLAKE2B 9c92e7ffebbd06a132467fd3a097a5dc194c307922de06885da08b109c892ca1e597e82b175bbb916ce9df7ab14ef1528936272fea082494fd6fabc79157f284 SHA512 3d3fd320f0940b7c3198cafb42f4e6fc85ea893e0e52f2210cc8b49a939c8e81bcb8775f67b74b9abfefd963b6340da023464d181020b2e979b77d29fbb450e3
-EBUILD tatt-9999.ebuild 777 BLAKE2B 5e3f662008cf447ad3e7982f80228542ed89f2b5854821b6eb42514415a32dd76a37cf4b39bd94e5ad5c49a70dd5aad99e397c287c8b1814030409facecb6311 SHA512 a93dddaea45560a76023b06cdf57751433e2d28c0e2ceab2dd6c0e413a082f0f4c7b7892207cf9a11636322435570480c4b7f12eac008c80a40d307657957a74
+EBUILD tatt-0.7.ebuild 806 BLAKE2B f200c82442e60229610d81de78b96da996259254a29bc17fca69618393ddab5e568bf1b09fa5e452a0e13f53ca8341cd718e732461fd0aed4a0f80136215efe5 SHA512 7a63e8421385cd27ca0b6f5946afe6382118df8907f95951b3a48600389ee76d1a4be165f9c77bb6222c8fe447fe7a7dd3cfb6ab61f42c06f507dfd8c2d59dff
+EBUILD tatt-9999.ebuild 768 BLAKE2B 8db6c40f1f015a07a6247cc90396a33ea9682043ed8ee9a6d532616567a10c51ff57d3b19fd26ae88e6be5550a9b8d881467cd178959e9fd3eb6534a857b5e07 SHA512 9b11b302618d9657e3ac80e17c2358ddd4b4cbe0556ee7ab4cd03c1a7534348d2453f72d11e7cda1480db58df8ea89d930613e267b8e25d02a0d1358dddf0616
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.7.ebuild b/app-portage/tatt/tatt-0.7.ebuild
new file mode 100644
index 000000000000..c8f7b83d6e13
--- /dev/null
+++ b/app-portage/tatt/tatt-0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="arch testing tool"
+HOMEPAGE="https://github.com/gentoo/tatt"
+SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+templates"
+
+RDEPEND="
+	app-portage/eix
+	app-portage/gentoolkit
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-client/pybugz
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use templates; then
+		insinto "/usr/share/${PN}"
+		doins -r templates
+	fi
+	doman tatt.1
+	doman tatt.5
+}
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 8351da5ce080..15cbacda910d 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	www-client/pybugz
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 878477cf803e..e8707b00da04 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,6 +1,6 @@
 DIST ufed-0.94.tar.bz2 48566 BLAKE2B db58624005c637c7133a298c17b60cae3cf54c1b1d2ba3337693e1f6c330a5305986e92b6c1b25a5ebc94b1f8934cb5a35db94eccb596f2eb15619dfb2ce4977 SHA512 a40e55db8afc99b5e16b080d93867ef8c832a7318af7a50edb582bfea99bcc6a467b4bf12b75a9d3943e8a008a0222ed73daa52a8e7dae57d73bece4ac084d24
 DIST ufed-0.95.tar.bz2 48956 BLAKE2B b2bd9210b314814fe9bd1e84ea4ce9de8f3285e5133c989d72284f775c1ed246b0fb641952d4babdf9252cd4b8689afab6b4023099f6c81c81358ab2cbbd9d28 SHA512 010273fc4ff13822ba42f6497a8865c0d29c1d0118b62fd7e2bab66390818fcfb09390fbac671ef612d8e71609fc920b951a11dd42ac79e846d9469a374d2629
-EBUILD ufed-0.94.ebuild 951 BLAKE2B 780fa571f99d74da51658b950cce40051aa08f8750ae71632ee53cf759d83e1796092411d2af99dd053ef9c4f0f46e33e16fec23a29f29562abb5b1d2bdcf569 SHA512 7fdc5ddc3a8463ec3e97a9d69f0343e50fa4f98c357fe7ce3d9defd018038a155290db68f3132ce9495b287911c4cf92b71006c7f6ba7a4470337b432e9f47c5
-EBUILD ufed-0.95.ebuild 968 BLAKE2B dfce0a964ca321ce66b8e74a7ee929e2292698cc26adf9e2f9649dc96ddbdb14e5b7a404e0a019de234b3e7f98b56821c2e8db075da07da22cffc812ec1ba5ea SHA512 d44490a0315951c5bb5617f435ed2ac184a586218304d88cb04573644c3566c6037cfecbc3158c32b34493280792c8e36df4d67f35eb42020c0a48b9c38bda0e
-EBUILD ufed-9999.ebuild 952 BLAKE2B 381447ef1162bc8f3ae6e53cf43216b9c097d64c2fe5426e7d12e8854843e1b20c92285564fc1700326182f81feea6ecb9b741dfcd54ec173a2e998e1e2136d0 SHA512 ba5d761545eed25bd6f330e980cfcc62bf7699304f442c7cfc70bd1914d3c98a2bfeefc7d87fb266773122ec738faa79186133c523318dee858f46cdedb6925c
+EBUILD ufed-0.94.ebuild 948 BLAKE2B 3a766d0d523a7651bfc36f80afcb592c018663e0c31dad34ee517ee9b2174aaf4bf948aa88eb83ae7192ba774ccfc7b49eebb6d48b5f7c6d629d9f9dea32d5e5 SHA512 ee5180aa3a37d44f943ae33c616286537c7d97fc7a79b49cfed41e5daf71c54e5031af05cf1a71eaa0283373145e3cff510c76d3da363324cf7dea7b62523712
+EBUILD ufed-0.95.ebuild 964 BLAKE2B da67f1aea80a406fe8175a1f5db8ef9a4d5d84f421c2118d4259d050aaadf1d9503b2a08dfd53dc61f82766caab84f95bb1f9d2ec2876e2133cb1c30e878f55e SHA512 0d67580ee0153b8de4ea8cbddd212b26657d3f9774e0f1246785eb972608ab59487ff0cd0c71b6b15b0a62776dc83f7c17d073ca84bf899df1267d7707ee6b7f
+EBUILD ufed-9999.ebuild 948 BLAKE2B f20e415160ff62dcfcb4a601a40d2b94a017e772f26bf30331d80cb5e99bf4b4622c4a6901390bebd437669f02d3cb396d1a585c268872b903345c24498efddb SHA512 f78d0110f4b4f67ec6a015a8aa6a9f00b0f1fa9c263a353da89cf8b5ab78a2909b311b7380f6ad461c1736b309d38ccfca817e5487341e93cb3d67a66a1c703a
 MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
diff --git a/app-portage/ufed/ufed-0.94.ebuild b/app-portage/ufed/ufed-0.94.ebuild
index 867d502350c7..65b38c4b30b4 100644
--- a/app-portage/ufed/ufed-0.94.ebuild
+++ b/app-portage/ufed/ufed-0.94.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools out-of-source
diff --git a/app-portage/ufed/ufed-0.95.ebuild b/app-portage/ufed/ufed-0.95.ebuild
index 62eb8a49ad51..7b1d8fd7fada 100644
--- a/app-portage/ufed/ufed-0.95.ebuild
+++ b/app-portage/ufed/ufed-0.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools out-of-source
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index e076a131b1d5..ecf6d270bd5a 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools out-of-source
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-portage
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)