gentoo resync : 24.12.2018

29 files changed, 20 insertions, 708 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0fd4e1c2811f..b2814128afd6 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 5764d4750f7e..8daeddd743fd 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,10 +1,7 @@
-DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
 DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
-EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
-EBUILD eix-0.33.2-r1.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
-EBUILD eix-0.33.2.ebuild 2795 BLAKE2B c490432dce6040986795e37744569cf27d320e9a0e066f5998960eded9cbd17e443786eb4346463d4d8d852765ff8791856951c109a514d7a0b6568bb7888571 SHA512 bc901e7e995bde5142988d6bf7ff4031fd3c895684e10db8249e7c723f39d9de4bb948d369da252aaa9b6378fa42318b66be177df6124ef79d9bf7094c762bfe
-EBUILD eix-0.33.5.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
-EBUILD eix-0.33.6.ebuild 2800 BLAKE2B f23daa963d486af806ccb9fefad94164bb299071b6df49b8f122ebdcbf0c228888da359d3185d7962f69e1c2b084cc6019ced705528f814bf04a5a39992b3a59 SHA512 b53472ef80af890d9822d32ed890d62962fac175f2eb19da716426d2b159629d96758bc92110502b01201347d3449416a678527dc18b968c472fb1ec1e15c83c
-MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
+EBUILD eix-0.33.2.ebuild 2646 BLAKE2B 3ad92e6cdac3d31adb3c8a3a914030265659a73322fbdadb0ae211bd0312685b1969f09c3af73239ddf2acd566922f86dae629c54c570f703a36e232805fc2bd SHA512 88ed2a920e0d5cc6e8d633f21b3990045a1b70453dd858902f82b84474bd2b3e4fb3e58748983c0c9dc74086b9f7deb278fdf6afa9188027cb18062b71452c18
+EBUILD eix-0.33.5.ebuild 2647 BLAKE2B 154fa5064cb7525cd40ef14243391b15912498efa029835b75ce045bcafcc4590c9e16b854c58a255eee0dda989cb3a12a000edd64df7b521c25792edbc31842 SHA512 9fec63ff1a58eab93b7d52b76caccf2a1635a482fb4eeb28c173ca5e64c88a21e6b12a968ede6d52354a1640274a74f341d5e00a4edb12ffe7e6cea67ecb3083
+EBUILD eix-0.33.6.ebuild 2654 BLAKE2B 2923f5cf4b6db39cb1007e8b7b531c883ed02523afe53fefa4653e0e30ab2cbcc30f5d35c84dd07d347b85a894ce362410893b9db5d4204f1a9c506e2f0c963e SHA512 5445aae967a808d08b888f95be38df115c6db0f993dfad69f52eb480f5cbde14ffe670778412cd7a1edb6a773050e19f00def9fc2aa2b746abf36ebeb8116245
+MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
deleted file mode 100644
index e8dd7466f598..000000000000
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 systemd flag-o-matic
-
-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.sh\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoicasserts)
-		$(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++11
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	systemd_dotmpfilesd tmpfiles.d/eix.conf
-
-	insinto /usr/share/${PN}
-	doins "${ED}"/usr/bin/eix-functions.sh
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-
-	keepdir /var/cache/eix
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
-		chown portage:portage "${EROOT%/}"/var/cache/eix || die
-	fi
-
-	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.2-r1.ebuild b/app-portage/eix/eix-0.33.2-r1.ebuild
deleted file mode 100644
index 507d7acf722a..000000000000
--- a/app-portage/eix/eix-0.33.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-	keepdir /var/cache/eix
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
-		tmpfiles_process eix.conf
-	fi
-
-	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.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
index 4efb8b39b3c2..35f1e69f4cdb 100644
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild
index 507d7acf722a..dcde53139623 100644
--- a/app-portage/eix/eix-0.33.5.ebuild
+++ b/app-portage/eix/eix-0.33.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 )
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/eix-0.33.6.ebuild b/app-portage/eix/eix-0.33.6.ebuild
index 22862304f235..6591a20647ea 100644
--- a/app-portage/eix/eix-0.33.6.ebuild
+++ b/app-portage/eix/eix-0.33.6.ebuild
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index f07795f51987..acc485463b42 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
   </maintainer>
   <maintainer type="person">
     <email>martin@mvath.de</email>
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index b079f5199380..de9cd5ba3c5a 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -3,7 +3,6 @@ AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaa
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
 EBUILD genlop-0.30.10-r1.ebuild 768 BLAKE2B 4ebed55f9ef1e0cde53dba5737dc4efb703df271fd51abc762bab1e5d3a800c0e6b3ceeaab3afb301a6cb30c6e8000d3accaeeb85b1621d4248edb4c6ee6651d SHA512 ea1e977c546be4a1ae9af37dd8e70ca07c4a35e6e1eab5d9b07f57174b75a4d31595597935390449610d9f158491fea5c9b852165635f418f417f6f76f85633b
-EBUILD genlop-0.30.10.ebuild 651 BLAKE2B d81b28aeb5aec942da39a344a9555c5971f33065d2f3a4a774fd3e3096a2d4f6e53c90f10d92cf0aa8e9a2fd36dc2b72a1ec57f1df5a0b092b0f465bb381b24e SHA512 d0bf745a31bf0151622e0e919e40a48fda8edf39998e396a37f6d259bdc6db361bd0a42f0c20e1c602e48ec28e0d4ad6a7fdb83a56a1b9341e638c05ee17692a
 EBUILD genlop-0.30.9-r1.ebuild 773 BLAKE2B cfccd4ab36b55323bf320928c7c0e8719b92c00e1254dbf295241287010913768865b3428ac0130db3d93ab6fc12f5d60e50a4e417280c21a630a83cb1180711 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10.ebuild b/app-portage/genlop/genlop-0.30.10.ebuild
deleted file mode 100644
index 79e11b3c92f2..000000000000
--- a/app-portage/genlop/genlop-0.30.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	 dev-perl/Date-Manip
-	 dev-perl/libwww-perl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin genlop
-	dodoc README Changelog
-	doman genlop.1
-	newbashcomp genlop.bash-completion genlop
-}
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
deleted file mode 100644
index 8a568e052dec..000000000000
--- a/app-portage/gentoolkit-dev/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gentoolkit-dev-0.2.8.3-tests.patch 897 BLAKE2B 6d04857c29e4e5b53a3a4189b33ff395b26d4d8c9bf07a624ae7f3f0e605b89b2cc3f1f04d3562fad22e8aa90640498d5460f1a282eced5c0c0c6f7a3f9a0bcd SHA512 0b5f3555a8374c1765770c27a950a26a3e7f7f222a5cf1cb1a5ed326d1d7757fd40639eaf58c54daffc668929bd25e76fffb108c75f20e5f0a2937f74a03e8cb
-DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 BLAKE2B 65136a748a971688371245a5bc46d9d45689c14fdb0a772c0d2a94264cec4464c90345b9d089b855acae91db92b08b604400ada09ffb2c08f77bb3662ea952b3 SHA512 f55362e46928633598cb07640505202521e3f4bdaade1faecb4ac14ba1bee0489207cb7ab03531e06d7922446a57083365f51c63ceb8cf1e0badba9ac503c16e
-DIST gentoolkit-dev-0.3.0.tar.gz 58655 BLAKE2B 5784ed2b2c6f92f2b6bf4a0d3d4a61d2f9defe20c438d273c5a89ed7b980afec08dd70fabc787066acd2aeea4ee5fdd6127d42cc500aacd8dcbd690ff7124d63 SHA512 d15f6546cf88af0832c14eb003c72b5906bb9b9f078c903e1e444b12c2e432fd1a2fa077eda5496e222cb50cfd5a705e86044b9a1c0164ac6b4b38268461ced5
-DIST gentoolkit-dev-0.3.1.tar.gz 58472 BLAKE2B 33ad722d23abfa94fcc73dd505794cde935119aafa8ae6f2828b59e6f1e95c00dcbb751732f69327d2278751350fb2aa25e3f7c2a33cf35367b10edad5744193 SHA512 e47fa698710132914c2de6d25f7450b90383b9d6283e927221bec30be3a56de93c09e81c35e025dee2f01bd5c2f10cf231fc392c415849029529712cd81aea19
-EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1531 BLAKE2B 1ee609aa149a676a04bb1662b6b247590e9243b1837a21cf900463f3e8c5fd390ff84c0f7407b77d42b9c4b1a37a4fb948dfdb29fbdfefa3443bfe14b4efc825 SHA512 67d350f38a7dec1029d5197cd9703edf4ae892a72d422cf0bffb3fc246f3347975657907f7303dbbc31277bf13b3087156c11d7f107eef7edeaf5cdd86dab774
-EBUILD gentoolkit-dev-0.3.0.ebuild 2316 BLAKE2B 4620f92a61532405e7b389b804dc469c4185e45686ea92c3fe4f765b528b498978aeec1d42d01077cf77ffe80e7dde5aa8ff0b0d9159641a10d504bf4935c7bd SHA512 69d866d1984d64bc3a01b3ccf6d16de02d813a40d3aa14aa1dd182ad34d7bae50cc015b4def07314d22dfc6e5eff9e05de7056641740a7e881c5f40176505406
-EBUILD gentoolkit-dev-0.3.1.ebuild 2391 BLAKE2B 01e65aa2f968af4db14fd5dfd0a369c75e4b68f88a42b9092db552418e60182ff153ee549e1792a7a1febdd8d8cb50b0d6f88d32835ad8471524d014b4272fd5 SHA512 44f42c010e08c753fa2ffb7733db82e38a9dabd89ece709ea97c8f25098ed0609563fc71fb3c6a3ec4b0058cf5b7791cb37fdf0d371752cf0fef90fd08ec4408
-MISC metadata.xml 386 BLAKE2B 5b0d8e65ae078df17212c8ab4d23f9448609d4c5caf9a9020cf94ee332c8caf8494e66ef72c1f25c93d21f379b984ff174a846160d2657f87d36835e83207363 SHA512 6ee5dcd5f54623999f208a01cedd3e9fce88efa45e82a0d18d77f4dffa4f0ad4dc105d52221ec3c31924c895298705a5c0ec974cd59d4bbc6fabac72e60b85f0
diff --git a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
deleted file mode 100644
index 533491d76897..000000000000
--- a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.8.3-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2da4232cfd9597b829dda4bcfbf3aab25f243950 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sat, 11 May 2013 23:56:25 +0200
-Subject: [PATCH] Fix echangelog test
-
----
- src/echangelog/test/test.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh
-index 0559113..53bb0b5 100755
---- a/src/echangelog/test/test.sh
-+++ b/src/echangelog/test/test.sh
-@@ -160,7 +160,7 @@ ebegin "Preparing echangelog"
- 
- if [ -e "../echangelog" ]; then
- 	cp ../echangelog "${_ROOT}/tmp" || set $?
--	sed -i -e 's:use POSIX qw.*:use POSIX qw(setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
-+	sed -i -e 's:use POSIX qw.*:use POSIX qw(locale_h setlocale getcwd);\nuse TEST qw(strftime);:' "${_ROOT}/tmp/echangelog" || set $?
- 	eend ${1:-0} || exit ${1}
- else
- 	eerror "error"
--- 
-1.8.1.5
-
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
deleted file mode 100644
index 871c6d5c4255..000000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 eutils
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-tests.patch"
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]];
-	then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/imlate
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
deleted file mode 100644
index c270ccd256be..000000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
-		https://anongit.gentoo.org/git/proj/gentoolkit.git"
-	EGIT_BRANCH="gentoolkit-dev"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	if [[ -n ${EPREFIX} ]] ; then
-		# fix shebangs of scripts
-		local d p
-		ebegin "Fixing shebangs"
-		for d in src/* ; do
-			p=${d#*/}
-			sed -i \
-				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
-				${d}/${p}* \
-				|| die "failed to fix ${d}/${p}"
-		done
-		eend $?
-
-		# fix repo location
-		sed -i \
-			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set EPREFIX in ekeyword"
-		# fix repo name
-		sed -i \
-			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set correct reponame in ekeyword"
-	fi
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]]; then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
deleted file mode 100644
index bef715e4fdbf..000000000000
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
-		https://anongit.gentoo.org/git/proj/gentoolkit.git"
-	EGIT_BRANCH="gentoolkit-dev"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.gz"
-	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
-
-DESCRIPTION="Collection of developer scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	dev-lang/perl
-	sys-apps/diffutils"
-DEPEND="${PYTHON_DEPS}
-	!>=app-portage/gentoolkit-0.4.0
-	test? ( ${CDEPEND} )"
-RDEPEND="${PYTHON_DEPS}
-	${CDEPEND}"
-
-src_prepare() {
-	if [[ -n ${EPREFIX} ]] ; then
-		# fix shebangs of scripts
-		local d p
-		ebegin "Fixing shebangs"
-		for d in src/* ; do
-			p=${d#*/}
-			sed -i \
-				-e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
-				${d}/${p}* \
-				|| die "failed to fix ${d}/${p}"
-		done
-		eend $?
-
-		# fix repo location
-		sed -i \
-			-e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set EPREFIX in ekeyword"
-		# fix repo name
-		sed -i \
-			-e "s:repo='gentoo':repo='gentoo_prefix':g" \
-			src/ekeyword/ekeyword.py \
-			|| die "failed to set correct reponame in ekeyword"
-	fi
-}
-
-src_test() {
-	# echangelog test is not able to run as root
-	# the EUID check may not work for everybody
-	if [[ ${EUID} -ne 0 ]]; then
-		python_foreach_impl emake test
-	else
-		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate}
-}
-
-pkg_postinst() {
-	ewarn "This package is deprecated.  ebump, ekeyword and imlate have "
-	ewarn "been moved to >=app-portage/gentoolkit-0.4.0"
-	ewarn "The remaining gentoolkit-dev commands are considered deprecated"
-}
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
deleted file mode 100644
index 411cabb0fb09..000000000000
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<longdescription>
-		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 0a7de676d69c..470c179ed588 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -2,6 +2,6 @@ DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d84018
 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 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
+EBUILD grs-0.7.ebuild 1365 BLAKE2B eed6413c817bc353c4022b0d8d5a2e13e4879661e16eb66e3e1748f9e221038e9033532546b6c3f55a6127aa630886e03108f9cf0d52732628c050db7de3dabf SHA512 7267336449d5275f12c407a20e1dedb2f499bc5edc4236e0abebb091b39dbecdc15282aa0be32fe396d6c9b916be445e42a966949fe393e7ae293d86ac905c60
 EBUILD grs-9999.ebuild 1368 BLAKE2B a52038471b4e024aebd20c5d8a5179bdd2d4443961172869cb1df24a2a3c643f35e842a2c418c3c7d832e995546078d19abfc79f9d36af8acc611ef92080a902 SHA512 9ce761b4865fdd6bb3c3472da74e86b5cb1130620a820cbc2f7c9c3ee6317315ad65fa4ba3c2a5315d1d2894296f3ee30efe87e931983d69eb40b3fba62a6df6
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index c741dcba3eaa..a983fe56c126 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -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 x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/gs-pypi/Manifest b/app-portage/gs-pypi/Manifest
deleted file mode 100644
index 28ee339140ee..000000000000
--- a/app-portage/gs-pypi/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST gs-pypi-0.1.tar.gz 15351 BLAKE2B fa1a1af502abf0bc4d7d77344c87da7632f5176d693decca3d7738c4ea8e9e6973cab342f155fb23e07053369cbf2e639130763a446fcc783efdb4a2363f6f70 SHA512 e7d8dabed21de28f327da3163e95ea16dfb63c27d502233c0f6eae7bf3146866498c492795eff5c7126bf56bf6dd1613457290ffab83962741d49bd9254f059f
-DIST gs-pypi-0.2.1.tar.gz 16608 BLAKE2B 498eb01321ff91e70d46315d64838b6b2770f12ec71fcbc0dc92ed14bdf96d08e88181739cb27faef881ffcbdc8ac08861b04498f45348783f53394a0a8b4925 SHA512 72c04ab621690b0e1e8aee489cef09ed3f04a84b4d1f5e0888913429f24c37e79e320d41c585d7e5a087b8f9e6859f6702c42d81c1086bb51ce77c9949af6ac0
-DIST gs-pypi-0.2.tar.gz 16582 BLAKE2B 8d331913165fc94d3aa2e1a1fbd9f11bde8834441520998b7341819ae669d6301190d1ac362b4ada4f8cc1ead858a5229bec2554eb6a1b172a613e762fade174 SHA512 b28143f6eb85151cee27c24f11fd8e2adae7115120cc38eeaaa9a59af49af9cee8423725db0babc0dec7ef357ed2485f8a360f69db9fb246f1097fc0f3c227b0
-EBUILD gs-pypi-0.1.ebuild 618 BLAKE2B 953f7cceeddd4669b8c91a9ffe7a44b58b2202b215a4724a8e6edc92c78d36ce5a3e568911882f04be639d97e1e24351d46445353b8a1816124b1a815bb40d21 SHA512 50d55c21c3bb025c3d8e958ef54ec19be9cd0c710f867ac4658eabd059e6cb4a6b61fbd894dd2e7c3c025d50fde04bcbf178f29b48736d663598169150b82d2c
-EBUILD gs-pypi-0.2.1-r1.ebuild 643 BLAKE2B 01ccab0654360ff8c87de773323b9d055d03b13c12b94e346c587be29706a3930800e2d697cc1807887c8b09874ed30f553a76d7af07be3a77aa407978efc2c7 SHA512 66fb85e81ee57e6b7c84d1fd81fdb7f68521816eb9d0a19d39a80d8467cca0949e8cd9bfa9bde81700e6f2576c823e75b4dfc72e2f85d6d436934267ca894f2f
-EBUILD gs-pypi-0.2.1.ebuild 639 BLAKE2B e2ea6bc762bd5c9bc695e19ecf7ad1ba544fcfbf01ad33667abf32c854af706412e427b26681d3a70746fe1b25ef2c94071f85fe2b52b11144e26bd501098e5b SHA512 bf2a0488128f89f21a3d7c26c11b3d76e707bc5b40725a3a7b4306468529b3df3dfcf9be509f474062c2a1b95531b97405ff978d6dfda7bcb77ad2ff6460218b
-EBUILD gs-pypi-0.2.ebuild 630 BLAKE2B ea96bba6458ebfb07f5b98cb9a9c506e6f0aa7b950364f4644564c806a83831896ef3020fac0a38e267364dfcabf9f254286cedce034528467f736cf574f97d6 SHA512 27424c83d2221634968425a533e1fb8582453ff40444cca141674c57a1c15085476bb1255643c17b5a5fd44b9dfdd0fbc8713e659d66f5d85042a00c534dae58
-EBUILD gs-pypi-9999.ebuild 628 BLAKE2B edc7219f8398161469e15db83b513aa5e0d7c8de271c6a7137012a611749d2ec98b5086b31e3abb8e45a5008737ef68b54ccadb16da46ef0c49f11a9faca22be SHA512 9dd5b854d7fd55cd79c5120245a80f690d1fbfad70405fa39134506a452817cac9055d7ed6a3d99f47e462d2c6a2cfda6d49cd96c80320eaa31f9f4f5ed1fed9
-MISC metadata.xml 410 BLAKE2B e119f3352b8d35a923f7d10e6015ae5dd6d749dd5d3f1074b2ad473466916d4029702cecd9188b584e24ef956e6b125f3e66feb5ed7fc763a096ba63c1d9a184 SHA512 48b08cac54bc8d7c7cd02686a2c16f00e5d0ace033ec37862a516d855908e21caa475e3eb66b53e47f4813cc97fb0b5b4dc6b758e551a456c9aaa31440b664fc
diff --git a/app-portage/gs-pypi/gs-pypi-0.1.ebuild b/app-portage/gs-pypi/gs-pypi-0.1.ebuild
deleted file mode 100644
index dae5eca3555d..000000000000
--- a/app-portage/gs-pypi/gs-pypi-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for pypi packages"
-HOMEPAGE="https://github.com/jauhien/gs-pypi"
-SRC_URI="https://github.com/jauhien/gs-pypi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
-		dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
deleted file mode 100644
index 80da171c493e..000000000000
--- a/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for pypi packages"
-HOMEPAGE="https://github.com/jauhien/gs-pypi"
-SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep 'python*')]
-	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
deleted file mode 100644
index a118272f159b..000000000000
--- a/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for pypi packages"
-HOMEPAGE="https://github.com/jauhien/gs-pypi"
-SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep 'python*')]
-	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-pypi/gs-pypi-0.2.ebuild b/app-portage/gs-pypi/gs-pypi-0.2.ebuild
deleted file mode 100644
index eed9d40201b1..000000000000
--- a/app-portage/gs-pypi/gs-pypi-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for pypi packages"
-HOMEPAGE="https://github.com/jauhien/gs-pypi"
-SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-portage/g-sorcery-0.2[bson(-),$(python_gen_usedep 'python*')]
-	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-pypi/gs-pypi-9999.ebuild b/app-portage/gs-pypi/gs-pypi-9999.ebuild
deleted file mode 100644
index 4233e2078a9e..000000000000
--- a/app-portage/gs-pypi/gs-pypi-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="g-sorcery backend for pypi packages"
-HOMEPAGE="https://github.com/jauhien/gs-pypi"
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://github.com/jauhien/gs-pypi"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=app-portage/g-sorcery-9999[bson(-),git(-),$(python_gen_usedep 'python*')]
-	dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-pypi/metadata.xml b/app-portage/gs-pypi/metadata.xml
deleted file mode 100644
index 299a3233827d..000000000000
--- a/app-portage/gs-pypi/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>layman@gentoo.org</email>
-		<name>Gentoo Layman team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jauhien/gs-pypi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 651e234480a0..06a60a0d8928 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,10 +2,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 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.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2
 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.72.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
 EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
+EBUILD portage-utils-0.74.ebuild 1078 BLAKE2B b16056a4718cc2953420dd39c1e965a14222a80469f0e29fd2e11cf19df3c4809ddbb4e863e647a17675dc4199ffe82b31715f7f9130c59bbbbe694e8e3eff83 SHA512 6c12372c7dc91e7b083fb4c7718ce9bfcd6ade84d2987ef0108cab274173d966214c12d775ebfca9c43832fc8b69f3f9924f1ca66b265df3ddcc088cee35967f
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.72.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index 26bbfdf95355..ce99c5e83810 100644
--- a/app-portage/portage-utils/portage-utils-0.72.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index 98ed3f9c6ce1..67b0903ec79f 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -3,4 +3,4 @@ DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e
 DIST porticron-0.7_p20140126.tar.gz 4453 BLAKE2B 99a81cc2fc0feb753656f4490c2ceb5bc2abba02a74b54ca30f086da1ab95797a119cbd323c91acbb9688cd93996705b92d4bec044a256920c562af8d1e96d70 SHA512 c14c5ff18eff74d7c225883dc0e1cea16666f0dcab07f9b249aed0db2874179eacc824c0f35dc2cfd97dc0c2db5f2bf6d13c3e76a2cd1b87de46fb073622f3d5
 EBUILD porticron-0.7.1.ebuild 575 BLAKE2B e45a7baabf9f2cde961dfb3f6df76448448a1553a66e625fa12a2ca00e6e29523934599841666c21eebfb0e8b3f5d4cc89df67640e98e21264c2a40b8d5ecf56 SHA512 041b14559b7df56ff482d979ec71cbd7ebd0ae18d8ed8c1413e939f66f8c7eb502d6b8ced13affdd898940c3c000e70ba17b86f3b8bc1ef312a139c57fc714fb
 EBUILD porticron-0.7_p20140126.ebuild 627 BLAKE2B d5baa9d0e311e692e649c90608007762540abb4177758dc3f01eea39bd04193fcb591275b87c2415b4704d7474426cf331a93e3683ac3dc223993581518fb621 SHA512 50fe9bbbab60dbbe8201228e4b60a997f0efe47e59b7e64e4a21cf82e5ecc5c58f56c4684280a3a339c3e0c7e2a168be92409de0ab1eaf125968a7abd17691fa
-MISC metadata.xml 334 BLAKE2B 1dd60924e3196a76b8c5c2b1a0b807171920276fbf650e585640916d3c836dd88a21d2b7ec75c5a393b76c852e75cf3567049be880f5ea86750a3d9b015c6a4d SHA512 76cdaa159c6d7b418e8f4cbab36fdcd1ec7361f176222e305622b57084514719c94c3b97377cbbe847a3c5e5b34e0118983d07983db9af107b41cf1b3ed49136
+MISC metadata.xml 253 BLAKE2B ad8e5cfca6065d748c657aa2b9d8aef6bb41bde317916762fb57b6c64ee9a08d3e085dfcd260c49df33ff3fe4dda7d0e72cfd0e99d0513a04ebdd3f9639d5346 SHA512 912bcda064b63efa5586eadc7702c84081b57478a2be9a31293c94e86b8d0e7f98344c8426a99972885981ff25efd6b705c3a3a3ab4b931f5cc56237f021aaaa
diff --git a/app-portage/porticron/metadata.xml b/app-portage/porticron/metadata.xml
index ffc8ad5b4f61..e49009053e19 100644
--- a/app-portage/porticron/metadata.xml
+++ b/app-portage/porticron/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">gentoo/porticron</remote-id>
   </upstream>