gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /app-portage
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
120 files changed, 441 insertions, 995 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 923704be5a14..1df4563466af 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index 71fe74cbb241..fabf8f3aa947 100644
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -1,3 +1,3 @@
 DIST cfg-update-1.8.9.tgz 162356 BLAKE2B 2194b485ae17ee09fe212fb88fee0d3974bb7877b9bee6a243475f689e033e950d9d331108f9360a5bb65b40f2a83916fc9bd208b153d4eb2a6fac0bfb3f4c64 SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9
-EBUILD cfg-update-1.8.9.ebuild 2975 BLAKE2B 40ac869ca667a8090a58a873ee46004ff6eff0aa2743233c4a58940ff71779320f3452da0f1a6df3272b9d19172b336ce7c1f712aeb66e52414dcaffa5ecdd15 SHA512 163b354dcdc84e8747a1b93b44adb650ae183cbe19a160972e3ce45069d3757c0b3c0699a9f344fecaedf65c76d05fbb6e5f041dc679f8f8f9b018829f43fbd0
+EBUILD cfg-update-1.8.9.ebuild 2982 BLAKE2B 7d207ad3ced070ee9658c9934794bc7ff11850ea7fb444b3058e074bf80943897dd03c8e592814c5521417f575b3d9544c546b88087aef469054cb970841e5fd SHA512 dd6f446f105e70d047b3a8a486de57293c950e715a40b6553df1389240333de62122efac1357ff365e61947ebfd9f80045eeb5cc53bb5ae46dd69b932bba8710
 MISC metadata.xml 305 BLAKE2B 7ee3e6df88046614c6b02661384885e8f61eb72b26555456e5fcb5c034777ad37567c5bc091337cc4aa5f36415bc00ec4b9edd9fbb78cf87f449af966158adb4 SHA512 e0e51a2923f24cb77e5a9dddcdb89b2c4301d3c1b34f6a71be1611890e91ecf8e890852307964594c3c09486aee1e6758ad6d59e902842dd9cb63c6168b6d515
diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
index 66b2498efec6..d0afd7d9ead5 100644
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index b120013f506e..fab4a44d39c0 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,6 @@
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
-EBUILD cpuid2cpuflags-1.ebuild 1058 BLAKE2B 2f84de424a39c3f163dffffb5acf0b919e1abd2375b961e6f1f281011157fe7fabcebcee4ba771abfb2fef9407fbf4c67a104aa3ec4de2bf1d81b91cbc6e272c SHA512 ca30faabee1bd898fc80f7207fe71d205d6ee6a09e1697f242bfafaca1071fb343ab58623d713b15202096f6e3e240dd83600ce0b695be546721037c77e9c850
+EBUILD cpuid2cpuflags-1.ebuild 1049 BLAKE2B 7d80e64bf6109c0554ecf37f3ddc4042bc8801cbab79235e94647dd1d46bef5de89261640957a3cb0715345855462b81bfcd2d2c3a9b6d2e21fd201c2cf916d4 SHA512 df3f8412a7992d034495dab33395ed892233976ab7ae70e3b8e698867e03cdf0231c2814968bca139c870107e3d96aa90b4473904a4c6aba02b7be098c9617ee
 EBUILD cpuid2cpuflags-5.ebuild 922 BLAKE2B 0c8097b9adda83aaece462f4efd3b0380c2ea743c51a3629a9bb5efc6c0a3ce549d21cae446e457357cc70bc723b859df86d095189f4606cc164e3a8cff65f7c SHA512 e13f6f2561fb4c511ba845c32256319512381657664e5eef38014e6f6e0f1e6a64f5224203022e276fe950f8900cc3933ddbba06a2099d7936689b93e514d4d6
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B 44af8539bbeb11b608db0f69a40210ce2aeeb7b7acdf8ea1d03b4e2276642ae0f0a0e4f247b58bd9e2c0ebaa4bb3fd357cddf7b8d248e3d3ba0c10c9280dfa27 SHA512 d1151a028eacf45527dffcb0046e5f9b108eaacb8f57ae43bd5effcf22993d09b55338182655c8515ca0367bbe66f5b824b56dd17e5c6e1a5274c9c322751046
 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 cc95afbc6f2f..05fe61f27a1a 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit python-r1
 
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index a7000c5814d2..db8e0779218b 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 591 BLAKE2B 8e9382795795a264430b52399f934f683afc92bb98964c989dfd482cb6673e4ac495bf960087117074b0ac806f8ca91fee063b47fa95e107177135a1950b9270 SHA512 d6085745542397828e909931bf58605c725166af6f1018ad7c8b8dc12c21e6f2ebade3cd2816af1e6f65f8aa0a3fb3a921bd80d655f40a142bdd47f843b46c3d
-EBUILD diffmask-9999.ebuild 529 BLAKE2B 7f0ee0e021de985ef464da681356119597f047ee94621fc0d652d5d7ba6775621b7324a5d6a481a6a8032e27ceb571e2b5f67bf747c22f64f058369d8bb3c143 SHA512 db899c9a751a223cfa93328d396f38a4f3698ccaca03ad24bb3f0a2712fda8ee5b09214bc3df29284bd15406a54fd3fcd9548426aba434c58550f8e8d40cdac8
+EBUILD diffmask-0.3.3-r4.ebuild 584 BLAKE2B aeca1e66173a1c078419f5f7659aaab63ffe00b8d0f5c476d6fc27080a7196b53c10e438fc0b37e0c6212a53bb2dae0b804c050ea59a51fb01ef235bbada7627 SHA512 aa33a827b03934ef11faa25835e6881eb5950b6bf4be483334481e0d9a6a6e44c17d446cc269ea9779a9c6ec3b46ce882f98cb921703f6afaeaa648ec6ec3c85
+EBUILD diffmask-9999.ebuild 522 BLAKE2B 130261102bdd350b85cdca67e657994a8adbf5d2496b1d2247a04a731e14d121a8f1ec01d74225e3b40fc5a8ae0ef0596e515adc60144512568e6c03b7c824a5 SHA512 974daedd98bd35d842da7eddf5da1eac93a0a76ed7efb9c4b067264131cd086abf0660259c8d4b315de7fe2ff7eccc38d2e3c7732cd0fa49ab6df863147e147b
 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 80b09bc47ee5..7112b22828bf 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 8c0f4525f829..ec9a134f71de 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 7fbeeb62e355..2c3e9aa7513b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,7 +1,3 @@
-DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
-DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
 DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077
-EBUILD eix-0.33.5.ebuild 2643 BLAKE2B 2a9c179699e2df18328b1a1ff78927f8f0c5f8f476d3715b14fd10eaf1cd22c19895b4ebe46d5c05b618263b604ba73e903dac3838342ef5d23faf847bbd7071 SHA512 829d144019b1ee4beb72b66d51a42f007b9b09d122deed5f0990582de5012d0128ecc584010034ee1ab52b8f15edf939cdafbe3527b2ae7c651c4fa1e87f1c11
-EBUILD eix-0.33.6.ebuild 2654 BLAKE2B 2923f5cf4b6db39cb1007e8b7b531c883ed02523afe53fefa4653e0e30ab2cbcc30f5d35c84dd07d347b85a894ce362410893b9db5d4204f1a9c506e2f0c963e SHA512 5445aae967a808d08b888f95be38df115c6db0f993dfad69f52eb480f5cbde14ffe670778412cd7a1edb6a773050e19f00def9fc2aa2b746abf36ebeb8116245
-EBUILD eix-0.33.7.ebuild 2654 BLAKE2B 31e3aaf0bb2872297ba0961ebe2f1a981d07666cb4c68577858716c370058998e888ac079b52c909dd3573934d40f6259759f8dd702b784bcd3c7812d5908dc8 SHA512 82c73ebeefd2620fc4e4b852e4c6ea775c3c5bd47439ffb33d0d4705edffc6efaee3d0f7bc09e559be01c8f112b603cb49ee687a9b67d0ec5092893c1200e49e
+EBUILD eix-0.33.7.ebuild 2643 BLAKE2B 2a9c179699e2df18328b1a1ff78927f8f0c5f8f476d3715b14fd10eaf1cd22c19895b4ebe46d5c05b618263b604ba73e903dac3838342ef5d23faf847bbd7071 SHA512 829d144019b1ee4beb72b66d51a42f007b9b09d122deed5f0990582de5012d0128ecc584010034ee1ab52b8f15edf939cdafbe3527b2ae7c651c4fa1e87f1c11
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild
deleted file mode 100644
index f39cd59bc55b..000000000000
--- a/app-portage/eix/eix-0.33.5.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 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.6.ebuild b/app-portage/eix/eix-0.33.6.ebuild
deleted file mode 100644
index 6591a20647ea..000000000000
--- a/app-portage/eix/eix-0.33.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 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 ~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.7.ebuild b/app-portage/eix/eix-0.33.7.ebuild
index 4fd174fc704e..f39cd59bc55b 100644
--- a/app-portage/eix/eix-0.33.7.ebuild
+++ b/app-portage/eix/eix-0.33.7.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 ~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 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 )
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index e7e2dc7ac619..1dbfae6bf7e9 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -12,6 +12,6 @@ EBUILD elogv-0.7.6.3.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421
 EBUILD elogv-0.7.6.4.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
 EBUILD elogv-0.7.6.5.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
 EBUILD elogv-0.7.6.6.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
-EBUILD elogv-0.7.7.1.ebuild 1610 BLAKE2B 7bc1b57184f26a53ca29f2267f405a2025203c2629f709e6edf66c6261c8af43b2179a9f47f4c29c2da1a6abbc28a3120caf8d8c9dae6b64bb7e1f8d9748c2bb SHA512 23b3c6e4232a9ff4c16a982e8d54c8eb42203c323d23c684906ab80a9607fbf9e24974af3a960d478002d3a1c79c39f1c25c1dc084fe51c4c83dfeb030776e0d
-EBUILD elogv-0.7.8.ebuild 1610 BLAKE2B 7bc1b57184f26a53ca29f2267f405a2025203c2629f709e6edf66c6261c8af43b2179a9f47f4c29c2da1a6abbc28a3120caf8d8c9dae6b64bb7e1f8d9748c2bb SHA512 23b3c6e4232a9ff4c16a982e8d54c8eb42203c323d23c684906ab80a9607fbf9e24974af3a960d478002d3a1c79c39f1c25c1dc084fe51c4c83dfeb030776e0d
+EBUILD elogv-0.7.7.1.ebuild 1605 BLAKE2B e3405d22d08ea00e4414f0aa034af298859a08f751069fc8b26fdd41efed8e8de9f2fa5526d0ca306d03412c92ecc3903c08d6e4e6f35b5ce23a34ddbb818cbb SHA512 4707b1e5a995d1e65d5079ff5cfedcbc7f6322026ed48c2dc1bd6a84297b24e596bf58df24d49b619cbfcf6da1adf904ffc808944277200c1a9359fe20d8013b
+EBUILD elogv-0.7.8.ebuild 1605 BLAKE2B e3405d22d08ea00e4414f0aa034af298859a08f751069fc8b26fdd41efed8e8de9f2fa5526d0ca306d03412c92ecc3903c08d6e4e6f35b5ce23a34ddbb818cbb SHA512 4707b1e5a995d1e65d5079ff5cfedcbc7f6322026ed48c2dc1bd6a84297b24e596bf58df24d49b619cbfcf6da1adf904ffc808944277200c1a9359fe20d8013b
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.7.1.ebuild b/app-portage/elogv/elogv-0.7.7.1.ebuild
index a47dbd42ebab..7220f6e5447d 100644
--- a/app-portage/elogv/elogv-0.7.7.1.ebuild
+++ b/app-portage/elogv/elogv-0.7.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
diff --git a/app-portage/elogv/elogv-0.7.8.ebuild b/app-portage/elogv/elogv-0.7.8.ebuild
index a47dbd42ebab..7220f6e5447d 100644
--- a/app-portage/elogv/elogv-0.7.8.ebuild
+++ b/app-portage/elogv/elogv-0.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index b1f86b4e6bcf..39f95dee93d1 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 1761 BLAKE2B 24b9e45586dd521da1b84e60eaee1e8d921ed0af3aa15daa1c4edaaf5e870606ffea71fcf0ec0542fdf670e89d1708125b0a6a3d67bb2fa75b976a737a2c0276 SHA512 0da80252b934601cbc96e17ee918ad15ed853d9f1155451473ef3cd3da0e733ddf7293e83974be2ce6a0ffd502269c570a0f7ff5e917a0a8eef9b77385eeb153
-EBUILD elogviewer-2.9.ebuild 1765 BLAKE2B 429d7a92fa9cc64532c0e543a29b011f0d5d3e49ec321223398aafe2bbfc5bacfaa96fdb633860a8f7ec9c1d42e46019dd16bc5e258fdd645466f06b6601000d SHA512 db42ed22dc07cfb77d874a5c3dfe58b5d8e5269016388e38994edb1103e3298687e581cb152e7f42c6c051e176e38fe456bb67ef7fbd20ecbb00559756ee5329
+EBUILD elogviewer-2.7-r2.ebuild 1754 BLAKE2B 1c8827c05c4d43477963ba4d09b05fea923993bfef71c69308a1d4ad45b11f1a1d2f23a22311697c25114593532f530031d43e83e0b185b5c55eb30a3a3dfcc2 SHA512 4cd782c6d2b25d967e5fbdfde2aa9631c542c6b4932be09be6b64abdb744922bd578a14c1e1f073b2f1fcac1fafe8c3f52c4113a0ec60bbf332ca26956af2db4
+EBUILD elogviewer-2.9.ebuild 1758 BLAKE2B 9e9a131b0aa5baabdf62e8c594c1f24fbd1fa61ef7e461d6339078132b2a45c2324b299f629a5d4fbf70be3e0b0288b47725904e540354158acca8ac089b028b SHA512 ffa35f2ffff9e1c74c741b8eb816e6612c9fb578af100a2c4b36a231cd3f384e022167f32b014d8632b8ac5d1fb7f65ad98815ea26b8b7a428f5ae842825e41c
 MISC metadata.xml 508 BLAKE2B 4414a5567ae33626032ceec6a059d7547bf8f2b69bc561b08e7ce60817194cd646813e0d3d0debc88ca10b85933ecbbdf954cbfe4d6b4194499e866ce54d7271 SHA512 bcea5d31473ddfb682d52f604f8eec6ec26938a30a62f7388e9b3be36d17a8f189ea97c418708b88949a6d48e10f6652feabbd247eeb9ef9132ce20916c41ec8
diff --git a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
index c2a6997e1742..54fa8c1e65a7 100644
--- a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 DISABLE_AUTOFORMATTING=true
 
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
index a97ff3d045b8..2da493c07cfd 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 DISABLE_AUTOFORMATTING=true
 
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 370241403154..be39e26b607f 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -5,5 +5,5 @@ DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb94
 EBUILD emerge-delta-webrsync-3.7.2-r1.ebuild 1223 BLAKE2B eb7b371e2584645e623e31fbc395f52dee2754825165032406ccfa3c4b505d826f1cec1d90792391612b75983b2400d09bb58cba66c8b2726e7bd553ac65af33 SHA512 84208b781a603717b8f22f1a111949279aeb44b693fedb7d0e823f9dbd6c8a21037f353f8ea12c2d7694cb484f20af448688a2f75976288ac73afd9213a3c728
 EBUILD emerge-delta-webrsync-3.7.3-r1.ebuild 1152 BLAKE2B 38658bc218767c81baefae62af6f04dba9f609a3ca39242517fe81fed033c07109100c22759e4d0e1c00c3cc290d05abe2d15426be8fae96fcf0e2a720f1e64b SHA512 03e4b5228f1ded39ae9e3047455e3cbf7a13a15f3b6ada9a0d95fc37e9c59461042313f82ccd47b73b2e2d9fed31ecc4a6625dff68e1137fbd8a32748afc59c6
 EBUILD emerge-delta-webrsync-3.7.4.ebuild 1152 BLAKE2B feb8e81fb9b46d76d8ce5c760c83e072cb5dd65e84b93dc89a23af5ff5e0196ddb0dff4a354bb3942dd22b26f8c6a7b3884147299b7938d254d028dbe31630e6 SHA512 1ac9c635ca5cabd50466aaefba4d5aae423938576da4c3e444f81475ee550f7f27fa8dcddecc41702f097077d48a3db1514bf1b2e1f7104a5c5782fb90ceb091
-EBUILD emerge-delta-webrsync-3.7.5.ebuild 1146 BLAKE2B 9df676ed89090592fd0f90c09f2b5e0f7fd9b50fa278b25c9c5b80385cd4e44dea114511bb1d545ac6198c0fc37ecf6299f3cd24c4e9557917143c00abeae667 SHA512 1557186f9ab35f3dbe1045e440c8c05c5a87d4021cd98ef9e194813729a2b005286e7104f90620f687e8e4609f218ff43b308945804a8dcd4fd0bacbe5b980dd
+EBUILD emerge-delta-webrsync-3.7.5.ebuild 1144 BLAKE2B c6787f786adb02becdce14e899fe4fe8dba87238d772295c06cc52fcbb8a547b91c0100a7fcd490b703bcb292b2db10a979ca44337b6928bc18bb13e1ea0bbd4 SHA512 f04fb8d5b9536286a54e59313bd6fcb4bec91997db189c213d91b3da94aaeebae36b063911b6da06b8789f7809c13dbb82078c86682b160d19abef1f037f7260
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
index 174c9d04a3d8..9c7a2f82821c 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 1a2e5410c4f3..fed8c4510889 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 1565 BLAKE2B 09a20ccd02ba4a4b8995836881293fc4f11b71ce365203cec2afa7b8ae997575df16885dc7913a8a37b3c97fece63f9d9bc37cd37eaf24f4f309e7db629f30f9 SHA512 84c942ab92e21cae369365a0426f9eeb29b52adaa6121418fb185188a4bb9f9b402037b4460b3740c95c021a77411a809b04cff9919eb81a7469567c8f3354c0
-EBUILD esearch-9999.ebuild 1145 BLAKE2B 6cdb90bf72eb3f638fd11eab43bcd9b5f1d408b60d86397b4d47163fef0dd4dd0a641d38d2df762db04ef7a3c9d4b3bd5791de16fdeeb9e2d163adee2a8f66bd SHA512 af36069c02638fb83cdb9e5cdda3c76e3719526085449d823e17042da88b8414fbf285d0ffe9ba0458cf5e7ec170b20699c6391667b3b4287c5d2ee730a961f1
+EBUILD esearch-1.3-r2.ebuild 1558 BLAKE2B 22ebdcdf868ed54850accec79440e5e372e12ac466cdc70356da91fd9136c9c859aa6fcd8eaffcb7152e9b90e192edf4f6f6838886fc8ad4e09577494ceafa1c SHA512 f244753d0547395ce9a6a2d05196f6e9910653c8c5c208faa357145b5b049a71c2ac96ea8701c0343773c7e4e5f89b75fa6701d0efeaab32cca6f1d86531e027
+EBUILD esearch-9999.ebuild 1138 BLAKE2B 922288f6aec13a893b30a1a25c50d48d3a2d0985e5881194b2d0405dff29209831706ee4cbd5ea72a5496be3527453cbb52d5abf2cbb401b6f3320b32168f191 SHA512 9443b681023f0a8ba4df3f8d7f63f3e77452b9eff1032ceaa4b64d0b3a50c4cb690d30b33d9f55febbc7ea7bf90286a6809fd47f3b0d824c716006cabbc749ab
 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 55244957de30..d628b3b73575 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index ae29c8dc76a8..2aecbf1e30b3 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 PYTHON_REQ_USE="readline(+)"
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest
index 3f3f143e04c9..22c64faa7770 100644
--- a/app-portage/euses/Manifest
+++ b/app-portage/euses/Manifest
@@ -1,3 +1,3 @@
 DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
-EBUILD euses-2.5.9.ebuild 449 BLAKE2B aeff70ea3ea8e0af4ab1a496a42e62b573566abadbc11ec6ff1088e936a9944f02166d4bc1496f648b43fae6263a06217f2bc004b4dc1ef8799ae4076ad55bfe SHA512 99954debb0f506b717ce7b8a57ba04e8170bbbe9c372785957def0e912ae920fdaefbbd95aee8e6c2ba7d12a99fbc281c90d7f17cbb77f9e9266cc9914a27d09
+EBUILD euses-2.5.9.ebuild 456 BLAKE2B 90c95227a12a678fdbb26f0de597dfe998321b25f95ee4c072911288a566a0572d298f872477265c0a882e6a03496742b9c35d114841897d66043b2db7732321 SHA512 0f0f47e6753596b46cf6da1c22cd511298742f5b47039623e8e7d3c02db061c7923a33172cb6221f2adaa383bb7517aee06a36962d7104f3010653cc6bc7b773
 MISC metadata.xml 363 BLAKE2B d048d26125f3c965a6f3e467d8cd211fa8a3999692bd507c036b625b23d0a75dfcea9f32544aeb3e3219d7ba2a2ab03005b0cbecb51cd58f11cc48cebff9ef59 SHA512 568c3af8e7aa91c9732a29b74b31b89869ae031fcdf94d9c13c64f740bf1c86ee45a257cf10a298090239c7a92119e0010fc9316962a625a6494ff3174e80e5f
diff --git a/app-portage/euses/euses-2.5.9.ebuild b/app-portage/euses/euses-2.5.9.ebuild
index d56aa793a6bb..aa8f61bc25c0 100644
--- a/app-portage/euses/euses-2.5.9.ebuild
+++ b/app-portage/euses/euses-2.5.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index 73bc9048165c..e42f4c71d421 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,3 +1,3 @@
-DIST fetchcommandwrapper-0.8.tar.gz 3558 BLAKE2B 6e37264382900d9326d7da0546ac870a07b9ba66056221e17cc2a170ccfe367e867d74cf3b6f1a6e9d5ce834a054d26b40e57d9d1bd00a87bda80b77b1b427bd SHA512 b064515d3f4b85f849de53934a45e7a64c9af8bfcfb83ee70d09aad9712623cff2c43a28c93ccd00b74f99679856225201e7c8f33b9b0338121ac1072335e5ba
-EBUILD fetchcommandwrapper-0.8-r1.ebuild 699 BLAKE2B a9f71bbfb042fd9b6561ff4864f5551dad95c828d66ef78e196089ceb6b36ab19e600f94d1f77521eae5ca2f875518648739ce491924d53fc9161fba7d1c1dcd SHA512 e686fd203cdf9babc99aa730cf285f8394701f4d334b321555c8061573aa4fd11350c25c87cb26cd7490125d9e146ca766da548a2b019fb0a6b7ae4631d00d5f
+DIST fetchcommandwrapper-0.8.1.tar.gz 3579 BLAKE2B c2bf9bf5c463c264ace781a513e4943c4dc4196bfbef1e14112f673d0662c89b947daa860abe3b9b4a2cbf88d5cf6743670da7dbcec13876db7fdad2051e8e7f SHA512 087cbeaeb3126fe43708e453bc1a21a8957c47a9dedaac336bc9e6222191bf8aaafea17031b3e6d011b8bfd34483b521410eb84be43d226e5fb1ce1eccf4d4af
+EBUILD fetchcommandwrapper-0.8.1-r1.ebuild 699 BLAKE2B 543d2684a9369f97f047eb6774b1e3c559446b4c0b1ea0a798eaa9e346b493930a1c04efc83ef8246c06df2738d60ea3379c66fc7db872ff8846b9d89d7a514e SHA512 2b36dd392d905c0bac18c6dc770b1570a716db9de985b01a91acf6954d90e30f1a1b47d89d4be1d6fc4316abdd1892c8bbb9cfcd4c10f10345e746bf5b19a6ff
 MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8-r1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild
index a29ec9fc0106..acace947d056 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8-r1.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 93ea0023c94c..a693722d1531 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 1183 BLAKE2B 80cf98bc9f217d6f34b40ad3b5acaa7ecdf456f4756b0b717dec3d97424a1383d00d3387d5e4abc8c44aa2e1bda3b6998a598972a49862038fcac383268ca317 SHA512 658d4d06e9a35e4cd39c344716c8f1c3c1021f8d377d26885c244205e5b945818a9ad2e249c6c19424b737cbf4bff318a6488a354a697e1460c62c5554e862e1
-EBUILD flaggie-9999.ebuild 1096 BLAKE2B 160eb996e148481ae0625a866c97e71175b78991eec0acb87f7c7221c202553f4e49df7d8034c873fae8b324a4f1e50ca9ac9ebcb387c1d6423afc843b0fa4cd SHA512 71826a72d278256024ed1fe9c127b3f7eed003c2a79c639bd094dc8aab1b91861c43d3f69e2028b70eea3b279fb31790df5225d9c83ac71a85cec92b730dbec7
+EBUILD flaggie-0.2.1-r1.ebuild 1176 BLAKE2B 849699806f44573d71185e5b341381486b7658526e57570d270eba59b9d43ac729bcc390df02af5a3e50199865bbe9e270cb2f3e7dd72abfde8fabf4110fe8f3 SHA512 4744cc6d20e4e0c9bd62ef9c53be7a2d18c9d704a9612ca3f403cc4bc210851db2eb772520f4a6459a16278d7a85f08e380d492d1a29bacaffd818c6fb94fb59
+EBUILD flaggie-9999.ebuild 1089 BLAKE2B 2abb095d7949fa404c4f5a32107fa2ebd6e9bcddaa308988873edb2693a67c2d3ab5f05c1ff5ecd37f2342ce801cb702c606f4f5d1750fa6a770164513b467bc SHA512 95773469b76fdfe870b15f44388746daff1bbb2244b919e2cc27098b2aa7ad3647831d4e2331b24e4f68dd12b1c72bde93e187e4b027505f65cff80dc072b446
 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 6cf9bd001462..1e348532fb0a 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index b6b4297c035b..8bff382266f1 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 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 cbd23dcb312f..cfc903bddb41 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,9 +1,9 @@
 DIST g-sorcery-0.1.tar.gz 45796 BLAKE2B 8439b7c8a394723156ee1d35d432ac10197e04b056d69ff87a010d89b6115b9465eae73888c55396676a4f31c75d0d6fb712646d8929dce401928ab41dc67bb0 SHA512 207776ed65c79365dd65a21b14f3ba38589a2b5f47c3c6ac38691ba7949b9a836f6a8543e443119d6f2381a5f34ee854ecbc7d2f88527301c7cb1e10478406a5
 DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
 DIST g-sorcery-0.2.tar.gz 54173 BLAKE2B c110c670d792bf41430980a5155ca83d9ff45e9e301507628913666ebf313155e3b262856efcdd4896dad005c2eac393f9573fc106fa868b057a7b8f5a026b9f SHA512 9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32
-EBUILD g-sorcery-0.1-r1.ebuild 666 BLAKE2B b0d63d33218764d3f41820017973e9ba785ccee04b2a0ba1bb9e1eb96e8fc3dd18baba1f36997e776a8ac23e69ca57b030f00c6f713ecf0fe7e46bd58e28f3e5 SHA512 0b86108e43627da22083a965455f8a2a109d207281eeff32d40cae1c4e8b360037e05f46731ec65aa8291ad8d8260288207ab189fd1ed06a934b2694d8fa2a12
-EBUILD g-sorcery-0.2-r1.ebuild 894 BLAKE2B cf6b55447cecabc742fe669f6f8f920348569270d62bd7d3983ceda343a957279d73d22fc659228436d0e2d3d746cc56fd54a3ea31d65037a2f3830ee787d688 SHA512 d590fcc4c64e6e2bcfb38e16653ed1bee65f47b6b349d3eac977219fb51f34afb4a2cb39b7b04b2629327fceb7f67aed81499c716482fe75e9135638847322ca
-EBUILD g-sorcery-0.2.1-r1.ebuild 963 BLAKE2B 734d44e9c6347de14d14ba95911b705c0b49908ef5e17877e7a441c085543bc6d730ac22e908bf737bbea4acdf5d23e94666846e31dcd8e73f02b91d4323e2d2 SHA512 788ede4ba82312bbecc1aa9c0087847430d8a16553ff03c06fa6c097ff30e98855f41563c5a205dc057c9e9c894315e5b68ee4ad9cf28ce50beeda60657d986e
-EBUILD g-sorcery-0.2.1.ebuild 866 BLAKE2B 99748c1dc04ce8ac57784e4746dd015f52d60116651578a78aee0c37e1fadc92b012aef2dc8bc36be66adc5fd46ffd6312e5de44d42bd3ba676bedb470e95ef0 SHA512 f290aaab0f812cf104d6dc4fc0db9d4e7fd383f1743a3bba12600faa3fa03931f274760cf4ec046d27edd7daceb8ad989edef0c1b8558f0bd7bc89ad91360364
-EBUILD g-sorcery-9999.ebuild 934 BLAKE2B b8cf1bb81703e9f56030bac340d044d577471599d31d7920abec1151eb1385ad0344daa35cc67e3bf97911ee059ab17bb82679932d63bc7689ddb03bed133125 SHA512 e5a938e712309f020aee0530cdc61451347f4ef4fa74f07a75772b75470bfaaa54ac79579475f2f55f03a8f233be445e1db254344d958df3dee717b36f9a8b0e
+EBUILD g-sorcery-0.1-r1.ebuild 657 BLAKE2B ef02ba3796acf6684f43efd86d8c2ce01e69b74d8ec327d34f286429e9047b9dae9506786832f8378e7e27e0acdbb2d60dfc4a1e9f120e0393d693a76eced218 SHA512 829b5b598086e56ec67791c005687c962a474c942aef5054113b3cda143294548613320f14c9afa9f498a6d6de147a4c54fce95633baa491ce88032829025928
+EBUILD g-sorcery-0.2-r1.ebuild 885 BLAKE2B 45594b6fd3a8ea513a51c006540a86a847e9897e468db82e5bf4107b574042db30df19600d2695d954f159c38ec7388cbe95b277231c2897e209d680daff086d SHA512 1b7012dd24c8603724700098a9bf5fb3ae56366c1b01d31820a633b4ae968638791ea79b8882299f37b4ebbaadd98fdccda8a7de7d866bc5bf6c7c5d2c4b18de
+EBUILD g-sorcery-0.2.1-r1.ebuild 956 BLAKE2B fce2b8b0643b06cecc944a7fd3a2934b2a5b6c22fd3d6a087f9c6273eb7299cf851bbb0927a198a5ab32ec12431317eb28c13c180210c12667cee7273138a8ce SHA512 986f3e3a3aa17b63729fd684f07f26a4227ccbd56fee683e32983f242e596eb9886d387d4f27bf7f32e898cde3ed80f5c21d0a8bea352beb7f9c38490e419ce8
+EBUILD g-sorcery-0.2.1.ebuild 857 BLAKE2B 6c17b1a9605887a85576dd55e4f418c53acf86e2e09ffa7b030a4e7b6b2921db5f1aa4da6e0fc8610729b4371fecc9a50a319f0112d227067655548f8c78fcc7 SHA512 bf5a8e33dd3e59043788da60336e071364c8879f5d442f5d095290d059030899587e708c57af52e0323029a481466c4fb9d9eec6bcdfa54d8858324701217ba0
+EBUILD g-sorcery-9999.ebuild 927 BLAKE2B 68f95e8d9f9d1ffc1868b5cb0f218e174c6e7ffa1e0485c8217e98afda5248334788096421758e98648c0a22235066d2b5377e0481eaf9fa3d699d5f1486f7fe SHA512 ac9d7f51b5ec2973a3de0835f0b11b8b4099fb7349440a339f01f00df74dfbbbb2f3c5bf1f9fbad5402767e5b98a06dd44985fa9e50f558a81b55de6e27e5833
 MISC metadata.xml 494 BLAKE2B 558f844e741fb22e9b08b8e926fdc0bb697a6d0697815efe74e925eca39f644223772a1ed3f98585383f58a5d2ed4b092b8868b595f453184762c62e1937f2da SHA512 dc99a22780958061da21e20aa74ea128b1397fe09092b8dc32268577315efdb6d8531b227e24863cab4eaf393ce94e783c763f0835a5358ea39c02bd628a74c1
diff --git a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
index 08cac22a5e43..5aa4d484ea63 100644
--- a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4})
+PYTHON_COMPAT=(python2_7)
 
 inherit distutils-r1
 
diff --git a/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
index 5ee1d41cb94f..f4ae888c88ed 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4})
+PYTHON_COMPAT=(python2_7)
 
 inherit distutils-r1
 
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 0e9fb53fe35b..ce8223299c71 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit distutils-r1 prefix
 
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
index 3c6dc9125f1c..42de5e61c47e 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4})
+PYTHON_COMPAT=(python2_7)
 
 inherit distutils-r1
 
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
index bb8f8a3556e9..bd1017c18e31 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 3187cba0597f..df119f00ff3d 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,7 +1,11 @@
 DIST gemato-14.0-multiprocessing.tar.gz 71359 BLAKE2B b8c6fbcf8a83c8e85db4045ad23296944b94623d132a6c5f15b8388662fd092cb589600fda1d11c9645541106dc735dceaeed87d642b1fadf0f352f4a9b3f108 SHA512 2f1a1cbd837ab316bf544f713470f570286a313e002a4dcc075e464e77a3b10ba86410f805aad3d5702f3deedda48f8270f1274a67d76086b4ad5cd597426c5e
 DIST gemato-14.0.tar.gz 70754 BLAKE2B e66d63a20e144e809555b2eeff6a24f899e1f488c95a14b2250c6eb45c39a6e6b0e614afe30a64f5a353720ab38371ba3e4bf9948052dae3e06f9f82ac3d04a2 SHA512 0494b8fab720b4e5ad2b190fab128baf997073137b933bc113dddc8c5f2c54f53d09bc640b01565e9757b41197d039c8487cb2b78de77313722d19baf008b51f
-EBUILD gemato-14.0.ebuild 1360 BLAKE2B 3bbf4df6ddbfc5696889856e7fc6161e9ff5f592ca5d144caeaf832d14650ba8e917f5302f33b3a2607b5e7334ba9c937e330474e5ac24a9a8b6c35886037b79 SHA512 68c10ec303ba9892e878440226d71fe4e2ad10beba0a70c5ec40948c695b6e6184daa45283fa565b5c61d60bce79e6191301b3ebd86d951f506d8cc321957e14
-EBUILD gemato-14.0m.ebuild 1650 BLAKE2B 41e08cfc1a17b80aefb2876114a048d9822d886449d4b10703641d5c6db0a8f5068d9b1dae4fd217cea405e88140756ded2d8502a32635de1b87d6e78649f86d SHA512 fec4d9c39cd42816b122d8c4be2362caef0cc6a949c841705535bea6cb3e831a152a2fcc235bccac373b6c2f843db877b3c3ea9a51bc5887b0864ebeb16ee82d
-EBUILD gemato-9999.ebuild 1286 BLAKE2B 402b7ce64483e1225768e61a1d69ac59641158d42932ed86e08655c4d473664adc7e3ffbd7dc6e9349be54e8563d004deea07a0b1ad0b32b79573ae7770e86c7 SHA512 18b749bd0745a502dce6f0fd802800a36d13fe2c75d150975924eeb8da37e48aa05ef94008c2e4ca129e536c3ddcbb03030e456a6654807ab5732bf038b51dcc
-EBUILD gemato-9999m.ebuild 1481 BLAKE2B 29e278a127ee7c6a3a8b0095d8891b2c4c7499acedb3ee6bc87778b1060d7b707bbb69710c9d7cf3d83a02d5ddf57a32b6fcfc2878fba756f1387203156c7ce5 SHA512 750b63ad3781aa318d9ee7224b26686b687a9fce2769b92a927142dfa7076d19bdea892495dad7d168bff2c571ed50d02f6efff3ed78749d8f89e5f1e256ae39
+DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a938c20ecadfb1a1332db3842b14bfac69006269efd0f1da6d6bf0f10f3aafb07ebe01af09e64f9612c50b8e98a0bd6aff27651 SHA512 fd4722dd2f632bda4abac59b7e62f531edbdc455be1f1ec94d8bf99194956de15b6cfa4d623713bf3c25e55a6cc6adcdf8039cb7d20a556924bed0ddefd95daf
+DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
+EBUILD gemato-14.0.ebuild 1345 BLAKE2B ac180fa9d7672584a81c0fe094d2b12640ac59126dd0981ecb5910a6110d1c4df9bcb78b6978de2e6ae81aedcd1907c8f557ac8876498fceeacc507aded57307 SHA512 fe872627f00cbccd6f9ba1e9b00d3585838df87f8faf87d19e395f25d4fdb5cf878d1460406c423c0938a3ac4d04812bbaeff4150d75d3c8b394bfbf5aed1125
+EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
+EBUILD gemato-14.1.ebuild 1358 BLAKE2B 42ca82d3e27d6fad78fed56f787cbfee47dc176bcc4859c1853c04d19747764b0a7d54f93a094a0a0106b78a5d871cbb0d32dfcfe7794ee5cb7c56b44d0b4043 SHA512 3f0a1ef3baf932ca284e11dc3bb12b0f889fb14dd08891398523d4044af39484b42b21e74cf547daf625e6aeb9eeb5f13a356a4399cae5e633d0bb7db657486a
+EBUILD gemato-14.1m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
+EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
+EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.0.ebuild b/app-portage/gemato/gemato-14.0.ebuild
index 68e8be492310..ecb84bc3788d 100644
--- a/app-portage/gemato/gemato-14.0.ebuild
+++ b/app-portage/gemato/gemato-14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
@@ -18,11 +18,11 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	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_4,3_5} pypy{,3}) )"
+	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}]"
diff --git a/app-portage/gemato/gemato-14.0m.ebuild b/app-portage/gemato/gemato-14.0m.ebuild
index 25aceedd13ff..318a72bafc86 100644
--- a/app-portage/gemato/gemato-14.0m.ebuild
+++ b/app-portage/gemato/gemato-14.0m.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
@@ -21,11 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	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_4,3_5} pypy{,3}) )"
+	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}]"
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
new file mode 100644
index 000000000000..1f75c347bb8a
--- /dev/null
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -0,0 +1,43 @@
+# 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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+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
new file mode 100644
index 000000000000..318a72bafc86
--- /dev/null
+++ b/app-portage/gemato/gemato-14.1m.ebuild
@@ -0,0 +1,53 @@
+# 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-fbsd"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+
+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-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index da28752419b0..eadfa2181db3 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
@@ -19,11 +19,11 @@ KEYWORDS=""
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	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_4,3_5} pypy{,3}) )"
+	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}]"
diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild
index 57616701daf2..d07e16ce862d 100644
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
@@ -20,11 +20,11 @@ KEYWORDS=""
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	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_4,3_5} pypy{,3}) )"
+	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}]"
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 70757c4c4f9a..5b39575ca3bd 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,6 @@
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 DIST gentoolkit-0.4.3.tar.gz 3218723 BLAKE2B d305db514e48446c0341c1ddc7a6c1bcd464eee11b8ee58f1a16bdf797670a9bb13eacfb2afa666d9ef292ad1dcbdf9970f8ded64bd5d12ca9d73ffae8923119 SHA512 81058d4787b291b6398d82d9a32f41b78d939f8d20ad8afbf9e22a47311ff0a270098c69e53d903ab3ec72a4cd11f13f3be30279a538a6a52972e1651efe447d
-EBUILD gentoolkit-0.4.2-r1.ebuild 2368 BLAKE2B 399595be69cf9173c1babb77803ddd88ae037de95d6e192bca4172ba32d093fc1e137028c28e44d3fb88174de19283e9ef884f2867131f42a508c58d478ff178 SHA512 e1e722d9fa45f5e0569349afe31a047a0d642371ce3b7edd04125e30d39ea55926913fa823c22c5b09219893dc45e70c98683d5c011511f7a1eeaa7ea47e4941
+EBUILD gentoolkit-0.4.2-r1.ebuild 2363 BLAKE2B 1564354ab84b5193b5533be6e1bb8eb48cf04bc9ebe903d47fa7de9b5839e316dec7623abddb10f6e6537aed9c76340756c80633d5fd0906f917072614452549 SHA512 1e2518f0e9a333715f8b778ce3f80613a06255fe48eee8b6b95940fc747c87f2d9c9047a452ca973a0bdd8333dfd9ce5d4adeeb7d54cb7785b2117cb7654633b
 EBUILD gentoolkit-0.4.3.ebuild 2364 BLAKE2B 9d84291067ccddf24791829b454f05a828becf50c928a67f942666d039e39ffdec783e8927863cdd71d6e3c6c28800866b26984819df5dfaa7712a44f897c3f3 SHA512 953a1f0a8fb665da5e26ef2c7035447eedcc72d61e2669d0a7fd3a8cf08be84d604b938408819949ed294c4dffe3de99fb077d2aba53b514953fe05d250ce393
 EBUILD gentoolkit-9999.ebuild 2120 BLAKE2B d6e21de1c8f8cebfad004a31d3c234e65cbf844313b76e8cd88e20f4d8fdb0d07505b152bac05fd0f008bec746f4fff11a3a64cb8eeece2170d70e36a53f353b SHA512 d5f9fceb75be60c0bbf989f90b9f12824206ac665790555ec372c8cc7ea289dede2319eaa26ab11687ced634c530198d3d8cc3dfee68dd9842979fad6e7cbb61
 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 fadc14db84b9..5f1841df4939 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 1395e140b98f..1e77d11c2a79 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
-EBUILD gentoopm-0.3.0.ebuild 703 BLAKE2B fbc63c3b3c87542a0f16af807dfa740a8dbe1212ff2df7871b07b9afa94b88e4261996743cc242ee53f15629c94a1cffc97234e08b625e0db10dc335fab0f11a SHA512 31fc803c79a53964d7f4dfea1c36521a64e66d841f7b58e731c4303dc21eed0f620b2936aa1052362e2cd7284492581587ff911a94b5277a91d68b3032173045
-EBUILD gentoopm-9999.ebuild 653 BLAKE2B 4c7c1b5ba0d773860e9c341be16ae204f085e8116a671263611ae797fe2d8040ce354abfe87f93cdb0a0c4bc6bba87a67514cd2ceb6d471276c438eed829b606 SHA512 3afe1c700bb27e6be556ca3bf625e6ab82a0cf23f218146eb80b9a17c68a621260ef505403725b020bae66db25fde6ca5d23c1cfd09f616091dc7bd0996bc818
+EBUILD gentoopm-0.3.0.ebuild 696 BLAKE2B a5abab8f706dd8ee1df29c9b3a2866583dce1f4b32456efd68dcef9d0b97cf5e11eb55bfa064bc9535cecedb394bd33851a3c0bdc68a6017ffce1d30d0865332 SHA512 5b70f0ed25c88f2274be8666a37e11ee4165adb7daa54f8dbb29757696f95b64dae9204a72a9706ace70f08f5a904fab17b34aff078b70d6b8578ccf55107fec
+EBUILD gentoopm-9999.ebuild 646 BLAKE2B 2a98405fd1aac50b93966e5ed8f3ce9684237cfa2bb8b6aed4b381c34b288f24441e476bca821dc41afd8a3d34c2ba3a2c3bc6c6e0b9124a18848b1b34a98411 SHA512 8eb21703e52e3d2f80fea962fc6edada6be413fbc39c29baa345ea75dfa9e39177c61013acaf6a863900e0f557096b0d2ee821137b50eb8e5defde3b5940a604
 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 aeaa632ee25e..74d2020e7a1f 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 02688cdcf483..5bbfc27833ae 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 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 2ddef129b3d0..2347ace4d915 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,5 @@
 AUX implementations.txt 801 BLAKE2B cfc22a01a7d532e654c2b0e02688a432c2d0dff105082d10506662ce88a87a71197179ebf24c4b92be703d4e618dfc8590ecb242e3d313cd475952880e42b264 SHA512 069280aec5b0cdd78dc3603b6af8b589bff1cd8187aab155e17573af0af5c2e63411e9589dd71696d31b40ccc6e2d7f0031cd8d9928db339362f2b4f4af5d48d
 DIST gpyutils-0.2.2.tar.gz 19646 BLAKE2B b5c24817b8a5ef3122d46330d2311a328ffa9c936878f494586ed62fd9fa9d54210c4edcbd9d07f61af7c27faf410e0abf60943188e8340ea52f06d95359c6b1 SHA512 28ca27b3688b593665037bd7a811014a11b3192bc0acc4568c3e70d13cf7a163b41ba3ffd9d8caaaaf4de2758e1cb68b7dcc255d9fb26ca8448a6bfd6416e66e
-EBUILD gpyutils-0.2.2.ebuild 520 BLAKE2B 5ab72e1871efe3d6274ec526032f8671dbaf0db7890c26fa44e8442f1eaffc6b6db5df4380bec3b3f5207103ac7c19236588a761e61bf2213381060f42c1b228 SHA512 1e6e5cf72b741a57b84ec0cca4d5502095a891ea41085ad29ca15ae5afffd68173b4b8eca83f35ac6a31353b0d8e39d826dc66324773c318d6db5793870441ab
-EBUILD gpyutils-9999.ebuild 502 BLAKE2B 599965a84ba580c312a53af148501bba76acdca1490a0c2643a97422eb87370d7905ae74b76446b1c067229155db73b98c23137b491f9b861b30ba71c0be3a8d SHA512 f4b5fd097b1cae93703c896cd846d097c300cfbfa2d3dd7d78f47be735245398bafdc23e255c1b8091e74de209b2f81efb2fddfc68b5215481fc3d0d8e725282
+EBUILD gpyutils-0.2.2.ebuild 513 BLAKE2B 422d795cf35c312ba8337bc13579bb28a3191e0ed01d23e2d0f79ade2c6a38b0365b428f328cbd62fd33c59bf679825f17e318f9ba0256eae2e70e68156e51ae SHA512 7a951b5502cd9731342ec5175614e1e55fba77775c132791f229d89d2be47f74a651eb8a1d92f96ac6e7ce722e69c0eefaeeb4c49d42cf7e18a036c09b2c9e59
+EBUILD gpyutils-9999.ebuild 495 BLAKE2B c40a7148f2ed6e3ed6d65831956faf6c220f21f3eec8af3fed7bb9088029cb6f85aca7fecd3e051748519c2fd7cbc4abe9a52a7b9c310625853fd6ae6cca43e6 SHA512 011f3e934c7aa57118e1f1fd38752cb590c32b3d345689c99f6ae6087a355c6e01ceb1259b2f8d169a8bcee884ad5e39e6f6204372b4fff37337908f736c6536
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/gpyutils-0.2.2.ebuild b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
index 0da52ae15800..eaa405ba2591 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index b91c5aef712c..42df3c3086a1 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 470c179ed588..77709ea6de55 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 1137 BLAKE2B 2e3b9bf26a56e68c99ce6948f1dae78a6773a117f3354a4979865e96a56242ba3c792050f93729a0699175d59c08f0ecce477b1bdc6d3f533b382378dc9dbcb7 SHA512 718f231d2ba04966a408b7c02ebf47c2eee83cd7f1c4274eb5e818346f38681dea56b0a45d8cc96447c7b7777e49efb486825e03298f0b13104a5f8714d690a0
-EBUILD grs-0.7.ebuild 1365 BLAKE2B eed6413c817bc353c4022b0d8d5a2e13e4879661e16eb66e3e1748f9e221038e9033532546b6c3f55a6127aa630886e03108f9cf0d52732628c050db7de3dabf SHA512 7267336449d5275f12c407a20e1dedb2f499bc5edc4236e0abebb091b39dbecdc15282aa0be32fe396d6c9b916be445e42a966949fe393e7ae293d86ac905c60
-EBUILD grs-9999.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
+EBUILD grs-0.6-r1.ebuild 1142 BLAKE2B 986034e57b662a2d7cc1cd2fe3d429a53aee0e5899b5cce67465abd321e6a94ddd929848128a8c129788ce75daac342b88bf001518f190d105df731643a43aaf SHA512 43b7025539cb87d8308cbf3573a2c318d81efba5e50f574f035ae280a95648c7e8a32ce44a568bdcbd3f1557532bfff6891314bd1d9ecab10802ed5237e80503
+EBUILD grs-0.7.ebuild 1369 BLAKE2B 5926bd7336154efcce2a76ea885f4ffdb900cfd6a8ec46e4754c0975df64f89327763be2c2e955b1a852a46997e0b4dcda1a623360fcbd02117b72d39b2e1cfc SHA512 3113a4e6cb291b28cef1539a53175e1c1a5461f566404c41f6f2b01d342b59192131e636446acece5b00d55dfd5a13dc152b243178289302a90bc2dd451d3ef2
+EBUILD grs-9999.ebuild 1373 BLAKE2B b76dd652616df84b2b5da59d998099b500b8c9ac7f7e2ed88be03f3c30c4ca4b144adac0c905aba0d69bdc4846c1e2db8fac9de780d93680f905b410e3e8d141 SHA512 9cebc2c278978864644a9336bbb9e17cb085b1a4294b175592c6ed372e2437f3bd3803fec71324f27971e6c62ebfbdbd904d963f1cae010a832b103ae67dccba
 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 c5876bba4ff5..ae62f02c691d 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 linux-info
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index a983fe56c126..896318e916de 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 linux-info
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index c741dcba3eaa..d3f672cdaa01 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 linux-info
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 40d1973c9846..f4d4b64afe4c 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 618 BLAKE2B 06272da701d2d704ca0f1f1fc38f80d23b6b60bf0973fa217d11d58dde6c4e431a60e3cbb378f0f90076de3ab0c0b28a0dbaf9ff8b49051c0e1fca2d688ef4d6 SHA512 1768b17526f1cd60a98826137f8187958f46e1c24e5b379afb3a0cf1931a1379c841b52db502d205dbf5d68a1e781efc82d499ba5ba4e756f4372459bc44d984
-EBUILD gs-elpa-0.1.3.ebuild 610 BLAKE2B 27e1930b9806ed5db819ebe3e039507d11c8f98aa418437e91b1c378ccda9c33f0bc0068f17f2d6f0d97782bb1f51cb46973880f2ff73e2e98061bb1ebb32502 SHA512 d38f0e4130f0fd0237db8a24773724e1f5926ee0e46b97195cf01bea25ea744677db6b75a7075cac7cf46b8fdcc9e2065ebf7f0844c65124ebaaa28f708153df
-EBUILD gs-elpa-9999.ebuild 610 BLAKE2B b3c3d90c5561d02aea31e6df7154aa0e2af49f175860378931b2c17e7afd3a966df9ff734047a35ebe937ecf7e1ba324d0761c4ef3a6c99b82320357f1dec2fc SHA512 f87bc1bf68c8c4c61131feb3d098b9584f830c755d282772070a0d338c84fc19288093f712a08e0422556101ea9914e4d54d7c67183b95640ef2e40b384a55d4
+EBUILD gs-elpa-0.1.3-r1.ebuild 611 BLAKE2B aaf209792b301352bdec3d8c59e44d4038f6698ef23a504e31870411cfadd1fa32e6ce1293d3c35cda723ac877e6eca35a8b58155aa101c4a90f46b63bd93e70 SHA512 9a973e77b992b4f24f42cfa42f10af241778a8043300c6878d73fe72a0ca8d75703af59cfce7bf5222128c75b2e3f4a8d235e0ff3cac1cd1bcc34541ce0b6f49
+EBUILD gs-elpa-0.1.3.ebuild 601 BLAKE2B dea8a0b01179e9b9eb6e0d872d397fd9c25621dcc2b80180fad9bfb8a625e3b10eaf52c19c57c5f3da394da098dd769fe8daaa3c8a851cb973a29edde6fed7fe SHA512 ab8fa141fe05ee4aabdd80684978bbc8b802e623b49c090a3e76dc20e1e908c157cd5af34ce0c4f4dc62a00073b508c0d563e3ade4f004549df229dcd7f76c23
+EBUILD gs-elpa-9999.ebuild 603 BLAKE2B 5a33f85b77047f3407754a72e71e6266de017aa4280f20c8ddb5eb4f4983c1bf2d612b872b306c3c12427a0ad276871995c7547a00cd3e3a01377a148bf53bd6 SHA512 32985794e555d5772f548b591e51852d814a12e4dcb0f5ec7f566ca41d8f3a26b5b661b9dbc2837f04c2ab3be49946cb4eb2a2a3fdda37a5b89fec35d73a41a1
 MISC metadata.xml 410 BLAKE2B 9f071e05c03a23b6d215d066cce446e3c1e810f0d83823f133f45cd90f31e70729e8358d524bba95050848d445fb31b80b6433854c4273a0e41b377e5bb5a135 SHA512 22269ab3fd95d8480b44f2327301ee4ccefa28e68bc58d31ecd4b64ed345eefdeda87b6341e708fd2c2f19066ae820f9a14cb375917b85bbca93d0496ad4c9bf
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 7f67a9c0ecc7..b62d0f7d2fb2 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit distutils-r1
 
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
index 137fcd14cc02..5cbeae5ba87b 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_4})
+PYTHON_COMPAT=(python2_7)
 
 inherit distutils-r1
 
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
index 6c070907fbd6..e0ae6f03fb67 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 6b09f1e2ceca..13a24ca6d992 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 625 BLAKE2B a37a88fc21a5a5882f323e8d6d52c6166baa6ea7e232e6c98af155b3730393272b34f49a8a2debaa50a3529ae2320f82d87105f7f2232e5460eb79e77e84e69a SHA512 86358f642922dafdbae848c075da6bbd6294f22e174e83b36d6b8f33bd8b42685b31e08b7d3f1953d2a33ab2666679ffd361d6570ca1604f48bd7363de68c9ec
+EBUILD gverify-1.ebuild 620 BLAKE2B f098829258d2ec502fc737846a655d17d9647d1c56f42c4e75dc424affc60a1b0828ffa6c849b13ea58e4e6675ad14d37851ab3fcde5e4fa1073b21a96ecf25e SHA512 d99791d7c312496df216ae24a182b1e322bda4fd5e495583878b0030f31732354a92f9b3ad3c67db117ec0ed1ee50370c2e5df2b69b4a6b0753a7fe27ee784f8
 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 3564e46d3051..03f7f3d60d91 100644
--- a/app-portage/gverify/gverify-1.ebuild
+++ b/app-portage/gverify/gverify-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/install-mask/Manifest b/app-portage/install-mask/Manifest
index 09aa40c6a9b6..b6fa97dcb17b 100644
--- a/app-portage/install-mask/Manifest
+++ b/app-portage/install-mask/Manifest
@@ -2,6 +2,6 @@ AUX install-mask.conf 173 BLAKE2B d47372786719c1774c3dcb1cbb42a102636bbc48e640f3
 AUX location-db.conf 282 BLAKE2B 65f447019c1c3b318e0823b7d4e62f29f6568571cfb7a9e411b285e9634a50169c93c3a543c907d3f1a8e2d9f9e8679b1eb256fa53f0f4dd5a604a624caecf2d SHA512 5a20a014a2a58245bcf25cd061f87ad1d34a48d9d2e3e7287ba0544b603e917fe91c2d4b166ca028e44d87898a1633dfe1fe7ef3a35d5cb787c9a53a34239b5b
 AUX location-db.xml 505 BLAKE2B 5dc04da8837878c3560bd8d18a2cbd445e78f250ae8af6d2428a308c53e3215b0d779b3f8e42c2ee53511c7c981839aa1f5b584ab1a6b2bc7192b8944add0caa SHA512 8dd05ed3206dc4b99fc0fd895d7547ee03f0b46f0cfde2009f1c104525c6e7a7d46bcd30ed42c83974082846ece34659180eb51de9ea0d2910e920ecffd42513
 DIST install-mask-0.1.1.tar.bz2 4241 BLAKE2B 3516f6023efc406076bb3f9189af7b4a647689c6289b4c191d7c05eeb296c14343b9b61e025e5f4ef50ad80982c00dcdd5d133df45b559d2ec5e2db6bf5ea538 SHA512 461f58b4e6fc41bfbe60d713a6d02eec8fe0a4e9ed8a19f8e155174b27f8e3d93c739e2ccce8ab34488ba31649ee585d7b23033dc94f19aa2e3b2033f21f5e79
-EBUILD install-mask-0.1.1.ebuild 622 BLAKE2B d61b1d739ea5b55b643bd138738a5b31dbddda4f0bcd909b86ed33489158e6bff5db353bbab5a36f29d4c3e41a697b92a15561e99503f33a6579bea02c60e9b7 SHA512 65ea5ffae5a2c1ea8a96852674543f5113d43b83bb5ed61167bd7fce574b20c0f3b52f37fa8f785e890c3594d6fa7ec59fd9840efed7e1e7df30485b1ca9f3a5
-EBUILD install-mask-9999.ebuild 745 BLAKE2B 3357de655193809128d1f3b5614e2a7dc1366c3e07ab8806a501276bb95c32f0f650c5c46988e0f2e84813c02edf19c97df88d557c960edc95bd67ba900b6e85 SHA512 0a9b47aeef41c8927a7fb1b3d6ae6907a15ef7c517c4113bfedcf051c0daf37b3e87478a0bffed856f1e2f9d8f3d7dfdc73c61a77101e4b38c799813da800a0d
+EBUILD install-mask-0.1.1.ebuild 615 BLAKE2B 8ef3d7b87a2ef700642ee503195e3214e6f23d0d9c8494c1dcdb671318dfe1d42a5f377ded5a1cdc7071c8f4929a30d3bd5af88324ce28591c46d4175d719560 SHA512 45e15719e6f59b04e04d88e35eef0653aedecc6350326db5b1a2b9b3d695d4e82032202d48b79ddaa730a8b699bb40866f54a14fbdace95ac1216d3a6d8aafbe
+EBUILD install-mask-9999.ebuild 738 BLAKE2B a672908b4c1f99b672cbee7b4b0d9ae25e1db8a7ac3d5fb697538aa83739d87c3812ec101d3f3797d9146975fd4961314846f8b712640782e094220b934bb2cb SHA512 08ce5e9b2878db199e5cc8cd92a8769229c4db66c05a2db2ac726d82c54bc9d2399fc4f132fc5144e430f1f7201d09724ba95f71e1de09ce9f350c1a4d25c44a
 MISC metadata.xml 541 BLAKE2B a57897cc7d8924c603305bc5bfebc543f240bf20df9745716373d10799fd6a6dc645c3a1ae2861dca6fe8ad9e813a0a9d94a238b7a0a749e389772cb7c45b4b2 SHA512 637298068bdb858d10e754d6911e150ae8d0e38ebde86cb7d57d41654d53c58128e942b3cbb6675c398b9a108a67616d966bbffd6975ea54506163cf1ba49696
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild b/app-portage/install-mask/install-mask-0.1.1.ebuild
index 82f83703be43..89a65b3af451 100644
--- a/app-portage/install-mask/install-mask-0.1.1.ebuild
+++ b/app-portage/install-mask/install-mask-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
index b551ebb532b2..4115f7c72ce2 100644
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index e1928342a988..4ee9bbab3ca1 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -10,9 +10,9 @@ DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1
 DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
 EBUILD layman-2.0.0-r1.ebuild 1629 BLAKE2B ff95ce6ba92ce4d8b536260cb15149f786bee79fac0b5a0eef979854687fbb59ca799dc593457dcb3468dfcce038ed740009fe94c64004a1778a4e37279514ee SHA512 bce1210abde1e4626bdcce87a771f7bec2e95de631df615b89508d61b1ad33571dd3379912c8915408b4689d106914451abc0ab2ee9168219ad1ccee2282e056
 EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd63dac873d20fd0235d3c35ba21991b2b97dc992d735a1b0452eaf44cb5eea7cab6678a977dce55c932bfbb685e2 SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f
-EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
-EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
-EBUILD layman-2.4.2-r1.ebuild 2290 BLAKE2B d0b14efa34f39d9e290cb5c0aa1f412da1f52c97bd711c09ce769784af9c1a6774edf38f61e50e58434a8ea9aebc4cedc72bd460b0084988070348551613dfce SHA512 e53e629e613c8507fabc046cc1549b3f8ab9334e43fb23e3a049ed76ab9b3f43b0f24111ed1bd3af683ecb6da1504779952a217d0d299c8f5d0f2cb6819709ef
-EBUILD layman-2.4.2-r2.ebuild 2427 BLAKE2B b2a1f619050ef6fff19eaca05d7886c7c9cda04c61814b02a0d98f2c8185e161ba4abbd58f8de19ed5bb503007b0a79415d1042bce36fa20eb28d371c9be5dcf SHA512 8c936dc9f1f08e2bbc5b7af848b8fcf5a545f14a4d0e2bb0c925491b485a3c9cb017efa15b8a401b312068927bfe4b2f8a67c1468ff5d51f206bd1d82ef76c33
-EBUILD layman-9999.ebuild 2427 BLAKE2B b2a1f619050ef6fff19eaca05d7886c7c9cda04c61814b02a0d98f2c8185e161ba4abbd58f8de19ed5bb503007b0a79415d1042bce36fa20eb28d371c9be5dcf SHA512 8c936dc9f1f08e2bbc5b7af848b8fcf5a545f14a4d0e2bb0c925491b485a3c9cb017efa15b8a401b312068927bfe4b2f8a67c1468ff5d51f206bd1d82ef76c33
+EBUILD layman-2.2.0-r7.ebuild 2169 BLAKE2B c6db6a0bb066ab4a505a8d24c6d255b23ef3da9c90c2a2cc47a54c8d2c5e94683bf44b97ab071c02ec37cf98be2cf507b84645039063ad5482bf646e7455e693 SHA512 f90f728d15f6d6a98a57612e691c2e1b237d2a7033cfaa3ce7e236dc3987610b42d1794ffe5c489309123acc53b5fc776ee7666cb4fe56878d7347427594d3fc
+EBUILD layman-2.4.1-r1.ebuild 2109 BLAKE2B 2c09406d4bd3679deefc851bba94f909de9563be0131e0a747203b8cff8bbb45fc9f3481103a279a140d39953f8cb863cb2d119f8b31381ba1deeed0d5bc7da9 SHA512 0b1cd552fd2cb6c4d5bddc781c8b0a7125364e8a5967b83e87fbaf914e4f9f6eccea3e3b0534ca2ef7ce9c11abf6847e43f2c7447d039624845cd568b0890a00
+EBUILD layman-2.4.2-r1.ebuild 2283 BLAKE2B 955519c30da06558e8612f62ea07c88cb02dda32bfb14b8c7eb8c581d793ae82be7d1e17774fc0673957eeb968bb407c86d89ea8cb8620ef9467757d3f0ccfe0 SHA512 cf7262acc6186ff2ef8bb9010bffbe8b1f4274cf0f731fd1be265c856b9378b4a5303825779c52222397c2eba6e421851ee9db880a346605e549b242ecd0db82
+EBUILD layman-2.4.2-r2.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
+EBUILD layman-9999.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
index c8f4f72e8786..a73ce50d5cf4 100644
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ b/app-portage/layman/layman-2.2.0-r7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 PYTHON_REQ_USE="xml(+)"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
index 78e7343bf953..77bc20805a86 100644
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_5} pypy )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index e5c2a340f727..10849281e9e2 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 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 2c9b4823a37d..27e2292dd23e 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 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 2c9b4823a37d..27e2292dd23e 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 linux-info prefix
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 3d35b7601704..e63a0894bc60 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -5,10 +5,10 @@ DIST mirrorselect-2.2.2.tar.gz 15964 BLAKE2B 96698286c05fd96ea03ec6594c8b0849fad
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.0.1.ebuild 867 BLAKE2B e27dc885e6473f635ea9ca01accdd082147c74a38ca3add37e55a4da3cef78e8241847588e25164456cc3a569e916ae601288f002ed5c360180c81038ef81bfb SHA512 ddc4aa350d3f829b898537f50522f37dd5207b5032e9a18696c71ba472d6822a5c33ce63bee185c1201fc47d62fe2a150fcb5ea7137615ccd23b61ab5b9c853b
-EBUILD mirrorselect-2.2.2-r2.ebuild 1132 BLAKE2B 960e0b92fec73ea502da071f4c649e925464b883b5bfd02b21911890dae69d6f10e8ae442af1012cd6850774440c9e2addca8460c0f3198cf7b70aa3727cf081 SHA512 42ad846a47675f9fcf9290b09941ef161ee5b827e42025e81937a502ecb39e8d6e597c206f9b55b28f12fce2554a1af14890cc43ae85f373e5ccb1171f8aea8a
-EBUILD mirrorselect-2.2.2.ebuild 1018 BLAKE2B 51c48fd71552be3b25b28bec7bebd15db3c102aaabab3a899eb466e2f5d464d853249f866455fd12d48b454c757a9a85f6cb9f83a23d73460511358d7289db5f SHA512 95b12638b7e49a49597abedffb6e09c412237714ee649a10360c595a38935512644988b226afde7526749568938a1453aaff03c28d7ce77c623414476f94597e
-EBUILD mirrorselect-2.2.3.ebuild 995 BLAKE2B 5b3dee08d02c8e9dc9c6d189ba54cf944da2f4df226033f235c888e2503580cb2adf28e74ade3c0cb14d222bfe30fec7f414fbd4e3cf99c15c9cbf8d418c8c40 SHA512 79537872c4f61ce91232799ffbee682cb25efd24cfdf8966d8c8be68283d31954ca8fe03d2abf6799134edc15bffd5c8d057039a22f75dba8a38202d90a0271a
-EBUILD mirrorselect-2.2.4.ebuild 988 BLAKE2B 16389196fb84a622e8d24da8b2f31a1672aee96bdfba7aa7ed2193a977ab62c8e3f7c3097af2766486d66ce6c47f5a2618177dac2229f50580b8deea9c31559a SHA512 7a7d2d1fd7e3290f0ab3fb8e2802da6575ad38a4f56a3f95b2655c38b22d1bf6da90f01671b673f0f7d011c6ca248012a5a01309312a133e2c3f168e967f351d
-EBUILD mirrorselect-9999.ebuild 1053 BLAKE2B 890a869ce8ec358e55d575ca9000a4282471e0e0ad8971010013d6f41ed527c15b16867a252f76687cbcfa77dc244ed815f936e16481adc5522bd4083ea39913 SHA512 e1ec6c42a99cd00ab71ed10aadbb8a7600a388c3a56a5b20662fb15017649e8fc95afb5e27deb9a67b407aa00b16b59207a661bdb420a44bae1e27174fe205dd
+EBUILD mirrorselect-2.2.0.1.ebuild 858 BLAKE2B a02fbca35c275845f8363b6c62196efc717dc5e598020fcfe87386c938e6c45c883809a17cfa611ce19c446f1f4f202d58105639d8b97e159fc8b8891862e843 SHA512 07bd6b8a86105dd42c6645dbcb97e72c681dd10651591036d5eb63bbd928c3f745a670c5be1adc5149f074f99d8f02ddcca907b0eba98f303ce0da44ea875632
+EBUILD mirrorselect-2.2.2-r2.ebuild 1123 BLAKE2B f46044dbbc399f0a328353d3341d009c49b7ba07d7302c83fcdf1c25e8882b18eea130ae9d2b5352bc8ae1c42edc4dfaa5087e038e0c12e2ee6b88bdae1e1957 SHA512 b591331504d1b799156376682f19ae419a129738fcbd7f3141f92fe0c03d7badc79ffeabad0695c47f6f2b2f17b624bff02e98184cb9551d96dbd40fb8387b37
+EBUILD mirrorselect-2.2.2.ebuild 1009 BLAKE2B c94f8f77acc95639337ec600388242c956cd2804bef08d2b0c472e8e1ebebc30dd6604e0232ca3167cf8293ef1d2a69c98122f26d7b0ea82eb2dde1ca9d2cfaa SHA512 08f27bfcd5101cc0446d586c935639e1724278259490ba34dd45947410559438793d9d8e3c34533f4a47bc68fde0254334c642fbf720ab4cd2fe604011ce347a
+EBUILD mirrorselect-2.2.3.ebuild 988 BLAKE2B 8595db07b837f8c8d31b19415d6e68cb8d91dad412fe4e9bcc31687a230239b8ea94edb71a2aa44bb967e47643e1407e959747e6fb72ed20f8ca6bea0ae8ce23 SHA512 844328048a7f7cf05e6fde4b5b81a5b37b99e719e09878bde75f027735378eefc6461552550c5b093186d3820ce65c53a2e8899bdc28821b04eb01491eb0aecb
+EBUILD mirrorselect-2.2.4.ebuild 986 BLAKE2B 6eee6df9c8666a281520511348fc7f182e539ea7a3e179c4b31b94b67d22bb96615f73237ae4928b2db9c9e1cf84dfd2dc83446939faf49cc68b0ad276332599 SHA512 c1a1469efaa63b3ffacaabb470abfe3375d6c5fe04c44254f1639340e34fcce6025b56a74b508b456789339c97e0335fdb115dd46ced53c5ee0e3141cf6a7c0e
+EBUILD mirrorselect-9999.ebuild 1046 BLAKE2B b150f3953eb8fab0dafafb9b70862559961cb882fd56304ecf1fb389d77429e53a652c72298d69f1c3a896cdbf5b44dba9e11a620c190be2869535d7e5bafd35 SHA512 4a4aea0b7bcad385dbd6a6a793965a8c3714ad0a5dc6a6a8c3c3603478ffa372441b207c60dcd77ac64eb73fcbbed2e800f0a87007143ccbba3b0ad030b25794
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
index b45d2f38ba34..81e105381e8a 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
index 725b4bf5dcce..2d83632168c0 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
index 88aaa45414ac..c70e13ffed3b 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index 23550f0b0158..b0de77292050 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-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
index ca96fe973d34..92d8fee57299 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 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 4b49dae3c819..36964fd86606 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index b74f68087cf8..ba3d97b3f6e5 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 466 BLAKE2B c916134cbe58ada2432a06f4be63496eba7f66ccc2943eca889dd5fefad9340ae432b824749d199ac49a5904a819a7c3bc06f143f1c16afc1ca5bd2ef8ff43bf SHA512 14bb74721903f33da9fbe1c44892b631553e14d36f8ecf05de11ee331006b6523d5d24305943904bfde815a6396d7b3f1cd6482de16eb0d2a9ea438199cc3742
-EBUILD overlint-0.5.3-r1.ebuild 543 BLAKE2B 98f28a6fe5bab8f66a0a9ed4b5a811822a80a2d0c7b3b3cbfae5d7875afd78d10735ab5293d271a0fa7ec1eb1d8ad8682ed7224e34fabee3ca8c9edaf9f9ded8 SHA512 ea3665a033c1040b741cd206af229872d16580abb2c99b13fb6aea42d7f5deb93b0f667ad4671a8d53351b0af9e5498c0abac12ab3bcfac431416cbd8050e137
+EBUILD overlint-0.5.2.ebuild 457 BLAKE2B e6079019867f0e481eba6bfeb4bf9fc5d0a34d1046bcbeae842307ae994b71d6fea892a0ee8ea6b867318af2f62fcb1807d5c3ae8c6fa469d6684ea6e7e8e132 SHA512 4d99f548db70e81ed92cd9eb3e8574fe0641151627d6b83d57635edaf2db118efc5e97af34d2ba30f727f8107fbe07248108beb886fe3b5922d073ba2e3e89cb
+EBUILD overlint-0.5.3-r1.ebuild 536 BLAKE2B 16672ea7eeb16b42fc42c966d6a6d90ccf4f1c857bcef421e811a7c08df4ee996051c61182decf97faafeb919d0e9a17c05611c551f4d26afa7b58be08cf0f22 SHA512 46e9ef632a8cf3c61945ce4da9e21259bfec926a1e6761f57cf34f0d140ed215f5fd6410185d269e676f890c2171e0f15ca5bdf06d897d70641de0be8522f0dd
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/overlint/overlint-0.5.2.ebuild b/app-portage/overlint/overlint-0.5.2.ebuild
index bad334ae475d..7664c6c50f47 100644
--- a/app-portage/overlint/overlint-0.5.2.ebuild
+++ b/app-portage/overlint/overlint-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/app-portage/overlint/overlint-0.5.3-r1.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild
index c21a4821b5d1..798fbce0b3c9 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 9faf0469de57..647b5bcee7ae 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,11 +1,10 @@
 AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
-DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
 DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.64.ebuild 1296 BLAKE2B 32d3375e708bb4e55f2addce4366d88289b47d928e9c331ebbe559f7954f76bac2240a90adcbe1b9f6828b54a20765810ed3d663a4972b3aad6b7af65a2b2c1d SHA512 6ca693b29d59ef4b46cd2179f92fe200ed846611d785e6440d94beb62190a53507d88560bdb852b7a0661c3ccf1ad616c31706710f20a4769fd6d8a3c469fb7c
 EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
 EBUILD portage-utils-0.74.ebuild 1066 BLAKE2B ab52c50d0d46d3bafca5ae63d4b5c57a9abe7fda5861827bd32d149bd4f27e820c935cd8fe6bf12b4e0bd92bd82261df94d9f0198a31b074fa559dffbd059ba9 SHA512 47e9b2b3e7d63b482f3db32d2bd561512bed1ececa67f14d44aa9b6f7a4ba80213c54904e2e5c174870b082ad33d5f6160a35a6aa47fca737aa1bf0b826f48b9
+EBUILD portage-utils-9999.ebuild 1036 BLAKE2B 5f8f0cd1f69b04ed5946ec0203a8a65becc1953e85058c079088dc9e965959aadb07c9cd4b749dae367cc20f81f09b6c2ec1de06bf328372b629d04f5c29042a SHA512 aa23862f72f5d25d54890c2b953891730658f07d1ee5d24a0d36f8f9a7ed02653e4d9d0e44e6a6adc909ae5247fb6b59a2a0aade1a1448c5f36c721b7965305f
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
deleted file mode 100644
index 1a7cb5264db2..000000000000
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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] )"
-
-src_prepare() {
-	# bug #638970, caused by gemato writing Manifest.gz files in
-	# metadata/md5-cache dir, unlike hashgen
-	sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
-		tests/atom_explode/dotest || die
-}
-
-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-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
new file mode 100644
index 000000000000..d2afd91deb57
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -0,0 +1,36 @@
+# 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf --with-eprefix="${EPREFIX}"
+}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 38107a69501e..f421e4f19e99 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -3,10 +3,9 @@ DIST portpeek-2.1.24.tar.gz 12736 BLAKE2B 5d4d30e3c7d853e2a3be7e094ad7a40861300e
 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 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
-EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
-EBUILD portpeek-2.1.25.ebuild 694 BLAKE2B 7ce31d63bec751641bf74868e04df23064b72f7ffae9ba11a30b89b64e7c28588fbf39669407aa55732c9dac196044cf398f65f42134e44318367ba6a712a8ff SHA512 464d37757a6f770369b445fab9588e948590e7929d5528255ccece45941e79cbecbe6bf88c8d4dcdd9f31d7065393a183e49e64ebde501c8b84340be6a5b886a
-EBUILD portpeek-2.1.26-r1.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
-EBUILD portpeek-2.1.26.ebuild 716 BLAKE2B 8786aa84b88d7ee02c6147070683cfd373f24c4a89d911d9ae947e17844a96db62a258dc80ec8534ab5ae08e0582c4f4b70cce84aa830fc2e4f403b042d01985 SHA512 533afba3d15de73b3a9dcb01037ecef85934cb135e339b9d1e6a3ebac9ecc6d4998e116c75278ee389ec802f47b578411950637a4a87d3f651861082ab732cef
-EBUILD portpeek-2.1.27.ebuild 760 BLAKE2B 45bd0d4a777b5292470c21fce5017589299f47d942484a6ea97845500552441b0327634a346cfea528026713011150f79353dee190cacccaf51a1dd655461f92 SHA512 51de071c4ebbf5439c0aaaf73a0e147be438291a32065e12373acd43e52c220696748f32a5b11986c98e522a1287df66cf41ed25f40c81320be0df18087075a9
+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 711 BLAKE2B e7f5fadbbbcd46824b684a9d0081114e1d351e27bf6e84500533ddd4fb195397bf9ab9e77b6903fe0d435c7f3b13097e292896205b47db2b73afa6a012558ed3 SHA512 2fe8b282bcb8ec8690f569024c5be883bafbbeac82ea5aa7da7db98e6710fd6d76fc0e21fb1d2167a8e063041fa1c8382c9f46cc4212e3ce4c2f341eef6a22e6
 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
index a737d6375ca0..e3e1ecc89147 100644
--- a/app-portage/portpeek/portpeek-2.1.21.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit python-r1
 
diff --git a/app-portage/portpeek/portpeek-2.1.24.ebuild b/app-portage/portpeek/portpeek-2.1.24.ebuild
index f10e14f839ac..6a3e5c93cd82 100644
--- a/app-portage/portpeek/portpeek-2.1.24.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit python-r1
 
diff --git a/app-portage/portpeek/portpeek-2.1.25.ebuild b/app-portage/portpeek/portpeek-2.1.25.ebuild
index e44085c02489..dd48d7b28323 100644
--- a/app-portage/portpeek/portpeek-2.1.25.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1
 
diff --git a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
deleted file mode 100644
index cacbd8405782..000000000000
--- a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,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}]
-		sys-apps/portage-mgorny[${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
index 5eb5cc173be5..046d4cbd2188 100644
--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit python-r1
 
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
index cacbd8405782..046d4cbd2188 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit python-r1
 
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}
 	>=app-portage/gentoolkit-0.4.0
 	|| (
 		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 	)"
 
 src_install() {
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
index 7f82958cf23d..3f2f9f235215 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 673 BLAKE2B f07f8f2f7f4dbb106ace96cafcbb27ec5cfab4ac50c682f23870e9da52a44e1b4b48e9bb0f0e49b3b02a36f12750be4576628af29d05352e4ef6d5ba14306ebf SHA512 198889e516c2cb5bb3b6212c445174e6143088683de81ab6e8e323bac5622635e8ce9a6e6f94edbd17520653814c62abf60a249d1012951787ad64e773f9d672
+EBUILD pqlop-0.02-r1.ebuild 666 BLAKE2B 852470e4fe53df5143c3ef9512f1742fa6b3cf24ba212959154cab99a4f1d9b8ad0b38afd699afe6a6eeb8f2f837a19c488292a55a58c1d5b8ce0e623ea31f5d SHA512 ebdba344a9e6464d3b8e2e040dc8f0ff194638d79b9859b2c6fe8a446643a990700d9a4030b71e9372fb6ddb4d146cde4d9dff404a4ff1f3406d5d793ae295cf
 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 25140d6226f1..0985141d34c4 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1
 
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index c4e7092f57d6..6fba851c3669 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,7 @@
-DIST pram-1.tar.gz 3759 BLAKE2B da8670ceb689893bde486f6b7332dae8f793b945c71034354853195c4639c2a515533f56fd5ea67b91aba550219cde0a50d7c4c7e60bfeda1877904ecb4e2872 SHA512 fb0d2a2b177973d710d2e68eda82101d64e573e9d90e6aeb2a7bf2be86bcba01b4047c857d6d29d40a5768490a8f999aa001e7e5e45022cf2d1c08bed8ee8d44
-DIST pram-2.tar.gz 4255 BLAKE2B 43d72f5602325490642ac8209a1b15f06ed5ffd160ce42c99ac0f46082459e2b6bbba5c4bc50b80f9e2cb1d263fc43b62f725ac924858e773b3b8af317a12bd5 SHA512 5e28fd63efc68f5b27b74712a49bb865fc32b1ad30515b8be74ae5a61f8fc9ba45c785b3a6ffef5e606e56d2db815b1038798fe44ed572ca6f5e5e6b42330476
-EBUILD pram-1.ebuild 481 BLAKE2B 7f94cb01c1e1523c4c98bda91caa88f4d4e5db398aa5e856edc704af74635feb7f2a0edd475eff43a349b1cab03e6eb49068bbbd89cca37f8baaf70711360882 SHA512 ccd69af34182419703430ecb7c5846cd2d6cf6af2cab47822805639630881607582dde068c80dc84d53fd8fa5edbe8e912cc0a225a159cc1d94220861c242575
-EBUILD pram-2-r1.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
-MISC metadata.xml 497 BLAKE2B ed7f60c0693229da828921bfcf6e0a579a7ac07fda8bfa47124677d83e288a738a9c237a71070bacdaadce91708827ca7bc2ecf1755cec249945fe6fae752a9f SHA512 5588a6d5c641976a95b0696de4343cf3f96ef67515339e33f22a6f1255d05c6675a5f440a32354513f96fea7c57ae15230f02610f0650a400a2ef25815a5400c
+DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
+DIST pram-4.tar.gz 4406 BLAKE2B c01a8d322f7449398ed0264c9ed4108ac9fc697ef68e5dfc035fb20a53f5c5f9a42e9155937a4b6b6722816779c71dbe4558e7e60e8c19dcf961667996380802 SHA512 00a1f4e0cc07c5b61026e42350212cc55a66b6597082ee677bc905f9bfd0f5692a830c62f15a66a5ba42942449f40b92544f740344ad1d064bebc667c6f730e1
+DIST pram-5.tar.gz 4443 BLAKE2B 0c5d1ddfa44944e8480cffd0b4f49d6143fff36ed690c9e7c0acbdd54ae6ea50b6c1610c65914c2626a260c9de1084b42e101ca38952a3e8fb9264663c3ad00c SHA512 7634bcaac11c999e2ef01d5e12305d96032396ce624cc6085b4954583aebf6d54f0a1155604863d1aeda1c2bdf17ddcfd81b833decddfbe11eb8689297c70b23
+EBUILD pram-3.ebuild 494 BLAKE2B 0645da8c08cfe9030ae5c0806b4b3fb9a5c463aeadad44971e30905d18e1c0b8db852aab26dc145bce5351ecaa6e9234888cae8a3fe6fe1176e14ef9f729797d SHA512 a1f32e1b2ba31bb9fcf25eedb8b04b6fc8e2d526ad24f4b2fba0154e6ee6b3d93611a068abd9fcaa324c0afc0b2c4fdb1f436b12d17722216707f4c857ac3096
+EBUILD pram-4.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
+EBUILD pram-5.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
+MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/metadata.xml b/app-portage/pram/metadata.xml
index af57dcce87b9..6dde7de270a0 100644
--- a/app-portage/pram/metadata.xml
+++ b/app-portage/pram/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="active">
 			<email>mgorny@gentoo.org</email>
diff --git a/app-portage/pram/pram-3.ebuild b/app-portage/pram/pram-3.ebuild
new file mode 100644
index 000000000000..b62f6ee8e34a
--- /dev/null
+++ b/app-portage/pram/pram-3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=""
+
+RDEPEND="dev-vcs/git
+	net-misc/wget[ssl]
+	virtual/editor
+	!dev-perl/Gentoo-App-Pram"
+
+src_install() {
+	dobin pram
+	doman pram.1
+	einstalldocs
+}
diff --git a/app-portage/pram/pram-2-r1.ebuild b/app-portage/pram/pram-4.ebuild
index d5151395d54a..d5151395d54a 100644
--- a/app-portage/pram/pram-2-r1.ebuild
+++ b/app-portage/pram/pram-4.ebuild
diff --git a/app-portage/pram/pram-1.ebuild b/app-portage/pram/pram-5.ebuild
index 718e513c9cd8..d5151395d54a 100644
--- a/app-portage/pram/pram-1.ebuild
+++ b/app-portage/pram/pram-5.ebuild
@@ -19,5 +19,6 @@ RDEPEND="dev-vcs/git
 
 src_install() {
 	dobin pram
+	doman pram.1
 	einstalldocs
 }
diff --git a/app-portage/prefix-chain-setup/Manifest b/app-portage/prefix-chain-setup/Manifest
deleted file mode 100644
index 3f43c3d7242c..000000000000
--- a/app-portage/prefix-chain-setup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD prefix-chain-setup-0.6.ebuild 6123 BLAKE2B 57a80f622d81f428304a4c2f06aaf719042eca5269dea2f806219bb8fadbfc25fa00d3f8ab4c6fbfe0096e4290313c1a38b6278874ed6acd87d016402038ecc0 SHA512 300c8ad213b746d5c62d07bbb918c6a3370184221d57b5dd3b19ea475c00aa22a7e0acf75cf40b8eab04e71e1fb58562c073964e7c77b747860c947cba15d602
-EBUILD prefix-chain-setup-0.7.ebuild 6610 BLAKE2B e5b50102a64ec9e70ba8c9a3f3ac63e94738aaffd9390978a4d2def8446a52cea5fb9367109a8fbfbb1a95c5f7390447907ebdbc856714cf81f8d2ab79df00b8 SHA512 ee6013082cf657586aeac0261f7cab46bfff1b66190f70cc0b3cc842d7803ae246d25b41c18a0f94954c48d8da6ba51bf04174418b81ad43567c4f9ee1e200ba
-MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-chain-setup/metadata.xml b/app-portage/prefix-chain-setup/metadata.xml
deleted file mode 100644
index d33cce94b0d4..000000000000
--- a/app-portage/prefix-chain-setup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>prefix@gentoo.org</email>
-	<name>Gentoo Prefix</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild
deleted file mode 100644
index da26e810781f..000000000000
--- a/app-portage/prefix-chain-setup/prefix-chain-setup-0.6.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Chained EPREFIX bootstrapping utility"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	eprefixify ${PN}
-	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
-	dobin ${PN}
-}
-
-src_unpack() {
-	{ cat > "${PN}" || die; } <<'EOF'
-#!/usr/bin/env bash
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-DO_MINIMAL=no
-DO_SOURCES=no
-PORT_TMPDIR=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]]; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-	--sources)		DO_SOURCES=yes						;;
-	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --sources              inherit 'source' statements from the parent make.conf"
-		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-if test -n "${PORT_TMPDIR}"; then
-	if ! test -d "${PORT_TMPDIR}"; then
-		einfo "creating temporary directory ${PORT_TMPDIR}"
-		mkdir -p "${PORT_TMPDIR}"
-	fi
-fi
-
-einfo "creating chained prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage
-	mkdir -p "${CHILD_EPREFIX}"/var/log
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo "USE=\"prefix-chaining\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "#"
-	echo "# Below comes the chained-prefix setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "# by default, only DEPEND is inherited from the parent in"
-	echo "# the chain. if you want more, make it a comma seperated"
-	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
-	echo "# all that is possible"
-	echo "#"
-	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
-	echo "SYNC=\"$(portageq envvar SYNC || true)\""
-	if test -z "${PORT_TMPDIR}"; then
-		case "${CHILD_PROFILE}" in
-		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
-		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
-		esac
-	else
-		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
-	fi
-	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
-
-	if test "${DO_SOURCES}" == "yes"; then
-		# don't fail if nothing found
-		for f in /etc/portage/make.conf /etc/make.conf; do
-			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
-				break;
-			fi
-		done
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	# this -pv is there to avoid the global update output, which is
-	# there on the first emerge run. (thus, just cosmetics).
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
-
-	set -e
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO \
-		gentoo-functions baselayout-prefix elt-patches gnuconfig prefix-chain-utils
-
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss that
-	# ability, but interix binaries don't.
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
-
-	# select the chain wrapper profile from gcc-config
-	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-
-	# do this _AFTER_ selecting the correct compiler!
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOF
-}
diff --git a/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild b/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild
deleted file mode 100644
index 9261c360d302..000000000000
--- a/app-portage/prefix-chain-setup/prefix-chain-setup-0.7.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Chained EPREFIX bootstrapping utility"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/portage[prefix-chaining]"
-
-S="${WORKDIR}"
-
-src_install() {
-	eprefixify ${PN}
-	sed -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST}," -i ${PN}
-	dobin ${PN}
-}
-
-src_unpack() {
-	{ cat > "${PN}" || die; } <<'EOF'
-#!/usr/bin/env bash
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-DO_MINIMAL=no
-DO_SOURCES=no
-PORT_TMPDIR=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]]; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-	--sources)		DO_SOURCES=yes						;;
-	--portage-tmpdir=*)	PORT_TMPDIR="${arg#--portage-tmpdir=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create chained to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --sources              inherit 'source' statements from the parent make.conf"
-		einfo "  --portage-tmpdir=DIR   use DIR as portage temporary directory."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-if test -n "${PORT_TMPDIR}"; then
-	if ! test -d "${PORT_TMPDIR}"; then
-		einfo "creating temporary directory ${PORT_TMPDIR}"
-		mkdir -p "${PORT_TMPDIR}"
-	fi
-fi
-
-einfo "creating chained prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/var/log
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo "USE=\"prefix-chain\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "#"
-	echo "# Below comes the chained-prefix setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "# by default, only DEPEND is inherited from the parent in"
-	echo "# the chain. if you want more, make it a comma seperated"
-	echo "# list - like this: DEPEND,RDEPEND,PDEPEN - which would the"
-	echo "# all that is possible"
-	echo "#"
-	echo "PORTDIR=\"$(portageq envvar PORTDIR)\""
-	echo "SYNC=\"$(portageq envvar SYNC || true)\""
-	if test -z "${PORT_TMPDIR}"; then
-		case "${CHILD_PROFILE}" in
-		*winnt*)	echo "PORTAGE_TMPDIR=/var/tmp" ;;
-		*)			echo "PORTAGE_TMPDIR=\"${CHILD_EPREFIX}/var/tmp\"" ;;
-		esac
-	else
-		echo "PORTAGE_TMPDIR=\"${PORT_TMPDIR}\""
-	fi
-	echo "READONLY_EPREFIX=\"${PARENT_EPREFIX}:DEPEND\""
-
-	if test "${DO_SOURCES}" == "yes"; then
-		# don't fail if nothing found
-		for f in /etc/portage/make.conf /etc/make.conf; do
-			if [[ -r ${PARENT_EPREFIX}${f} ]]; then
-				egrep "^source .*" "${PARENT_EPREFIX}${f}" 2>/dev/null || true
-				break;
-			fi
-		done
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating profile/use.mask"
-cat > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-chain-setup <<-'EOM'
-	# masked in base profile, unmask here
-	-prefix-chain
-	EOM
-eend_exit $?
-
-ebegin "creating profile/use.force"
-cat > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-chain-setup <<-'EOM'
-	# masked in base profile, force here
-	prefix-chain
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	# this -pv is there to avoid the global update output, which is
-	# there on the first emerge run. (thus, just cosmetics).
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -p1qO baselayout-prefix > /dev/null 2>&1
-
-	set -e
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO \
-		gentoo-functions baselayout-prefix gnuconfig prefix-chain-utils
-
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss that
-	# ability, but interix binaries don't.
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" CHOST="${PARENT_CHOST}" emerge -1qO gcc-config
-
-	# select the chain wrapper profile from gcc-config
-	env -i "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-
-	# do this _AFTER_ selecting the correct compiler!
-	PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" EPREFIX="${CHILD_EPREFIX}" emerge -1qO libtool
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOF
-}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 5ae047b71af8..5d69146a288c 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,8 @@
 DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
 DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342
-EBUILD repoman-2.3.10.ebuild 1952 BLAKE2B e14b21a2bd636bff2104dcf56d91e99a5cf0ab1deaf6ccdd3c4c30a482f0780a37f005c80d14d74cb27d2ce523e1c7c6db6eaa8e6501178506053c38f4dcb5f6 SHA512 e053f9decb8bc1e4bc9a2df878ee227f5bfde2fa325eaa137a24b2ce070a8abe6fa6144e01b737da188bcb20d5d7b69133adff27296e7a77292f3761e9dba0fd
-EBUILD repoman-2.3.11.ebuild 1946 BLAKE2B 2286b77ccd4d1bd546e84ea0c50bb3ba12ea30c5b3a38ea98649bb74cbae82910c79ab0501087f12fa36fca9696c269b5610b082e462b765e3bc493c838030f9 SHA512 d866b6bdef1c4da28eb7368862b725e87c4bcf052b4df083e2c0a1631ed928814c9bdbda3022258fdb25a5b5c2fbbf13e235a617ab64d2d2e59d666795956469
-EBUILD repoman-2.3.12.ebuild 1958 BLAKE2B 3b07f84e738e20027799bcb3faf4985b5b3040699051380ce8b8b640289a37cee9b97fc46a3a3b3e2559aaddde5b70d86b4e7f8626dff5721d2b450d5e7e89c6 SHA512 2486405267eb1de83802c9ecc817fe0f31d1e9825c92991bd0064e5908c4e0069e5ed2fb0b44bf7e8092cf4163a9b14f00c425bc72174a39dc393fbb4898f734
-EBUILD repoman-9999.ebuild 1982 BLAKE2B 2da48849d7f710be3930ae5882f420d25e9e9aa07a5d94cb77e658b0914cfe94ec2b3bcb174bfbb8a9739a55732f4fea02ca85afe8516dcdaf89627bdefcf0be SHA512 e9ee663fd2019db232df7cba9b0842f654f64c7b83dacd991a9844c1736651ff74ce2096979035ca2b29e6e9ddbbf01891c35206b77bb4ca0f077c7354e65f6e
+EBUILD repoman-2.3.10.ebuild 1947 BLAKE2B 5d1a5e9fe74a16d9bac3c12577c76e3e18dd6c6249d08a44b0d8b02863f9bfa5610470a2ca33a724ec7b5079402b4c5bf8f4d339da3200661cc6fb4148392355 SHA512 399353e4ea2e55a2d2be99b44040d1ff63786395f68270592f65db6a0172aec3dfbf1ec66f42e6b6511d01bae71b6c425c2b00f28fa1f0981b7b7d2ed46472d2
+EBUILD repoman-2.3.11.ebuild 1944 BLAKE2B e1fcbbbe81adb06fff85c70a53a5f0ef4951e99351ad32f99e3bf64a5b97a5ea9bc30b3de922e3355a623b840c5ed24d13215b9fdbe091cd858dea6e824a9356 SHA512 309c463aa75cbc09d1e0c58748ccb6920ba722a57d5146e319aea38f9a7c80308859ea746668bfe66da23c23748d470b91b5e71faa6feb6acf913aca3e73b11b
+EBUILD repoman-2.3.12.ebuild 1956 BLAKE2B bfa168252ee2b643e96ecff5fe15b5f6c450cc42edf9f09f6f1119f75b3d1f70a7f12492045cf1c7215577e706d18e902f7b1dc39049d158ebe7c51279f214db SHA512 beec9616ba8a19a79c0b10e431d103154e92fe426d94f5f8f9acfb9e01ffa3889f8262cf3561664e41f0a8672dc46290ba83eb94f8be8970c566212b19baed2a
+EBUILD repoman-9999.ebuild 1977 BLAKE2B d52d7ff36f851f7d53f6f1814e910f4d8af9a19e2d7a9485f55d2cd0da5b72fe28ff557efe6c45a171a3bb4b054be2f4330018a8204f3139f45bdf7cb8c8e815 SHA512 8489e6a632a46ef004973507eaef8e985ddb77dd3c41cafb682d754ab5403d275ce730063145ce972fd8720574c53f83fcb5a47a7120df4dc3f86a9108b02aeb
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.10.ebuild b/app-portage/repoman/repoman-2.3.10.ebuild
index 76890f067318..86bc693f814b 100644
--- a/app-portage/repoman/repoman-2.3.10.ebuild
+++ b/app-portage/repoman/repoman-2.3.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.11.ebuild b/app-portage/repoman/repoman-2.3.11.ebuild
index a5c219e15621..67c22fff38ad 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.12.ebuild b/app-portage/repoman/repoman-2.3.12.ebuild
index 3273c5884deb..1edcbad20eb6 100644
--- a/app-portage/repoman/repoman-2.3.12.ebuild
+++ b/app-portage/repoman/repoman-2.3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 8063252c048e..71bf765f4d48 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,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 310325528508..f8e48a3ce019 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 831 BLAKE2B 8263c19ce90fe63dce8ace4f0624e1c7987edb86f14bf87d0e0e689420d9ef2fb6375f2cad4c0974f66b308770ecbc7361c3beffd10edabe87711a50ecb7b6d7 SHA512 282615a33ae2d7356cdaaa54c75c98f9a26d52cf54794e661b16848522a7f5f5d11ee8c9dcd8d88d484b949e1048efeee6926a73c3254349d54f2c19ba9f8420
-EBUILD smart-live-rebuild-9999.ebuild 740 BLAKE2B 6fee19f8e59b7da874e9edafbbb794285c11a7338e531062d30deb73dd51f1e2e8287ed1887fb4146e54665b083b419fac14214c0d5104d934c2fdf1aa2c56f9 SHA512 87bef6aa7cb90ab260b8eab9dcaae46b2d2a3ec92c2117fbb53535e3841b8f903a706bc972cf5db7196459878330ad5caefe8bfc6b13ad57b57d2e29595e257a
+EBUILD smart-live-rebuild-1.3.6.ebuild 824 BLAKE2B abdd61fef6843b7aedd26618727a6ba25c8b83e820c8135c0d29334a40f433e54ef3ff19a4d271b9f289e376964d885a349cd7356e7bf18ae00999a227fde34d SHA512 f89abffacde818b9b889bb25551ae293af073e707900e07fb0979be878371706558d4670aeba15e8123f8acdb8c5afaaa7ff940c2571a6eb4ae1337b0d5b30ae
+EBUILD smart-live-rebuild-9999.ebuild 733 BLAKE2B 425e9a462501ac90850fc64a851b5be0fc68e38285c8eaf490935019d7c9fbed2e3930f9565616304950c4541740afedd256f19263a7e0b9d678637c06daaf1f SHA512 d7112f4ac4f78bcb387bb5d70536ef9735dcb71f4e29b9d34dc256b9ed10b407a4d5364b66d12d42dd54d693be37d7b5338c5b68999a6dd629a96f5105355a73
 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 127e5c6c0513..8f38614fd68c 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 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 37edadce0959..98ecad4c2484 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-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 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 3c0fe436b660..ca8dae40f0d6 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.4.tar.gz 23397 BLAKE2B dc6efaf866b059567d11c2a91929b025e74f73ae5ad81a98a632c3b2393025e2e35320ed223ae84b28a8770c713536afe73289d66f7c1396118a975867a56161 SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
-EBUILD tatt-0.4.ebuild 837 BLAKE2B ed3e6b5953fe0f5276336d2ce7d1e809220b56bd1a5bd9005041145879702b96c7540114790962e7d3bc5361a919ef2da5d6990ad0808cbcc0b63e8d11f5e1b8 SHA512 61bb3f55c1c2dc18ac9549decd4257d14a2d7c500868843974c3fe6e5f05fce4550f4e2b364efb355f31f78c53b3fad830051c444b179ac3fb9c79cfdfe2a7d3
-EBUILD tatt-0.5.ebuild 836 BLAKE2B 8a25cb4385c06a1f1f380d7c6c30bbea7a1680aa7a61c10026645fef71f4178be4b42b95028e9912701c6ddbaa08dd9958cef72a96c325b81b8fe9d81ad74c75 SHA512 fe8103af64462291cbcda3e6b18d7e271febece1bf110f0e35837fdc592f86a5488a2596caa873e854cc1e3d6493cb3b4468034aa67e044242190a31f70479bc
-EBUILD tatt-9999.ebuild 750 BLAKE2B b7f6bfb81ebd1aa9fcf824b772f9e7a8dbbe540b4c2d838f4a24d4633502d18009ff3eb7f0141004e3908334df91fbd63b4e333a8a31910408597e0fe198360d SHA512 f2ba4af09dc1f83010883ac4d58790b38ad48fda09ee8b58b16b2eef8b428e5308ecf6c317c15b0a8934bd2deff3fe9834133d78932aa6ade4dd64deb13fd746
+EBUILD tatt-0.4.ebuild 832 BLAKE2B 61e7d71589066c610e5b562b17724d25d2a114cd26135fc141935ca2560ef0bea2379ce00873da937190a62508b828fdd7578c4f1320a48f79e72e5ed7f9e43b SHA512 533da9e62820a3ed23790192f8aed5136f01b4dc86db30185e1b73c99cb3c1a9c920138fde7c3c2c0c2c599ae22b8695e0f9272a2b7125535c20bc501fe68b6e
+EBUILD tatt-0.5.ebuild 831 BLAKE2B 54a8aff9f4abd913350c8ae038a2c4f6934e213014675e8a35b3c1d45aec5cbc04083ccb9dafc12162e9704440e31705474bf1a26cd6bc8ddc4e46897c697f8b SHA512 45a75cd181dad7e5ede5d295b8609405623a5f9f8e0e2c95dab4819d075e93fa34821c2aae72be29938508fba3ae186a0812961f2c26a6b90de1fd07e4b587c1
+EBUILD tatt-9999.ebuild 745 BLAKE2B fc572ac14a28ae29d696c7367fd1dec97a6c7a86b91e7bcf59339431a6f96908ea62d590740ad26dcca244ed2693788fc30363401bcf77466e287166db0f5470 SHA512 60f4189512d3bd5796927d56322f8aa01fc7f232d6213905456ea3fbf6acd91f202d6fb37416ad51c82b3d8d037b2903061e3b99f0fe82a222fa51a078749ad2
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.4.ebuild
index 78be3080366b..a623eb3b75f5 100644
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ b/app-portage/tatt/tatt-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 0971d8130bdb..73af7bef033b 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 18cb809559db..0138130f94fe 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index ba6cf7fdca78..fd0c0f7f87a8 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,6 +1,8 @@
 DIST ufed-0.91.tar.bz2 61466 BLAKE2B 63671c875f7dae13a6e76995204a278703691ed3c081a95853a6cbd9a57d1f88cf1c7625f1d524bfc1a816f1344282577126865160e0433cf6692d8067596f59 SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35
 DIST ufed-0.92.tar.bz2 61606 BLAKE2B b01c409d5852d59a3237748bff49348a2eab386d06c55389d5eee54ad1002575d67ab5138334e99ed2da434a8af05862d769fdf7e692bee2e77bd9c41b793762 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408
+DIST ufed-0.94.tar.bz2 48566 BLAKE2B db58624005c637c7133a298c17b60cae3cf54c1b1d2ba3337693e1f6c330a5305986e92b6c1b25a5ebc94b1f8934cb5a35db94eccb596f2eb15619dfb2ce4977 SHA512 a40e55db8afc99b5e16b080d93867ef8c832a7318af7a50edb582bfea99bcc6a467b4bf12b75a9d3943e8a008a0222ed73daa52a8e7dae57d73bece4ac084d24
 EBUILD ufed-0.91.ebuild 1020 BLAKE2B 5d4b06638b51bcdf2f08821fda1aaf2be8cd63e7193089860235be67e3a2d987369b055465fa6e7db0429cb58d850026de553a9dffb68dbcb80930195d553380 SHA512 a009ee56787d3c800bceb2f292ab2971f560ea60ece2d08da8a285589ddb4b3782a1790241d8c99b839d4fbfd303458753d6989580e40f5d465df7820f459d11
-EBUILD ufed-0.92.ebuild 1023 BLAKE2B 76a992c76f7b596bef0daa187a04a90aed8d9d2545453a55ed52b4ac933ecad5cc62af38507dc9f16e3706b68a7eb3f753687077b51c7ab83c04df4eb9ed4729 SHA512 d5404f6348a9baeab928961743c4ef32795c95235044432ba1bacd9eb0f37598eac0568e6b87d43911f775b12fc05a5ab0a5199ec623359d78f15818dd0dfd78
-EBUILD ufed-9999.ebuild 714 BLAKE2B 8f61d1cbf96e6cc33808eba3517f92a28f64cfa5369a6392ebbbb70fb157b483915a07a03631203a5222d8c7f942a4be0124e5e378d95885b6f297c844103694 SHA512 ff9611854a518be33df2b340235d33ae3ecc7675e08c97debeb87ac8d699e2346aa1c6911d1400343f17dfe297f29993c6001401f5ea3fe61016abfedc720c60
+EBUILD ufed-0.92.ebuild 1030 BLAKE2B 301ceb1fb8ae9154f43539a706da5fe74e87a95a1e33b05f18cbe17acd6cd94f469096c3e1d0ba1bd2d75815e7b4c2ca667e28b7cffe749cc24acb4d80829f6f SHA512 36c7e2761dd307b783349aafb9204ee3d6db654fcb75f928b09dadcdb1659e028b068486d4eefc229a15ffe58d89c47da2679fae84a92262d891ddcabe6f81cc
+EBUILD ufed-0.94.ebuild 986 BLAKE2B 631f4d1c8afbb0d51a2c088e0214c67a1e9959dd8a8515222ace63511ca5a2281f41df35c024c96a0990cdb326768852050997352dd01c13a138a8d5ac55a6a8 SHA512 ae6dc0289d5c272b3ef5be06d7721f54f43c5ac8c012eaa9457f39f16477581ee4b2340dfca4c38951552c91b27be3d550c5844f4171febc9d921dd525cbcf16
+EBUILD ufed-9999.ebuild 992 BLAKE2B bc1ac52e5b2c959ed91049e890ed608f24f868a8cd7750eac10b3cc8916656522ded60abcf92b07982d11a5cb814301e8d8fc62c18418cb42f5380b6c23ca547 SHA512 d383c0e984ba29e17827fd51cf10985d251f5ccb8a066c8a1a150846d97a584c962e4dff7900a9ea9f50f4fd05f0959d3fbf9304c482fbc54696a6a1585af098
 MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 439c65b2bb97..9922509db2fb 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="sys-libs/ncurses:0="
diff --git a/app-portage/ufed/ufed-0.94.ebuild b/app-portage/ufed/ufed-0.94.ebuild
new file mode 100644
index 000000000000..6e20116621dc
--- /dev/null
+++ b/app-portage/ufed/ufed-0.94.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools out-of-source
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses:0="
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# Change the version number to reflect the ebuild version
+	local REPLACEMENT_VERSION_STR="${PVR}"
+	[[ ${PV} == *9999 ]] && REPLACEMENT_VERSION_STR+="-${EGIT_VERSION}"
+	sed -i "s:,\[git\],:,\[${REPLACEMENT_VERSION_STR}\],:" configure.ac || die
+
+	eautoreconf
+}
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index 6ab99b399c04..3a357527b718 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib git-r3 autotools
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools out-of-source
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
-SRC_URI=""
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="sys-libs/ncurses:0="
@@ -22,11 +27,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
 	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[9999-${EGIT_VERSION}\],:" configure.ac
-	eautoreconf
-}
+	local REPLACEMENT_VERSION_STR="${PVR}"
+	[[ ${PV} == *9999 ]] && REPLACEMENT_VERSION_STR+="-${EGIT_VERSION}"
+	sed -i "s:,\[git\],:,\[${REPLACEMENT_VERSION_STR}\],:" configure.ac || die
 
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+	eautoreconf
 }
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 02c60c18c6c9..cd5315d6a6bb 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2
-EBUILD unsymlink-lib-13.ebuild 641 BLAKE2B f967256636c88afa1d80c73359cedec7f29f73403796ddeceb4b1ebf98f5b30d0dc968cc1633ced1ee3a922715f06a565359dc05f7e5f320e9a787d7432a5861 SHA512 29232685faf31b790a027e2ea862de4b309d9a9423585bf1d12d63cdf298a20b2e6fd68f8a1917fbac14b7ffd3e6a287d1c358c2744e597ccaeaa32cba279b75
-EBUILD unsymlink-lib-9999.ebuild 627 BLAKE2B 4ebcd4f34b4326174f4c32cbc5c23572e8ca57a5bdaa3f170c60ca5bb2d4a9ac31b9a8203093bd7891eb78fb62642a4b9cb9f0e5fb16aa276e9561d4b0ff1a96 SHA512 e8a09ca9ebc84eb8702334de9c72f508bbe168961d0eba7f113c24f6e08e477d63ffde2f79927d7c1b6b0f2056e4ea6fb42c5c60156e92700088e70429b108d4
+EBUILD unsymlink-lib-13.ebuild 636 BLAKE2B 0a0a4db4c7638e68a48c2f841e8a12fc726cab974f71af7d5f7d2f3c3cf1d6f94e501299ed816a19b43de159c7bc54e3af0b257e402dce1631b16ffac08a163b SHA512 7bed1ac9570ba7c3cb6d0bbe8948a23e1e1823cfbbe5eadc73312bfeb775d45da9806600a8644f567ed0c446c901a3ef415dca2c7317a83835cf25fb1e32a03e
+EBUILD unsymlink-lib-9999.ebuild 622 BLAKE2B eab1eb2ff1d50aac92f4879b04831b87f071ec511f26c839122d45613d409bc39a4f86be9b2072e76d0d81cfc6b548400572926ad3853fd81aa654cd13aa1f49 SHA512 d2901dc74b12808fea0c7526e39b9084cd8103a4ed2d4806aea41dddd2c31a34a7937a71a12602c012bf4f412bece00b5b718839b927eeeb3519b21e5325fdd8
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
index 2fcdf5eb3a90..4218a14a9897 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 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 0a8f8ce3adaa..a6bb9b48f358 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-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit git-r3 python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /app-portage
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)