gentoo resync : 02.08.2019

29 files changed, 117 insertions, 346 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 5bacb8768318..a275883c5b41 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index a9e92620c934..d5645dc069e6 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,3 @@
-DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077
 DIST eix-0.33.8.tar.xz 627116 BLAKE2B b301b4218d60c13a8d6c4be484b65e9bc257e6c4d1989054cc844861cd6ec96194e60094e72833f82cfaf1b1d14a249045590dbfc91a39e5c92d5dae13b2c643 SHA512 014ce5b660430e117e8037d8043bdfe5e6e98b7cb889e88d93aeb87e650296a8db64871f3eb736842dbebde7eb1f23936f6df9f5f547f89565734b7874e6e907
-EBUILD eix-0.33.7.ebuild 2650 BLAKE2B 08a198024ced124b8ee493c33811ffaa83388fb71bf74919a433ffff26f7087887f4dd177ebaccfc92f44b485ce1c34a3e40b0b8078e510c03e82a7319071d24 SHA512 f8816c2b2fd3fcb4c6d1c7f4cf2fdfeab4af7c966b135532a7e99655caf1a8ae22c98af3dec509ce9cd7d8bdfafc75cc4e235743612bae52b4d79eb131ef133e
-EBUILD eix-0.33.8.ebuild 2661 BLAKE2B f135d383d67071fb5d29136e4a14568d993525655c7f9c50dfee25d805eba646fddd24b22bf23afdb10c26a15d3d8f026fc184ced10aa8344206b650934018ad SHA512 a0a58dac2ceeb821ff9c6c7f275c3abab04f706d3d83be43645566f6de7b06cf89818a68cd790fcd3bd7ddfd257df9e17b8df389f3566feb53b62b05f0efac82
+EBUILD eix-0.33.8.ebuild 2772 BLAKE2B 898b3633a8ce7776546e8b2bfb8182b4eccb3cce5b73defc2be46674c61afbd1e63662341806d583f3bd842e95a0ff8a129ed3be59cc70bc2caedd66ed3b57fc SHA512 4ba1f925b7508b5ec9fa8d40ab5a0771d0eede7a468ff9843bc8771849d767b04f47e1112aba75dd5ed2708687c9d43333ac57ff52d3ec4bb96ba93cb38a20f8
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.7.ebuild b/app-portage/eix/eix-0.33.7.ebuild
deleted file mode 100644
index 70613c31e587..000000000000
--- a/app-portage/eix/eix-0.33.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
-
-}
-
-pkg_postinst() {
-		tmpfiles_process eix.conf
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.33.8.ebuild b/app-portage/eix/eix-0.33.8.ebuild
index 240099310a8f..2208c56879e9 100644
--- a/app-portage/eix/eix-0.33.8.ebuild
+++ b/app-portage/eix/eix-0.33.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
@@ -76,6 +76,9 @@ src_configure() {
 	# https://github.com/vaeth/eix/issues/35
 	append-cxxflags -std=c++14
 
+	# work around https://github.com/vaeth/eix/issues/64, bug#687988
+	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
 	econf "${myconf[@]}"
 }
 
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 1f01cc0dfba4..0fc01bad7fce 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,5 +1,5 @@
 DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
 DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
 EBUILD emerge-delta-webrsync-3.7.5.ebuild 1108 BLAKE2B 6256ac7a8233ba7ba20b376563008f9b5f8ee8303aa55088630533d52982e38ff6dd218e278dd7c81abfc0e9791e2eae48c2dbedad6cc75f0d4a6637393f861f SHA512 4238088ad85b5bca771c9cc2745ff11a2cefdc30aac7899f69e1927590f87fa831c6dcc5bf26001ed0f137b0f0d716832abeeed01d330bb9c0a67434002b6340
-EBUILD emerge-delta-webrsync-3.7.6.ebuild 1113 BLAKE2B b10d7574ff050876971fb3d3ac006e155a6b00047a727c339268d4f6e36c366cf7823588fec6b3a86cd1cc6e00ecf8647f0eba992fc5c2f7c9cb97b05a7ebf7d SHA512 d618b3fd89559fedd8b639f49dc03402b854b6dceeea9c8fe45b9786c0eba0205da51c2cf9dbf4b999f61039796a641eca84bc5990003cd593a049043e7938e5
+EBUILD emerge-delta-webrsync-3.7.6.ebuild 1108 BLAKE2B 9fed334c6178ae6fba5f8b0eb38c348d379ff1f21b515d4d8a330d8bf8c60c2287c1a881985ebbcd28fdfe4b5810f14a6019a96221f189ec18e24db559709ea5 SHA512 c6bf0259e4da453c3dc906716b27bacbf10cd10c1dde497180e6703cfe58006cb70bb62b06fea2724946a53b0718339d1f2c68469e2d67993e1f373cf7916d02
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index 65533f9f804d..fcfd710aa732 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index daf60173a5c8..631c2272a37f 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -4,7 +4,7 @@ DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
 EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a
 EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
-EBUILD gemato-14.1.ebuild 1379 BLAKE2B 6ba59769dea15167d5996c1263142b19c84baa5f6d9ab30d442d9f71c0b2c4f32607450e93331fad3bfa5d1a611696c7e2d04ba25861edbe500b15eab7da9589 SHA512 159eb02f6444c040780b1d922cb16cc4ca3ccf89cf4642ef9a61704f1597a50fec667ebb3e42584d3b498c2a9addf8329f0767620647240cb1d8e8376fd6cc30
+EBUILD gemato-14.1.ebuild 1376 BLAKE2B afbbeef63e526db7e95387b56bd138fe5f0a69c0709647c15a6549f67e4991a7478a952ff857943da77932982706b2caf91eb7dfef0e65e8de39e2cf856ba6cf SHA512 d634cc2e59c18a4669701db466a8cabaecd81253a3e98e7279fc8e5d6634c1da4a51c38fed1a383037a2034e98579f7df2857e3a1102c9d148664ab060b98aad
 EBUILD gemato-14.1m.ebuild 1659 BLAKE2B a097ef71bbe477eb7b3b9e389e10b42d63df3e56ff5f5773d7fda06fa771677a64538acdc9a4b86b956ab825d680fa8516cfcc5d8bd415548432fd8b4abdb4ef SHA512 20e969002fd5861edfad5d538b96d2f47c7881f9e59034ba28ce98b37d663221bd2870308cacc9685add8b12dc281792a9d06a65c7f143ca83aa4c8b1935ef04
 EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
 EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index ca88cf6cbc3b..33abd8977510 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 13a24ca6d992..33df217b63f0 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
-EBUILD gverify-1.ebuild 620 BLAKE2B f098829258d2ec502fc737846a655d17d9647d1c56f42c4e75dc424affc60a1b0828ffa6c849b13ea58e4e6675ad14d37851ab3fcde5e4fa1073b21a96ecf25e SHA512 d99791d7c312496df216ae24a182b1e322bda4fd5e495583878b0030f31732354a92f9b3ad3c67db117ec0ed1ee50370c2e5df2b69b4a6b0753a7fe27ee784f8
+EBUILD gverify-1.ebuild 656 BLAKE2B ca6e3bfd5fb6353854229ebd9d4c0cd374197af5030f2f9879c64e6619415ca22f9e4f7c158fce92b8b9d6c24349419c17f19f0f16ec0c70b1a0131bf997571b SHA512 da8ec323226418f4b24f00f9a5457547b144718442cc0579baebdc6f7359c814467167193126ef66f03a6d2a55e1e73aa220fa60ced8e2172072bdb84805fbfd
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-1.ebuild b/app-portage/gverify/gverify-1.ebuild
index 03f7f3d60d91..43ea384eac01 100644
--- a/app-portage/gverify/gverify-1.ebuild
+++ b/app-portage/gverify/gverify-1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	app-crypt/gnupg
diff --git a/app-portage/no-distcc-env/Manifest b/app-portage/no-distcc-env/Manifest
new file mode 100644
index 000000000000..c338f2aeae6f
--- /dev/null
+++ b/app-portage/no-distcc-env/Manifest
@@ -0,0 +1,2 @@
+EBUILD no-distcc-env-9999.ebuild 824 BLAKE2B 397d8f5eb1f86098b22a1fe003fb7e44a0e7ba8a7947eaead1da81b8cecde72e53f1031eebe705a380b2d6486e1705dc5eace230ba609dda7519f7b42376695c SHA512 7e64bb34b3028cc5c0dea357538e5247464db2982644ab4802345a2596ac277cefdcb667648f818fadbe615cc5ee95f7cbd94d281e05f87567d699530bd44f7b
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/app-portage/no-distcc-env/metadata.xml b/app-portage/no-distcc-env/metadata.xml
new file mode 100644
index 000000000000..b58e8386fcb2
--- /dev/null
+++ b/app-portage/no-distcc-env/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/no-distcc-env/no-distcc-env-9999.ebuild b/app-portage/no-distcc-env/no-distcc-env-9999.ebuild
new file mode 100644
index 000000000000..3a4ae008947a
--- /dev/null
+++ b/app-portage/no-distcc-env/no-distcc-env-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS}
+
+DESCRIPTION="package.env files to disable distcc on a per-package basis"
+HOMEPAGE="https://gitweb.gentoo.org/proj/no-distcc-env.git/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_install() {
+	insinto /etc/portage
+	doins -r "${WORKDIR}/${P}"/env
+	doins -r "${WORKDIR}/${P}"/package.env
+}
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 1904f9fc6135..856b69b33d47 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -3,5 +3,6 @@ DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b1
 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-r1.ebuild 1070 BLAKE2B d2f61338842eb15b5f345ff46b3440fce2f3312d70bd7996c0fd0bc88d019fe0eb60b21c11993151b989b595b926ec9e169254325e68c7a7ca448a21355c2564 SHA512 ef505fd1d7bc2db87343c4dcd79a1fb2478398adbae83846e087b85d7a8b76b6bc2bca94a91ab9c6867d0f36234765c6a1c9d99b1f53f8e4436074ea26e17566
+EBUILD pfl-3.0.1-r2.ebuild 1115 BLAKE2B e38da39cd034e2629b72141313bd7c37728adbbe95575500cb3ad0d1822c4c68bf8967a9b5c79adba93a855633822ef8cadbb46f30398bda6cd6ea3db6331c41 SHA512 5cdb4750408b1dd77015b89bbab55e1a12bd537e04325b7a900f5c27ac9e00b56c5cb702114e2ae5fce704bea97358f5c21ca709c1a1dd0680d2d4ae8d9d3817
 EBUILD pfl-3.0.1.ebuild 1020 BLAKE2B cfb1f9d9850ded79b63727887f1b97978a6a4ebc8c737f166a26a5a6b28e13447f5941cb39706286ef0db4d711cdedd7e55eccf88bc0409e6a59188031033442 SHA512 53a262e921fdebd4512d17b13e6ff32a984ceef05ba8bf77650888914160cbf69c5ae40ea257be2c0fb09e73c4a3608a0976d33f1518c717ba53375eb45c4849
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.0.1-r2.ebuild b/app-portage/pfl/pfl-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..cdc339e0cbab
--- /dev/null
+++ b/app-portage/pfl/pfl-3.0.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]
+	network-cron? ( sys-apps/util-linux[caps] )
+"
+
+PATCHES=(
+	"${FILESDIR}/e-file-function.patch"
+)
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 2ff334026df2..bc9eb261910c 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -7,6 +7,6 @@ DIST portage-utils-0.80_pre20190719.tar.xz 1760524 BLAKE2B 4e16950d937a69bd601e6
 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-0.80_pre20190719.ebuild 2447 BLAKE2B 15f875ba7bfa8d5e168a71482ec37be3e81db955241c20fef2851a92cd772a70404d205458ccb1ec0d2ffba6b482b236f29a2b2b93a04b509550909104e8a537 SHA512 9e1a8ca755ea39f7c1809a5be02385ab2ecb13f08961b8fa93ef4bf78b3da566be1907496ee9eff907336749cd39fae32adc90278f4b822d13f397798b4adad0
+EBUILD portage-utils-0.80_pre20190719.ebuild 2466 BLAKE2B 45392a54ffec91f233a6364eef98b86a98574ce67059415dd0c9cf808729ea1cd1294cd43b4d3a0ac0c4cff838efb43b8531bf0b9d42490ad6613455a44b40a6 SHA512 393eed6639544d2a0bbf7bfc8540f98f9ff036c9d068909afc60f04ee4faaa4cb7c875931e50b00b6d999d4c27a0725ab0f63435c38f39313a6d243207286c77
 EBUILD portage-utils-9999.ebuild 1907 BLAKE2B 93409bc140a20ad03ae376ffe230545f6c8f393c0b18090bb2bee0746d3224f80295bb5a09afa06a1bac4742f6fa8d305cfa88b4dea29d7198016bf9466f672d SHA512 f3279b48dc6fb1071ebc6b062d5c0bfddef898af3fd21970c69e7aeb979207e84b6d9c24926bfa624d1bf8cfb86f467c02f9214e35d493a1649c9113e07c7aa5
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190719.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190719.ebuild
index 1c8161df1e84..9f70cbd5155f 100644
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190719.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190719.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 45beca6f5343..7088089061da 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,11 +1,3 @@
-DIST portpeek-2.1.21.tar.gz 12624 BLAKE2B fbf70d10799e4264832644a04b197816aa5824a7dd1063458bad1182441ebd70b6b05084f2577b097ba1bce5837728b2aeeb7f2e0c33dcd6d8779f2f3c946287 SHA512 7b430c85dcba4ac0d29e6fd680eaed2b59a60b5d21f0b93e90ff2e3ca7018f141e858accf10a035b75463c067444ef1be718be198bb6cc237827c9b7e67df76e
-DIST portpeek-2.1.24.tar.gz 12736 BLAKE2B 5d4d30e3c7d853e2a3be7e094ad7a40861300ee2f1582dd35d352f91354bcff504dcb8b53830a5b13dd31accf64095a0b2e3836147663d2505016acc381369f2 SHA512 fa702483c6182685242a26401ba1b058f276ff6fd18839fd7f566d48cb62c2cb78029789089267cbacc1b435f1aa815c0df51ace06afa71f242298511fa79d7a
-DIST portpeek-2.1.25.tar.gz 12864 BLAKE2B 1b0522b1d6beee25451f461c8601923666712470493f278378c8d314b48e3070d6a8853579d3636bee86cb59d3ed3a42cb1695a25d41a256b78220b8c99a4c79 SHA512 9d40ad387d252bb42a66e27de00c63f2f4725a794da7bb35fc5519ab5342e309c823090005336b22add81e4e043b0fa4f97ecdb86bb20bf595fd4188bda437f9
-DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62c69acb7ef4b7efcab17a60d0918c98f6d1fd2ec149379f2408f4a932d3389ff19c720c9a63e4dc197021d4e2f8 SHA512 0bf139381629118cc216c1fb21e65d9a317eaa0f1a200f8032f6050dea12940ab6bfc440a0001e2f26d74a21698d8de14001309342c202ae9837923d703b7ad3
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
-EBUILD portpeek-2.1.21.ebuild 685 BLAKE2B 30cacee4e050ca964f3f5a14f81e3cc15943c6fa555852fc7bf31657e78c82f04ef67cf37baab425ceb0d57cd9712af2b51db78ed217efe97ea240934c185e1e SHA512 8c1accf25c076ccfd206c59aba8f4f3176f5e69da3f9a7d5ce54bfb56d6623f6ec9893b8cea047d5dc1d517a94ef65ae577c486a96f7a7a3920fc51b552e9fd1
-EBUILD portpeek-2.1.24.ebuild 687 BLAKE2B 0d6ebabb7c982b78d4ad4fdfb295cce7748e25acf2ae29c69351f44c6f1cbc4bae1f8fedd56c70dc4eec5b338d6f26885eea5d26ce89af9b5f2bfb8697f153b3 SHA512 d024cc7679a47a687e1d8e2624a3e9dd901f8ef2a6e7605153e1c6022c1b5e06c11aff0b7f1eebb6b19c0ebf327e32c16b66cd7a13c64782255b70fc8a91c3b0
-EBUILD portpeek-2.1.25.ebuild 687 BLAKE2B 5a96d5261bd807434e9a39a6deaba6f2f1bf9359891f8d47dc7ef11c1ebdb7644ca3a684efb334eb1376d2579d9b7c51ef4b1437cfa4aeb80a48ad439e998c6c SHA512 2baaca14101b0e8a6d709f7761d3f58d2cf5e7fffa38bd35ae89ccaf5a1dd9ed9846d03120b0d15b5ed706e44717a0af3120d9b95c492c7cecc609666e985ec1
-EBUILD portpeek-2.1.26.ebuild 711 BLAKE2B e7f5fadbbbcd46824b684a9d0081114e1d351e27bf6e84500533ddd4fb195397bf9ab9e77b6903fe0d435c7f3b13097e292896205b47db2b73afa6a012558ed3 SHA512 2fe8b282bcb8ec8690f569024c5be883bafbbeac82ea5aa7da7db98e6710fd6d76fc0e21fb1d2167a8e063041fa1c8382c9f46cc4212e3ce4c2f341eef6a22e6
-EBUILD portpeek-2.1.27.ebuild 708 BLAKE2B a62069d510dba570960bdf08e2b16fc57852bc617d00f5532dd3ca5a5366b49920f25a5f6bc683c4547c33102ee0d5a205cc2b1429b191f2925a732cb43095f3 SHA512 1b9a76d9a950bff72a902bc1dfac2f20b04f0e11aabbeb864cf6f5b8cf8877ec004d6105da683eb2c436aa0d2abaff659b6590403d15ea2dce51ba69e3362c3a
+EBUILD portpeek-2.1.27.ebuild 708 BLAKE2B 61039140892dac8444db2cfaeb6bdf40e7127f09060c590b0d22be082048752857d3ece2fb0c9ae3ba8db034bf701cb52ff97eee856b88d3905e11d23880700f SHA512 d8c4d4654f26961d507bea7a6dc98998eef2e85e6ee56e11c011eda763c2535bb180721d0967b7f67d037a0d5d328cede7af9c1cd2e5c3c0e02ad33a02232a6c
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.21.ebuild b/app-portage/portpeek/portpeek-2.1.21.ebuild
deleted file mode 100644
index e3e1ecc89147..000000000000
--- a/app-portage/portpeek/portpeek-2.1.21.ebuild
+++ /dev/null
@@ -1,29 +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} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.3.2-r1
-	>=sys-apps/portage-2.3.0[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.24.ebuild b/app-portage/portpeek/portpeek-2.1.24.ebuild
deleted file mode 100644
index 6a3e5c93cd82..000000000000
--- a/app-portage/portpeek/portpeek-2.1.24.ebuild
+++ /dev/null
@@ -1,29 +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} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.3.3
-	>=sys-apps/portage-2.3.5[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.25.ebuild b/app-portage/portpeek/portpeek-2.1.25.ebuild
deleted file mode 100644
index dd48d7b28323..000000000000
--- a/app-portage/portpeek/portpeek-2.1.25.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.4.0
-	>=sys-apps/portage-2.3.8[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.26.ebuild b/app-portage/portpeek/portpeek-2.1.26.ebuild
deleted file mode 100644
index 046d4cbd2188..000000000000
--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ /dev/null
@@ -1,31 +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} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.4.0
-	|| (
-		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
index 7dcd5c888492..c6db7e3120b6 100644
--- a/app-portage/portpeek/portpeek-2.1.27.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.27.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1
 
 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 4974e3452686..b7ce9b1f2bd9 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,6 @@
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
-DIST repoman-2.3.15.tar.bz2 86707 BLAKE2B 4c890fa311426d523c34fcaaf4e473fbaba6e3247cb55464709bf8547898df89420b4231a10181c06aafdeaa7ab6fffc02f8191f573487541dfd392945864b28 SHA512 d3f8d5d9b743d8fcd9e1a856a4c371747e235620105ed47f9c8b5933fbdcea7e8d556fc89e517834141bc575f15851cd833a56121bfdd55a1d81b3f86f859b74
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 EBUILD repoman-2.3.11.ebuild 1943 BLAKE2B b241eb055f279b28a6629a58b90b9d8f16f2df9dbfce8a816e7640a328aa5e71dbc3dd867d3bda6292315d728e533e76ad5fbef4585ed1d8c161c5c8f171f6da SHA512 c83557586c069c566aeb68d995685cd28e72f15eb274f11ed9439e85aff514666f4d4cc3df59388eba97ccc0b0ab313ae089c4935a07cae03561ae6f4bc32f4a
-EBUILD repoman-2.3.15.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
-EBUILD repoman-2.3.16.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
+EBUILD repoman-2.3.16.ebuild 1953 BLAKE2B 1f3fd07870dcd8a8db95fec7e0e70ab7cafced3d3b6a557022c43097fd031b65d671dde404fa028c531fe29400eebd3f1d88e853b150283d5ef70c3c6e730a34 SHA512 2759956136bfe9275c2e62eda1f0ba1bce6fa4f8b6f4415de9e62d750cbec73e2a22585c1aab3f9e513d969f1a58aa6cb4b002c14a44a8da6bcc61767db51d96
 EBUILD repoman-9999.ebuild 1984 BLAKE2B 731d6bd31c3f65e5402c3ca736afda5e7c566a25d59e869fde16a39cad2541a9261820d72c67150e8789464c8043f24d8329d40c3e8121ce61bc1bc6daa3795c SHA512 e411f9c7ba86104fb32f0013c12956362fe3de11fe5d3238999c4b5c3c625bdd6c7fe6fb136de24993e2525655b9c22c0a06d285323a8babccfb6fc0572a4924
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.15.ebuild b/app-portage/repoman/repoman-2.3.15.ebuild
deleted file mode 100644
index f4313d582c61..000000000000
--- a/app-portage/repoman/repoman-2.3.15.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.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index f4313d582c61..c3d858593bdb 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~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"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 66fd56706380..f3d9df1c66d5 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,8 +1,6 @@
-DIST unsymlink-lib-15.tar.gz 10145 BLAKE2B 500b78a84cd555319952ce6420af012354952ebd83983db121f1a48ee34d5c2ce9a9f56ce635d6f77eb38058b79d42cf94d2e421414095c188949db523aacbe0 SHA512 37b8cc4eb7b787a1ccc97750df9fcd4516c2c4ac110c5191b4be3999b1eb994ee567e0f4387aaafe243a745efa61c0d48d78b7f9a4a58bb7f896ccd7bdce03a7
 DIST unsymlink-lib-16.tar.gz 10139 BLAKE2B 8e43fe85747d97fa44ae30cf6f276e8e5557141004c0c6ec5f1b998c0f5c121e9fb6bb3f7d711d11ca962c703caa7dc6014ddfde2c6ccf16807264a132e37940 SHA512 0c5ebab3622aad1f8a02c2530bfb3f6d48c0ac9744fdde94e8a9b151c5773d10ae642c122642d5f7e2bd442d5969863d8f5f0586c8ed484fa22ac42143a06417
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-15.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
 EBUILD unsymlink-lib-16.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
-EBUILD unsymlink-lib-17.ebuild 630 BLAKE2B a7a82062dd14d42f6933b292abcc5567bf5e942238f3604719796675e4a41509c06afb04d9ed2005e500be83f5ebc6802c0c9744e3b3ddd5b76f569dbb311c47 SHA512 b082779cccb6a4fff08bbe6028b3a4daaa14f606616081e9b7bb33ae9377c1a0cc92b552b78857dd9904a82dc8963e9310b0d37e05fd68015011e5d945d012d6
+EBUILD unsymlink-lib-17.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
 EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild
deleted file mode 100644
index 562293f6186a..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-15.ebuild
+++ /dev/null
@@ -1,30 +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,6,7}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-src_test() {
-	# tests are docker-based
-	:
-}
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
index 90b56e60ca45..562293f6186a 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"