gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-portage
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
126 files changed, 230 insertions, 1922 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 95157f793c29..0a39557dd601 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 4ad90f706b17..1f4682332940 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,8 +1,6 @@
-DIST cpuid2cpuflags-6.tar.bz2 79329 BLAKE2B 3fb1e104a065b020926602e3badcb96c8c3bbcf5ddc708eebdf7754e37bc302b88297471f51a07403eb49b0d688a1c2725b878bcb2a47edb0f491e3608d72b49 SHA512 b7c844667988663ad50430a506055c11263c33bd8821ae8025eea3f719c33101425dcaef3f89afed7f15952d678e4467afe99672eb3135bedc34fe5979f999e0
 DIST cpuid2cpuflags-8.tar.bz2 82432 BLAKE2B c4284106a4b1433e266e364b40dd50cf801f6b4afcb6928b13c1ac58ea1c3854b4a952f6ac914ef995aaa8bc9cfd8a4428c84386eb2949f83228a5b9d9781ada SHA512 167ee1620d6d726ef849d265785b568bb72a1aae15f5f0c527a903424c8ce9519033c49e8a143ae093b56e25fd71b4746793fb825233173fe60ac29eeecca20c
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
-EBUILD cpuid2cpuflags-1.ebuild 1049 BLAKE2B 7d80e64bf6109c0554ecf37f3ddc4042bc8801cbab79235e94647dd1d46bef5de89261640957a3cb0715345855462b81bfcd2d2c3a9b6d2e21fd201c2cf916d4 SHA512 df3f8412a7992d034495dab33395ed892233976ab7ae70e3b8e698867e03cdf0231c2814968bca139c870107e3d96aa90b4473904a4c6aba02b7be098c9617ee
-EBUILD cpuid2cpuflags-6.ebuild 900 BLAKE2B bbbff47e74e55a6e7f8c70e4d70d8faca5551b7e96cbc891e1995217551bd662753578182a5f8a838cfc913d4b8143f4a4a26063537d9826b393f9a577d67f38 SHA512 1a7396af547599217540df2a925e3caeea27193427937518e1cd6ede3ff6929eca83acf7728368efb9310f377115d7b85ef002604b6110dfad94b4fb10867498
-EBUILD cpuid2cpuflags-8.ebuild 913 BLAKE2B b80f65c2ad289f2616b982ea630ee39ed3b6b3af333a14ce8825aa5443a0fbcb20b26f83b3816947ee10ee5919c93fb7021aa98dbdb57e6f0c23ffc9fb38393d SHA512 87452697d3a0a900f96f4103b9208dd6100475800da1c2977e917efb4017244607e8b810064657be2301e81e8cc66833565884ea70d362e7b4a04aadbd5b8f04
+EBUILD cpuid2cpuflags-1.ebuild 1044 BLAKE2B ed9ea1bd60d8aea784c8d9a44263c17ca5257b10822415346aa21d670c98c07501bc27d44fa03e79b4a51fa5d9408df6f408933f522ba5771c8c68077137e727 SHA512 e20138a528d97615db610a61fbe77e3f4e8cb3c811a635fe4e17220c93548b4ebeb10c05075e3dedd32c79972e7164a5cbad68ebd5253470f308b6bcab6b75f9
+EBUILD cpuid2cpuflags-8.ebuild 912 BLAKE2B 22e60d74fc8488858a7e43c05da0b51596a2a8e3a8465baa9288ea10312fd698b66a9fff3a0c00df3478e1450184a6c33835c747a3c8bb6a5da47cd463a99118 SHA512 ae3e68689ae5619463813d6eab98cbf24bd2a35aed71dc6e272747fed786b09ffe5a97fb16d1ae21d4856c50ee090bead74b15c66663e66d74c57374078c840a
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
index 05fe61f27a1a..3ca2f491f50c 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit python-r1
 
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild
deleted file mode 100644
index 1dd515226104..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
index c0e57ed3ad2b..269ffe7851c6 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -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/diffmask/Manifest b/app-portage/diffmask/Manifest
index afd3de6a8c64..169abd6f3f5f 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r4.ebuild 522 BLAKE2B 401b6c11a887105698607ae5467b5c5380efeaf07953186314606ea6f65c2e83d75129aed969ef9e0887883685f61427ba0001f0726c8bc37b2b25d2de0d9fd5 SHA512 92c4602edc889e855e27a945e5b67b171f5593b0e456f4390d6c51a7c39e40ba41be56959b68b55d49bd3c017335bae1e354fc95ea38360a4b33c2a751d57cfb
-EBUILD diffmask-9999.ebuild 470 BLAKE2B 327f553e32095ddcc490da4b8f11ca669612591a6c20379e0f847ea24bff9d509fd18d37afcd7050fcd3fe78dc5f5576b44675662cefb75fb3d813d11eca96e2 SHA512 68ec486e11b037cffdf612bc0e6dfdfade2ca6a9dd81705cbfeabfeb88caf8b033fb41062ea975e769a8a500f0ed47b42a95991113f3d99d13de3c2845b29168
+EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 07ef09c3c009f70593f0d490b17aca304fba56457d10ca0d4cd079972ac4543e0e50b3662e6317e9b094043cb0483fcf7047fd0d1b4e23f174bada5744350054 SHA512 bdfc29271881e112c0573221eda2ae27f9766ab7a7f0dfab719af414718db4358265498928cc403991df1f4221d0830cf26faa85eeae65cf3bf088e33b011041
+EBUILD diffmask-9999.ebuild 492 BLAKE2B 0ebaf4fba49213a01a364930e39e9b5b4f8a0690b1686f049cee464b3c0bc84ce53b51a083557125f31b0d73aaa4fb9901e7000390c5752291b31a2e344d0203 SHA512 a9deff76b54c6df8f0883f7269ac8e9b2689fad003c0214387111628db6c9810e6f5d830af24a89a5c96304671d87d3dc2e121174a71d8f00b173772ccd05514
 MISC metadata.xml 865 BLAKE2B c9fac77bca18c860782a29fbbd18bcf32013f03d35a4caf12a720b9ccd8cf93becdf5a775e6673717da25d08b11c4b871150dd878241c8fea364e383fe1d1094 SHA512 e5f89a3756c6ad777fac8961bbf74f2a62d2b555ff9d7d5ebcba0533173ef6086d3e364460ae84932099d45f7bd9640acfa831d45e0d8317a47eceb1ddba314b
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
index dd881f74bd08..696a18ca528d 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index b8f95825456d..e644b0bc2a5e 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index bda3f190603c..0a5e3e1ca324 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,6 +1,4 @@
-DIST elicense-1.0.1.tar.gz 9260 BLAKE2B b5782412de613bce009ff1d685de6af9a129afadd131a91328cfd02d55c416e5c7549aacf676c4596a4512de4e3a42d2b89c24d2367404177e9675a7fdc35d94 SHA512 3b7b412742a9b67b5c4dda10838d6380c1f18199bcaa87458f30b06bff068228f64364d336d1daf4b95df6c1889ae9de7f277dea3defd18dbf74d50fc9381500
 DIST elicense-1.0.2.tar.gz 9262 BLAKE2B fd1e808f577269758ed46c8e8965dc1be7649c825a094ff5b2e09dba12af5249a5a73dc5489ed131c8221e88642f92ac8b859ad5185d3a0c095bd1485178cd27 SHA512 ac6788e7726d962e72855da053be0c44722a013dfa7f500dc137ae46d946c176a285455ddaa5eeee1f6e224d5960aa2a578caa7c3182a5f93d3bbfae8cfd4a93
-EBUILD elicense-1.0.1.ebuild 928 BLAKE2B 8b679913b648caf2ef6cb2f57d73e63f48e34de91e9197cbcfb3c7575c5cb073216c8435a84c5dcc301615528a5f0f74c418334e4fcd0905a10eade90e2fd9b8 SHA512 748260c65e16fa4edf0e8f943c146a4796d0c8b04895c50f5df5e23fd9fb899652963c5c94a054d043db330cafb0cdd4c81e3bc925ef73bf8653f3439fb64521
-EBUILD elicense-1.0.2.ebuild 940 BLAKE2B 4cf03ecb7ca70ac589923766beb93bc34de23a2057c6912340510b610efacc985282ce3e29f23b01ecff0ed34900ac3b926f038b0ac714676e3dca925fbcbe62 SHA512 2b3e47f309eadd7d389c2159fc08d5598ea3029e4f036c6e6b5a3441332933e9160b360e3ffe033a02134baa873bc6273ac4ee0c4046c76424b9142fa03aea7b
-EBUILD elicense-9999.ebuild 940 BLAKE2B 4cf03ecb7ca70ac589923766beb93bc34de23a2057c6912340510b610efacc985282ce3e29f23b01ecff0ed34900ac3b926f038b0ac714676e3dca925fbcbe62 SHA512 2b3e47f309eadd7d389c2159fc08d5598ea3029e4f036c6e6b5a3441332933e9160b360e3ffe033a02134baa873bc6273ac4ee0c4046c76424b9142fa03aea7b
+EBUILD elicense-1.0.2.ebuild 924 BLAKE2B 787aa5a2e7cbdfebfcb17a4d1b1736c676f153213721c99b7cb014c97850483b51689ebe2724de4ba65fa483a30a170294e293a375f7bc18c0b9f952d93bdf63 SHA512 93778b59ff763351b0f50120ccb7c286f34514728bf4303076dcd4b86953846fe1d491b35457af0f6c703fdea7d81a91e18bdf0f15aa716f61039142e9f16e44
+EBUILD elicense-9999.ebuild 936 BLAKE2B b7af1ed2a4fb2c5c1a4b662bd87833f2ebc1fba1ff3c9f432d40f38dbc96d64074bf42e20c10c1b847ca128dcbce5df88d41c36b6fd9aac3699edf52861faad0 SHA512 cc68786c84c5fae0a816ca579411bc134b4ecf571c5e9419c106a3f3943f3ca890eeb930388a348a7e11c8ff220db6ca2c062d965fbcb1bfdbd4fe27f421f687
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.1.ebuild b/app-portage/elicense/elicense-1.0.1.ebuild
deleted file mode 100644
index 1c9715d82578..000000000000
--- a/app-portage/elicense/elicense-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
-	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"
-fi
-
-DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
-HOMEPAGE="https://github.com/Whissi/elicense"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	local MY_PV=${PV}
-	if [[ ${PV} == "9999" ]]; then
-		local last_commit=$(git rev-parse HEAD)
-		MY_PV="${last_commit:0:7}-git"
-	fi
-
-	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
-		elicense || die "Failed to sed in version."
-}
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index a4fe0df6ad1a..c4613e531414 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -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/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
index a4fe0df6ad1a..ca065b514b6e 100644
--- a/app-portage/elicense/elicense-9999.ebuild
+++ b/app-portage/elicense/elicense-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 443e88b3da78..0746033e48c3 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,4 +1,4 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
-EBUILD elogv-0.7.8-r1.ebuild 1593 BLAKE2B b92f573aca9954ba46b2e354baffbb73a8d1fcc7a178795f090e2fd79d752d0fa37f5aec5992aff77e95aec9f732667ae3a6dde2b26993c8f21482af2d917eaf SHA512 f08c903901fcd59363212ac1631de6af5d379a8110013fecf4d41afd16f85825083bfc00711854131b621185231fdb885d8c5cc0d8489c55adedd97936371935
-EBUILD elogv-0.7.8-r2.ebuild 1665 BLAKE2B 1f77cc7fe3b345c355a1a652fe3948ba358ee4db4261ad4d05e6ec80f1fa3b31c07513206d6703b05ab0e6596589f1331cfef4f2e66a8b6125834504c58955ae SHA512 00144db92d850ebbbc4b060cd4ef6b67f3d27d066fcb4f40428c3f71d3652b498ad8360b2d36f64c1f12ce86689b2dc062ecd39c56e585a6188baa19f704ab3e
+EBUILD elogv-0.7.8-r1.ebuild 1591 BLAKE2B 02a2079dc2bb538acce711cf185fdbae073af455262250eeacee9cf125ca0d8ec77b2636da279c42fef093654ab338f41553d387c1cbc1c543a644750f275c17 SHA512 c419b695f0db6cbc505eccc4225ee77a446b253a1997dc10f9b18d1bedccf3a6b2d46c9a87f7ecc13c7d5959a8c07ea9a5023ec89af964ab84081eada91c94db
+EBUILD elogv-0.7.8-r2.ebuild 1663 BLAKE2B d0945ca00a2a998ffc3a20e2ccd3a96fc69f609b6f640360f0302b621ce85734d79f88c61cd9796b2252292c5f92bad0458fac80e7830580004ac4362342bb4d SHA512 1706f0b8e7f3a0da7834f74d2245a7f1888c80f0ec93056526c6508e2300aa373f247db1139aa9d0d43482c1b476fae6b6566a85d17f78ef6712103286e33a73
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild b/app-portage/elogv/elogv-0.7.8-r1.ebuild
index 4849f78c55c5..29847a895697 100644
--- a/app-portage/elogv/elogv-0.7.8-r1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
diff --git a/app-portage/elogv/elogv-0.7.8-r2.ebuild b/app-portage/elogv/elogv-0.7.8-r2.ebuild
index 04a1a84d43f4..7dd9ad6ec418 100644
--- a/app-portage/elogv/elogv-0.7.8-r2.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 5560f92d9d25..602f528a2b74 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,5 +1,5 @@
-DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
-EBUILD elogviewer-2.7-r2.ebuild 1683 BLAKE2B 55a270fa925909f4e97bb2acebd60f48f93d3f3b60653a83688701dff6721d43b1ced465dd4b75254bce6cbbe0d3b1f7e128be55a1c3d644186fbb74b027ec09 SHA512 f67c73b5fbd80d82a44b943d7613a3854f083d6f907f41256f5a196e8d15f7879c429dc773a89f29f564ea7db3d42a737c6846505e21a8fbd6312757834ba7bf
-EBUILD elogviewer-2.9.ebuild 1687 BLAKE2B 2e8bffd3bb2b51f7b1726bca69ba59c40f3bbc50123986d45e5572fff44af3b1ecceaf4eb73c9a5ae2d94405e51ea5054726b28468d0f06cb24bb0f058f03140 SHA512 240d6fa0a5a6fc2544a3f08eb5bf4a492388937643285111e65bb8b6b33e7bb41c094791c2d8b6c2ccb2f6b5e64dccd585d9b857716396ea0fde1f0424f29d48
+DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
+EBUILD elogviewer-2.9.ebuild 1683 BLAKE2B bb559758ecbe038a05746c243df9dc8cab5b64436aff962a9af0b2cb9ce70525a7c0de9d467938bd98ee7805fdc2fc8b6298afdba08db854b7c9b00efd465048 SHA512 6c0390a209bc42555cbed8afea61e339529d6e3c01ff11d38614f88b5c7a04bcac217c2cc5e3ddfcb5ba3ab9d41731f71660f9c30aea69413ed05f46495ffb6f
+EBUILD elogviewer-3.0.ebuild 1686 BLAKE2B ca25da9a3620ffcee16c8d725cabf4a1a073cea3c883a12a19dfe17a80cbc48f6fd3321e1466fd48088437086fb40e6433334ed1dfb21a05e39d2e9dc1e19162 SHA512 6f2e2eecc570895a0690fc470518aed811cf3056af85befc5431864aa4b4bfaef35222581b173b17d3db68583ecbe2cf7dfe1010ff16af885ac6a153555e53e2
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
index 713dad4f7664..33df6b190e26 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 DISABLE_AUTOFORMATTING=true
 
diff --git a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0.ebuild
index 7f44226613e5..40533d03c311 100644
--- a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 DISABLE_AUTOFORMATTING=true
 
-inherit python-single-r1 eutils readme.gentoo-r1
+inherit desktop python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="Elog viewer for Gentoo"
 HOMEPAGE="https://sourceforge.net/projects/elogviewer"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 61f2c873d209..ddb2e2d75594 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 1456 BLAKE2B 42508f06293f70cb12a04779d2ed245db6989ae722ca73442968c9b95a001d7c2cbb01cab21636d49aa30b0952de6eb9954ff90a8ff9276f94876dd3f0da84b7 SHA512 e0cafe10011e7c616a174fd2542e24a8979d86bcb3c3213a21f836378c645a24117be17128f0875dcc1b24396b94f2908d0570463124f55b79c5019d5d2ac661
-EBUILD esearch-9999.ebuild 1046 BLAKE2B ed68b2bad6ba9d3e9165c1b726cc3cbb1dd918fe00f7d6cc30fee7c631c32c5ef473c68aa6e41be1add83b02c1ecec68ae76d06986b479ce39db6f4fe58e2795 SHA512 ab6e7467ce2edcd454e4e3cef9018fa7890f39f2c5e631f318162fddbd6b4afe735798c6c9f49e008d787c4326df6fa54a20b713c4a5cf7e733d4c5ea126f5e2
+EBUILD esearch-1.3-r2.ebuild 1452 BLAKE2B fb6a2d7fa6e557f8aec26da27fafe944c85171bea5024a513fd9467429b1cd8aaaabb1ed56c0b08929c5e6bd6294350844c23cdca5e6e20a5afcade77f6f177a SHA512 d0af71f2e8986d13ebbf26c98795604b1a60c47fe8d0013564f12fa17a77151c37f6e1583c49559ba581d69d31f737de32f5eb97dded9a7e1a0fa52d124c44c9
+EBUILD esearch-9999.ebuild 1042 BLAKE2B a42399fb3c2159df0cd649fea41bed2f30579322d88caac9b0cd5adea6d2feb1c32660ac32a72dbc792e6e7773e2633bf92a47b5b788854d3f7b70c7ab6b1036 SHA512 c138c8db4a8769ccd48edc64cd1df84f230570e3a0a26d0b72e8613a6cbe2f6b73919f4c0af401703e75c9723d4e0ef497bbd3da9c040e670ab73d6699d6656e
 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 f2e2ee6be360..49ee7afb28b1 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index 10b62a631ed8..2512045faf8e 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index abd59ec29705..1d72aa84762e 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,5 +1,5 @@
 DIST fetchcommandwrapper-0.8.1.tar.gz 3579 BLAKE2B c2bf9bf5c463c264ace781a513e4943c4dc4196bfbef1e14112f673d0662c89b947daa860abe3b9b4a2cbf88d5cf6743670da7dbcec13876db7fdad2051e8e7f SHA512 087cbeaeb3126fe43708e453bc1a21a8957c47a9dedaac336bc9e6222191bf8aaafea17031b3e6d011b8bfd34483b521410eb84be43d226e5fb1ce1eccf4d4af
 DIST fetchcommandwrapper-0.8.2.tar.gz 3878 BLAKE2B aefedc663cb59190353b9148807466cc26855ff2c9693e6152cac3d4137e3f0426d2f2787d34a5f3c620f4014e5cd7fbb11463929a635e8e0d261e2e487b8921 SHA512 b6417aa0db803f00591d07fcd065ec769cf8de307e59b91690b7bbb671124ce143f29776498fada873aaa234b714cb6eefb5578333f91ce74cf76d98d62d6da7
-EBUILD fetchcommandwrapper-0.8.1-r1.ebuild 703 BLAKE2B 88451e9bc4d20c2d5dc31c99a0abc918dda9795bce595f87918eb713abf6f765bed712acdacd84453a572c9b33038e6640587264713dea783d25a2d3b58db784 SHA512 7da95e775f0edcb74634f6c5646e635dae6ff1f39465d2df629d7854d469f12484626979baa2504be4c1d55692cd455cf9231486d7e7a579328c2325c99d1f3a
-EBUILD fetchcommandwrapper-0.8.2.ebuild 661 BLAKE2B 54ffcf0633858eb9c9084efa4c6d19dfa5481ffdc60e09bdd8969ce2fd1180149a17273f5cbc0b622c5da8d4b415a6c00b234b1cf4f70ebc431fbb171b29bc9e SHA512 ac5d3f7da1c408c6ba8e4635b98ce598c34496afff1c676a0033babedcb9aa705e39c99c9542a93d86ae37de368f325eef27d705f578b88cd9700ac6153de15a
+EBUILD fetchcommandwrapper-0.8.1-r1.ebuild 701 BLAKE2B 28ffdca1449cd218d55f4968f1c1e627437c18090e48926cadae3d087bb718caaa9f9f1723e7d52e811e6fcae681c7cfe64f6a622ac01ca060c6d91ea6d88d46 SHA512 2fc50a95080455afb3789947a1ffbac435a897a3c8dd634c5ead80379fc3c098c91052c7809e99d221ea956f06841d5347aaadaf8e0c57d57402c43e46f3ba06
+EBUILD fetchcommandwrapper-0.8.2.ebuild 659 BLAKE2B 5f8d92ee3af46f35d7fe54a27111c69f66c1790ee9248de4ada551744dea57688a6790295933715e222902207d623125d50818c3f7364781a06310fb16e039bb SHA512 b8d47cece137435865793c543a5cfe3443514268d98b5a2abfccaddd67e8146353e763e365a2d133df59d4361a279b7433e023289dc738ba8c0f277f2ff28abd
 MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild
index c0ba8e8ad082..bc16b3af32c1 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild
index 1e271a62fa3d..b4e138d38f2a 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 0708f87aad94..629098d5feb1 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,4 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1-r1.ebuild 1098 BLAKE2B 55a0d7825013c9584f3aec7d65c685870908e77bea591e83a47369593f96debc6e9e757cfee6210efc0396bd04bc99515c990f74312f6f0d3e08263da87f3d0c SHA512 12e27aed9400a785d80f4c85af36ad32b0201e0def2173109f9532602b331a83ef11b41f9446cba4af800d57726b5e41d415b43580d7edecb3af7770d35976d5
-EBUILD flaggie-9999.ebuild 1033 BLAKE2B 52d0d1fd0d45d3650ab73897b56795aae567b7aa457f6739213fc3d28793323f6c7ca6733a0545c8ffbb35a55385f1af3a49d1ebc953f74ce42f0e7856ca683a SHA512 552813cf0b7dfd0974f9d4d4cfc6b5336e8b0ff4045735a24395a6c421a5e270888f0d35f67119b330dfdaf3178eca23acfcd0be0587f908ac68912fda042601
+EBUILD flaggie-0.2.1-r1.ebuild 1128 BLAKE2B a28e11e7d41a3a98b09e0ad6dccada1df24680550dc847573b617a16b60abb1f70522eef68aff1e559b3e7b45ebb510ce5c29cc63d3a8c45fbe8a354099be288 SHA512 4b3d862d9428745c37f3897be443e8d7c26acbe02f37a90758104c0a03ca4bd15dea08ab92580808d2ecf13128ae8c1fb643a83aaf4f6e5aba488d533ce3ffc1
+EBUILD flaggie-9999.ebuild 1064 BLAKE2B 8f3ca02dbc2eeea258a5d56062a2a248194bbf3a0567ae62233c5f845f1905f232bc7cdb27e19ef603b7c85f60968e63dc02d255f04dac626dd2b42b0d687982 SHA512 e1f30e32871c6ebd2d001405e8873b90eb35f53b0581cc288152240f1e9738350683fcad03da1fab0d3ece6583b5bc15a3b07e963e1dc5977eea55c0c526dea5
 MISC metadata.xml 503 BLAKE2B f86cc20c12e1bf2bfb8d04b6ec0ae1cb66fd4a239cfe41885b1277abc2590fbed0a27dcdad6c0290227f140e4b783ffcbeb8c4556fa4874f0cb4e1d77e691165 SHA512 d406c0b2397c2d40c1aab0db4d4a54c2b928075558c823da63fe21762ed618da5aa20fcfc86c4b3066d8a7bbbc4dcc55d6037025db27a7873de274282dc0a88f
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
index d16a34cf3a3f..2257dbe98c4e 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit bash-completion-r1 distutils-r1
 
@@ -24,13 +25,13 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	ewarn "Please denote that flaggie creates backups of your package.* files"
+	ewarn "Please note that flaggie creates backups of your package.* files"
 	ewarn "before performing each change through appending a single '~'."
 	ewarn "If you'd like to keep your own backup of them, please use another"
 	ewarn "naming scheme (or even better some VCS)."
-	elog
-	elog "bash-completion support requires:"
-	elog "	app-shells/gentoo-bashcomp"
-	has_version app-shells/gentoo-bashcomp && \
-		elog "(installed already)"
+	if ! has_version app-shells/gentoo-bashcomp; then
+		elog
+		elog "If you want to use bash-completion, you need to install:"
+		elog "	app-shells/gentoo-bashcomp"
+	fi
 }
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index d979063b48d1..4a0285406c39 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 EGIT_REPO_URI="https://github.com/mgorny/flaggie.git"
 inherit bash-completion-r1 distutils-r1 git-r3
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index fbe321e54e5c..2f0d56018a37 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -3,7 +3,7 @@ DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc
 DIST g-sorcery-0.2.tar.gz 54173 BLAKE2B c110c670d792bf41430980a5155ca83d9ff45e9e301507628913666ebf313155e3b262856efcdd4896dad005c2eac393f9573fc106fa868b057a7b8f5a026b9f SHA512 9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32
 EBUILD g-sorcery-0.1-r1.ebuild 657 BLAKE2B ef02ba3796acf6684f43efd86d8c2ce01e69b74d8ec327d34f286429e9047b9dae9506786832f8378e7e27e0acdbb2d60dfc4a1e9f120e0393d693a76eced218 SHA512 829b5b598086e56ec67791c005687c962a474c942aef5054113b3cda143294548613320f14c9afa9f498a6d6de147a4c54fce95633baa491ce88032829025928
 EBUILD g-sorcery-0.2-r1.ebuild 831 BLAKE2B e46177245bffb59d0e7287d2b4aced99d9b3414bef79f6c5706d1cba26b8a5164a764c192c655ecfdd453962afc5623d3a05fb1c38f26b6d90fd22fb188c5add SHA512 5e5db3892a725664358c82f508a304fadb5de212ba44912383a68c16a5aa1830cea7c6ef22d31082f060d228bdb65fc7209dc462972d57465c8ea6c2d1db9691
-EBUILD g-sorcery-0.2.1-r1.ebuild 956 BLAKE2B fce2b8b0643b06cecc944a7fd3a2934b2a5b6c22fd3d6a087f9c6273eb7299cf851bbb0927a198a5ab32ec12431317eb28c13c180210c12667cee7273138a8ce SHA512 986f3e3a3aa17b63729fd684f07f26a4227ccbd56fee683e32983f242e596eb9886d387d4f27bf7f32e898cde3ed80f5c21d0a8bea352beb7f9c38490e419ce8
+EBUILD g-sorcery-0.2.1-r1.ebuild 952 BLAKE2B 5abb7b88be4ec392ffa753fc2ba022a7136f023b7e92fa47e2b97f75480551d774087c1642db8b629bf169eeaa3e38cc29b14fa1da46babfdd56fbb499527d16 SHA512 c9c8e18cf16c3653080f8277c39d665c7d9ba169340d8870be158d8ecfa23d7f27832a2b86426715393f915ead211839bf1b0b563c603d3a12e25fc2cc1da937
 EBUILD g-sorcery-0.2.1.ebuild 857 BLAKE2B 6c17b1a9605887a85576dd55e4f418c53acf86e2e09ffa7b030a4e7b6b2921db5f1aa4da6e0fc8610729b4371fecc9a50a319f0112d227067655548f8c78fcc7 SHA512 bf5a8e33dd3e59043788da60336e071364c8879f5d442f5d095290d059030899587e708c57af52e0323029a481466c4fb9d9eec6bcdfa54d8858324701217ba0
-EBUILD g-sorcery-9999.ebuild 873 BLAKE2B 548adb4347479ce35bd4f2751ab11c3cdaf60c80b2a478a8a88851292f8113e908120f4371b29f380479f03b91dc15f51ae0825592218b7661247135f4e43254 SHA512 2fde4d2e0b19a2bc999bcf2b6d4c497a5cba4da6f03b7511b311b7b7ce1e4e653e23502330339780399a0e081f5e3978f873cfdd043ac190416a3408e5ef41bf
+EBUILD g-sorcery-9999.ebuild 869 BLAKE2B a4e54c03822bedeae5537554891338766e9be01d751b17214b0042714f083ce9cca166e9758f5abe3aca036cf068594f4b6de1f08d682d734e86583d1abe3da8 SHA512 807411103956aaed6fb5bc60e98a93032d3f29ea5197fcda3fcb5974455935cb2673294f0be78a5b5c02782a28637e22221b31cebdaa8b87c4b160f7dc27625f
 MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
index ce8223299c71..71d2921aa27f 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1 prefix
 
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
index dc1e5fcc6a03..77a7ae95cd11 100644
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index f8dd2eed3ad2..7aebc1bae035 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,11 +1,4 @@
-DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a938c20ecadfb1a1332db3842b14bfac69006269efd0f1da6d6bf0f10f3aafb07ebe01af09e64f9612c50b8e98a0bd6aff27651 SHA512 fd4722dd2f632bda4abac59b7e62f531edbdc455be1f1ec94d8bf99194956de15b6cfa4d623713bf3c25e55a6cc6adcdf8039cb7d20a556924bed0ddefd95daf
-DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
-DIST gemato-14.2.tar.gz 71315 BLAKE2B e94284512bc42d129ef29b686a007dfaf74e8d325a5596f44ddae0e6ce76bf86cf24fa94ea72476fc17eb575a472ee39b02b987c1f97d987eb03ffe6901d472f SHA512 de4e2764bf5778cb5c5fe23c912d9d8c89c4201256305ce5820555fcb5eea4236b8d64ccac9b1a72fc497ec9a4a4e64446835850a8f9be7a8271cddde52eb561
 DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
-EBUILD gemato-14.1.ebuild 1391 BLAKE2B 0a130c15a4aa07d3d5da7d5e64e5d318430c298aedf9ebfe67ee91e963ce13dd9e9e8085fe19fcf17d3e0d4db99cb1447b9ce73b909ad24a1072fa9335e37fa6 SHA512 09b33fa833e567bc18135b2a9281736d1d882160c18749951d486681198cd4189c74b79e9e5064086a5e8ba9bcd1910c363faabd790f27abbf551bfabe9aaff5
-EBUILD gemato-14.1m.ebuild 1674 BLAKE2B ee7a98540166272128fc94af0e5f8a7bd45ad0c30e65777f08f0b45576cd287558058d0f0cb6c121939d79cea63b1a1cd4cfb24b69bb66759ecc744ec840f378 SHA512 c1509d319373ca7c35603e1cc14d1beac15e839b97c2648fe2aa9970f9d06b59f6355ec34196a6a0b7c4f3e87e8e99dc61b050be8fd543f6e6580aa9395cefb5
-EBUILD gemato-14.2.ebuild 1392 BLAKE2B f807e0d3bd911d5089913cbe38106b09b7133c4a9049df86ec89503c1c0c2c388712f08b8821f1d33bcc7a4fae79328796b12cb7c06b85f24813d992f5c7fcac SHA512 1ec51b5e2facd52fc0acd8a83abf8e47d8a7868f33afab6c1efe6d7a4d937c5343aa168b3bda41f3f58f2b449870e4e7a36bca7afb1ac10bb691ebac4616c7d0
-EBUILD gemato-14.3.ebuild 1353 BLAKE2B 7be8b507d589e919c6cb75f60553a06f92af98a131458c8c64b31f84a16ce2ed82a4567d3ad53daacf83840962f875207e109fb48db73894e60ad68f176ed5d8 SHA512 5b648f9461b2f9125cce62f8fc170108ac608f9835bc0b4053302bb59b3c06ff06a7ef408f3778215d6fd421a81c26e78820087af4d7f53772f9a64c7fdafcee
-EBUILD gemato-9999.ebuild 1260 BLAKE2B 68e799494aec328a7f16c80d85823e5022042382fe91fedd36ee19dede50249dd0a04c4392d7b034fb9e5703a2a5c1b997255c53ebbf534140d3ebf05f8ec3eb SHA512 82683aaa9e1862d7d199485c0891c19c404301bb1db2d77e055d38acf17862128d810ca8096701be304d2092be7e747597743d52fe67ac77ce9e2dda45ccd32f
-EBUILD gemato-9999m.ebuild 1455 BLAKE2B 8ac741c16f9ea0d391da5517066861e0c797a6bf3202bc59c3fc65b376b35620ecad44eb944a0a1fb27843543fc3fdc19c27b52e379d87f422a5e8ddc384ef86 SHA512 4299c44d2e034010045f0b0f00f4439c2b2d42291bcc5e7a860614ae09895472d40976703cc4aee0a740c43d41a8d9ded3bab6a99da74cdcf8fda4be33192515
+EBUILD gemato-14.3.ebuild 1346 BLAKE2B 6dee342d7315c6b0d38bd8343ecdbefe2a850f706cd6f4062b72975338d6f9437f15ce85f1741369109d6989e5a39794b3ec53ae1d96231f6d2fab45fc683886 SHA512 c9b22c0a31faf4cd11b5f4b2702e65046bb9e5ed01b1521216bf2a0760acf3e53d020df637a4c8df4d2d4ca8a0303710af37b4633a05f339ee8f58e00d351e5a
+EBUILD gemato-9999.ebuild 1253 BLAKE2B e7ec95e09ae89f9637f12456f27fbca524a6065e8d497874bd9d01feb42d91ec2abf95ec8940c5ca5ed138f8587d2970bdd02175b8a1edc73bea438c9ce8f18b SHA512 42f14a37f272d02bb910bd3ce42b3e81ebcc18c8b7bf46ef4d1ed4791c5c5ee9a28bc65b81144b5bc177d5e0e59f4c67e31d9db69e0537d118f1949ce5014025
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
deleted file mode 100644
index 96d59a16d5c9..000000000000
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-14.1m.ebuild b/app-portage/gemato/gemato-14.1m.ebuild
deleted file mode 100644
index 39cd57596246..000000000000
--- a/app-portage/gemato/gemato-14.1m.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-MY_PV=${PV%m}+multiprocessing
-MY_P=${PN}-${MY_PV/+/-}
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
-
-pkg_postinst() {
-	elog "The multiprocessing support in gemato may cause the process to hang."
-	elog "Please see https://bugs.gentoo.org/647964 for more details."
-}
diff --git a/app-portage/gemato/gemato-14.2.ebuild b/app-portage/gemato/gemato-14.2.ebuild
deleted file mode 100644
index d58a025ed50f..000000000000
--- a/app-portage/gemato/gemato-14.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pysha3 is broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index 99e10512f1dd..a45075df13b8 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index ec43603da332..840a8c6afc7b 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild
deleted file mode 100644
index abe4544cbdaa..000000000000
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
-EGIT_BRANCH="multiprocessing"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
-
-pkg_postinst() {
-	elog "The multiprocessing support in gemato may cause the process to hang."
-	elog "Please see https://bugs.gentoo.org/647964 for more details."
-}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 974aafb8d991..603976e31e25 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,8 @@
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
-EBUILD gentoolkit-0.4.2-r1.ebuild 2285 BLAKE2B e85f43bb96991b524b7a772927a6bae0408a7704b89b6a81839c92cbaa3170b83c389cf575566388ff37b575037a2109782ba968085dd1bb0b968e080c35aee7 SHA512 1ef91d922ae66de8f32ff94d7a9770496857850146a627eaccca03c29d1feb09b5ff97541fd6354c6c78d14928344226f9af3a916e69e064dbb4b81618689224
-EBUILD gentoolkit-0.4.5.ebuild 2282 BLAKE2B f003a1001d04e31ea2b6f85f46133ee7a46de6763a4bcb54a32987698848fa6882e54a960ee59ad608ccf3b1783947f788ac6456534bc27a22298c05990ca230 SHA512 0d3b2e76c71c69ac6f880ca2e871546898c05eb8e67464fed6a22ba72c16100cfb97870ca23b801e86b19cb0fc6a0a455ba7bc0e2710348454edf394e562f3d8
-EBUILD gentoolkit-0.4.6.ebuild 2280 BLAKE2B 7eb6d8f6d9cd87262b065036a2d74cd480ba2f19d90040814091b283ffe7887a1c3e43d89d42a1f57f174d6e8dbf6828f19ba4f9100b2d8decdaee82fd07acef SHA512 8509638cbddb32691af1733da1dcf62cbbe6fda1f8d1e7e22b950bc50a69d97cbca209c725bbc170c7e419c477641164431738d3eb5b61acc5b746be62b38ca2
-EBUILD gentoolkit-9999.ebuild 2060 BLAKE2B 8534d42030279b810cafddbb21dd397071bd2f8bbadc74be63caa941fe19d539a427fa7106f18d13d75c9ee99e58b4f6cc6e106a885dc5f7f3cab7c111774096 SHA512 2b44c33b5b55ad3caeb3fa7f069da9cc03d89f27a5303d00549399b39a93bdd3c0cacf28d2f7bee6eeebc2f4cd8a305c3b625e35ac52d80f98894f694a946c60
+EBUILD gentoolkit-0.4.2-r1.ebuild 2278 BLAKE2B db1210735a308e4e2e470e9f769ceb94a1dc5278f2b6795b54b1b7efc21095e953a3768c1b9e98ed519e8dbf76743314e4da78d84861eeddf8728b95e5d96335 SHA512 c9d6200beddb8f50825eeef0bf0a43e1a6252c0f40b98c7d5aa1e5cfcd0242ddd1a19812998f32b2dea825ca8ed4002def4a197b5777a0d09184093254722696
+EBUILD gentoolkit-0.4.5.ebuild 2275 BLAKE2B 6844981966887b3b73d350456a5ecd04af7b507794c5d7f4c2bce4819507b772cf2cb9c48eab7454061f70b49c918bc2fd495645a518271f198052e98f3b0e26 SHA512 b28ae8c213638ca3d79845d787655f645b845bd5857925d54d615f6e7b53d5bd36ce12e8fdae7e533ab8fee6b2919f5a0e9203cc2ed72839546b28e680c29e32
+EBUILD gentoolkit-0.4.6.ebuild 2301 BLAKE2B c9e9599b9594bf55ac06ea7c2f522ac4972d2ad1ee18a5830180cca58def2ae6eb5fc7df96d9e5a07724ffdbb2206eec4432a7f5a2e7fda1506fd2574371461c SHA512 e2ef3cd654d0f9e07637882d333aea4eadd9f95b54ff69884ea8f6f9cb2a7cf558dc7068efc2108a56ae0f31982959234f53d0b67a728b2e38fee414e053e6ba
+EBUILD gentoolkit-9999.ebuild 2081 BLAKE2B abf030bda7368309bc1faad184b87da00fb5a9e20d17126c7dc53e236e321dbe749f3f3b33b13f83cb32e8647a4849af5646de28ec4784384ae923d9246038c2 SHA512 aa890958cc64f5e361d19a9bb4401a01c25d51f8e5536efddb0d25a30251989d10a04a4f78be67315d6dfcf6cae938a6970223c152879d5a10d0d1251d49f102
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index e0843ebeb8b0..dd97569c42c7 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
index 0952495b68f4..795b9eb6808c 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 7efa0eb168c1..0e80f1b412c1 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 9503857df3b2..8254566390ff 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index efa48e0491f5..ca03674b3698 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,6 @@
 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 630 BLAKE2B d16a099adce797f225a7201b84029470425f8b83ad12afe59d7bf7d25d7b67143b4bda66d8fa84f8e73fef0bbaa59557ef7b594a0b8e27f699d0c49cbfce6d17 SHA512 f30f310e02e60588156c1a1bebd00ee85d807877c2a11972c8c8166c1c01377d92d8505cfbfa344d7e18801c5adfd12d0a54381733dd84969605f20040b998ac
-EBUILD gentoopm-0.3.1.ebuild 637 BLAKE2B 958e791359efffb9809a00e0c47f3c9c45928d8f6490877838acfe8fa143ec5ed713d7c70ddc9f2302a1f90669e5140438994454c73ab73e2300a121ca16a49a SHA512 6a7cc8f6f8732637020d7aa8b56a6743ff22c9cfbd4e9c6da3c79ff1466de79f40e2aaed70e2ca49963d99037d68a738ea1ae9a55e4c538172e2a56946cf48b0
-EBUILD gentoopm-9999.ebuild 606 BLAKE2B 1234d42a5866a5e8bb11ae94a8f5c62f9349ffc67eff131bd6a46be0d959ca59c19d57767ba6b074cc9271ea6c566bc9ab54815e6cedec1fd9c6c2fdd67eb77e SHA512 e5b8c09347a790a9ffde59f350ccf3d17dbf50024daa5bf6862be93a8fb29f44039237b287e811062c06ecedcd51dbfad4a2100ffe92c5d484bb7ec0b3899eb0
+EBUILD gentoopm-0.3.0.ebuild 621 BLAKE2B 3ca6aec80f0efecd2c2c4897ed8b56ac17d793a5e5e9365f0b6a8c63656abf76351159d8b9d8aaf9c3c5863763fc554176e28d0b2953060503f8de7595f107e6 SHA512 bf5a5bff2b7877aa6ec3e10e954357ea91612d923684f29f7f63610c289e6e19809059e6a51a0d5976a6574ab9875c8d98e6672ee8400ef38483d4ef7d469315
+EBUILD gentoopm-0.3.1.ebuild 657 BLAKE2B d2cc6c43b677c3900abf90893c585f0b450a1abd283d73eb497fac17ed601ccfc41affb6fa5b626767c776154463824199ee0aa21bf6dbcadf25f951f310cab6 SHA512 4127a0607ee84335e8348662ba040a44a50d6ede8a37c8ba11890423b813b1a7143f9271520b9c356ab4dd5857b638b2b9be99d2b2863a0d431d3f5e1733edc9
+EBUILD gentoopm-9999.ebuild 626 BLAKE2B 2426eeefa7243cfbb684fb6bb8344c880026c3f89cd1dc6489b3357b8a8f035d487e8b3030c7ff15b6675d2cbffcb052f26b03be5f9599369f5be9f15c43c38b SHA512 2dc92b3da5e827b1cdbd3b076aeb3ea848d916d8cfc4514848b90d8baefb0de89e52891ec5c24f3dbbf9e8f5e79f5af51cfa589a87db5fb1428122340e621e10
 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
index 232a3f7c5e17..56056b4658b5 100644
--- a/app-portage/gentoopm/gentoopm-0.3.0.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-0.3.1.ebuild b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
index 93cd31750f90..9b91c0258f17 100644
--- a/app-portage/gentoopm/gentoopm-0.3.1.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 8609fa346bb5..32c5bfe6d4ba 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 223f857ae58f..0af1664ceb68 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,7 @@
-AUX implementations.txt 826 BLAKE2B 0961c495730ff0580f592b135ff6120e4a6af618fbc1b0ed08cf512b78fbd2fd87521a69715672d35a9f519b458bae1580e53bc1066f052f269b3a3c66149e02 SHA512 27fb05394d3a6a98440ab9ec78f33246c1f2ff050d9155a145239e826c1e041f4043d21c279cadcc988d37af1f54220d555decf7dd442aa6aa3eccbc29223ffc
+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
-EBUILD gpyutils-0.2.2.ebuild 513 BLAKE2B 422d795cf35c312ba8337bc13579bb28a3191e0ed01d23e2d0f79ade2c6a38b0365b428f328cbd62fd33c59bf679825f17e318f9ba0256eae2e70e68156e51ae SHA512 7a951b5502cd9731342ec5175614e1e55fba77775c132791f229d89d2be47f74a651eb8a1d92f96ac6e7ce722e69c0eefaeeb4c49d42cf7e18a036c09b2c9e59
-EBUILD gpyutils-0.3.ebuild 515 BLAKE2B 6119dfd06e3d0c50ae46efefd0c78fa7fc1dcd10f0b7bbfa9c387ecd7d88492e2b131fa4d04d9349b79bb3ea0360e9180e6b03db12817bc7a309faa509c0b580 SHA512 7071ea76c970f647cb9398ec56093983a2c26f9b223b3ea28b1e645e7a747de967cedd72a181dcc055ac3aaf464da36a1c5f22fad0d1b0cbc84d4558e372ba28
-EBUILD gpyutils-9999.ebuild 495 BLAKE2B c40a7148f2ed6e3ed6d65831956faf6c220f21f3eec8af3fed7bb9088029cb6f85aca7fecd3e051748519c2fd7cbc4abe9a52a7b9c310625853fd6ae6cca43e6 SHA512 011f3e934c7aa57118e1f1fd38752cb590c32b3d345689c99f6ae6087a355c6e01ceb1259b2f8d169a8bcee884ad5e39e6f6204372b4fff37337908f736c6536
+EBUILD gpyutils-0.2.2.ebuild 504 BLAKE2B 0329f99a324d218657756a3a59e04fdfc4613ab41112cfd5f9a25d83a42b808a1b604c3e2dd7db759f4d25bbd4b3ad87b3c47c61572f396014ccc1ace5204134 SHA512 2ef897ec75b84edf715660355ae7b8662a0d903bf0cd751e04c388461e511eccfd087c12c55bc68491c1a8d442de41f205f0720f172ddfaf31722cfb43489dd1
+EBUILD gpyutils-0.3.ebuild 535 BLAKE2B 95eb9c3ba2c9349ea39fd5ae0a4f23ad21af4f5f97b7fb9a47b725b77f76940902471a232959366966e5cedf815ee870edc4d97bdf12f97fae748612a55e5da0 SHA512 aa4b9363b9eb1dbc2fe8d66cfd20ddf1b014d76af67f5a9b3605523441aa162c0c23ea71ac81cb48d3e4500262ce4f600cfe1e21d9e70b8a80c2e8bb12992e26
+EBUILD gpyutils-9999.ebuild 515 BLAKE2B 273fd65f86e256e0a300118a055f446099df36c6a3195cd69c24ff8247ea88ba392021c484a3ef43882e9070683b0c57d576b5909431081e03cfd78dd4ab7fd1 SHA512 2678dccaa3e5a7594a89b44bf9ddf5777a01a9f6782b89ed304928b11d6adaf2f79222314d7bc8eb60b80414fc6e2a8fd75fe882f1015914b069317b36dd2c63
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 62374901f222..bb8d5e39be6e 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -14,7 +14,7 @@ python3_1	3.1	dead	3.1
 python3_2	3.2	dead	3.2
 python3_3	3.3	dead	3.3
 python3_4		dead	3.4
-python3_5		supported	3.5
+python3_5		dead	3.5
 python3_6		current	3.6
 python3_7		supported	3.7
 python3_8		supported	3.8
@@ -23,10 +23,10 @@ pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
 pypy2_0	2.7-pypy-2.0	dead	p2.0
 
-pypy		supported	pypy
+pypy		dead	pypy
 pypy3		supported	pypy3
 
 jython2_5	2.5-jython	dead	j2.5
-jython2_7	2.7-jython	experimental	j2.7
+jython2_7	2.7-jython	dead	j2.7
 
 # vim:ts=16:sts=16:noet:ft=conf
diff --git a/app-portage/gpyutils/gpyutils-0.2.2.ebuild b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
index eaa405ba2591..c5079188f4fb 100644
--- a/app-portage/gpyutils/gpyutils-0.2.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-0.3.ebuild b/app-portage/gpyutils/gpyutils-0.3.ebuild
index 7eef1417fd80..e0e7821fc50b 100644
--- a/app-portage/gpyutils/gpyutils-0.3.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 42df3c3086a1..9d8bc151248d 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
 inherit distutils-r1 git-r3
@@ -16,7 +18,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
 
 python_test() {
 	esetup.py test
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 0e39804ae624..c23a23b537aa 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,7 +1,7 @@
 DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
 DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
 DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
-EBUILD grs-0.6-r1.ebuild 1106 BLAKE2B ec9d7a4ac0173dfb12ea6d7c2139b12336358efc97a7052633abfcd0b2a6436182ce279b4b0ee1456d15794eab5056a889e2b7230a1fa9cf0c2cc3130ee6d163 SHA512 a55296b583cbffcaefe3b80994e8a36553e910bfdc4f6a380b71591f9862d76dbb75a4f23f8f62c4bd84c67cef0a396594df9571968e0a9069f87f3dacdc65af
-EBUILD grs-0.7.ebuild 1333 BLAKE2B 8fcb795d3ede8ed4e6566cdcf002250de23dd75cc98ae92de5cc384a0b7c3c7fbc5d658c0b1c5ec94508d79bb0e4f7fb4fc3b485e5a6644879a5fe923dcc591d SHA512 1716b4644873efeb520c4485451d7394bd1f4de9e80731fff05137454fa909bbb1c862e09c6677f1b046b32ba0811d5c4c6330a385cd61d83f3dd9203f027241
-EBUILD grs-9999.ebuild 1337 BLAKE2B b3d3b28fe1bc5c91e7e299fc8a76fc81f0d1e9ddf0575a9a024003fe38fa75c577f0401998fb024d00022d22174ed8baeab6a73da18ae31418beadc022dae987 SHA512 b3a0bd056a7587d161c8ef85c41192a80fbc6e42904d5a00a953b1470bc6808369afc5104629add8d0e5135b18545988e8348a19f956bdeb58d075aabdc77b21
+EBUILD grs-0.6-r1.ebuild 1100 BLAKE2B cbc9af805c9f14f7721767a88ff36b3a849741cc6d94673629cc5d62f470ce0e0c12e8cf758fb84cb737e331f5a81e4668215b7749a1c945ea3b59135ecc2a3b SHA512 d867611fa3ed67bd5de17aa20c3a7467bb5ce269ec9440645550e91966c979df39bdd719cb3d43e287afb56d771b99614cf32e31880c659d1cc521ebcc59cc7f
+EBUILD grs-0.7.ebuild 1327 BLAKE2B ec38cbcb9e9edb74b50aa50b0170f11ebbefc2285b59e02d346c653a7de73ca580b401c3217970865f2789c619ad29c2495d56fe612243be9d92ceb117e8e0a9 SHA512 bf0c20ed65a8dd981cba776ed9464d8c79f020e13cc867680ea61bfddf7669b7db42188871c564ceee5ee985e714da8e871d7e26053b5a8b5f053786cb8f2718
+EBUILD grs-9999.ebuild 1331 BLAKE2B 5b74d0f2e1c3f32dfdfc2e00ea0e274273f55797838f37a03243bcda9434a208c0cd958f00dc1922a52528b967b7091c46e1238c961dc1c9900fe9ce0eac6ed0 SHA512 acd5b469ba6cee1e3b6d1dc48ba381661780c0580e912907daf7cd57b54a64deced6c53b0e0bb9e8ce9ece91be26518147447945b33a9b8decbf642e17e6103c
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
index 2a967fc5bac9..287a6c73de68 100644
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 linux-info
 
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~blueness/grs"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index 3ff77b9b3a7e..aaaa51e6533a 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 linux-info
 
@@ -19,7 +19,7 @@ else
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~blueness/grs"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 2049ce78eaa6..d586cdacd930 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 linux-info
 
@@ -19,7 +19,7 @@ else
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~blueness/grs"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 3121ca5dbfaf..56dc979e93b7 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,5 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
-EBUILD gs-elpa-0.1.3-r1.ebuild 611 BLAKE2B aaf209792b301352bdec3d8c59e44d4038f6698ef23a504e31870411cfadd1fa32e6ce1293d3c35cda723ac877e6eca35a8b58155aa101c4a90f46b63bd93e70 SHA512 9a973e77b992b4f24f42cfa42f10af241778a8043300c6878d73fe72a0ca8d75703af59cfce7bf5222128c75b2e3f4a8d235e0ff3cac1cd1bcc34541ce0b6f49
+EBUILD gs-elpa-0.1.3-r1.ebuild 607 BLAKE2B 7f7a184815838665c5ad3c933e8457cd1afe446e2012d4d0e1bcf5a8e262239fd16d14f28ccacec0ffb881c526ff6c7d628138a3136667b5954fd83ceeba22da SHA512 c14df45857886d3ffb1c0d575e6ace78c016e333f8cedf9eacf078a90877a36be9287e2f8c5e619b93e9e6bff6aace528a796701b74da8feb11f6f685f91aca8
 EBUILD gs-elpa-0.1.3.ebuild 601 BLAKE2B dea8a0b01179e9b9eb6e0d872d397fd9c25621dcc2b80180fad9bfb8a625e3b10eaf52c19c57c5f3da394da098dd769fe8daaa3c8a851cb973a29edde6fed7fe SHA512 ab8fa141fe05ee4aabdd80684978bbc8b802e623b49c090a3e76dc20e1e908c157cd5af34ce0c4f4dc62a00073b508c0d563e3ade4f004549df229dcd7f76c23
-EBUILD gs-elpa-9999.ebuild 603 BLAKE2B 5a33f85b77047f3407754a72e71e6266de017aa4280f20c8ddb5eb4f4983c1bf2d612b872b306c3c12427a0ad276871995c7547a00cd3e3a01377a148bf53bd6 SHA512 32985794e555d5772f548b591e51852d814a12e4dcb0f5ec7f566ca41d8f3a26b5b661b9dbc2837f04c2ab3be49946cb4eb2a2a3fdda37a5b89fec35d73a41a1
+EBUILD gs-elpa-9999.ebuild 599 BLAKE2B 7918fd5270ca458e5305826d0cc7dd34952645d530def78059b99c3ba62739b08ee9b8f16e3aadf19d166f97d8f1c77bb263f4a53f679c1f96f8e99dc7367d94 SHA512 0a95636e5b30d233de3220ac07149a42ca1b612de99e84ec444e95eee6c6db9b944d84272df71607708eb9a0b2da2c1eac33420881262a0affbd6c3c596c5910
 MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index b62d0f7d2fb2..a8f738252568 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
index e0ae6f03fb67..46e8ea22a802 100644
--- a/app-portage/gs-elpa/gs-elpa-9999.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 409aa028cd4f..54c4772f308c 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 694 BLAKE2B b37dd93384a8f7127a09215bf315be6548365e2cb37e9056143b0e524ecacffabd6b4e500eb4061142afa9e4cc69d627d05f74c913d17719f3d9ecc063ecb252 SHA512 a59a203dc0cf1816be048e8b6aa07a9e51b8b14e3062323b81ee34711dc7c8658ccf5d2466fbb5a2db383004b2bfbdd160b6c3d16f58d3d6fe4733125b13b6f8
+EBUILD gverify-2.ebuild 692 BLAKE2B 5b9c74d8a2f86f153e5a8c4a0821153d119e032ca06f29bd715f7b1a8c77920a0de164586e131f10568c8a21debffa77993ef30e990426ce191484128547fe2d SHA512 3a450468e173dfd89f238159e90e00a96ea52d65d60636dc2108af7aa6306244ed3046aaf4a37299e172fa635307d96e345e1790ea628a0f4c6b2c3f9768ce8e
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 0d9a0cfd660a..aaa8e33b8e8a 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 0c3e22cb1f78..6eea1610edf5 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,14 +1,6 @@
-DIST hackport-0.5.1.tar.gz 1390428 BLAKE2B a0791b39fe665934499fa930bda99cc3a9fe1c146ec4075985d139cac3fc49bac3fe68e37e9d26a7989e288a8e6c4c6f87dab29a4d088edb44018509f26f1fa8 SHA512 006e4457a9ebba9acff35787a73a321b903db2f6ff54423cd66e91a93390183d0ca2690e2d0c8b5c1256116c9f81cabeac45c6dcb21e537849afbb1109bd80af
-DIST hackport-0.5.2.tar.gz 1390418 BLAKE2B d9d90e86d16532a04fb387ba4d0aa3e53594ddb9c0780c1e7f05d3c1c75b60331656efbb50bd72c28b5b5736509210ab0087d7e1d441d4c8a9a8fd754538eae8 SHA512 c191421608667cde034eb8b4e3c1ae95a8ae41cc35df8f3cfad640870f871dd78711173666bee671af4efc762c069e7f20cd3693d96f64f60848d83ce185575c
-DIST hackport-0.5.3.tar.gz 1390724 BLAKE2B 666a1bbb4f5eb4abf6a5546867bbfdaf2280bcd2967773b3b57c2933f44e7a367127cd4b56c6d0cf300c3ae30bd6a066e02dd976dc962ecaa39316d70cbe937b SHA512 785a1fb9762bdd10e86f47255d687a905eb122eb46e9470b7ea562cbe98d1be882b28923d5852f41ba2481c27321de9b2322fc83b5fa77037ba9251ea5f08dcc
-DIST hackport-0.5.4.tar.gz 1390924 BLAKE2B 2fcc4ece84b813e130d860048328b7c4b704f1a37cffe15f26f24f8a9db8e7a267f083b1f8469f1d3e9753c07ad17dbbc209a2a8095770a7610fe73baf9965c1 SHA512 49593066608bf8d57678d1725c51da4f1f6213a06b1c5645d97e4a711704adc9a40c66ad4fd6a624572fc7491943874b5b48381bc02545a0e9b6d7a5619be073
-DIST hackport-0.5.5.tar.gz 1618493 BLAKE2B 939f0ef89c7bbc4117d6222e8c8d813883a02d1277466477f3ff1910ebaba418969ff4e8c170a6dae8888394254790aeb69ecc69b36e01c9f341663938aa39b5 SHA512 b91fe72884ccc3a6acb79115ba8f8418250e13f102a07542e3d06db3880b572c73d2d4b5c05622eee83af3715f3a854d2cf7142ebb92627d8b332db4152d817d
 DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f
-EBUILD hackport-0.5.1.ebuild 1243 BLAKE2B 9bcb9d03419e672f4fb8af2f27e8002366c338a898be2529e78c3eac819d44fc9ba9e7df2049eeab16bf0f1a5f069a76971b9f58ad0f9f526803c0856a741479 SHA512 a2119a7ee41604defab5bbaa6c4b01a02ad5d5b17808dbd2d2aab79921713c9e9de4ed98407c0400b9d307a80aa0ec0312aa37ac4dbd72140b432352f84b5cc7
-EBUILD hackport-0.5.2.ebuild 1243 BLAKE2B 9bcb9d03419e672f4fb8af2f27e8002366c338a898be2529e78c3eac819d44fc9ba9e7df2049eeab16bf0f1a5f069a76971b9f58ad0f9f526803c0856a741479 SHA512 a2119a7ee41604defab5bbaa6c4b01a02ad5d5b17808dbd2d2aab79921713c9e9de4ed98407c0400b9d307a80aa0ec0312aa37ac4dbd72140b432352f84b5cc7
-EBUILD hackport-0.5.3.ebuild 1243 BLAKE2B a546466648234383f4ae1b63506c604cdd585efcc2d8cba3fa669e0700aa0504550ff537cb8ddacb0f9cdce43464e6f893c586dd09f50dba824083880cb3bf0c SHA512 ef6a255fe4ea7f4daab8daabbd750b2e6af3136bcb47a3cdceb400f40588272c96273dea7b80d00089baaaa56f3edfc5064bfdc1b5ee41702c783b40954fc26e
-EBUILD hackport-0.5.4.ebuild 1243 BLAKE2B a546466648234383f4ae1b63506c604cdd585efcc2d8cba3fa669e0700aa0504550ff537cb8ddacb0f9cdce43464e6f893c586dd09f50dba824083880cb3bf0c SHA512 ef6a255fe4ea7f4daab8daabbd750b2e6af3136bcb47a3cdceb400f40588272c96273dea7b80d00089baaaa56f3edfc5064bfdc1b5ee41702c783b40954fc26e
-EBUILD hackport-0.5.5-r1.ebuild 1265 BLAKE2B e18798469d074961c82bb1e39e873fcb7f6d4d54cc73100cb800b0507f03dd8194e507a4aa348e4c2a8a2f59daa5b1e896fdd9b41411af31569594a7f924d308 SHA512 4b4ba6f51b688877c8518cfd40d703533ccbeee6f2f00f4051c9075052b86a49aae66935677ba7abe0ddfa1806ad41b682d1d946b2782c51b3d6479d7366398b
+DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92
 EBUILD hackport-0.5.6.ebuild 1265 BLAKE2B 14c0e4692bdfa62cb118639e681886b537354b8f02132baa69e7098ec50e03e09d8f1da81a7ce5e1255e2423907e9af6fbb1e1c08250e256ea7c1a0bb1021140 SHA512 e7367caa9ee201016caa31e56aad82066a1e34989266594c60d42dfc44d45121dcc8c79304ecc71348e4d1d6b569666091908b368fd9f0b591b2b6a1b97cd6a5
+EBUILD hackport-0.6.2.ebuild 1263 BLAKE2B 4e1bda2c18c368209c20f6df94c664efeaf0fd5fbcd0e7e02da7d8fe0048963e7714bb06e5960fecd4dd1555449a44aa8ee7ca2497973b10c45fd1b0796dca5d SHA512 45a93a427efee5fecde630f9fa35e02267b58300f17498645d8bc11de6314421c10aa597009482bd97492b194988cab5c8c888aa26f218410a704c4b5331e681
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.1.ebuild b/app-portage/hackport/hackport-0.5.1.ebuild
deleted file mode 100644
index 2e712db93789..000000000000
--- a/app-portage/hackport/hackport-0.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.2.ebuild b/app-portage/hackport/hackport-0.5.2.ebuild
deleted file mode 100644
index 2e712db93789..000000000000
--- a/app-portage/hackport/hackport-0.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.3.ebuild b/app-portage/hackport/hackport-0.5.3.ebuild
deleted file mode 100644
index 53cc6a83e631..000000000000
--- a/app-portage/hackport/hackport-0.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.4.ebuild b/app-portage/hackport/hackport-0.5.4.ebuild
deleted file mode 100644
index 53cc6a83e631..000000000000
--- a/app-portage/hackport/hackport-0.5.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.5-r1.ebuild b/app-portage/hackport/hackport-0.6.2.ebuild
index 1714397412df..ec10c7ce40f1 100644
--- a/app-portage/hackport/hackport-0.5.5-r1.ebuild
+++ b/app-portage/hackport/hackport-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-# ebuild generated by hackport 0.5.4.9999
+# ebuild generated by hackport 0.6.9999
 
 CABAL_FEATURES="test-suite"
 inherit haskell-cabal
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index f0296d38d040..2adda29ff077 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,18 +1,5 @@
-AUX layman-2.0.0.doctest.patch 933 BLAKE2B d2e9c8f4b49fdd37530981d6f0cd621a676eba9688e0c45e68cd82e774b052085f556b437a13789f0554bdf18a6a1112ce3b1503abf6a0719cfbb4efde20bc5e SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8
-AUX layman-2.0.0.svn_upgrade.patch 2447 BLAKE2B 0603c816eff3eef5824e04619c4b7634e253993028823b1c19713c76c1953d0df8160655e3a35d17a083736839628b75f77f8364e40a3e38d90035cc80c01561 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f
-AUX layman-2.2.0-adds-kwargs-debug.patch 1015 BLAKE2B b0f249a7e66606cd06f9107882d4a6edaed658b01a75c99f00ac03e8e8db8dc5fb1c2dc1e4738a8800c09645d44e7f39012d37dccf3c6c4ffc00f42833aff99e SHA512 cedf55524b2d11ae41a05192e8ba31fce677fb528560b168e4441bf2274c864c23a0d6463e79ea34c29e61ff1d4f514efba32bcee914fe6b915b6f039f8e106e
-AUX layman-2.2.0-change-for-upstream-ssl-fetch.patch 1234 BLAKE2B 1592e974a34142b62a21fe58011d98d118060a9bbc4e1e5d7ae0fdae1791a7715d325a9e3a2374a223f764fa3f40990855ec5d205a63a96d6b61cb1c3e4167d9 SHA512 bd58b813e3b364f4116537c1a66b0109a6a08fb5a30a53a691c697739197d84fed4449bbd3b751396e81d4adbb0f72101bd04e949068534bb77ced929c5c4191
-AUX layman-2.2.0-removes-doctest-remnants.patch 6172 BLAKE2B 0f6e9b68ebfb85f08c06a26e52a13bc3412edcf58d052cc72d576efbaeb8bd7c9a04268465632de0c3d611ed9fc369ae0d1dc9d2d61955a934124a70c7e46958 SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e
-AUX layman-2.4.1-sourcefileattributechanges.patch 1889 BLAKE2B b99001a1fbc19224111ab565343146230ac464add57bfb8ae3e202d339a6e7cb36dd3ba9050625cb1a9d3420ad892dc2417bbb5a5045a8bf6bf7e4e939f9a1a0 SHA512 ffb5015069c1b1725514d18abff9a7c152825335f05a7edf160d0e90a3d7cd9d0a6338fb24ed8a6ebcc24c2f23beefc4bc35d3d12fe887d86a3251bdb03fc4f2
-DIST layman-2.0.0.tar.gz 81184 BLAKE2B a1d8481f6dba7392c2c857c887284371c53f0bf64b4f013091b415fdb95c27d5695beaf004585fbc83731abcbdc08f4ecd6591dbfdc5a1caa418f3ab47aa37dc SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da
-DIST layman-2.2.0.tar.gz 116210 BLAKE2B 253fc35885e9e0bb804512db50962749a53cd25950102e3e79df48f87e683b6ad24857fcbd7d398a11a152c455a683e22a92dfa2ceaa7b80b6db764d54355514 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
-DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1a48a18331b5d936bb48568072ac4c208807baf667b346bbbc1edb6acc385cc379de1d54d96adb62484c5f085 SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
 DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.0.0-r1.ebuild 1631 BLAKE2B f92dd5f1cda05e10801371b435ddaeaf8bd82b43bfd0295bb70c2bf6020f8f6479b00884869e84d1e5f5df4897c31fc9658a8e26410b022f167b54d303cac7f7 SHA512 97c68d7f9c2b97c5ff4863114be546bd16ceff7a79423dc0a6769c40883a7199a2005f5e42ee125c4bbeeaf3396726505f6b8c9384276a835bdeb42abc57f061
-EBUILD layman-2.0.0-r3.ebuild 1670 BLAKE2B 6bc4a0d6008cf2b15dd887a3526e6cb20a2284e4ef8ea0440fb7376fa5483ac1d1c178c3093a68c7231578bcef97589554efa2ae6f1c2d18fc4fa0ada2144770 SHA512 d8112c10813e247facb85dcb52d19b5efcb2bac50bc2736f6a349e608a16d926bc33e609643999889e463a11c7e5d27b88bad701b84988f8dc2a784316de16d6
-EBUILD layman-2.2.0-r7.ebuild 2186 BLAKE2B 6556ab4446c772bead3046dbd09f611f5e6d2f3092100079f641ef5049e89a93ed79a7691c7e37a0b662cf208f65dcb2fe99172359ff5d49aff70e7ae263d733 SHA512 44c98c5bab21fba6614bda060b049ef585ebdbe9db8bbfbaf8d9004402265d357446d379ea74a4c656f0a72df7e08ee060d4de5f84c33f5a298e3bc20502703e
-EBUILD layman-2.4.1-r1.ebuild 2136 BLAKE2B 0168b1fc69a824395b21de3c30a65f3f143163eb06fc3a99356fa77d90fd790f511fc8b290652a4d403e8a9708b065a0cd031efb7a2855066bbb58e720dcd45c SHA512 16d1136d809db9c7302e8ad853c3e1a85ad151b109f74a9e94c7d21c25bc9e43c2e99eb4dfa169c14a73ef8dbf967a84dd9464c39388e4a2112c52004de2abe7
-EBUILD layman-2.4.2-r1.ebuild 2189 BLAKE2B c5af41e44eaba0593d95c3007470b7605fd37426f20dc3578a380cec3620c5772666ff746914a8430628fa794eca3de98ce1668cbc2d8f7fe037dabfb19e447f SHA512 6b7abcc082035388561f1495fbd3c507ae2c95b002df50b5653f2c6c0e0f3837d49c6c9904d60a201c4c3eee52744126e6304d41ca7dfc06b35b3f6bd3601c94
-EBUILD layman-2.4.2-r2.ebuild 2330 BLAKE2B e2c2055ff2445e4afb47363dbbc258603f4d5c57df656c47419c64c395c39ba4ec3e203288093538301a3dc8da3a295ace8cab8e30a9f2b56c8713b9b7fad645 SHA512 75b9a042f89df4ecb8d16340e5cd8ef3b3d50c3f0972c6b851e98fe83b5ea26c37cff58bc96ba63ab02e2d1e227540a0fea9c5a2a3fddb102c3aeb510c4a998e
-EBUILD layman-9999.ebuild 2330 BLAKE2B e2c2055ff2445e4afb47363dbbc258603f4d5c57df656c47419c64c395c39ba4ec3e203288093538301a3dc8da3a295ace8cab8e30a9f2b56c8713b9b7fad645 SHA512 75b9a042f89df4ecb8d16340e5cd8ef3b3d50c3f0972c6b851e98fe83b5ea26c37cff58bc96ba63ab02e2d1e227540a0fea9c5a2a3fddb102c3aeb510c4a998e
+EBUILD layman-2.4.2-r1.ebuild 2180 BLAKE2B 7a754addb5f54c497deab6c2352134f58fdf5ded9b82e6a71668d7a77f88e4df6f7a050cc307a4ad4c66229bb5e856b1d14aa329d362924d178b5a8312572234 SHA512 e505e8af6a4f670e25a5db45b8feb8c4e7591a37cbc053c90e821c39c9c5c578b360c805a4dd020a7851b9a6dc4db9206fcf50640a68d3f536874c404d0a01b2
+EBUILD layman-2.4.2-r2.ebuild 2321 BLAKE2B f40318c2f25f9e704ae7c4a34e22f6ac50c444e88c419cc266d9eddbfcee1736dfeeb213c411b026e976b7c8d31ab961bd22c12bb6b1772c724ef305bddfa25b SHA512 9084e88b667b6b17b225c8ffb42cebf70b32d53e5058d6af6624c7b59d31815150f2d27ae8cfdb662fab6c814cf09334922ab3047043aa99999ec4666e2bd248
+EBUILD layman-9999.ebuild 2321 BLAKE2B f40318c2f25f9e704ae7c4a34e22f6ac50c444e88c419cc266d9eddbfcee1736dfeeb213c411b026e976b7c8d31ab961bd22c12bb6b1772c724ef305bddfa25b SHA512 9084e88b667b6b17b225c8ffb42cebf70b32d53e5058d6af6624c7b59d31815150f2d27ae8cfdb662fab6c814cf09334922ab3047043aa99999ec4666e2bd248
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/files/layman-2.0.0.doctest.patch b/app-portage/layman/files/layman-2.0.0.doctest.patch
deleted file mode 100644
index 6d3305ca3ef7..000000000000
--- a/app-portage/layman/files/layman-2.0.0.doctest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/layman/db.py b/layman/db.py
-index e2d740c..55a846a 100644
---- a/layman/db.py
-+++ b/layman/db.py
-@@ -93,6 +93,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
-@@ -173,6 +174,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
diff --git a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
deleted file mode 100644
index 431b9370593a..000000000000
--- a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 6 Jan 2014 22:01:12 -0800
-Subject: [PATCH] Update svn's check_upgrade() for newer svn versions.
-
-Thanks you, Arfrever, for your assistance.
----
- layman/overlays/svn.py | 32 ++++++++++++--------------------
- 1 file changed, 12 insertions(+), 20 deletions(-)
-
-diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
-index 4804925..374a516 100644
---- a/layman/overlays/svn.py
-+++ b/layman/overlays/svn.py
-@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource):
-         return
- 
-     def check_upgrade(self, target):
--        '''Code to check the installed svn version and
--        run "svn upgrade" if needed.'''
-+        '''Code to run "svn upgrade" it only takes longer
-+        than checking if it does need an upgrade if it is
-+        actually needed.
-+        '''
-         file_to_run = _resolve_command(self.command(), self.output.error)[1]
--        args = file_to_run + ' -q --version'
-+        args = " ".join([file_to_run, " upgrade", target])
--        pipe = Popen(args, shell=True, stdout=PIPE)
-+        pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE)
-         if pipe:
--            self.output.debug("SVN: check_upgrade()... have a valid pipe", 4)
--            version = pipe.stdout.readline().strip('\n')
--            self.output.debug("SVN: check_upgrade()... svn version found: %s"
--                % version, 4)
-+            self.output.debug("SVN: check_upgrade()... have a valid pipe, "
-+                "running upgrade", 4)
-+            upgrade_output = pipe.stdout.readline().strip('\n')
-+            if upgrade_output:
-+                self.output.debug("  output: %s" % upgrade_output, 4)
-+            self.output.debug("SVN: check_upgrade()... svn upgrade done", 4)
-             pipe.terminate()
--            if version >= '1.7.0':
--                self.output.debug("SVN: check_upgrade()... svn upgrade maybe",
--                    4)
--                _path = path([target,'.svn/wc.db'])
--                if not os.path.exists(_path):
--                    self.output.info("An svn upgrade needs to be run...",
--                        2)
--                    args = ["upgrade"]
--                    return self.run_command(self.command(), args,
--                        cwd=target, cmd="svn upgrade")
--                return
--        else:
--            return
-+        return
--- 
-1.8.3.2
-
diff --git a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
deleted file mode 100644
index 2020cb716449..000000000000
--- a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Sun, 7 Dec 2014 23:12:36 -0500
-Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5
-
---- a/layman/overlays/archive.py
-+++ b/layman/overlays/archive.py
-@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource):
-             connector_output = {
-                 'info': self.output.debug,
-                 'error': self.output.error,
--                'kwargs-info': {'level': 2},
-+                'kwargs-info': {'level': 5},
-+                'kwargs-debug': {'level': 2},
-                 'kwargs-error': {'level': None},
-             }
-            
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
-             'info':  self.output.info,
-             'debug': self.output.debug,
-             'error': self.output.error,
--            'kwargs-info': {'level': 2},
-+            'kwargs-info': {'level': 5},
-             'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-
diff --git a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
deleted file mode 100644
index d738b26f12c0..000000000000
--- a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 17 Oct 2014 19:40:38 -0700
-Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change
-
----
- layman/remotedb.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/layman/remotedb.py b/layman/remotedb.py
-index f0f7ea9..b866bd7 100644
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
-         self.detached_urls = []
-         self.signed_urls = []
-         self.proxies = config.proxies
--        
-+
-         self.urls  = [i.strip()
-             for i in config['overlays'].split('\n') if len(i)]
- 
-@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
-         need_gpg = [False, True, True]
-         # setup the ssl-fetch output map
-         connector_output = {
--            'info':  self.output.debug,
-+            'info':  self.output.info,
-+            'debug': self.output.debug,
-             'error': self.output.error,
-             'kwargs-info': {'level': 2},
-+            'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-         fetcher = Connector(connector_output, self.proxies, USERAGENT)
--- 
-2.0.5
-
diff --git a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
deleted file mode 100644
index 4b077140019b..000000000000
--- a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Fri, 18 Oct 2014 15:21:24 -0400
-Subject: [PATCH] Removes doctest remnants
-
---- a/layman/api.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/api.py	2014-10-18 14:29:51.184849673 -0400
-@@ -714,15 +714,3 @@
-     write = os.fdopen(fd_w, 'w')
-     read = os.fdopen(fd_r, 'r')
-     return (read, write, fd_r, fd_w)
--
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/argsparser.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/argsparser.py	2014-10-18 14:30:35.256851781 -0400
-@@ -404,14 +404,3 @@
-         self.output.debug('ARGSPARSER: Returning keys', 9)
- 
-         return keys
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/cli.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/cli.py	2014-10-18 14:32:11.456856384 -0400
-@@ -397,15 +397,3 @@
-         # blank newline  -- no " *"
-         self.output.notice('')
-         return info != {}
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/config.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/config.py	2014-10-18 14:31:02.528853086 -0400
-@@ -348,13 +348,3 @@
-         if new_defaults is not None:
-             self._defaults.update(new_defaults)
-         return
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/db.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/db.py	2014-10-18 14:32:32.160857374 -0400
-@@ -315,21 +315,3 @@
-             raise Exception('Syncing overlay "' + overlay_name +
-                             '" returned status ' + str(result) + '!' +
-                             '\ndb.sync()')
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/dbbase.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/dbbase.py	2014-10-18 14:31:14.648853666 -0400
-@@ -252,21 +252,3 @@
-         """returns a list of the overlay names
-         """
-         return sorted(self.overlays)
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/archive.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/archive.py	2014-10-18 14:31:54.640855579 -0400
-@@ -188,15 +188,3 @@
-         '''
- 
-         return self.is_supported()
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing.
--    from warnings    import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/modules/tar/tar.py	2014-10-18 14:27:13.245842116 -0400
-+++ b/layman/overlays/modules/tar/tar.py	2014-10-18 15:10:13.303965557 -0400
-@@ -94,14 +94,3 @@
-         return require_supported(
-             [(self.command(),  'tar', 'app-arch/tar'), ],
-             self.output.warn)
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/overlay.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/overlay.py	2014-10-18 14:31:38.624854813 -0400
-@@ -546,14 +546,3 @@
-     def source_types(self):
-         for i in self.sources:
-             yield i.type
--
--
--#==============================================================================
--#
--# Testing
--#
--#------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/remotedb.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/remotedb.py	2014-10-18 14:29:31.064848710 -0400
-@@ -384,14 +384,3 @@
-         self.signed_urls = [i.strip()
-             for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
-     '''
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/utils.py	2014-10-18 14:27:13.254842117 -0400
-+++ b/layman/utils.py	2014-10-18 14:30:24.088851247 -0400
-@@ -347,14 +347,3 @@
-     for key in kwargs:
-         result[key] = kwargs[key]
-     return result
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
-
diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
deleted file mode 100644
index 207f474304c7..000000000000
--- a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 10 May 2016 15:12:02 -0700
-Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
- 'sourcefile' attribute changes
-
-It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for
-backward compatibility.
-It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError.
-The filepath of the affected file for the error message had an extra leading '_'.
-Add the module name to the warning message.
----
- layman/module.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/layman/module.py b/layman/module.py
-index 08bcbc2..092418f 100644
---- a/layman/module.py
-+++ b/layman/module.py
-@@ -49,13 +49,14 @@ class Module(object):
-             kid = self.module_spec['provides'][submodule]
-             kidname = kid['name']
-             try:
-+                kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
-+            except KeyError:
-                 kid['module_name'] = '.'.join([mod_name, kidname])
--            except ImportError:
--                kid['module_name'] = '.'.join([mod_name, self.name])
--                f = self.__module.__file__
--                msg = 'Module.__initialize(); module spec is old, missing '\
-+                f = self._module.__file__
-+                msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
-                       'attribute: \'sourcefile\'.\nBackward compatibility '\
--                      'may be removed in the future.\nFile: %(f)s' % {'f': f}
-+                      'may be removed in the future.\nFile: %(f)s' % {
-+                      'module': self.name, 'f': f}
-                 self.output.warn(msg)
-             kid['is_imported'] = False
-             self.kids[kidname] = kid
--- 
-2.8.3
-
diff --git a/app-portage/layman/layman-2.0.0-r1.ebuild b/app-portage/layman/layman-2.0.0-r1.ebuild
deleted file mode 100644
index cfba5b52cd7f..000000000000
--- a/app-portage/layman/layman-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.doctest.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
deleted file mode 100644
index e2e6e9df396d..000000000000
--- a/app-portage/layman/layman-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.*.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
deleted file mode 100644
index 00fc4d1dd541..000000000000
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	distutils-r1_python_prepare_all
-	epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch
-	epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch
-	epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch
-	rm "${S}"/"${PN}"/tests/dtest.py
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/external.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-		|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
deleted file mode 100644
index 398b9adf8cd8..000000000000
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
-)
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 9662dd128474..316be315fb4c 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild
index 1d63b0e05f54..c681b67f3fea 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 1d63b0e05f54..c681b67f3fea 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 8b4f76836cbc..8a0ba2aad2cb 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,5 +1,3 @@
-DIST mgorny-dev-scripts-2.tar.gz 6128 BLAKE2B a4a36c7d3872b70d388bfb2e68e4a8861a1a8ac76dbe27de382c203ed1a6dd7e56744aa7ba606392deefdd19397d078dc5a8b2402a05ba1c125ed218e42dad61 SHA512 bc98c83234c1107f649245b2b868c7fb649b03997497604deeeeb557d1dcd989ae896c8150bd54bd20daff98dee2a4a46f114d024a0a3b63231d26daa9cc4e79
 DIST mgorny-dev-scripts-3.tar.gz 6671 BLAKE2B 6e0cc8edd55fd175e6e2516bad6d0505da813fc905d12563d97b0ee327a019dd264c886884360dfe6235ecfb8d19fe5d982edf623cfa9019ad132f6cb0f4bb49 SHA512 22a8dae123d87461f07d12b7aad58775201de4dd72ffd354116bfde2bfb6d413b3c68fbf848e651b5a4eeb3df2afe9a10f8ae1a28be0ed077d1c0aa19fc91066
-EBUILD mgorny-dev-scripts-2.ebuild 546 BLAKE2B 30c7f15f1f38f80b7361c2ea0ad2364e688936de3eb218d8268f52e7c11c0f3e228cb70e704e3ff65a1a3e3284694af54f16290d88c79affd23f947cedd428ff SHA512 9ece234b6ce9f808079c61a4c409375c937e954746711558662ab5bdcd6b223d2359a6613c5deb5bf31e58eb9d8b0d66face25f36c2e0d899b92b42586092c7a
-EBUILD mgorny-dev-scripts-3.ebuild 560 BLAKE2B 9011fc9e5fed2c4585145200dab057c0217b5bfbec962fb8296a88600dcb9b9745f9d8d4f2c768ed76af29c69d7f88019120eb180e787d0d55188d1ddf906ab9 SHA512 3a40ba296686e4774e50ea893eade68a5a7b520c8c0826c65660a7a5cb0b4263805b0bb1d336adbab4c010b83c011e71f322b73a58cad69f39e78c0cede10f4c
+EBUILD mgorny-dev-scripts-3.ebuild 579 BLAKE2B af6419cc6d068cf7c57c350cbb428fa52fd55297e9de7f2cfc2f079c5362bfccec49285bb0ff39814e10a12031ca90e5b2c13bf65ecc684f3133a30e3154efde SHA512 639b6c1a42555def0c1ffcfbbed931e9573be78c832d3110737ff62d44f9f396967e8f12083ce18e3417e513637e645c3974adbff1a81665a0beaaedf884cd5b
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-2.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-2.ebuild
deleted file mode 100644
index f3c82965e9c4..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-2.ebuild
+++ /dev/null
@@ -1,25 +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-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
index c44525956a9b..e62d0a3b74df 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
@@ -17,7 +17,8 @@ RDEPEND="
 	dev-vcs/git
 	net-misc/wget
 	sys-apps/portage
-	x11-misc/xdg-utils"
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
 
 src_install() {
 	dodoc README.rst
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 81d9dcdb72dd..02fa6c7fa0c8 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 978 BLAKE2B 38888e533900bd27b40e5bf67c06fe6466fa4665caed5c1a54a11c88a44eacf36d6a05d70311950bf90b7ddddcad30a75bd4af0cef41e7c402d60beffc2e9f73 SHA512 e73b6f9e4c3d6f14be05937d630bfbbb4edb719136a4c6e1d1ee5734531039fdbb598269c6474bf82596067b9504b52256613b1d0cd6b798ba5699f1c8ea3f4b
-EBUILD mirrorselect-2.2.4-r1.ebuild 959 BLAKE2B 8099445a86cda60203dd60ee2b596c46cca8c3d4e06536fa5ae14f48c09e025030bd9553cf3288061d3acd38a461f4378a8d686f7461ca7dd6f2285624e07ce3 SHA512 3d6865a1decdf07e1d19c0f2e55b69a82323a781cd130f7597d1a130a4bbd8c49b0f708224f5abfe8ff37d582792777f3fdf5da707267484f7598f6026909258
-EBUILD mirrorselect-2.2.6-r1.ebuild 1490 BLAKE2B 53998d852de6e8d55d062862df9efd422484999d7fe83e112baf8372f4a262b5127317d86bf197ef97f8f0c0ad11548956d5aa0083f03df514d1429cc99d51e5 SHA512 749932bd03f5ff45ea479357bd0188b80ac563174edf5138171a5a85924ee121b27804ad3750f16f333c380b955d2814231a6bb7ad849cf4a109a89d8ea471bb
-EBUILD mirrorselect-9999.ebuild 1127 BLAKE2B 56bd17104d5aea092118583c035b8a4c6e8b26ab4cf766bca3a44009f3671a7c5ec25e366f4e2bf5f3acfd7694a3d7209b9f45fa4b04a3969cc2cb4d263eee67 SHA512 f2a22e6a5bdf0ed46c1ce70f00e727d92ade6caaa150707c1084deb87b93335d82d3d40cb3345a71114b72f9e8559b5c6c497433ca8a630c6dead4b524e2d9c8
+EBUILD mirrorselect-2.2.3.ebuild 974 BLAKE2B 2dc0c14853ce31d5555012cb3af48298f2e331e3d6aa10f5abb315c1b5735744512e19c1ea407ab17d6fd8f4a48c78dd9a7fb8f0ba0228423d5c727a6082d3ab SHA512 bac40f86121b7e5c154de0392ce4e9d724a5c92508f532cb41bfc3f3157bacfa230c0539488d101664298a29177e96aff739fd1ef9328d0fee166615389dfdb8
+EBUILD mirrorselect-2.2.4-r1.ebuild 957 BLAKE2B 550a7349fde3439de7d32ca13a977abc56abff7327e4932617d8cc9d01ce8322523d7b84fc8707eaf8bbaa5894bd4702bad4ad8c491117d84573cb882717e034 SHA512 54fe735c423d57ed8070eedca95dee7a55d1c6a1d62efe1a34dc26c451d725c0930b6e20ecb19880f39ed4a5902432dd04d3bec74abe3f37878bab2fe36edad5
+EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B 835bbb26b369d7fc25fd443c803922a409149731affd4b75b53cdeb87b34fe3f3968a834cb85c9a0a29d50a322d389050f49a443141cd78b4d4bb8b90f829698 SHA512 dc2e3598a2f9b5fcca0e1ffaae3bf70f9039880e51abcba2d9a5abd8ecb8f1e31c813ab17a8a478cb7c3ae9706c8c5da02262c95ee1209a49b2caa5c60536c66
+EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 1367e29df22a03d6d1c60da88dd6f5c7a267756a9480e916bdf989512d514ea2880aa1c407a0c837ab00b6d050ec16cac04b64a90d7237a7870a569a6fd52a60 SHA512 77ac529d5c967559bef59f21829253152deef3d72a3be7ba5ddf2c4c9bffece5aadd0611a90e2e788fda787b119c2ef08a56b3f53cb5917f0db6ddb1c961caec
 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 4ded19f04ff5..c8fc41be312b 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index d32c710ea1be..5896de6d6c4d 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index afad92c6beb9..53b5eee7bccc 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 18cf8ef6a6c1..5b8f8d1c2029 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index 0d4d42e76623..e201c7dd23b9 100644
--- a/app-portage/overlint/Manifest
+++ b/app-portage/overlint/Manifest
@@ -1,5 +1,5 @@
 DIST overlint-0.5.2.tar.gz 2701 BLAKE2B 28fe90628d1c6603af0936b7a5d945b39bd93b3a7444bee7ac79bb939d8c108a32f58ce51fe10198564d24927bb7c04e273de83417c77ec38d3442562a7a2a7b SHA512 aae78ed2d3f02e83ced3dbe8ace468adb204b80e040b979a97d92af0c91e79019f2ed14e6e3655ffa8137c55c8fd1f054c27229819ae7908632586acb284f3ea
 DIST overlint-0.5.3.tar.gz 2706 BLAKE2B 78c76a72556213bbc84b91ada3ea1d71ad045fe4498baab1f6710190a55802e5ffee14d652540d2cb7caaecd407963f7bad9682cb72e5e6571597983384bf019 SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149
 EBUILD overlint-0.5.2.ebuild 457 BLAKE2B e6079019867f0e481eba6bfeb4bf9fc5d0a34d1046bcbeae842307ae994b71d6fea892a0ee8ea6b867318af2f62fcb1807d5c3ae8c6fa469d6684ea6e7e8e132 SHA512 4d99f548db70e81ed92cd9eb3e8574fe0641151627d6b83d57635edaf2db118efc5e97af34d2ba30f727f8107fbe07248108beb886fe3b5922d073ba2e3e89cb
-EBUILD overlint-0.5.3-r1.ebuild 480 BLAKE2B abe5bdb0e7426836d250e4f232a1de6cc8a14a02340e0afbb75a8c380adbd8b56bb37ce87ac352b1e63011b522964537e2ec52ee20276364a5fd22f15618c84b SHA512 211125084e0ac865ca9a0f638bbe288fcdc32ee937ed095c9241351df6ac078ce5b652a6cc7cddc38554103a40382ec74ca90c2523332d7946d5d64f047a5dd3
+EBUILD overlint-0.5.3-r1.ebuild 476 BLAKE2B 97b10ed97daadb399df5b10a7a63832457e5890ac4d1ca40913bc3db9d8a6941982cacba2a0967da80abc6e90153475d5613c4faf756fccb9c36fd02d84699a6 SHA512 472238a36de06c78f0b34615ac5abfc7fcf2abb299ddcbfacd979567aadb60217711949aecd273c3b7284dffa7cf7659334ede60caca46cacc4c19a05aa2c616
 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 2b245e00bdaf..644952c2c6d9 100644
--- a/app-portage/overlint/overlint-0.5.3-r1.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index dea3401db034..8971e80b54ae 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,6 +1,6 @@
 AUX e-file-function.patch 535 BLAKE2B 507a9a8a83585613e37fb9810ad65c04f0d78be5fd24cb8cacf41cd56c4bc878b1562dfd65c65a0d0f8e59dd112d20b7f62ab62acfb1a3a2420b9da2f3433c5e SHA512 23b7b4b8d3d894b79973b4c5484bdbeeae13398b33d2316774e9da43e072da0d5a55d47774e3f201e71147a29857818b4b3a40cf9f7b868d642bf5db72eb4dbc
 DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b179c2618c3c7d508b90ecb21b0fa566eef54e6a24957251934b04b0013af41b88de57e7e1db558831d883 SHA512 f045ca21360f33f87816e72a4564d862275ea1415b3a79e32815aaa20d7548da3f38ca9ee9247db3150adbdd54155b330c4ae6d3bee878db6cd5cf78dada81b5
 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
-EBUILD pfl-3.0-r2.ebuild 1000 BLAKE2B 6402e058d0d3bbd14f4af7f629fc7e2daa04f529c1a49aa6cbe0b0e52220e05f6b43c1ac007bcbc86b2a9f84b477b006e0d739695406b1766198c16a8f94414a SHA512 9eb518f909fcfbd50643dbc581a0109ac7acfd2c4756d0f8ae208d2af21a5bae0b8526da7468e79b8ce8373fc9e67d43649f74f7bb435573398a832cbfa75cd4
-EBUILD pfl-3.0.1-r3.ebuild 1117 BLAKE2B cc4cf21bc1cd4f350ba01bb8c9675069259e7fe04dae60d562cc3451730eb985d34d1b72fcd4b6e79c9465cfbe335ea09968fb23d538916d964b4bc4fe1b09c7 SHA512 9e56a9fcfdf2fd1148e53bfdba89c4d072bf340c6b17bec4e0ee8f4e2c6c747d195b490e8b0e57946bcce313ab0b989202f71c1c20de8c7f07cbab91d542b307
+EBUILD pfl-3.0-r2.ebuild 996 BLAKE2B 43675b3f64c07d6c6231a9726ec9f5fad4a61a143dd54aef849826435fdab90232a20538b29a0175c6e24fbfed8fc90b5488a1273816dc5f9d2610d9cfa48520 SHA512 419871bf91008cfd15d1f6f6209562f13553225087d460eeca7098a2b62867694dddd321b3ed49d227f1aad2f8fb5b04ff4d51a0bdb340c5abd5932cd015b232
+EBUILD pfl-3.0.1-r3.ebuild 1115 BLAKE2B 332672775d82965a03492fd5822595bc2eca6ac7caedcc757f02cf4f660c57d9ff59df9a21354b0fe23e09c2965f63521b0c65cc0f62371c3b682a2ad22b8aa0 SHA512 af91981b1351204ca6956c420732d2d38698e326c4171de47551af0d754d1993b7e6385d4fcac6218d664befa5829b011907ce2c1a002801ef5ff622833ae36f
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.0-r2.ebuild b/app-portage/pfl/pfl-3.0-r2.ebuild
index e8b17613d1fb..d55b0bef6c6e 100644
--- a/app-portage/pfl/pfl-3.0-r2.ebuild
+++ b/app-portage/pfl/pfl-3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-portage/pfl/pfl-3.0.1-r3.ebuild b/app-portage/pfl/pfl-3.0.1-r3.ebuild
index 0683d8fadcd7..359c3f8f43dd 100644
--- a/app-portage/pfl/pfl-3.0.1-r3.ebuild
+++ b/app-portage/pfl/pfl-3.0.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index c0d40b74afe3..12392c763513 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,14 +1,8 @@
-AUX portage-utils-0.74-qdepends-Q-regex.patch 2337 BLAKE2B b277b8097559877c60093583b13ffc0e5524ac08ed75fc2cc8b98e46c8f11c54ed6a28607ef841249b182ad35d5a899e97d20588b7062ae19593c8cb30a824fe SHA512 f6c7e8bd264a8b20effce89f1d7938e4b98c7292cb7b806cd1b7be1bdfd879bd482fdb52ec4e80e72c059ea7a73f35b6a589d974bce03cbff503fc8e3dfcb35f
-AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429
-AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 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.81.tar.xz 1763088 BLAKE2B 1fa40950f9deff721ebfd8f3dc06a1ec99e1f5c1e8bce7cb20120feef4d0789f6ff02dac43fae84d9d554d9b9867423db43a0e7cb7a6070a60cb0619f36547ad SHA512 d9fa971e27aa8a58d4278cea8e9ec238f92d03e51f44b7124f51289613800790dcd5a0c886c3930dd89abd8cd032d0cfd05723e12ba7e2403a85a2d72b359ce1
-DIST portage-utils-0.82.tar.xz 1768888 BLAKE2B 27ef8a3835eab54be3e06e48496c5c3e1f2e89f350b80dc52c1e7615c3b2e0c1a5d771d070071057d6c308981f29e8e9d79739184596d3eb2d38a03b162fddf6 SHA512 dc4b452f7b8b0c81e7dbb1ba02984fb45e6cb3588525a2b464519c80f9287fc270ee9eeb4d097e6a96f2f2f06c73b1fe89cb0b01b0cae82b099aaf2326aca2a0
-EBUILD portage-utils-0.74-r1.ebuild 1118 BLAKE2B f51e775f5fa127ff2d6fd4e75096602f8bab392bb2773a2f6fc5ab20adfd3e99af4e9ee69d9260402fff33419bc762412fc2014b9feb219af11aee6c9ee9d0a9 SHA512 bdb0de9152c30e8064d67abcd65dd569b5549bb8eb21b25d4d57f8f126edb270e091684cf53d62a4e4557871ff1c9f3056dca0a1cdbbda2253cddb0396189744
+DIST portage-utils-0.84.tar.xz 1774396 BLAKE2B 964711e1d2277dbde814e86f9717381ea0b87fb2d8ae639c6134974cc141bdc88b4ee6a37c932495fb9b6153003d78832c34237a5c7076d4a0f7b7d9cfd3151a SHA512 90abe61dc30af4de34f57ff603afe4982d5951e7e0d702444ee7ab5e265976d03cda53518004b9ae1aa19c85eb235a732ea3fcf19705ac86977a42d49fe3b22e
 EBUILD portage-utils-0.74.ebuild 1051 BLAKE2B c8647973636f57b948978607ab73d4bea3a86eb51f045ecef3ca641a5d68976070cbf5c00520291c8876c6f003510c782252e5c5fc7a99245897a2e3585916b6 SHA512 158a8a3a4892bd99c48c6f0ae75c00b9b3c4df56678b6eb7deec2eb4f4a6974a0a4788f54dd4fc1e3b6d27d95cc989683f19ccf1bae214d376da0726255722fa
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B 9c7238b96dc6dc7acc9ca3765f1f545ea2cf8df62c492820ee8e1c8c979a3b5337f01080d6a68b920a9a3fd1458bfc2a2cae9b795a3f7178b83ac6d15838b2e4 SHA512 7ef7e5094c1bb02bc633c410f27db6e77d6cfdbc820adbded8996e889aaa27071ff4a1fba992ba70f32723c4d76d240941caf135afc6d38eb42d708f6078b805
-EBUILD portage-utils-0.81.ebuild 2264 BLAKE2B 467b8bf1ed1795c6e09d9f86f188d727f2992c0717e7215af591be2246e3f0a97a51fb2cb602cb588ca62f7dab2452bd08fa583f79a19e403334f1be720270df SHA512 3569b23821830052a63e010be3835cdc213e37b565eb1898b0c6702e22f7a39ebe50b98cb71c606bec8fb5e35659a77e155ee816be7ae8f4468f2db98ee78ce9
-EBUILD portage-utils-0.82.ebuild 2265 BLAKE2B be63572b8f87c47047c7af7778bbe6c4fca211b1758982b8b60c05c50dd523f1952446f044ca6efd652995d6f386ef8182cb2e53e0b8c2fccddd582bbb781c7e SHA512 7a930db170ec1e6690fa8066a0d78cc71e2f712963656a72aa946470df8032e3ebacdd6f87fdceb9b34ca7bb1c8b28fc5e60a9d15909c4bf1d9cddfa746c29ca
-EBUILD portage-utils-9999.ebuild 1885 BLAKE2B d0cc4e20e992c06091cdadfda6049b6b367fc972aa6b372ebef996e95fa321d96e75a267f9e164123f6083d08dd653037965bebd106155508bfce5d73c21c96f SHA512 c11f51098cc8637d86b9143d715f506574acea6b2e51715b2309f04f4e714ee43bbd8b874815bd6ef1edd7be0a760162c7338962d5ef839966c84c8352a95322
+EBUILD portage-utils-0.84.ebuild 2183 BLAKE2B 37dfa27802791a8f0488b31b0b378698f4d43dc5682e859696430aaa5ff3cf83d527d421e3fb2851159b4af50ff67aed9acae91e11f2da922f0483912cbaed5a SHA512 cd25ee41e03afb0c70b726afe0cebce0d71befab9b3944b0fa45b3eef400390ba15c583204bf9c24ad960e7ffc6bdc1b9086ad18d9bc7ca8ffa7813c38d814e6
+EBUILD portage-utils-9999.ebuild 1803 BLAKE2B 1f972e1295a2093606cc66f0c43a33f0134348dcd289e8c4b65d67d4607ea9c02908a1a112e14a1ecd82f7d43ed3510bd5931ff25ee428818a8dbb2a9de5d80b SHA512 43bd8cbaefea948ba613e8a85e3d3b812f15ee1a9b40ec7addfe617845f8bb72aaebb838e20dd094999e0a3fd2be9ddc1f899b83f529955ef39397de47330b49
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch b/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
deleted file mode 100644
index 6d10161d704e..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-qdepends: restore regex matching capabilities for reverse dependencies
-
-The use of atom matching unintendedly removed the ability to use
-regexes, which broke app-admin/gentoo-perl-helpers.  This patch removes
-the atom matching, and reverts to using regex matching always to restore
-behaviour.
-
-Bug: https://bugs.gentoo.org/683430
-
---- a/qdepends.c
-+++ b/qdepends.c
-@@ -483,11 +483,9 @@
- 	int ret;
- 	regex_t preg;
- 	regmatch_t match;
--	depend_atom *aq;
- 	depend_atom *as;
- 	depend_atom *ac;
- 	char firstmatch = 0;
--	char *sslot;
- 
- 	if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len))
- 		return 0;
-@@ -526,34 +524,17 @@
- 		return 1;
- 	}
- 
--	aq = atom_explode(state->query);
--	if (!aq) {
--		/* "fall" back to old behaviour of just performing an extended
--		 * regular expression match */
--		if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
--			dep_burn_tree(dep_tree);
--			return 1;
--		}
-+	/* fallback for old behaviour of just performing an extended
-+	 * regular expression match */
-+	if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
-+		dep_burn_tree(dep_tree);
-+		return 1;
- 	}
- 
- 	match.rm_eo = 0;
- 	firstmatch = 1;
- 	do {  /* find all matches */
--		if (!aq) {
--			ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
--		} else {
--			char *loc;
--			ret = -1;
--			snprintf(qbuf, sizeof(qbuf), "%s%s%s",
--					aq->CATEGORY ? aq->CATEGORY : "",
--					aq->CATEGORY ? "/" : "",
--					aq->PN);
--			if ((loc = strstr(ptr + match.rm_eo, qbuf)) != NULL) {
--				ret = 0;
--				match.rm_so = loc - ptr;
--				match.rm_eo = match.rm_so + strlen(qbuf);
--			}
--		}
-+		ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
- 		if (ret != 0)
- 			break;
- 
-@@ -571,18 +552,6 @@
- 					ptr + match.rm_so);
- 		ac = atom_explode(qbuf);
- 
--		/* drop SLOT when not present in aq so we can match atoms
--		 * regardless */
--		sslot = ac->SLOT;
--		if (aq->SLOT == NULL && ac->SLOT != NULL)
--			ac->SLOT = NULL;
--		ret = atom_compare(ac, aq);
--		ac->SLOT = sslot;
--		if (ret != EQUAL) {
--			atom_implode(ac);
--			break;
--		}
--
- 		if (firstmatch == 1) {
- 			firstmatch = 0;
- 			printf("%s%s/%s%s%s%c", BOLD, catname, BLUE,
-@@ -615,11 +584,7 @@
- 	if (verbose && firstmatch == 0)
- 		printf("\n");
- 
--	if (!aq) {
--		regfree(&preg);
--	} else {
--		atom_implode(aq);
--	}
-+	regfree(&preg);
- 	atom_implode(as);
- 	dep_burn_tree(dep_tree);
- 
diff --git a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync
deleted file mode 100644
index e94ea5d0257a..000000000000
--- a/app-portage/portage-utils/files/post_sync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright 2006-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-for f in /etc/portage/postsync.d/* ; do
-	[ -x "${f}" ] && "${f}"
-done
-:
diff --git a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize
deleted file mode 100644
index 7bca1a86b3ae..000000000000
--- a/app-portage/portage-utils/files/q-reinitialize
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
-:
diff --git a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
deleted file mode 100644
index 0f7b316377f7..000000000000
--- a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-PATCHES=( "${FILESDIR}"/${P}-qdepends-Q-regex.patch )
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls) STATIC=$(usex static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.81.ebuild b/app-portage/portage-utils/portage-utils-0.81.ebuild
deleted file mode 100644
index a898b264573d..000000000000
--- a/app-portage/portage-utils/portage-utils-0.81.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	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"
-fi
-
-RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			app-crypt/libb2:=[static-libs]
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-			sys-libs/zlib:=[static-libs]
-			app-crypt/gpgme:=[static-libs]
-		)
-		!static? (
-			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
-
-pkg_postinst() {
-	local pvr
-	local doshow=
-	for pvr in ${REPLACING_VERSIONS} ; do
-		[[ ${pvr} != "0.8"[01]* ]] && doshow=true
-	done
-
-	if [[ ${doshow} == true ]] ; then
-		elog "This version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.82.ebuild b/app-portage/portage-utils/portage-utils-0.84.ebuild
index 489d1d862b19..d1e5d7ff75ff 100644
--- a/app-portage/portage-utils/portage-utils-0.82.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.84.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="6"
@@ -19,8 +19,6 @@ else
 fi
 
 RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 00881bad1181..437145f4f2ff 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -19,8 +19,6 @@ else
 fi
 
 RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index fb491b98298c..88e353c76f48 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,3 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
-EBUILD portpeek-2.1.27.ebuild 698 BLAKE2B 58c402eece0955dfd08a05788ef94c6f1d108aeb4b39b6621cb200959249877b22d2676fb36b818655a5da31ae2d254dbb293821db59c49e6d2edbe81789a2f7 SHA512 e7770e86cdd20cf60b6e8ad0e10da3edf40fd021165486331b68e58bed9604754b42baf1d9c8e3185a46e634b8c9769c473e8adc8e8ea273ad16996974aeed33
+EBUILD portpeek-2.1.27.ebuild 696 BLAKE2B 770d97948bc613ab13d3dc6b783d2aac29f679a13284eb6d12367bf63796fc1308df5b3be85e24da7b391b4d1d9172f315cf8b318fa7a2f4caf31fd68c55b134 SHA512 5ec09462b17ad968c8d52c1053a36f365b29359efa540e7c0f78671ce77340c53115ab92ee2bdb1881ee3d9e58a2030fc744b29066cb16868ee0a4c240d0bd13
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
index 698085d33724..bc6c2290c0d5 100644
--- a/app-portage/portpeek/portpeek-2.1.27.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.27.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit python-r1
 
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
index 406266d06c0b..6d55c810ef1a 100644
--- a/app-portage/pqlop/Manifest
+++ b/app-portage/pqlop/Manifest
@@ -1,3 +1,3 @@
 DIST pqlop-0.02.py 14920 BLAKE2B 0fb3f11a928ac0997094e95d676bba0df19738006e7475332c9dcd207fea3296b5839fd259cb2240c093fb28c0721f4a73331e1ab6083c2fbf0eee5d425ac50e SHA512 6c2cca73b5280ac8563573a81baff56cf43420c18688fae497ff014ec5668806d589473a2cb8093fdc07675761e8c4124f18eb568a74e1816f573541459d633f
-EBUILD pqlop-0.02-r1.ebuild 643 BLAKE2B 349c3e33e4c10db7529dbe96c4c128b02af33cc6f3981861ada1ea781b8691d83392b4b2305a079be0e1f59b810a5c001a0a9c3d1939852e9821f671650ca3a0 SHA512 ceacfaa03e9dba2dcbf2863e6b421e7018b8e681f8ee1f667bb9002ddc39a4d694ffa13092018653b813da7615e7d8e8d458248f0d985e263a06c0a89a3b9b3e
+EBUILD pqlop-0.02-r1.ebuild 639 BLAKE2B b611bb064e1593e07aa46463fb5eda33b0e4c8a213b5380583c9c20468d01a61f00268879a8e4ae277f59c5b1319cf971a67a3323292d76fac042994e01d63dc SHA512 abaf9c050208b7cca500ec7360805c19ae4464f22e51e31539cc5a12674f486496589254636eb02e8e3dcc6147cf6b92cc52b7b1fdb1aba313f9da072546fa47
 MISC metadata.xml 328 BLAKE2B 1d54242b34507f9e056c0948f164b1766fc4f0a89c48ff7be9b9f4872869312f951f2705516bdffd30ae87313c60103a4eeafc7f46cfcf597088f9716b3d768d SHA512 653d8afce656d149a859cc3565346e38de8d5188d4f94464eaed6802aadcca41eb44d8dccabf7040d1d06a483f28f57f41fb54ae8bf4c37726eccecdd60961cd
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
index 72d9da4d8017..095482c5a84a 100644
--- a/app-portage/pqlop/pqlop-0.02-r1.ebuild
+++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
 
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index e87186109355..114b67a8f4cc 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,3 @@
-DIST pram-7.tar.gz 7471 BLAKE2B 5152002be35755031a81dbaa61118fcab0529eb9732f134b11eb2499a539e04b8b8cb6402ee3bb39c7b7c82bc918ee4fef30e247fcdba3fe32c5457cf654e257 SHA512 42e95577802d5940a0eab8da5fd36d9eb2338eccf654260364b91990a0d8de9d56cbfde767dc60bfd3c826eb45a1b0e73af717740488af0a25ff6d8c656df93e
 DIST pram-8.tar.gz 7918 BLAKE2B cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc SHA512 bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
-EBUILD pram-7.ebuild 560 BLAKE2B 24d58edf63065bd835826298377cb064922df5b7d8321f52af29d72776e4a4a10f6d056433622df1bce49a5a1fb9ab2fc754fc5414a2d1bfeeaa969e64007a44 SHA512 1ce452c60ebd05d2f030729637581362efc7370d01ce303cb52e5e9589911d7c5b140ad258cc11be5f6f537b4b3ab83df07bc99850c157895129870d200ba411
-EBUILD pram-8.ebuild 562 BLAKE2B 0887b922142a71a6aab8ac5f298132f5603ee513b3042207b439df1b473e7ac6883d9ffd67d7e6de9735b532eeab0552818e604e9bd8d327f94008f9dd9e3684 SHA512 56a224a9026b222545859f6d22b7082c96afd4dbfef4e4b752eff04ad54e80ad44c0f7a5a43b0641701ba38897268ce4cb8630e7085ef3343a7878c5e1c3e417
+EBUILD pram-8.ebuild 567 BLAKE2B deab4cc1384177a5b0d7a2ceeaa0c400262c616cee0a8dd70668d635d5f748fd9515c816c9f303926ab8eb38b6c2828c2b18472eb7ca1d59a71ecdc8c6f32040 SHA512 a89b7018accdb5d2a27ac58a45025e9a1343feae7efa251738a53aacf99f008c3f2f83d2b91937c95098956cf424313b44942c0bead8276ce481b68b0a6944cd
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-7.ebuild b/app-portage/pram/pram-7.ebuild
deleted file mode 100644
index 4d8fc0f4f3b8..000000000000
--- a/app-portage/pram/pram-7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram"
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-vcs/git
-	net-misc/wget[ssl]
-	virtual/editor
-	!dev-perl/Gentoo-App-Pram"
-DEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gnupg
-		sys-apps/diffutils
-	)"
diff --git a/app-portage/pram/pram-8.ebuild b/app-portage/pram/pram-8.ebuild
index 61c091c9c5c6..89db02183b63 100644
--- a/app-portage/pram/pram-8.ebuild
+++ b/app-portage/pram/pram-8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index f6e433a489c6..84bb0f0bfd05 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,14 +1,8 @@
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
-DIST repoman-2.3.17.tar.bz2 86732 BLAKE2B 95324a3513513349f3127b5c758766d3a05f9aa47ed9cbf1808a49b402b90004c469c2d621e5402358c307f53bfa04ac2873d0b3c5d6bc8548a092f9cde408b2 SHA512 a3c798482d5f91b61c979636876e8f127c5c84627b433c20343f359bc89b65b48f17fbe0d34fb0a8b9cbd3aabbacef71302ad87abc88763f51829e74a9d9f8fd
-DIST repoman-2.3.18.tar.bz2 86765 BLAKE2B 99ba098b17d676a24c03cd37fb8aa81ce34e178af0973083e67196af88acb4473b0992e6c7706aefc20f4540c03544776fe74dcef7e6b1e1789ea95e43e457d4 SHA512 f041acc2f848f02a14cc8b50ad6e9b556db5a3409fb31b6d3e3e1755b44439252a90bee50e004f5921fd6326307c80a140a58e833bb6d902a603d96970cd6ef0
-DIST repoman-2.3.19.tar.bz2 87027 BLAKE2B af2cdab503f886a1c54770874fe21126f1a5465fac358505a3c5d17101046a0a0b1fcaa2575a1c5e52e3f93ef5fc1d0a44e0fc2dd2179b1b7d7583b4cca460fd SHA512 240dded2dcc491e155cf33f701f900f3745fa37e2ce0de9bb9ec7fedf3a25b2002d2737156bc8945c95e8d612bbae5c01642868796026551e172201281d4beb9
 DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
-EBUILD repoman-2.3.11.ebuild 1943 BLAKE2B b241eb055f279b28a6629a58b90b9d8f16f2df9dbfce8a816e7640a328aa5e71dbc3dd867d3bda6292315d728e533e76ad5fbef4585ed1d8c161c5c8f171f6da SHA512 c83557586c069c566aeb68d995685cd28e72f15eb274f11ed9439e85aff514666f4d4cc3df59388eba97ccc0b0ab313ae089c4935a07cae03561ae6f4bc32f4a
-EBUILD repoman-2.3.16.ebuild 1950 BLAKE2B 13389c07fd49613296fdd5ce0d0223bf02a2044fb7a60ef37fc73afee0d5b2d39ba87fcdaf36d8cf6a38ad4f49dcadd9c6b8503c6e1aa381ca77863e8bc8f45d SHA512 e84c7582221cb20a3314bef5bbae3e8c2aaa934aa43260204af8e13a61656937def624ff983aa002970e11af6cb985371561dcd07875fe8ebff78becc9a365fd
-EBUILD repoman-2.3.17.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
-EBUILD repoman-2.3.18.ebuild 1963 BLAKE2B cf57f21c232d9e251d138480309f50ff93792baa48c643f9987ccea6b0fd93b228c02f962e594b1720e15c993f4ce97051548b3ba3d6cca6d2bcb3e23c70b3de SHA512 dde0e97ff661c835b7cd37d1e4389dcb36bebfce5efb44875187f3df4412c68d96a2a68031376843803096c086fb3bda76afb2ad0be5fa8263571c0e92ba1b7c
-EBUILD repoman-2.3.19.ebuild 1965 BLAKE2B 62d52b853ca3314d5dde5c1e577ab4d225d2eb0c154a814d85858dff990d2d325807388fa5723ca63ac4a64945c322aa76030c319a0c13dc0e764fa2413549f0 SHA512 d6c145aab0d7549851a85ae2567015904f001e5b36c5a752a13de6b6dcfb6acfbbbf06a89606a1af58ae2bad46e03b2f838b25a1dd1dd910caaec6d4f6381262
-EBUILD repoman-2.3.20.ebuild 1965 BLAKE2B 62d52b853ca3314d5dde5c1e577ab4d225d2eb0c154a814d85858dff990d2d325807388fa5723ca63ac4a64945c322aa76030c319a0c13dc0e764fa2413549f0 SHA512 d6c145aab0d7549851a85ae2567015904f001e5b36c5a752a13de6b6dcfb6acfbbbf06a89606a1af58ae2bad46e03b2f838b25a1dd1dd910caaec6d4f6381262
-EBUILD repoman-9999.ebuild 1962 BLAKE2B abace55d502ff1d9e60bb6a29dd002b1018398429c521419919bfdcbe67a8c056ef736768466f613d6049f590ee3eaa373b7897778502221583653112fce91f4 SHA512 588ff7191b2212f0961c33adb5fa6bc1ccb8b989b886d01cd5061a78be5f20837695a5d9f6d2f7509848b5242f725d972dd911ef74a1329e64a4c1969a2e1295
+EBUILD repoman-2.3.11.ebuild 1941 BLAKE2B 2754cd770886fbc0bdeabe5a4f3ac5d29dec91a77e1379af630e97648f156524aae40f636cc1ef8331c3554c8bc26abd8f3e6617197492ad691c288d2bbafdfc SHA512 cdfbb8d40b17e401cfc0e7cd8a76193ffb011784e42f7bb87652b2f3f09274f5cc92c8333576c086fbe98670716f4c7ac1305781e60aa5812658b891011b7328
+EBUILD repoman-2.3.16.ebuild 1948 BLAKE2B 279f17c650948f278fd6a528c87672d459ab98c2e3c191de7cf41cb98c8ae1a633e9ade47eefeefec5f12c916fea4cc944ad86681787a01a04a9a9766e31e61d SHA512 810fe7e188616ee55740d610d4caf309e4aa57d4b74ad6a38757844e7eb798fd39251b0c3e5f83ea72ff210fafed79b950f9067393ebc956604cf0427d559fc1
+EBUILD repoman-2.3.20.ebuild 1991 BLAKE2B 9c9e2d3e2b8497d07ea1cd9a456eefc0beda0d742d7c4b18105468ee77f28868acccda9baf9414e7a71388aca3a984b7c066bb9327301b9ec5e36259845ed6fc SHA512 dc3a930ffe423b497d8d59c6979870519ce8a69c0b58c0479b95fdf357ad28c21e9378c4e528061ce611261cd02bf060eaf03598227a1b01b063a55dad420161
+EBUILD repoman-9999.ebuild 1988 BLAKE2B 9f52d6cdd535e510127b092728c3acfd1fbea560399a7caa0ef58c9f975d2296eb5310faa5062b6f31be215f633e34525a113e6cd71a6a91d0dd0b615a31727d SHA512 374298336d3a8a1ec10b199040f10ff410ef450e4048024962daaebafa8dbf4611265081f14fe8699ce8eee2eda6fc424c897ea1d05b44a0c851f1fd59369ee9
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.11.ebuild b/app-portage/repoman/repoman-2.3.11.ebuild
index 72c295840e74..e59256607fae 100644
--- a/app-portage/repoman/repoman-2.3.11.ebuild
+++ b/app-portage/repoman/repoman-2.3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 0566684b73c0..573ce64fbba8 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.17.ebuild b/app-portage/repoman/repoman-2.3.17.ebuild
deleted file mode 100644
index f4313d582c61..000000000000
--- a/app-portage/repoman/repoman-2.3.17.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-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 ~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"
-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.43[${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.18.ebuild b/app-portage/repoman/repoman-2.3.18.ebuild
deleted file mode 100644
index 7ce444e76570..000000000000
--- a/app-portage/repoman/repoman-2.3.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-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 ~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"
-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.72[${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.19.ebuild b/app-portage/repoman/repoman-2.3.19.ebuild
deleted file mode 100644
index 55dce4a172b2..000000000000
--- a/app-portage/repoman/repoman-2.3.19.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,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 ~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"
-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.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
index 55dce4a172b2..c77f2d7f7328 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.20.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index b61d3f3831c8..b19cdf422382 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index cea33b2373be..86800aac670d 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
-EBUILD smart-live-rebuild-1.3.6.ebuild 818 BLAKE2B 2e9a8127cd9ee7e60ac8b42722cc77e988a51b2f1b86248f755cd752fbf0e72d755c9d4ac3c6a69208fc7de16c80fc997ab390475848b6ba38c16976ba00b3ac SHA512 a65d9f040b8f7b795c66c0f0e500bebb078afadbb957670b51ea2e5da6759841ca3ae77d86c872966ccecb3151f79918ff47a20bee16b2014d70306a9fd6fbd6
-EBUILD smart-live-rebuild-9999.ebuild 737 BLAKE2B 917677f468d5dfa3ff6fd63e4d91fc01cf101dc59110b6833469b6b1d3a66b3e7711958ffd4a2ae50c7c98a324ca8386757e225694740ada8e1c2741fd248141 SHA512 56bb536ea5eca0b5d091a12dfb204a673b9ed44f31e135e12092ceb748b99071c0004f7b06d86905a11421237e9c93b82894c5975b90195f4bae5a5faeb6bf94
+EBUILD smart-live-rebuild-1.3.6.ebuild 814 BLAKE2B d1ab5e6f83c914889faabfe940cb194af583045152dee449cbdcc91e12cdd8829337a26b5467f5f1fe3775a15e23e69f5ee0ddff03d52340f756b4211df1c8f8 SHA512 166d7c095ee12ce5eea4f3fe601790d98ea4bf6cd0ca50687d7e5ea7df86c256a568f33b495e9dc792364cf7e1c441d96b5f299c77f802d77c14c7adfa494175
+EBUILD smart-live-rebuild-9999.ebuild 733 BLAKE2B 7b59872efed0e77ec676e12fd1cba543d0c2ebeb56bde592b737fb15da14c58c0aba2696f7d605c817b118cfdeb96df1cc7855269641c4b5904d06246e5961be SHA512 2f9d27406a435abbf636013d95c52a9074208723a6786524ee6ffc82c03cd4b601ccd385af65cc7e81cf25a2cd1adc478fadd0c074501e0b46000f36792d62cd
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
index 85ebbd16dc55..7f3072729e8a 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index c2775c920f60..86d7aeb6f5e6 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index b673995381a2..17d9f3d796fe 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
-EBUILD tatt-0.5.ebuild 831 BLAKE2B 54a8aff9f4abd913350c8ae038a2c4f6934e213014675e8a35b3c1d45aec5cbc04083ccb9dafc12162e9704440e31705474bf1a26cd6bc8ddc4e46897c697f8b SHA512 45a75cd181dad7e5ede5d295b8609405623a5f9f8e0e2c95dab4819d075e93fa34821c2aae72be29938508fba3ae186a0812961f2c26a6b90de1fd07e4b587c1
-EBUILD tatt-0.6.ebuild 833 BLAKE2B 39599e9da77810e51ed4db431ab299f71bd77c12777c06278ba116ec18e03e373636e2d045a35a2e45fecd56145456d6d78ae171d0798a72632a26194fc0917f SHA512 135d27a2d7f859fa12c8a16bd5170e9dc921ecdca7e5cc0fbad355849ec1f5c64c101589fabf9519c88d915b1b56239cae9784c944b2da6fda7d36928c4bf6e5
-EBUILD tatt-9999.ebuild 745 BLAKE2B fc572ac14a28ae29d696c7367fd1dec97a6c7a86b91e7bcf59339431a6f96908ea62d590740ad26dcca244ed2693788fc30363401bcf77466e287166db0f5470 SHA512 60f4189512d3bd5796927d56322f8aa01fc7f232d6213905456ea3fbf6acd91f202d6fb37416ad51c82b3d8d037b2903061e3b99f0fe82a222fa51a078749ad2
+EBUILD tatt-0.5.ebuild 827 BLAKE2B 64a4a7b8317c3c255bd5f2fde1e0e4ab873aea9da490e6a4dde74cb86ef30c2ab1a04d972fd0015f12c6e3f6b1521c2128f9e6612564b1cebd45b655f94124ec SHA512 2eca825604ecbce791e31bfa486d937b500d042326c26f06ae610c98897205a7bc985a7ea98f8b1c4431b7d5781edb18f6153f0c3f3d00d6700d9520a786e10f
+EBUILD tatt-0.6.ebuild 829 BLAKE2B eb17f1334a2d1d2990514e5daee3ee7cbcb6023da8695027c1ea8bb69b33370a99a6a11bd4b764ade735ab919b8587528ee769dc1ca630082650553ca88b9160 SHA512 41722f1e64065725e0298125d40a91b0e4b33a8d994aab29c3dd43bdaf0911c03243b30d4b828be2083d936ee7ce3251c8ec94f9ff938580a9b4d63015d8f0d7
+EBUILD tatt-9999.ebuild 741 BLAKE2B 7465e680ec62afd9c0c9d847f3a01ba3a680e586d33d57ee55908ffe4a93807caa07fa9d545c2bf0dd265d1724e7766c14d73f6f565fd358b59f3ee2291158c2 SHA512 d103954e60316698084dfc20ebf502f97b243df8d31070b5243d03eee1b326cddc023aa49904efb9d6abcbaee2cb94f0b4fb7c5f186ffa4c66c28206204a6444
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 73af7bef033b..34f4aa75b7f1 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-0.6.ebuild b/app-portage/tatt/tatt-0.6.ebuild
index 2574422e2124..99e6ef2ee940 100644
--- a/app-portage/tatt/tatt-0.6.ebuild
+++ b/app-portage/tatt/tatt-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 0138130f94fe..e036b05013f1 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 7a2ce162a0c7..5e512b7725a0 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-17.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
-EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0
+EBUILD unsymlink-lib-17.ebuild 627 BLAKE2B 23527042b9398281e992af52465012fa0c0d4eeebfe6f8dc54f2acc221b0fa1de8bb2faed3307f847ac6fc531f4c3c516772498f6ac05cfabf13b3024e877f0a SHA512 ea2e14aec535206a853cf88177bc1a542f0b986e90cda1973287afc9a4e45a2897aa236f4e26f680d0547648b0ca10accd8c19166e539cf27a11be99ebbbae00
+EBUILD unsymlink-lib-9999.ebuild 564 BLAKE2B 409fcd8bd82f72c77359dcebb83f805ae45562fcc7462272e53b1bd3c4500b4ec48684fa88c20460b8cd1c20ba87492ee7df2fc72ed8bfa6e0c138022a6506b2 SHA512 44aa96bdeb404f203194cc02a1a37d0898e009e84805cf5a88d5fea5592ebbd95a3b954ff2d1943b6531dc0ded625583fac8e3347a4397dc1b9f7856d94807de
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
index 562293f6186a..f8585615353b 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index 62e3571806d8..fbbc79d8b0ff 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit git-r3 python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-portage
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)