gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
commit: d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree: 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-portage
parent: 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
496 files changed, 2158 insertions, 10952 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 19d131bb3248..a8e6570999c9 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cfg-update-1.8.9 b/app-portage/cfg-update-1.8.9
new file mode 100644
index 000000000000..e52dc7c03467
--- /dev/null
+++ b/app-portage/cfg-update-1.8.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prerm
+DESCRIPTION=Easy to use GUI & CLI alternative for etc-update
+EAPI=5
+HOMEPAGE=https://github.com/rich0/cfg-update
+IUSE=X
+KEYWORDS=amd64 ~arm ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/TermReadKey X? ( >=x11-misc/sux-1.0 x11-apps/xhost )
+SLOT=0
+SRC_URI=https://github.com/rich0/cfg-update/tarball/1.8.9 -> cfg-update-1.8.9.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=62d56fff3bf432d17d1cf7cbe3e84693
diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
deleted file mode 100644
index 71fe74cbb241..000000000000
--- a/app-portage/cfg-update/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cfg-update-1.8.9.tgz 162356 BLAKE2B 2194b485ae17ee09fe212fb88fee0d3974bb7877b9bee6a243475f689e033e950d9d331108f9360a5bb65b40f2a83916fc9bd208b153d4eb2a6fac0bfb3f4c64 SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9
-EBUILD cfg-update-1.8.9.ebuild 2975 BLAKE2B 40ac869ca667a8090a58a873ee46004ff6eff0aa2743233c4a58940ff71779320f3452da0f1a6df3272b9d19172b336ce7c1f712aeb66e52414dcaffa5ecdd15 SHA512 163b354dcdc84e8747a1b93b44adb650ae183cbe19a160972e3ce45069d3757c0b3c0699a9f344fecaedf65c76d05fbb6e5f041dc679f8f8f9b018829f43fbd0
-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
deleted file mode 100644
index 66b2498efec6..000000000000
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Easy to use GUI & CLI alternative for etc-update"
-HOMEPAGE="https://github.com/rich0/cfg-update"
-SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="X"
-
-RDEPEND="
-	dev-perl/TermReadKey
-	X? (
-		>=x11-misc/sux-1.0
-		x11-apps/xhost
-		)"
-
-S="${WORKDIR}/rich0-cfg-update-2f10786"
-
-pkg_prerm() {
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Disabling portage hook"
-		cfg-update --ebuild --disable-portage-hook
-		eend $?
-		ebegin "Disabling paludis hook"
-		cfg-update --ebuild --disable-paludis-hook
-		eend $?
-	fi
-}
-
-pkg_postrm() {
-	echo
-	ewarn "If you want to permanently remove cfg-update from your system"
-	ewarn "you should remove the index file /var/lib/cfg-update/checksum.index"
-	echo
-}
-
-src_install() {
-	dobin \
-		cfg-update emerge_with_indexing_for_cfg-update \
-		emerge_with_indexing_for_cfg-update_phphelper \
-		cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
-	insinto /usr/lib/cfg-update
-	doins cfg-update cfg-update_indexing test.tgz
-	dodoc ChangeLog
-	doman *.8
-	insinto /etc
-	doins cfg-update.conf cfg-update.hosts
-	keepdir /var/lib/cfg-update
-}
-
-pkg_postinst() {
-	if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
-		&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
-	then
-		ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
-		mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
-			"${ROOT}"/var/lib/cfg-update/checksum.index
-		eend $?
-	fi
-
-	if [[ -e "${ROOT}"/usr/bin/paludis ]]
-	then
-		echo
-		ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
-		ewarn "that you have some corrupted CONTENTS files on your system..."
-		echo
-		ewarn "Please run: cfg-update --check-packages"
-		echo
-		ewarn "The above command will check all packages installed with Paludis and"
-		ewarn "will output a list of packages that need to be re-installed with"
-		ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
-		ewarn "you risk losing your custom settings when updating configuration"
-		ewarn "files, that belong to these packages, with cfg-update!"
-		echo
-	fi
-
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Moving backups to /var/lib/cfg-update/backups"
-		/usr/bin/cfg-update --ebuild --move-backups
-		eend $?
-	fi
-
-	echo
-	einfo "If this is a first time install, please check the configuration"
-	einfo "in /etc/cfg-update.conf before using cfg-update:"
-	echo
-	einfo "If your system does not have an X-server installed you need to"
-	einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
-	einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
-	einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
-	echo
-	einfo "TIP: to maximize the chances of future automatic updates, run:"
-	einfo "cfg-update --optimize-backups"
-	echo
-}
diff --git a/app-portage/cfg-update/metadata.xml b/app-portage/cfg-update/metadata.xml
deleted file mode 100644
index 1864b4eb4ebf..000000000000
--- a/app-portage/cfg-update/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>rich0@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rich0/cfg-update</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/conf-update-1.0.3-r1 b/app-portage/conf-update-1.0.3-r1
new file mode 100644
index 000000000000..b85113e19db2
--- /dev/null
+++ b/app-portage/conf-update-1.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile prepare
+DEPEND=virtual/pkgconfig >=dev-libs/glib-2.6 sys-libs/ncurses:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) colordiff? ( app-misc/colordiff )
+DESCRIPTION=conf-update is a ncurses-based config management utility
+EAPI=5
+HOMEPAGE=https://gitweb.gentoo.org/proj/conf-update.git/
+IUSE=colordiff libressl
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.6 sys-libs/ncurses:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) colordiff? ( app-misc/colordiff )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/conf-update.git/snapshot/conf-update-1.0.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d0d561b6f6112db4a931a1f9e292f159
diff --git a/app-portage/conf-update/Manifest b/app-portage/conf-update/Manifest
deleted file mode 100644
index f216d6b89e54..000000000000
--- a/app-portage/conf-update/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST conf-update-1.0.3.tar.bz2 18296 BLAKE2B 7551b8de644bacf00764c8ad989cbf0c96be3ca4733a26b5f3083b3a9d26c3b8e1fe3525ccfc648aa9543bbc73ff6e3a949c5a3e7d59f71a008f73a720042f4d SHA512 7f20a4974f804d73729105d9abc0f3205a7574c6e2c6dbf020404f3161500b5ecc60d141e0833e9ae0f43a814591a74cd885a5033f50864bbcfb36ba452175b7
-EBUILD conf-update-1.0.3-r1.ebuild 885 BLAKE2B 37bfcec5276375d4a179dfa7264051192c0efe5fb0762329dee82ef8b219b2fcaebf151dc1a6d4667b9f18327ebec46aaf10f9147e92d69267b4f85059e0ff71 SHA512 9f1983417e066bd533ccceb808c42b08e3e89a5995aae0f41f066f51eb1b1621b41e771c28429bcc8a5e15853d8d06d54f7c145fbffe74f47ac432639117f667
-MISC metadata.xml 728 BLAKE2B ba7411d42f9f27d3016ea51286b26855e4aa5a3eafa25a385139b5c7e783e77becda429a1a4c17bae6b32c7b68c8ee56e432a470a757979d5de943051e53c300 SHA512 dd6ad3267044f17b5398a8cae02392196ba3fa6c0c413235033ae4fd8c842555a431a80647c93b2839db171892bd486ecdc95e04e2e58ce66289f8fc9c2764fe
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
deleted file mode 100644
index b599d25db4be..000000000000
--- a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="${PN} is a ncurses-based config management utility"
-HOMEPAGE="https://gitweb.gentoo.org/proj/conf-update.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="colordiff libressl"
-
-RDEPEND=">=dev-libs/glib-2.6
-		sys-libs/ncurses:0
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		colordiff? ( app-misc/colordiff )"
-DEPEND="virtual/pkgconfig
-		${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/\$Rev:.*\\$/${PVR}/" "${S}"/"${PN}".h || die
-	if use colordiff ; then
-		sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf  \ die 'colordiff-sed failed'
-	fi
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
deleted file mode 100644
index 3307947ef434..000000000000
--- a/app-portage/conf-update/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
-	<longdescription lang="en">
-		conf-update is a curses based tool for the Gentoo Linux portage system
-	</longdescription>
-	<longdescription lang="es">
-		conf-update es una herramienta basada en curses para el sistema portage de Gentoo Linux
-	</longdescription>
-	<use>
-		<flag name="colordiff">Use colors when displaying diffs (<pkg>app-misc/colordiff</pkg>)</flag>
-		<flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/app-portage/cpuid2cpuflags-1 b/app-portage/cpuid2cpuflags-1
new file mode 100644
index 000000000000..940d5e9547e1
--- /dev/null
+++ b/app-portage/cpuid2cpuflags-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v1/cpuinfo2cpuflags-1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=02203f9aad725e3b40b5b24318ae83a7
diff --git a/app-portage/cpuid2cpuflags-5 b/app-portage/cpuid2cpuflags-5
new file mode 100644
index 000000000000..67a340516765
--- /dev/null
+++ b/app-portage/cpuid2cpuflags-5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v5/cpuid2cpuflags-5.tar.bz2
+_md5_=58ea904b574263ab2331e4d14ce36522
diff --git a/app-portage/cpuid2cpuflags-9999 b/app-portage/cpuid2cpuflags-9999
new file mode 100644
index 000000000000..c1ad0f02e737
--- /dev/null
+++ b/app-portage/cpuid2cpuflags-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
+LICENSE=BSD-2
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=69a5013ef8a1b58603e2d3dad39e17f0
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
deleted file mode 100644
index ac9883907db3..000000000000
--- a/app-portage/cpuid2cpuflags/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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-5.ebuild 927 BLAKE2B 453e5761cb2477c2e5dfadcc829cf284f5f078012f94f7c78a9c494817c2f892a01f54f921a3311c15c9235fd8338b5ea86b3e2a9c1cf4b176b151a9d0c55616 SHA512 e63150b6223b2658f3c34dc26527cd82c4c29e74278a569e4ae7039f9f90baab4e41f986d8ece1d989a8c1759f325fea9df763310ba5a0a59c80a25b3ae419f8
-EBUILD cpuid2cpuflags-9999.ebuild 410 BLAKE2B db323508784e37a7f4220c8d192460e854ab54bccfcebb40826821335de6834e97460dd4bc6dfbe11fc6d650171fb76a0a9196bb1bf6af81a08db35afda2e466 SHA512 02a38010f453641b73461f5afb980b7e1cb1817f3a688064d699827d698f94a3f27a65f7c0dddb7be287694cfe426bbfdd5ec03714d3b777a4975a38e5561b69
-MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
deleted file mode 100644
index cc95afbc6f2f..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
+++ /dev/null
@@ -1,39 +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} pypy )
-
-inherit python-r1
-
-MY_PN=cpuinfo2cpuflags
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	python_foreach_impl python_newscript "${MY_PN}-x86"{.py,}
-}
-
-pkg_postinst() {
-	if has_version 'sys-apps/portage' \
-		&& ! has_version "sys-apps/portage[${PYTHON_USEDEP}]"
-	then
-		ewarn "Support for matching Python implementations should be enabled"
-		ewarn "on sys-apps/portage as well. Otherwise, cpuinfo2cpuflags won't"
-		ewarn "be able to figure out the correct repository location and will"
-		ewarn "require you to specify it explicitly."
-	fi
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
deleted file mode 100644
index cb1e96dd1c68..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
deleted file mode 100644
index 8e891b478ae5..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/cpuid2cpuflags"
-inherit autotools git-r3
-
-DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
deleted file mode 100644
index 422aab7218c1..000000000000
--- a/app-portage/cpuid2cpuflags/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="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mgorny/cpuid2cpuflags</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/deltup-0.4.6-r1 b/app-portage/deltup-0.4.6-r1
new file mode 100644
index 000000000000..63e9426cbf89
--- /dev/null
+++ b/app-portage/deltup-0.4.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/zlib app-arch/bzip2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+DESCRIPTION=Delta-Update - patch system for updating source-archives.
+EAPI=6
+HOMEPAGE=http://deltup.sourceforge.net
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib app-arch/bzip2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) || ( dev-util/bdelta =dev-util/xdelta-1* )
+SLOT=0
+SRC_URI=https://github.com/jjwhitney/Deltup/archive/v0.4.6.tar.gz -> deltup-0.4.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e7ddd24cd1928685b205098dd9699f7
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
deleted file mode 100644
index c03f973e6edf..000000000000
--- a/app-portage/deltup/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX deltup-0.4.6-cxx.patch 659 BLAKE2B 1005ff5439b96eda1f8106dc3620a00e343fd4df6f1736b9ca1b5fe6f06f8bafcc332852f7e51565179fccf8994515ce8dff19c6eb89b8263253e71132cdfdd5 SHA512 fae1d6c90a7458b0c4a7795a16ac794a506e2bd002be0be9e0772ef7a9f5174aeef35422d6ee1cca69e4dccc49b36dc732a3408d92d0c960e229935318d0033c
-AUX deltup-0.4.6-ldflags.patch 241 BLAKE2B 43091ce7b06d5b554183248b3e26732a00c0a7eccaaeaa7aa5dcdd4b2d11ca4f6cde707941545b9ecc13367152efd85e086f5ee94d8816ac967a79e5d29e01ad SHA512 e8b705bd581928b15523e6692648fb89f2bb0c15c565a7dee4d45292fae8aad88e9c6e83b29672825943c2bc15d8b151e57f603dd1c6577a62203249f1e96316
-DIST deltup-0.4.6.tar.gz 14869 BLAKE2B d0332eca70da268f0f85718bf08f8b19da7e7e8a1868d6bb4b2edd386d498f61342538234defebbc0430cc176da13b57efc11ecd62f300eef960b62e738d3147 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a
-EBUILD deltup-0.4.6-r1.ebuild 915 BLAKE2B 1651ccaa2f0a066f166d75417f532100bc4aca577e17b82dcfbea34f4f4026417d9b0b8dd327e381422441ede4b3b2bc07f0876bcbd52a2ff424d46b2f15ba1d SHA512 e41bb9abe643fb6961f6b99081b318208430b6f03ada7e196bad9dd388ed7ea4a1a31b94fd12bcda1dae212c125a40c075efb8a0208a69667833e82ef032a46f
-MISC metadata.xml 529 BLAKE2B 32728c366ecf7e40a84e875ba3dc2e6e181faa241939ed343e23257ac7120008ec86718495a4e7866aa7037b99143360df13253bd4f8fbffd6abc78aecda7fb9 SHA512 453e074a02cbd112c17da0b4726a15f4f98ae3dd1d73b454dd09775c2db4d792a9687920c0a647940e810e4bce623b59f793dc66bf9f33d697ed3bb8cdc77790
diff --git a/app-portage/deltup/deltup-0.4.6-r1.ebuild b/app-portage/deltup/deltup-0.4.6-r1.ebuild
deleted file mode 100644
index 9c4ebf21a658..000000000000
--- a/app-portage/deltup/deltup-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Delta-Update - patch system for updating source-archives."
-HOMEPAGE="http://deltup.sourceforge.net"
-SRC_URI="https://github.com/jjwhitney/Deltup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_PN="Deltup"
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="libressl"
-
-DEPEND="
-	sys-libs/zlib
-	app-arch/bzip2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-RDEPEND="${DEPEND}
-	|| ( dev-util/bdelta =dev-util/xdelta-1* )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.6-ldflags.patch
-	"${FILESDIR}"/${PN}-0.4.6-cxx.patch
-)
-
-src_compile () {
-	emake CXX=$(tc-getCXX)
-}
-
-src_install () {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc "${S}"/../{README,ChangeLog}
-	doman "${S}"/../deltup.1
-}
diff --git a/app-portage/deltup/files/deltup-0.4.6-cxx.patch b/app-portage/deltup/files/deltup-0.4.6-cxx.patch
deleted file mode 100644
index 6a07dc1ee0a1..000000000000
--- a/app-portage/deltup/files/deltup-0.4.6-cxx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6a3aa95..a591a6f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,3 +7,3 @@ CC = g++
- objfiles=bpatch.o archfunc.o file.o system.o tmpstore.o deltup.o 
--libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
-+libs=-lz -lbz2 -lcrypto #-lssl
- 
-@@ -12,3 +12,3 @@ libs=-lstdc++ -lz -lbz2 -lcrypto #-lssl
- %.o : %.cpp
--	${CC} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
-+	${CXX} -c $< -o $@ ${CXXFLAGS} #-g #-Wall -pedantic
- 
-@@ -17,6 +17,6 @@ all: deltup
- depend:
--	gcc -MM *.cpp > .depend
-+	${CXX} -MM *.cpp > .depend
- 	
- deltup: $(objfiles)
--	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
-+	${CXX} $(objfiles) ${LDFLAGS} -o deltup $(libs)
- 
diff --git a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch b/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
deleted file mode 100644
index 0d06255abcd2..000000000000
--- a/app-portage/deltup/files/deltup-0.4.6-ldflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6a3aa95..6e7c5cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,3 +20,3 @@ depend:
- deltup: $(objfiles)
--	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
-+	${CC} $(objfiles) ${LDFLAGS} -o deltup $(libs)
- 
diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
deleted file mode 100644
index b61ab2084920..000000000000
--- a/app-portage/deltup/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>Ameretat.Reith@gmail.com</email>
-    <name>Ameretat 'reith' Reith</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jjwhitney/Deltup</remote-id>
-    <remote-id type="sourceforge">deltup</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/demerge-0.047-r3 b/app-portage/demerge-0.047-r3
new file mode 100644
index 000000000000..ab452abee414
--- /dev/null
+++ b/app-portage/demerge-0.047-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=dev-lang/perl >=dev-perl/PortageXS-0.02.10-r3 virtual/perl-Term-ANSIColor dev-perl/TermReadKey dev-perl/Shell-EnvImporter
+DESCRIPTION=demerge - revert to previous installation states
+EAPI=6
+HOMEPAGE=http://download.mpsna.de/opensource/demerge/
+KEYWORDS=alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl >=dev-perl/PortageXS-0.02.10-r3 virtual/perl-Term-ANSIColor dev-perl/TermReadKey dev-perl/Shell-EnvImporter || ( sys-apps/portage sys-apps/portage-mgorny )
+SLOT=0
+SRC_URI=http://download.mpsna.de/opensource/demerge/demerge-0.047.tar.gz
+_md5_=6e1ea22d0c04ae4830ebb3b6c8e5f5a9
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
deleted file mode 100644
index 6f260abf0321..000000000000
--- a/app-portage/demerge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r3.ebuild 1364 BLAKE2B 8bac5b8fbbdabe89a6e717cde3fbff04110c5ebfa470d2c90e22a75c8df542a6cdc38e2ead434417ef3a1ba19b9ac528de856cf7cfb09847fddc8c3cbf75b272 SHA512 1110ea8a530420726e16673d9043bada92f11b15200df7b86f39dc92eb6d7f17336621551c5037eda1a4c4233ffadc33835c1668ada324ea6425cc6ad84825c2
-MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
deleted file mode 100644
index 980b9722183b..000000000000
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DESCRIPTION="demerge - revert to previous installation states"
-HOMEPAGE="http://download.mpsna.de/opensource/demerge/"
-SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/PortageXS-0.02.10-r3
-		virtual/perl-Term-ANSIColor
-		dev-perl/TermReadKey
-		dev-perl/Shell-EnvImporter"
-RDEPEND="${DEPEND}
-		|| (
-			sys-apps/portage
-			sys-apps/portage-mgorny
-		)"
-
-src_prepare() {
-	# Fix path for new make.conf location
-	sed -i -e 's:/etc/make.conf:/etc/portage/make.conf:g' demerge
-	default
-}
-
-src_install() {
-	dobin demerge || die
-	dodoc Changelog
-	doman demerge.3
-}
-
-pkg_postinst() {
-	if [ ! -e /etc/portage/postsync.d/demerge-record ]; then
-		mkdir -p /etc/portage/postsync.d/
-		echo '[ -x /usr/bin/demerge ] && /usr/bin/demerge --postsync' > /etc/portage/postsync.d/demerge-record
-		elog "/etc/portage/postsync.d/demerge-record has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x /etc/portage/postsync.d/demerge-record"
-		elog "If ever you find this to be an inconvenience simply chmod -x /etc/portage/postsync.d/demerge-record"
-	fi
-
-}
diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
deleted file mode 100644
index 93ad16625584..000000000000
--- a/app-portage/demerge/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kentnl@gentoo.org</email>
-		<name>Kent Fredric</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		demerge makes it easy to revert to previous installation states.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-portage/diffmask-0.3.3-r4 b/app-portage/diffmask-0.3.3-r4
new file mode 100644
index 000000000000..621f33c5f861
--- /dev/null
+++ b/app-portage/diffmask-0.3.3-r4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/diffmask/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=88a23eedaab727a9cbda3574b84d2512
diff --git a/app-portage/diffmask-9999 b/app-portage/diffmask-9999
new file mode 100644
index 000000000000..0e6af2534fdb
--- /dev/null
+++ b/app-portage/diffmask-9999
@@ -0,0 +1,12 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/diffmask/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f7ec2871488267c0f4c8a9233a75c692
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
deleted file mode 100644
index a7000c5814d2..000000000000
--- a/app-portage/diffmask/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
-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
deleted file mode 100644
index 80b09bc47ee5..000000000000
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
deleted file mode 100644
index 8c0f4525f829..000000000000
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
deleted file mode 100644
index a7831157d057..000000000000
--- a/app-portage/diffmask/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<longdescription>
-		A utility to maintain a package.unmask file consisting of entries
-		copied from package.mask files. It can (try to) automatically find
-		entries unmasking specific packages, update existing package.unmask
-		entries (e.g. unmasking additional packages as they are appended to
-		the mask entries) and remove old unmasks.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
-		<remote-id type="github">mgorny/diffmask</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/distpatch-0.1.2-r1 b/app-portage/distpatch-0.1.2-r1
new file mode 100644
index 000000000000..ca98eae8f42d
--- /dev/null
+++ b/app-portage/distpatch-0.1.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=sys-apps/portage-2.1.8.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/snakeoil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Distfile Patching Support for Gentoo Linux (tools)
+EAPI=6
+HOMEPAGE=https://github.com/rafaelmartins/distpatch
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=sys-apps/portage-2.1.8.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/snakeoil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/diffball-1.0.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.1.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5da1b28dd2e1514a519ded2e3707d42c
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
deleted file mode 100644
index 5427caf04439..000000000000
--- a/app-portage/distpatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2-r1.ebuild 689 BLAKE2B 8d2a423f86303ba72d6bb7fee48a299ae634da7962648febfb3d66addbdbb5bd16006a3984339121a652579a32783a627efa5ef0bfe96af1cb24359296347f8c SHA512 1df97a296228ff408ff7643b8584402f8e49c94db6f695fec41408f34501ca00f46bbde8459adadd065bc0833817103264a6753e2b2a4c75400f3e8a8907eaf7
-MISC metadata.xml 489 BLAKE2B 8e711ca92c6c71f69ad71dbe4253ea4ff8444c5122e408c404d0adfa9b0cbcbe61df31a9ef7f58564109a4a655bcf3fe9d4cbb1e1c5b3d5b7bfff0318355f149 SHA512 bf9e190068b60e9bcf3a857a38a155c7189d0ea00a098e2df94b152218157c03f936ab15e00038edc09aa9583cba1711a57e1a9ef17edb794fef59372b35f08a
diff --git a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild b/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
deleted file mode 100644
index 5c369d66145e..000000000000
--- a/app-portage/distpatch/distpatch-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
-HOMEPAGE="https://github.com/rafaelmartins/distpatch"
-SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	|| (
-		>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	dev-python/snakeoil[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-util/diffball-1.0.1"
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
deleted file mode 100644
index 523e39992295..000000000000
--- a/app-portage/distpatch/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>rafaelmartins@gentoo.org</email>
-    <name>Rafael G. Martins</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>rafaelmartins@gentoo.org</email>
-      <name>Rafael G. Martins</name>
-    </maintainer>
-    <remote-id type="github">rafaelmartins/distpatch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/eclass-manpages-20180302 b/app-portage/eclass-manpages-20180302
new file mode 100644
index 000000000000..dd7a7cfa76a0
--- /dev/null
+++ b/app-portage/eclass-manpages-20180302
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eclass-manpages-20180302.tar.xz
+_md5_=7055515431463f8d06a98806326af95d
diff --git a/app-portage/eclass-manpages-20180607 b/app-portage/eclass-manpages-20180607
new file mode 100644
index 000000000000..767da4bf55dd
--- /dev/null
+++ b/app-portage/eclass-manpages-20180607
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20180607.tar.xz
+_md5_=67fa76893182bede29925cbe32215518
diff --git a/app-portage/eclass-manpages-99999999 b/app-portage/eclass-manpages-99999999
new file mode 100644
index 000000000000..e6a24f9ab883
--- /dev/null
+++ b/app-portage/eclass-manpages-99999999
@@ -0,0 +1,8 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny )
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+LICENSE=GPL-2
+SLOT=0
+_md5_=6d2c0aecb4412449dfb3e08d6bdff741
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
deleted file mode 100644
index fba9a773d098..000000000000
--- a/app-portage/eclass-manpages/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
-AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a98f1c1fba86feb807792ba8ae52420b3ab4b5296c6dbd42af597e591ce928c19b26c5fc80be09202973c3 SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c
-DIST eclass-manpages-20180302.tar.xz 454568 BLAKE2B 2d09a44e33efe0a302d4bdfaa3189e6ca0d373c84518e58bfb62824c00f83e865660c42cb0df597902d253241d9cbdac468add16ad19f94edd925460701c9f4f SHA512 17878001c9d70c69b9260541ac87cf642da0f0c5adbb77b3df2f614331e29af6af90b64950c9d95a2bc76d4b24180b46575d02a602956b721e3b03b93ee251e0
-DIST eclass-manpages-20180607.tar.xz 435652 BLAKE2B 42070a7b09681c0337a223684a2d1993aa79f7ecf02fa06597780ea1cdfc00b591191d583e3f948a7b962a63b31841287c2a8078e045074ab6d7e1af9f999569 SHA512 4a002e7dfb0436efb661d929291ada0c0802f595637fd3b77d99a1d803cc24329a3793eaf13e74dc470c67168cdc5452316bea8f78a95c1a3ee608aa5eb8b0cf
-EBUILD eclass-manpages-20180302.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
-EBUILD eclass-manpages-20180607.ebuild 1087 BLAKE2B f8e430423d389e06cfec6689539e28dbdcf61be418786df4aafd63314397c5b62383781fa8c2cfbd0b4bbeecf34ae401ecb092c8fd503f53e1513319abca6b4b SHA512 25b0db417330fb5c5caed47d9bafb7c0b4cc15c8c6d813db72ddd7264f201e246617305609e992f4d67dd130bd5f081cfdcb51438fc4370a9fec78a570e2b24d
-EBUILD eclass-manpages-99999999.ebuild 954 BLAKE2B 654df18ee7a23338c3d87fbe1e545858aa8ef64bec0cc54e5795f7431e513776d1d40d136ffbd0061aedd63f956bb49e118f1f82de38acfdb80f3abc77125612 SHA512 ac8ecd64716f06e3130345e45b5d5ee2c5c339dac5429d0d765bfac0c50dcab433a6d210c5b425fd52c516ee2af8fb9cc47888b0a398da8fe0f85adb09409be9
-MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild
deleted file mode 100644
index ba2852161332..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/distfiles/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
deleted file mode 100644
index db10d2aba060..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
deleted file mode 100644
index ea11ad476084..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)"
-
-S=${WORKDIR}
-
-genit() {
-	local e=${1:-${ECLASSDIR}}
-	einfo "Generating man pages from: ${e}"
-	# Need `bash` because the .sh isn't +x on the servers #451352
-	env ECLASSDIR=${e} bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_compile() {
-	# First process any eclasses found in overlays.  Then process
-	# the main eclassdir last so that its output will clobber anything
-	# that might have come from overlays.  Main tree wins!
-	local o e
-	for o in $(portageq get_repos /) ; do
-		e="$(portageq get_repo_path / ${o})/eclass"
-		[[ -d ${e} ]] || continue
-		genit "${e}" || die
-	done
-	genit || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
deleted file mode 100644
index b40eaf112091..000000000000
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This awk converts the comment documentation found in eclasses
-# into man pages for easier/nicer reading.
-#
-# If you wish to have multiple paragraphs in a description, then
-# create empty comment lines.  Paragraph parsing ends when the comment
-# block does.
-
-# The format of the eclass description:
-# @ECLASS: foo.eclass
-# @MAINTAINER:
-# <required; list of contacts, one per line>
-# @AUTHOR:
-# <optional; list of authors, one per line>
-# @BUGREPORTS:
-# <optional; description of how to report bugs;
-#  default: tell people to use bugs.gentoo.org>
-# @VCSURL: <optional; url to vcs for this eclass; default: https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@>
-# @SUPPORTED_EAPIS: <optional; space-separated list of EAPIs>
-# @BLURB: <required; short description>
-# @DESCRIPTION:
-# <optional; long description>
-# @EXAMPLE:
-# <optional; example usage>
-
-# The format of functions:
-# @FUNCTION: foo
-# @USAGE: <required arguments to foo> [optional arguments to foo]
-# @RETURN: <whatever foo returns>
-# @MAINTAINER:
-# <optional; list of contacts, one per line>
-# [@INTERNAL]
-# @DESCRIPTION:
-# <required if no @RETURN; blurb about this function>
-
-# The format of function-specific variables:
-# @VARIABLE: foo
-# [@USER_VARIABLE] (set in make.conf, not ebuilds)
-# [@INTERNAL] (internal eclass use variable)
-# [@DEFAULT_UNSET]
-# [@REQUIRED]
-# @DESCRIPTION:
-# <required; blurb about this variable>
-# foo="<default value>"
-
-# The format of eclass variables:
-# @ECLASS-VARIABLE: foo
-# [@PRE_INHERIT] (the variable must be set before inheriting the eclass)
-# [@USER_VARIABLE] (set in make.conf, not ebuilds)
-# [@OUTPUT_VARIABLE] (set by eclass, to be read in ebuilds)
-# [@INTERNAL] (internal eclass use variable)
-# [@DEFAULT_UNSET]
-# [@REQUIRED]
-# @DESCRIPTION:
-# <required; blurb about this variable>
-# foo="<default value>"
-
-# Disable manpage generation:
-# @DEAD
-
-# Common features:
-# @CODE
-# In multiline paragraphs, you can create chunks of unformatted
-# code by using this marker at the start and end.
-# @CODE
-#
-# @ROFF <some roff macros>
-# If you want a little more manual control over the formatting, you can
-# insert roff macros directly into the output by using the @ROFF escape.
-
-function _stderr_msg(text, type,   file, cnt) {
-	if (_stderr_header_done != 1) {
-		cnt = split(FILENAME, file, /\//)
-		print "\n" file[cnt] ":" > "/dev/stderr"
-		_stderr_header_done = 1
-	}
-
-	print "   " type ":" NR ": " text > "/dev/stderr"
-}
-function warn(text) {
-	_stderr_msg(text, "warning")
-}
-function fail(text) {
-	_stderr_msg(text, "error")
-	exit(1)
-}
-function xfail(text) {
-	_stderr_msg(text, "error (ignoring)")
-	exit(77)
-}
-
-function eat_line() {
-	ret = $0
-	sub(/^# @[A-Z]*:[[:space:]]*/,"",ret)
-	getline
-	return ret
-}
-function eat_paragraph() {
-	code = 0
-	ret = ""
-	getline
-	while ($0 ~ /^#/) {
-		# Only allow certain tokens in the middle of paragraphs
-		if ($2 ~ /^@/ && $2 !~ /^@(CODE|ROFF)$/)
-			break
-
-		sub(/^#[[:space:]]?/, "", $0)
-
-		# Escape . at start of line #420153
-		if ($0 ~ /^[.]/)
-			$0 = "\\&" $0
-
-		# Translate @CODE into @ROFF
-		if ($1 == "@CODE" && NF == 1) {
-			if (code)
-				$0 = "@ROFF .fi"
-			else
-				$0 = "@ROFF .nf"
-			code = !code
-		}
-
-		# Allow people to specify *roff commands directly
-		if ($1 == "@ROFF")
-			sub(/^@ROFF[[:space:]]*/, "", $0)
-
-		ret = ret "\n" $0
-
-		# Handle the common case of trailing backslashes in
-		# code blocks to cross multiple lines #335702
-		if (code && $NF == "\\")
-			ret = ret "\\"
-		getline
-	}
-	sub(/^\n/,"",ret)
-	return ret
-}
-
-function pre_text(p) {
-	return ".nf\n" p "\n.fi"
-}
-
-function man_text(p) {
-	return gensub(/-/, "\\-", "g", p)
-}
-
-#
-# Handle an @ECLASS block
-#
-function handle_eclass() {
-	eclass = $3
-	eclass_maintainer = ""
-	eclass_author = ""
-	supported_eapis = ""
-	blurb = ""
-	desc = ""
-	example = ""
-
-	# Sanity check the eclass name. #537392
-	if (eclass !~ /[.]eclass$/)
-		fail(eclass ": @ECLASS name is missing a '.eclass' suffix")
-
-	# first the man page header
-	print ".\\\" -*- coding: utf-8 -*-"
-	print ".\\\" ### DO NOT EDIT THIS FILE"
-	print ".\\\" ### This man page is autogenerated by eclass-to-manpage.awk"
-	print ".\\\" ### based on comments found in " eclass
-	print ".\\\""
-	print ".\\\" See eclass-to-manpage.awk for documentation on how to get"
-	print ".\\\" your eclass nicely documented as well."
-	print ".\\\""
-	print ".TH \"" toupper(eclass) "\" 5 \"" strftime("%b %Y") "\" \"Portage\" \"portage\""
-
-	# now eat the global data
-	getline
-	if ($2 == "@MAINTAINER:")
-		eclass_maintainer = eat_paragraph()
-	if ($2 == "@AUTHOR:")
-		eclass_author = eat_paragraph()
-	if ($2 == "@BUGREPORTS:")
-		reporting_bugs = eat_paragraph()
-	if ($2 == "@VCSURL:")
-		vcs_url = eat_line()
-	if ($2 == "@SUPPORTED_EAPIS:")
-		supported_eapis = eat_line()
-	if ($2 == "@BLURB:")
-		blurb = eat_line()
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-	if ($2 == "@EXAMPLE:")
-		example = eat_paragraph()
-	# in case they typo-ed the keyword, bail now
-	if ($2 ~ /^@/)
-		fail(eclass ": unknown keyword " $2)
-
-	# finally display it
-	print ".SH \"NAME\""
-	print eclass " \\- " man_text(blurb)
-	if (desc != "") {
-		print ".SH \"DESCRIPTION\""
-		print man_text(desc)
-	}
-	if (example != "") {
-		print ".SH \"EXAMPLE\""
-		print man_text(example)
-	}
-
-	# sanity checks
-	if (blurb == "")
-		fail(eclass ": no @BLURB found")
-	if (eclass_maintainer == "")
-		warn(eclass ": no @MAINTAINER found")
-}
-
-#
-# Handle a @FUNCTION block
-#
-function show_function_header() {
-	if (_function_header_done != 1) {
-		print ".SH \"FUNCTIONS\""
-		_function_header_done = 1
-	}
-}
-function handle_function() {
-	func_name = $3
-	usage = ""
-	funcret = ""
-	maintainer = ""
-	internal = 0
-	desc = ""
-
-	# make sure people haven't specified this before (copy & paste error)
-	if (all_funcs[func_name])
-		fail(eclass ": duplicate definition found for function: " func_name)
-	all_funcs[func_name] = func_name
-
-	# grab the docs
-	getline
-	if ($2 == "@USAGE:")
-		usage = eat_line()
-	if ($2 == "@RETURN:")
-		funcret = eat_line()
-	if ($2 == "@MAINTAINER:")
-		maintainer = eat_paragraph()
-	if ($2 == "@INTERNAL") {
-		internal = 1
-		getline
-	}
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-
-	if (internal == 1)
-		return
-
-	show_function_header()
-
-	# now print out the stuff
-	print ".TP"
-	print "\\fB" func_name "\\fR " man_text(usage)
-	if (desc != "")
-		print man_text(desc)
-	if (funcret != "") {
-		if (desc != "")
-			print ""
-		print "Return value: " funcret
-	}
-
-	if (blurb == "")
-		fail(func_name ": no @BLURB found")
-	if (desc == "" && funcret == "")
-		fail(func_name ": no @DESCRIPTION found")
-}
-
-#
-# Handle @VARIABLE and @ECLASS-VARIABLE blocks
-#
-function _handle_variable() {
-	var_name = $3
-	desc = ""
-	val = ""
-	default_unset = 0
-	internal = 0
-	required = 0
-
-	# additional variable classes
-	pre_inherit = 0
-	user_variable = 0
-	output_variable = 0
-
-	# make sure people haven't specified this before (copy & paste error)
-	if (all_vars[var_name])
-		fail(eclass ": duplicate definition found for variable: " var_name)
-	all_vars[var_name] = var_name
-
-	# grab the optional attributes
-	opts = 1
-	while (opts) {
-		getline
-		if ($2 == "@DEFAULT_UNSET")
-			default_unset = 1
-		else if ($2 == "@INTERNAL")
-			internal = 1
-		else if ($2 == "@REQUIRED")
-			required = 1
-		else if ($2 == "@PRE_INHERIT")
-			pre_inherit = 1
-		else if ($2 == "@USER_VARIABLE")
-			user_variable = 1
-		else if ($2 == "@OUTPUT_VARIABLE")
-			output_variable = 1
-		else
-			opts = 0
-	}
-	if ($2 == "@DESCRIPTION:")
-		desc = eat_paragraph()
-
-	# extract the default variable value
-	# first try var="val"
-	op = "="
-	regex = "^.*" var_name "=(.*)$"
-	val = gensub(regex, "\\1", 1, $0)
-	if (val == $0) {
-		# next try : ${var:=val}
-		op = "?="
-		regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}"
-		val = gensub(regex, "\\1", 1, $0)
-		if (val == $0) {
-			if (default_unset + required + internal + output_variable == 0)
-				warn(var_name ": unable to extract default variable content: " $0)
-			val = ""
-		} else if (val !~ /^["']/ && val ~ / /) {
-			if (default_unset == 1)
-				warn(var_name ": marked as unset, but has value: " val)
-			val = "\"" val "\""
-		}
-	}
-	if (length(val))
-		val = " " op " \\fI" val "\\fR"
-	if (required == 1)
-		val = val " (REQUIRED)"
-	# TODO: group variables using those classes
-	if (pre_inherit == 1)
-		val = val " (SET BEFORE INHERIT)"
-	if (user_variable == 1)
-		val = val " (USER VARIABLE)"
-	if (output_variable == 1)
-		val = val " (GENERATED BY ECLASS)"
-
-	# check for invalid combos
-	if (internal + pre_inherit + user_variable + output_variable > 1)
-		fail(var_name ": multiple variable classes specified")
-
-	if (internal == 1)
-		return ""
-
-	# now accumulate the stuff
-	ret = \
-		".TP" "\n" \
-		"\\fB" var_name "\\fR" val "\n" \
-		man_text(desc)
-
-	if (desc == "")
-		fail(var_name ": no @DESCRIPTION found")
-
-	return ret
-}
-function handle_variable() {
-	show_function_header()
-	ret = _handle_variable()
-	if (ret == "")
-		return
-	print ret
-}
-function handle_eclass_variable() {
-	ret = _handle_variable()
-	if (ret == "")
-		return
-	if (eclass_variables != "")
-		eclass_variables = eclass_variables "\n"
-	eclass_variables = eclass_variables ret
-}
-
-#
-# Spit out the common footer of manpage
-#
-function handle_footer() {
-	if (eclass_variables != "") {
-		print ".SH \"ECLASS VARIABLES\""
-		print man_text(eclass_variables)
-	}
-	if (eclass_author != "") {
-		print ".SH \"AUTHORS\""
-		print pre_text(man_text(eclass_author))
-	}
-	if (eclass_maintainer != "") {
-		print ".SH \"MAINTAINERS\""
-		print pre_text(man_text(eclass_maintainer))
-	}
-	print ".SH \"REPORTING BUGS\""
-	print reporting_bugs
-	print ".SH \"FILES\""
-	print ".BR " eclass
-	print ".SH \"SEE ALSO\""
-	print ".BR ebuild (5)"
-	print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url))
-}
-
-#
-# Init parser
-#
-BEGIN {
-	state = "header"
-	reporting_bugs = "Please report bugs via https://bugs.gentoo.org/"
-	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
-}
-
-#
-# Main parsing routine
-#
-{
-	if (state == "header") {
-		if ($0 ~ /^# @ECLASS:/) {
-			handle_eclass()
-			state = "funcvar"
-		} else if ($0 == "# @DEAD") {
-			eclass = "dead"
-			exit(77)
-		} else if ($0 == "# @eclass-begin") {
-			# White list old eclasses that haven't been updated so we can block
-			# new ones from being added to the tree.
-			if (eclass == "")
-				xfail("java documentation not supported")
-			fail("java documentation not supported")
-		} else if ($0 ~ /^# @/)
-			warn("Unexpected tag in \"" state "\" state: " $0)
-	} else if (state == "funcvar") {
-		if ($0 ~ /^# @FUNCTION:/)
-			handle_function()
-		else if ($0 ~ /^# @VARIABLE:/)
-			handle_variable()
-		else if ($0 ~ /^# @ECLASS-VARIABLE:/)
-			handle_eclass_variable()
-		else if ($0 ~ /^# @/)
-			warn("Unexpected tag in \"" state "\" state: " $0)
-	}
-}
-
-#
-# Tail end
-#
-END {
-	if (eclass == "")
-		xfail("eclass not documented yet (no @ECLASS found)")
-	else if (eclass != "dead")
-		handle_footer()
-}
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
deleted file mode 100755
index 5f389390d60e..000000000000
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-: ${ECLASSDIR:=${0%/*}/../../../eclass}
-: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files}
-
-AWK="gawk"
-while [[ $# -gt 0 ]] ; do
-	case $1 in
-	-e) ECLASSDIR=$2; shift;;
-	-f) FILESDIR=$2; shift;;
-	-d) AWK="dgawk";;
-	*) break;;
-	esac
-	shift
-done
-
-if [[ ! -d ${ECLASSDIR} ]] ; then
-	echo "Usage: ${0##*/} [-e eclassdir] [-f eclass-to-manpage.awk FILESDIR] [eclasses]" 1>&2
-	exit 1
-fi
-
-[[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass
-
-ret=0
-for e in "$@" ; do
-	set -- \
-	${AWK} \
-		-f "${FILESDIR}"/eclass-to-manpage.awk \
-		${e}
-	if [[ ${AWK} == "gawk" ]] ; then
-		"$@" > ${e##*/}.5
-		tret=$?
-		if [[ ${tret} -ne 0 ]] ; then
-			rm -f ${e##*/}.5
-			if [[ ${tret} -ne 77 ]] ; then
-				echo "FAIL: ${e}"
-				ret=1
-			fi
-		fi
-	else
-		"$@"
-	fi
-done
-exit ${ret}
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
deleted file mode 100644
index adfe3aaf03f3..000000000000
--- a/app-portage/eclass-manpages/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/eix-0.32.9 b/app-portage/eix-0.32.9
new file mode 100644
index 000000000000..16c69e0ae1c7
--- /dev/null
+++ b/app-portage/eix-0.32.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Search and query ebuilds
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug doc nls sqlite
+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
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.32.9/eix-0.32.9.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dc61ba2f28d81bdf2e91a4f87cb8d325
diff --git a/app-portage/eix-0.33.0-r1 b/app-portage/eix-0.33.0-r1
new file mode 100644
index 000000000000..79cf5b2ca3dc
--- /dev/null
+++ b/app-portage/eix-0.33.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Search and query ebuilds
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug doc nls sqlite
+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
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.0/eix-0.33.0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3738359504d38c8106174cd36b237863
diff --git a/app-portage/eix-0.33.2 b/app-portage/eix-0.33.2
new file mode 100644
index 000000000000..193ee058d0fd
--- /dev/null
+++ b/app-portage/eix-0.33.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Search and query ebuilds
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug doc nls sqlite
+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
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.2/eix-0.33.2.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3738359504d38c8106174cd36b237863
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
deleted file mode 100644
index 7a9ef23b2ced..000000000000
--- a/app-portage/eix/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
-DIST eix-0.33.0.tar.xz 610600 BLAKE2B 484d70c3efcceebf54f2a2e0af69b701716d6c6c45aa867a8cc372b135db29bb1bf23cf0efa6d3d2a19224255113229fa30cdd40ab4d64f226eafa73991daa96 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2
-DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
-EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
-EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
-EBUILD eix-0.33.2.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
-MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
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.0-r1.ebuild b/app-portage/eix/eix-0.33.0-r1.ebuild
deleted file mode 100644
index 3f61ef866261..000000000000
--- a/app-portage/eix/eix-0.33.0-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++11
-
-	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
deleted file mode 100644
index 3f61ef866261..000000000000
--- a/app-portage/eix/eix-0.33.2.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++11
-
-	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/metadata.xml b/app-portage/eix/metadata.xml
deleted file mode 100644
index f07795f51987..000000000000
--- a/app-portage/eix/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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 type="person">
-    <email>martin@mvath.de</email>
-    <name>Martin Väth</name>
-    <description>Upstream developer, CC on bugs, do not copy ebuilds
-      from his overlay</description>
-  </maintainer>
-  <use>
-    <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
-    <flag name="doc">Create description of the eix cache file additionally in html format</flag>
-    <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">vaeth/eix</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/elogv-0.7.6.1-r1 b/app-portage/elogv-0.7.6.1-r1
new file mode 100644
index 000000000000..44f3316864d9
--- /dev/null
+++ b/app-portage/elogv-0.7.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.1.tar.gz -> elogv-0.7.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7426251a67ef09c68df05077b8ad2b47
diff --git a/app-portage/elogv-0.7.6.2 b/app-portage/elogv-0.7.6.2
new file mode 100644
index 000000000000..d118bb60aea5
--- /dev/null
+++ b/app-portage/elogv-0.7.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.2.tar.gz -> elogv-0.7.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/app-portage/elogv-0.7.6.3 b/app-portage/elogv-0.7.6.3
new file mode 100644
index 000000000000..a8ab1596d011
--- /dev/null
+++ b/app-portage/elogv-0.7.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.3.tar.gz -> elogv-0.7.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/app-portage/elogv-0.7.6.4 b/app-portage/elogv-0.7.6.4
new file mode 100644
index 000000000000..8f0c1092c8cc
--- /dev/null
+++ b/app-portage/elogv-0.7.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.4.tar.gz -> elogv-0.7.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/app-portage/elogv-0.7.6.5 b/app-portage/elogv-0.7.6.5
new file mode 100644
index 000000000000..899d0f9cdff4
--- /dev/null
+++ b/app-portage/elogv-0.7.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.5.tar.gz -> elogv-0.7.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/app-portage/elogv-0.7.6.6 b/app-portage/elogv-0.7.6.6
new file mode 100644
index 000000000000..e21f98a170f3
--- /dev/null
+++ b/app-portage/elogv-0.7.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.6.tar.gz -> elogv-0.7.6.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/app-portage/elogv-0.7.7.1 b/app-portage/elogv-0.7.7.1
new file mode 100644
index 000000000000..ae433ff7b4be
--- /dev/null
+++ b/app-portage/elogv-0.7.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.7.1.tar.gz -> elogv-0.7.7.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b80929507fa2de3887374f6600d99bf8
diff --git a/app-portage/elogv-0.7.8 b/app-portage/elogv-0.7.8
new file mode 100644
index 000000000000..efac2e58fe09
--- /dev/null
+++ b/app-portage/elogv-0.7.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Curses based utility to parse the contents of elogs created by Portage
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/elogv
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b80929507fa2de3887374f6600d99bf8
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
deleted file mode 100644
index e7e2dc7ac619..000000000000
--- a/app-portage/elogv/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-DIST elogv-0.7.6.1.tar.gz 17968 BLAKE2B dd2476932a83bc067d39f052d565e3a8fa0c6fd6e2c996b3706c1669f9da395793b5569676846e6704e32f7d56d42227640139629a97a11c095cb198f4591631 SHA512 c2ddea6189165262fae6968d9bb3b8e76f316d9696f07369552ae00eb48a49323232ea7d3609310cd0e440bd912e474dd396a71922dbf5c9f1ee587899ef859e
-DIST elogv-0.7.6.2.tar.gz 18206 BLAKE2B d32713c02d3cb49b9cee7121cda1dea51cdeb496ec859ca0954d0dc676726f3c7de80226b96e6d234d0a0c28e76b9d742a663c1a339b40c5e63d611f082a0d37 SHA512 5628a409346d6375f10a77a08eaef6a160abff385701232c78f5d02a9493f84c451a53f301940a96e177eb295198d05e9c3e2525ab89ad6565f0eca2f2b0102e
-DIST elogv-0.7.6.3.tar.gz 18424 BLAKE2B 8b62b278347ee25f2e45c87a98d0fcff34efe6aad1ae7927336ab28fd03945af0586f8aff316727f7d7ae4e0753f9c25d380bd24203dfecf8d0f2295b7665f5f SHA512 c9127a4770721bd66cd75cf197af9262f7764f8227c36a7229d597fcd9e8db52aeffb42bdcc7b0c0ff20bdcfc9d18b9a568b0456b71ec764a937b148f9893677
-DIST elogv-0.7.6.4.tar.gz 18481 BLAKE2B b7a81e5d736b589cbee3cffbcd0df64c76ba83b12946283771e3cc91a96902de6b4ba37b950f335df1698945ed873734c9117667b4de0f54f228555f4d27b688 SHA512 e9331438552a63c26afc3f16ed4877298bb976a242639c0aae506507570b68cc677bc6e491f0b293a1986579c9edbab769b8d63924f9b0a18ad1e5a222f4d388
-DIST elogv-0.7.6.5.tar.gz 19021 BLAKE2B 0b9f67357ac8fc617ca922a5de64da8559b98cd929d48ed8ba758f8e9a694c60c1e49c33d78aea8c4b5b5d7fc788595c56ff5903b9bc93f6cde5cd1128c6920b SHA512 4a596653ca1c1dc3c315cdf111ddf12d7af5514582da50bf659c48d063fd971c2466d1bd0e4fa1e92e71afaa9715024269cf7ed3a5969ce986742a2c5f648c4a
-DIST elogv-0.7.6.6.tar.gz 19362 BLAKE2B 79ab57c2e30e077731836a3137889c7093fbddd0c10e1e0f3da3160dbb801e928e93a01d3cceadc6fe21f11a8d1eeecad713e915c4cee3cd3ee8ef8255540960 SHA512 d044feecbbef17d676551e545dcc4e6e27779668371d40d891d53bb7187474f665a422a732a0e95246fbd9d689ddeca509a74b6ce677f3a50871878e12895cba
-DIST elogv-0.7.7.1.tar.gz 19437 BLAKE2B 07f39ce5363541020332d8af72fc9c3145ed1ba435bd37f1c0a8846a7e8831e55898c5a9eb65510e821a0f1067fc461c5b124db88600696cfeacdb74c77189cd SHA512 5a766e7ccf1da07795b111dbe45656203a54a6e9fe2aee12caa3ad4c28f122e4845274a4af45b492a34b93d316b241e1a1c33acfc7c366daa328563da04c165d
-DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
-EBUILD elogv-0.7.6.1-r1.ebuild 1600 BLAKE2B ea0deeb9e37125a411641216a09caf887e1b087f7de7b76bc6e4de314e18259e3c796007711533c96ce03cec0770e9ccc0b6668eb2ed5bd03e0d59a9128b4f02 SHA512 6f46ef4653736467ada2660007c2e7648430cb1fa1a5dbabe2932028e34de2e968d53fa6b974283448ac57a8a34053c26479addc88617decffec583eae29c9d1
-EBUILD elogv-0.7.6.2.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
-EBUILD elogv-0.7.6.3.ebuild 1604 BLAKE2B 79843abb72fd03926aaf766f130d97267aa2421a2b4c68c51b52c07151ce045a7590b0427478a65abd3afbbd41c10f69e55c9a1c49e9017afc3cc35a8ed18869 SHA512 818a5d0736eb2d89680e3269b66a12254ba1e05058a731b55f9d07bcf224df1004ea12bbccff911bef3acc65c499d8fa7e670adea2b5679273516b22f5abcd17
-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
-MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.6.1-r1.ebuild b/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
deleted file mode 100644
index 6627fbb857fc..000000000000
--- a/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.2.ebuild b/app-portage/elogv/elogv-0.7.6.2.ebuild
deleted file mode 100644
index fbd9e2a59bb3..000000000000
--- a/app-portage/elogv/elogv-0.7.6.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.3.ebuild b/app-portage/elogv/elogv-0.7.6.3.ebuild
deleted file mode 100644
index fbd9e2a59bb3..000000000000
--- a/app-portage/elogv/elogv-0.7.6.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.4.ebuild b/app-portage/elogv/elogv-0.7.6.4.ebuild
deleted file mode 100644
index fbd9e2a59bb3..000000000000
--- a/app-portage/elogv/elogv-0.7.6.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.5.ebuild b/app-portage/elogv/elogv-0.7.6.5.ebuild
deleted file mode 100644
index fbd9e2a59bb3..000000000000
--- a/app-portage/elogv/elogv-0.7.6.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.6.ebuild b/app-portage/elogv/elogv-0.7.6.6.ebuild
deleted file mode 100644
index fbd9e2a59bb3..000000000000
--- a/app-portage/elogv/elogv-0.7.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.7.1.ebuild b/app-portage/elogv/elogv-0.7.7.1.ebuild
deleted file mode 100644
index a47dbd42ebab..000000000000
--- a/app-portage/elogv/elogv-0.7.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.8.ebuild b/app-portage/elogv/elogv-0.7.8.ebuild
deleted file mode 100644
index a47dbd42ebab..000000000000
--- a/app-portage/elogv/elogv-0.7.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
deleted file mode 100644
index 1194e752228a..000000000000
--- a/app-portage/elogv/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sping@gentoo.org</email>
-    <name>Sebastian Pipping</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>tools-portage@gentoo.org</email>
-    <name>Gentoo Portage tools team</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gentoo/elogv</remote-id>
-  </upstream>
-</pkgmetadata>
-
diff --git a/app-portage/elogviewer-2.7-r2 b/app-portage/elogviewer-2.7-r2
new file mode 100644
index 000000000000..cff0c37bfe1d
--- /dev/null
+++ b/app-portage/elogviewer-2.7-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v2.7.tar.gz -> elogviewer-2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8b55d736080190ac845e1ce306c7bb39
diff --git a/app-portage/elogviewer-2.9 b/app-portage/elogviewer-2.9
new file mode 100644
index 000000000000..9c6799716d2b
--- /dev/null
+++ b/app-portage/elogviewer-2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=33d3c1463ce2ebec36bb841c8ac8e7c2
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
deleted file mode 100644
index b1f86b4e6bcf..000000000000
--- a/app-portage/elogviewer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-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
deleted file mode 100644
index c2a6997e1742..000000000000
--- a/app-portage/elogviewer/elogviewer-2.7-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	|| (
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
deleted file mode 100644
index a97ff3d045b8..000000000000
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	|| (
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
deleted file mode 100644
index 7144a8404ae4..000000000000
--- a/app-portage/elogviewer/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">elogviewer</remote-id>
-		<remote-id type="github">Synss/elogviewer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/elt-patches-20170317 b/app-portage/elt-patches-20170317
new file mode 100644
index 000000000000..4c9f181213a8
--- /dev/null
+++ b/app-portage/elt-patches-20170317
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of patches for libtool.eclass
+EAPI=6
+HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170317.tar.xz
+_md5_=be9e7e6d20526ba9b8b78242f2b85926
diff --git a/app-portage/elt-patches-20170422 b/app-portage/elt-patches-20170422
new file mode 100644
index 000000000000..d864c5a9a75a
--- /dev/null
+++ b/app-portage/elt-patches-20170422
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of patches for libtool.eclass
+EAPI=6
+HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin
+LICENSE=GPL-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170422.tar.xz
+_md5_=8f507b1b8e23e7bbb0eaeece34ad52a8
diff --git a/app-portage/elt-patches-20170815 b/app-portage/elt-patches-20170815
new file mode 100644
index 000000000000..7753eb707268
--- /dev/null
+++ b/app-portage/elt-patches-20170815
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of patches for libtool.eclass
+EAPI=6
+HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170815.tar.xz
+_md5_=0092e5ed03e8fd231fa4683ec889f35a
diff --git a/app-portage/elt-patches-20170826.1 b/app-portage/elt-patches-20170826.1
new file mode 100644
index 000000000000..5130ee31f324
--- /dev/null
+++ b/app-portage/elt-patches-20170826.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Collection of patches for libtool.eclass
+EAPI=6
+HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
+_md5_=453470093441c9b52fe24aab4ad1b0e0
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
deleted file mode 100644
index e124a433f9cb..000000000000
--- a/app-portage/elt-patches/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf97710fa28fa0744356ce5c1b52f1866c0683b80d7d5971288bbaaf88cce0ec717956904f2f5969f22a3f1d11a8444b3866a SHA512 28da9a214cd2bccebad45f464a414fedf80fc6b497d1f6b8f30a0a67570a614065ef67ce43316872d94a144de1a154ecd164a47009ebcd7d39128ccc2dd39618
-DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
-DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
-DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
-EBUILD elt-patches-20170317.ebuild 702 BLAKE2B ca4ead87686d025391adf43d12006e9fdeef59d6089b4bd2599d28dc14ecad5c3f288482dd34ab1ba0336466bec381dade42028fa5d64128d73e5dc66c8c2b3e SHA512 71ff8eb6a19d1e8e785b753587e426e64baf56ca215e2011b66fe8455fc40e6f6c8df1e3d0b037da1552ca94724fb2f29b14ea674a4e6c9d647ea3b8f16bc9eb
-EBUILD elt-patches-20170422.ebuild 825 BLAKE2B d652e8bea87970f26c4db1e26d525c4cd9700f6069e5e48f89ef2478b005cb0e3a3142a4ce0799b19a202ab4e18b5453b7d61d731095ca89f04f971b16801db7 SHA512 8c1f168c3fc9088d6d3e24be3584c44068562d59ac7e9240ba0dcabc616355efcaa22bde1bc5ba689a12ef22b669731a78236c02b4bb4adc660d31979ba6e06d
-EBUILD elt-patches-20170815.ebuild 829 BLAKE2B d29398c793bdd1b2b14e22b5e653d47112e45aaaed9299f4c030e9a48a66417cc01ada1793b44e65d8007d525c0737c1aa7c328015b78354bd0bc6b230d6ead2 SHA512 6a67cd999de7ec8dd4efe89791fe81fa87d0156a7a061a2fc5fe347610deb18a431fff126bfc7262646cb10725d7cd6742abbd7407e4dcd0e1a687ddfe7f361d
-EBUILD elt-patches-20170826.1.ebuild 864 BLAKE2B 28c926ca9e9687616e8ba94527c5c86a33d96b1cf574a006fb6df5cf2c06b41c63a396431753b5fb3d1005a0762087307e3c949480a6d6e2d4049c958a8f3be7 SHA512 b7771ecff9120bd83a032f79ec9378971d97e9dfbc8c226d505a84dae14c823b60630a86f37b5011002f42cf9fa9da8fae9f959551f59020299ad7b0429c52dc
-MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
deleted file mode 100644
index fbb181673f1a..000000000000
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	insinto /usr/share/elt-patches
-	doins -r .
-}
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
deleted file mode 100644
index ea7235f801ef..000000000000
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
-IUSE=""
-
-RDEPEND="sys-apps/gentoo-functions"
-DEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" libdirname="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-}
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
deleted file mode 100644
index 0911da2ad6ad..000000000000
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-apps/gentoo-functions"
-DEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
-}
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
deleted file mode 100644
index 8cf0f84e0634..000000000000
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-apps/gentoo-functions"
-DEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
-}
diff --git a/app-portage/elt-patches/metadata.xml b/app-portage/elt-patches/metadata.xml
deleted file mode 100644
index f540000d5aab..000000000000
--- a/app-portage/elt-patches/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/emerge-delta-webrsync-3.6.2 b/app-portage/emerge-delta-webrsync-3.6.2
new file mode 100644
index 000000000000..7433adf86e7c
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync-3.6.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst unpack
+DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
+EAPI=4
+HOMEPAGE=https://www.gentoo.org/proj/en/portage/index.xml
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-shells/bash >=sys-apps/portage-2.1.10 >=dev-util/diffball-0.6.5
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/gentoo/portage/228a860476d7543608b469c569ec1d4e70aa7f59/misc/emerge-delta-webrsync -> emerge-delta-webrsync-3.6.2
+_md5_=0f1e3928ebce344a8d57f6a2ffa4b53d
diff --git a/app-portage/emerge-delta-webrsync-3.7.1 b/app-portage/emerge-delta-webrsync-3.7.1
new file mode 100644
index 000000000000..6082b0593fb1
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync-3.7.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst unpack
+DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
+EAPI=4
+HOMEPAGE=https://www.gentoo.org/proj/en/portage/index.xml
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-shells/bash >=sys-apps/portage-2.1.10 >=dev-util/diffball-0.6.5
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/gentoo/portage/4ab31da4f09c7d0cb323b16b5b4b607d652ffc48/misc/emerge-delta-webrsync -> emerge-delta-webrsync-3.7.1
+_md5_=74b90f9bb1dad8ac699c377ec5e9d795
diff --git a/app-portage/emerge-delta-webrsync-3.7.2-r1 b/app-portage/emerge-delta-webrsync-3.7.2-r1
new file mode 100644
index 000000000000..1a1a448f76ec
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync-3.7.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/portage/index.xml
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-shells/bash >=sys-apps/portage-2.1.10 >=dev-util/diffball-0.6.5
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> emerge-delta-webrsync-3.7.2
+_md5_=872282a7bb2d226507758f3ffd9fd3a2
diff --git a/app-portage/emerge-delta-webrsync-3.7.3-r1 b/app-portage/emerge-delta-webrsync-3.7.3-r1
new file mode 100644
index 000000000000..87dafcfe5269
--- /dev/null
+++ b/app-portage/emerge-delta-webrsync-3.7.3-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst unpack
+DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-shells/bash || ( >=sys-apps/portage-2.1.10 sys-apps/portage-mgorny ) >=dev-util/diffball-0.6.5
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=d2ae2f85a34e27a6b458cb51cac008686911e8ce -> emerge-delta-webrsync-3.7.3
+_md5_=b11730c12d1380891601232291c3f518
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
deleted file mode 100644
index 40be2b75fb0c..000000000000
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST emerge-delta-webrsync-3.6.2 16837 BLAKE2B de9a2d014c51c2a765602f98a56c51329d3a9e5c70e6d7a520fe615a2d85789a32f96062d05ecfda1db324d6d1ccc9cd06d116eb16cebd018dc4104c7f71c90e SHA512 734598326dbdd588f5b62e2117ca377ad443161feca73a50dfe5740c20afb59ee9e8cd056bcaa0555f7276172db19d572a9a32023c5a311a6aa309d11f3dde86
-DIST emerge-delta-webrsync-3.7.1 22122 BLAKE2B 3446161266d5a386ac4cc4f686f81b8d717feec771e4416a74fbaee4ebf40f13be5bc9a3ca0f524ecaaff63adfc4905c554454db7d32a3aee7b21962ec8d339e SHA512 57fafb5ee4c083b60fc52f030928a9e6d1d3306f5ac53c88d7277a0421ffb3b64b1934db4367878077b05692b0340113c958116aa503d0e7a1ec3bcd383470a4
-DIST emerge-delta-webrsync-3.7.2 22344 BLAKE2B f0c6054c0bbc32760eb3339ef121a3aafd32b6fecfb1474d46258ab48473ec5392e0e3b92d84f9d02bc061fd91b467020fbe4dbbb69a6f0625ea765cb013c706 SHA512 36b65e0f550b5b0a3a5cf271126bf0d44bd182c06148d72c5ed9e105394a38be5dd0845e2d674df246b4436a10f15033bdc857526f664656f1cdb79dd8b7a18c
-DIST emerge-delta-webrsync-3.7.3 22348 BLAKE2B 7f89d71c2621bb3f2ebacaf1a5cdc66f3783d4704f9bd31adb8d7affd37e696a020712807f15c978025bb31fbdf95d6fc9b005a88cad132112f32b0d97ae99ab SHA512 987dabb5013233a164651564cfbf27ea7bea9057c810c3497b830a3fd58b89317791f1fb6d12f5e3e4aee58954a8aa6abe22eb8a5384b398239d4b28b665b2dd
-EBUILD emerge-delta-webrsync-3.6.2.ebuild 1113 BLAKE2B 8757ee5dbcc212aee3975c9ab9050c06b1fbbc72a9fbd986e6d65b72d739093aa67b918b8a1c1626ba731c7361b2fc5c8148e7cedb1cbcb83ee4240ce5f1a5ec SHA512 18f23ead9aba98412070f5d7a7c06fdf53cf38d0c92a8103a903e8b434d7f977731abd6406e9ea4e1c81aaa3d47803186c360a12743a37635da4b24ff1b254ca
-EBUILD emerge-delta-webrsync-3.7.1.ebuild 1117 BLAKE2B a5718e0358bbfb5b2e6f1e266cbce042979b5a394d39d3f9c7acd934ac6c8bdb0f9148d7f3b555b849cd99fc8cae1d2515613443feab818b0a7839cb0566ace6 SHA512 25e2fcf9089a3a6354503ee783269a85adb08cc934f67c3b34c8901f3b3c807c5200f06320ebfbfe34a49ab8d7ad88ee1cbfb6e2e254d0d9edd185b651a5f43f
-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
-MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
deleted file mode 100644
index 1819bd0a5b5e..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/228a860476d7543608b469c569ec1d4e70aa7f59/misc/emerge-delta-webrsync -> ${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild
deleted file mode 100644
index 52849edb7524..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/4ab31da4f09c7d0cb323b16b5b4b607d652ffc48/misc/emerge-delta-webrsync -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
deleted file mode 100644
index 4f574f0ad868..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_prepare() {
-	# Remove premature `rm -fr "${TMPDIR}"` for bug #506192.
-	sed -e '334,336d' -i ${P} || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild
deleted file mode 100644
index 676645ce9c0f..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=d2ae2f85a34e27a6b458cb51cac008686911e8ce -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	|| (
-		>=sys-apps/portage-2.1.10
-		sys-apps/portage-mgorny
-	)
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/metadata.xml b/app-portage/emerge-delta-webrsync/metadata.xml
deleted file mode 100644
index 15533694141b..000000000000
--- a/app-portage/emerge-delta-webrsync/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>
-	<upstream>
-		<bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
-	</upstream>
-	<maintainer type="project"><email>dev-portage@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-portage/epkg-0.4-r1 b/app-portage/epkg-0.4-r1
new file mode 100644
index 000000000000..21f6fd7ce38e
--- /dev/null
+++ b/app-portage/epkg-0.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A simple portage wrapper which works like other package managers
+EAPI=5
+HOMEPAGE=https://github.com/jdhore/epkg
+KEYWORDS=amd64 x86
+LICENSE=BSD-2
+RDEPEND=app-portage/eix app-portage/gentoolkit || ( sys-apps/portage sys-apps/portage-mgorny )
+SLOT=0
+SRC_URI=https://github.com/jdhore/epkg/archive/epkg-0.4.tar.gz
+_md5_=91ba5b6dd2161ea70a007211bad570ba
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
deleted file mode 100644
index 211cda71a2aa..000000000000
--- a/app-portage/epkg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
-EBUILD epkg-0.4-r1.ebuild 549 BLAKE2B c22f37227d3c288abafd6b733179055cc0660e64ea23af9c156e11970beb290be9095d48157a3ec150719f91d348d2afe0246b69e7ae2894fdcb60f2fac01d60 SHA512 0c546e8cb14336ed14e435a7aae6f2fd325369ed660b447bb65b0b0aa5a9116d001133f231e59950c05226f855fb833fa4add626a55eda6da408d5c460e534f9
-MISC metadata.xml 219 BLAKE2B 3aa3a0bafea86569301510afade33d5fc60054738285425c905c398a437a3ad917736cb53c26aac3d76dc6501b474c53d6a9ca118dfdc2115518faedae4d4d6e SHA512 b0549e6cb87ae03afde418a4bc199edd3cc4d0d0d545a2a96713fd8f66adcad0750f52a426856a9572455de41253b63f7559a80c3f3a60fee92cae6c4a63b82f
diff --git a/app-portage/epkg/epkg-0.4-r1.ebuild b/app-portage/epkg/epkg-0.4-r1.ebuild
deleted file mode 100644
index 83026091ae95..000000000000
--- a/app-portage/epkg/epkg-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A simple portage wrapper which works like other package managers"
-HOMEPAGE="https://github.com/jdhore/epkg"
-SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${P}"
-DEPEND=""
-RDEPEND="app-portage/eix
-		app-portage/gentoolkit
-		|| (
-			sys-apps/portage
-			sys-apps/portage-mgorny
-		)"
-
-src_install() {
-	dobin epkg
-	doman doc/epkg.1
-}
diff --git a/app-portage/epkg/metadata.xml b/app-portage/epkg/metadata.xml
deleted file mode 100644
index b291a268b032..000000000000
--- a/app-portage/epkg/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="github">jdhore/epkg</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/esearch-1.3-r2 b/app-portage/esearch-1.3-r2
new file mode 100644
index 000000000000..b48821c929ac
--- /dev/null
+++ b/app-portage/esearch-1.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Replacement for 'emerge --search' with search-index
+EAPI=5
+HOMEPAGE=https://github.com/fuzzyray/esearch
+IUSE=l10n_fr l10n_it python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://github/fuzzyray/esearch/esearch-1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=afe440f091b6d30b796ea414feb1ecb9
diff --git a/app-portage/esearch-9999 b/app-portage/esearch-9999
new file mode 100644
index 000000000000..76be5e0d22a8
--- /dev/null
+++ b/app-portage/esearch-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Replacement for 'emerge --search' with search-index
+EAPI=5
+HOMEPAGE=https://github.com/fuzzyray/esearch
+IUSE=l10n_fr l10n_it python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d2283ac7d623474b9448cf8123b75e04
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
deleted file mode 100644
index b4e69d2707f7..000000000000
--- a/app-portage/esearch/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f93190586d9bfc4c84f451605d073372b8db528c6680616c2be3038e8fc58c26d134300862db17088591043eac55aa89eda6cabf20b SHA512 b136b610a87e61e2ca01956fc2ba444b25e26333ed973c0c779279203ddb1ab100ec7ca35c50f4aeaa950829438c7e7729aa95fa43efbd0b5eb3b6f31fce529a
-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 1576 BLAKE2B 98fe51c640d6830e8bfbad7c8fb45110a4642418def3facf8d7dd7b73c5106a90cce51aa037755946c18cf3ba3979a2ab365c13b1de328ae7c3b95895d9ceec3 SHA512 33db3a09d49e7a2de817797d35f0316a033bd6c6fb70af57321e0a0bf2372e1448de4abf29d78a5bdbbccde8518814756ac9ac8297aaa4a49a1c14f8998da70b
-EBUILD esearch-9999.ebuild 1145 BLAKE2B 6cdb90bf72eb3f638fd11eab43bcd9b5f1d408b60d86397b4d47163fef0dd4dd0a641d38d2df762db04ef7a3c9d4b3bd5791de16fdeeb9e2d163adee2a8f66bd SHA512 af36069c02638fb83cdb9e5cdda3c76e3719526085449d823e17042da88b8414fbf285d0ffe9ba0458cf5e7ec170b20699c6391667b3b4287c5d2ee730a961f1
-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
deleted file mode 100644
index 3c8b1eac66e5..000000000000
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ /dev/null
@@ -1,58 +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,3_6})
-PYTHON_REQ_USE="readline(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="https://github.com/fuzzyray/esearch"
-SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="l10n_fr l10n_it"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-DEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
-PATCHES=(
-	"${FILESDIR}"/${PV}-Fix-setup.py.patch
-	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
-)
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
-		|| die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
-
-	# Remove unused man pages according to the l10n flags
-	if ! use l10n_fr ; then
-		rm -rf "${ED}"/usr/share/man/fr \
-			|| die "rm failed to remove ${ED}/usr/share/man/fr"
-	fi
-
-	if ! use l10n_it ; then
-		rm -rf "${ED}"/usr/share/man/it \
-			|| die "rm failed to remove ${ED}/usr/share/man/it"
-	fi
-}
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
deleted file mode 100644
index ae29c8dc76a8..000000000000
--- a/app-portage/esearch/esearch-9999.ebuild
+++ /dev/null
@@ -1,49 +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,3_6})
-PYTHON_REQ_USE="readline(+)"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="https://github.com/fuzzyray/esearch"
-EGIT_REPO_URI="https://github.com/fuzzyray/esearch.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="l10n_fr l10n_it"
-
-KEYWORDS=""
-
-DEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
-
-	# Remove unused man pages according to the l10n flags
-	if ! use l10n_fr ; then
-		rm -rf "${ED}"/usr/share/man/fr \
-			|| die "rm failed to remove ${ED}/usr/share/man/fr"
-	fi
-
-	if ! use l10n_it ; then
-		rm -rf "${ED}"/usr/share/man/it \
-			|| die "rm failed to remove ${ED}/usr/share/man/it"
-	fi
-}
diff --git a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
deleted file mode 100644
index 36c9d2255b8c..000000000000
--- a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 8 May 2013 14:26:48 -0500
-Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
-
-Thanks to zmedico for the patch.
----
- esearch/search.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/esearch/search.py b/esearch/search.py
-index f91f5b1..696a0f0 100755
---- a/esearch/search.py
-+++ b/esearch/search.py
-@@ -22,6 +22,7 @@ import re
- try:
-     from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
-     from portage import settings, pkgcmp, pkgsplit, portdb, best
-+    from portage.util import cmp_sort_key
- except ImportError:
-     print("Critical: portage imports failed!")
-     sys.exit(1)
-@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
-                     data['defebuild'] = (searchdef, pkgs[-1][3])
-         if not portdir:
-             config['found_in_overlay'] = True
--        pkgs.sort(mypkgcmp)
-+        pkgs.sort(key=cmp_sort_key(mypkgcmp))
-         for pkg in pkgs:
-             rev = ""
-             if pkg[2] != "r0":
--- 
-1.8.5.4
-
diff --git a/app-portage/esearch/files/1.3-Fix-setup.py.patch b/app-portage/esearch/files/1.3-Fix-setup.py.patch
deleted file mode 100644
index aad5d49f2f56..000000000000
--- a/app-portage/esearch/files/1.3-Fix-setup.py.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Tue, 18 Dec 2012 04:33:27 -0600
-Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
- version.
-
-This fixes the issue with egg-info always having a version number of
-9999.  Fix is from Brian Dolbec courtesy of mirrorselect.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9d2addd..45a4c06 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,7 +14,7 @@ import io
- 
- sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
- 
--__version__ = os.getenv('VERSION', default='9999')
-+__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
- 
- cwd = os.getcwd()
- 
--- 
-1.8.5.4
-
diff --git a/app-portage/esearch/files/eupdatedb.cron b/app-portage/esearch/files/eupdatedb.cron
deleted file mode 100644
index 1cf802f7b05f..000000000000
--- a/app-portage/esearch/files/eupdatedb.cron
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/bash
-
-# The eupdatedb script _needs_ to be installed with the filename 'eupdatedb'
-# because it does things based on basename $0.
-
-# Run some script
-
-SCRIPT="/usr/sbin/eupdatedb"
-SCRIPTPREOPTS="nice -n 19"
-SCRIPTOPTS="--quiet"
-PRECOMMAND=""
-POSTCOMMAND=""
-DATE="`date +%Y%m%d`"
-LOG="/var/log/`basename ${SCRIPT}`"
-
-${PRECOMMAND}
-
-# Start logging
-echo "--- Starting ${SCRIPT} for ${DATE} ---" >> ${LOG}
-
-if [ "`${SCRIPTPREOPTS} ${SCRIPT} ${SCRIPTOPTS}`" ]
-then
-	 echo "${SCRIPT}: success." >> ${LOG}
-else
-	echo "ERROR: ${SCRIPT} failed." >> ${LOG}
-fi
-
-# Cleanup tasks
-${POSTCOMMAND}
-
-# End logging
-echo "--- Ending ${SCRIPT} for ${DATE} ---" >> ${LOG}
diff --git a/app-portage/esearch/metadata.xml b/app-portage/esearch/metadata.xml
deleted file mode 100644
index 540aa0188fe8..000000000000
--- a/app-portage/esearch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>tools-portage@gentoo.org</email>
-    <name>Gentoo Portage tools team</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">fuzzyray/esearch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/etc-proposals-1.4.3-r3 b/app-portage/etc-proposals-1.4.3-r3
new file mode 100644
index 000000000000..fd33e65632f9
--- /dev/null
+++ b/app-portage/etc-proposals-1.4.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/pygtk-2.10 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=a set of tools for updating gentoo config files
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/etc-proposals.berlios/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygtk-2.10 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/etc-proposals.berlios/etc-proposals-1.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=053ce392e5e3bdb558a9fd8c072237ca
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
deleted file mode 100644
index f34aa4096f56..000000000000
--- a/app-portage/etc-proposals/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST etc-proposals-1.4.3.tar.gz 53696 BLAKE2B aa86d4b55d53ea269bfeb58cb1db9877fab224c5387fd91ac377d757814580b8c4561c868d9c2d97c465b332041c67fdfe7a5e196fe329b92a768d542257a9ff SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1
-EBUILD etc-proposals-1.4.3-r3.ebuild 1272 BLAKE2B b99b4f39bc3c08f433fd93d90f24f3f8e953bd1d4c091d81fcf8fcbda045b670bbcf93bca0835164cf3c0307fa43f3a1b688653f913b9d45f51eb93e69f5eaa8 SHA512 1d85af758807a3d7eb94041528c29c48566809a4c5a975562b153f62fe40a91d61c912629c4f9792ce53cecfa72a0e241c7b395d173509420d37ef48146ade07
-MISC metadata.xml 463 BLAKE2B fc408f9701b4ffee390c6d5983b94e5913d28dca4c0ec97a7f0fe5758797b767d3fce8738208a869b5134907c066d5dfdd15fab70f0de821f69e587b7361453c SHA512 8e858c382a8880509a3f8964a2d94e64899a842d7c0368069eb8f58c041863a3a6d6a3d586cfd12d411de21bd990b685ebfa3d2d97ac460c0eb2a6dbf6aa91d1
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
deleted file mode 100644
index 8ec312a94438..000000000000
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="a set of tools for updating gentoo config files"
-HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-DEPEND=">=dev-python/pygtk-2.10"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodir /usr/sbin
-	einfo "Moving /usr/bin/etc-proposals to /usr/sbin/etc-proposals"
-	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
-	rmdir "${ED%/}/usr/bin" || die
-
-	# Package has PyQt4 support no one ported to PyQt5 so far, bug #634956
-	sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
-}
-
-pkg_postinst() {
-	elog "The configuration file has been installed to /etc/etc-proposals.conf"
-	elog "If you are installing etc-proposals for the first time or updating"
-	elog "from a version < 1.3 you should run the following command once:"
-	elog "etc-proposals --init-db"
-	ewarn "A full backup of /etc and other files managed by CONFIG_PROTECT"
-	ewarn "is highly advised before testing this tool!"
-}
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
deleted file mode 100644
index 8f4a4e4862f1..000000000000
--- a/app-portage/etc-proposals/metadata.xml
+++ /dev/null
@@ -1,15 +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>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">etc-proposals.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/euscan-0.1.1-r2 b/app-portage/euscan-0.1.1-r2
new file mode 100644
index 000000000000..524027878c42
--- /dev/null
+++ b/app-portage/euscan-0.1.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Ebuild upstream scan utility
+EAPI=5
+HOMEPAGE=https://github.com/iksaif/euscan
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/gentoolkit-0.2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/euscan-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=836fd137dc4c16bbe03de2c0ed37f391
diff --git a/app-portage/euscan-9999 b/app-portage/euscan-9999
new file mode 100644
index 000000000000..e2a024a498a8
--- /dev/null
+++ b/app-portage/euscan-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Ebuild upstream scan utility
+EAPI=5
+HOMEPAGE=https://github.com/iksaif/euscan
+IUSE=python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/gentoolkit-0.2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3f99c6284b9bc9acd6dad99de91e026
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
deleted file mode 100644
index 8d486f3f6a24..000000000000
--- a/app-portage/euscan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST euscan-0.1.1.tar.gz 441780 BLAKE2B 7c0603cca9b9da1f849999b215db2d397656ffc1e8e87193174e6ada548497f1ebb30252f83d0fb4dbbfa92000480947b1731f1792d8612e1ad56fd56daa2b54 SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab
-EBUILD euscan-0.1.1-r2.ebuild 863 BLAKE2B cbc6710b4911fcaa58c1a32ae90859571e45f6301e434e76d0f576f3fa57e2e56ca89c1c0cb18f7c82e119bedfb14613324db5209b4042cbad4bbed7b9f81a39 SHA512 b1a802d02693afed7d393823b88760c41a7b67da8dc67f194dc42f58a9a2cd1e510bb3ca21fd5d6fd2c9d77ded0bd4b1cfdff4f59894030e0c742f83e6486fd0
-EBUILD euscan-9999.ebuild 816 BLAKE2B ccba573b5a4740c44ce9d39ab050b4deb0d06ef901cb5556dc1a04249d943b79849f63e3f63e07f9983ec913466a6649697dddcc34caaa577d056d6c2409138a SHA512 b366831123590d0ee27951147a9f7ac66c8cc2df6a83c03539317e58c9f6377f6deac80231056d90304a24de2d0472fbc01d56a369e77ad0a8bfe8b0b05cab62
-MISC metadata.xml 340 BLAKE2B 9429176a710bbd82a9c4bfdbf3228422807daa00564201eec1d8bfa2a1b76f65b84e16e6083cb0847bed08745262f0b95b8563b7449e69be95d8bc2ecdba6d1c SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d
diff --git a/app-portage/euscan/euscan-0.1.1-r2.ebuild b/app-portage/euscan/euscan-0.1.1-r2.ebuild
deleted file mode 100644
index 27566cc7555f..000000000000
--- a/app-portage/euscan/euscan-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Ebuild upstream scan utility"
-HOMEPAGE="https://github.com/iksaif/euscan"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
deleted file mode 100644
index c71e1ee07ef8..000000000000
--- a/app-portage/euscan/euscan-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Ebuild upstream scan utility"
-HOMEPAGE="https://github.com/iksaif/euscan"
-EGIT_REPO_URI="https://github.com/iksaif/euscan.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/euscan/metadata.xml b/app-portage/euscan/metadata.xml
deleted file mode 100644
index 2c94ca18e808..000000000000
--- a/app-portage/euscan/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="person">
-        <email>patrick@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-        <email>alicef@gentoo.org</email>
-        <name>Alice Ferrazzi</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-portage/euses-2.5.9 b/app-portage/euses-2.5.9
new file mode 100644
index 000000000000..e7d90b44fa7b
--- /dev/null
+++ b/app-portage/euses-2.5.9
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=look up USE flag descriptions fast
+EAPI=4
+HOMEPAGE=http://www.xs4all.nl/~rooversj/gentoo
+KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.xs4all.nl/~rooversj/gentoo/euses-2.5.9.tar.bz2
+_md5_=1d9f6d0c8cc374902b13d1662f6bad56
diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest
deleted file mode 100644
index 3f3f143e04c9..000000000000
--- a/app-portage/euses/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
-EBUILD euses-2.5.9.ebuild 449 BLAKE2B aeff70ea3ea8e0af4ab1a496a42e62b573566abadbc11ec6ff1088e936a9944f02166d4bc1496f648b43fae6263a06217f2bc004b4dc1ef8799ae4076ad55bfe SHA512 99954debb0f506b717ce7b8a57ba04e8170bbbe9c372785957def0e912ae920fdaefbbd95aee8e6c2ba7d12a99fbc281c90d7f17cbb77f9e9266cc9914a27d09
-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
deleted file mode 100644
index d56aa793a6bb..000000000000
--- a/app-portage/euses/euses-2.5.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="look up USE flag descriptions fast"
-HOMEPAGE="http://www.xs4all.nl/~rooversj/gentoo"
-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"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog
-}
diff --git a/app-portage/euses/metadata.xml b/app-portage/euses/metadata.xml
deleted file mode 100644
index f62a0f06e2e9..000000000000
--- a/app-portage/euses/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-<maintainer type="project">
-	<email>tools-portage@gentoo.org</email>
-	<name>Gentoo Portage tools team</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-portage/fetchcommandwrapper-0.7.1 b/app-portage/fetchcommandwrapper-0.7.1
new file mode 100644
index 000000000000..a9c42a936643
--- /dev/null
+++ b/app-portage/fetchcommandwrapper-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/fetchcommandwrapper
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.hartwork.org/public/fetchcommandwrapper-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=504848557f5122b5dce69a36841f0d79
diff --git a/app-portage/fetchcommandwrapper-0.7.2 b/app-portage/fetchcommandwrapper-0.7.2
new file mode 100644
index 000000000000..aad6f95aaeb9
--- /dev/null
+++ b/app-portage/fetchcommandwrapper-0.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/fetchcommandwrapper
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.hartwork.org/public/fetchcommandwrapper-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=504848557f5122b5dce69a36841f0d79
diff --git a/app-portage/fetchcommandwrapper-0.7.3 b/app-portage/fetchcommandwrapper-0.7.3
new file mode 100644
index 000000000000..349c9cd8dd94
--- /dev/null
+++ b/app-portage/fetchcommandwrapper-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/fetchcommandwrapper
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/fetchcommandwrapper/archive/0.7.3.tar.gz -> fetchcommandwrapper-0.7.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bbf60311affb73a491309456f568c4c2
diff --git a/app-portage/fetchcommandwrapper-0.8 b/app-portage/fetchcommandwrapper-0.8
new file mode 100644
index 000000000000..ace6b4c9149c
--- /dev/null
+++ b/app-portage/fetchcommandwrapper-0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/fetchcommandwrapper
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/fetchcommandwrapper/archive/0.8.tar.gz -> fetchcommandwrapper-0.8.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bbf60311affb73a491309456f568c4c2
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
deleted file mode 100644
index ad60da15c497..000000000000
--- a/app-portage/fetchcommandwrapper/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST fetchcommandwrapper-0.7.1.tar.gz 3187 BLAKE2B b2ddce407cb9977ca66da6ca732ef263f4f3e3fe60296882e6266af9c36c1b103d62d8a002d72e1827d02c6b4cb4c0a90ea31938460d598f39b531a2f3e32615 SHA512 be1e382180606d527f85c2f45888373286687c2b521c66cb11ed90f05e107bb54cbfe83b0509bf52e31108db3a52b9089259c83e63cae3a1d25dbca583faaf74
-DIST fetchcommandwrapper-0.7.2.tar.gz 3134 BLAKE2B af98fa7ad46bb1179c71db36a2465f904e5f0c28b573272eb84da328fc0a5c0f209674a9e23f2d482f14c472e5d6879fb872c2e09465638b3249b503f583cc53 SHA512 f268cbef691320106b3f929b0ab3b63085ffdd3e1988fbada2d37c6abcdf7e417758055fff503bb70490840dfde7704e87bb7434faa1d1115cc42729ad10de61
-DIST fetchcommandwrapper-0.7.3.tar.gz 3431 BLAKE2B c9c03eb0cb39c1f61f741cf716cc9c857bab8400cfc4c622350b0b65e03cdc618c86922cf6dc2cd5f2b841f8771ab9d0f2b39eca326fa4806eb77c56376b938a SHA512 df314331b66b89842285a175be686fe800de4a93ad382b72659429a62de02c4fc708d8964f766c7203c3c2aa838a684e808442d410d37ab9f8b9af8328442a51
-DIST fetchcommandwrapper-0.8.tar.gz 3558 BLAKE2B 6e37264382900d9326d7da0546ac870a07b9ba66056221e17cc2a170ccfe367e867d74cf3b6f1a6e9d5ce834a054d26b40e57d9d1bd00a87bda80b77b1b427bd SHA512 b064515d3f4b85f849de53934a45e7a64c9af8bfcfb83ee70d09aad9712623cff2c43a28c93ccd00b74f99679856225201e7c8f33b9b0338121ac1072335e5ba
-EBUILD fetchcommandwrapper-0.7.1.ebuild 634 BLAKE2B fd0a02ae7d64277dd3f1d4fe0cbd29c1b941c485cb1614990fa2b129e2101a5a61a3fcdb690ca0d1ade8be65b9bb96d6aeceb4a90054fbf5c3736c6816a43053 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809
-EBUILD fetchcommandwrapper-0.7.2.ebuild 634 BLAKE2B fd0a02ae7d64277dd3f1d4fe0cbd29c1b941c485cb1614990fa2b129e2101a5a61a3fcdb690ca0d1ade8be65b9bb96d6aeceb4a90054fbf5c3736c6816a43053 SHA512 8b281114c4c0218fa5005c14937a8032b3b46fe1f9100f63ed3a91636ed6c6483a5993b7cb9741838b49c0951470dcfe248c8f75d0dea873716ffb4882377809
-EBUILD fetchcommandwrapper-0.7.3.ebuild 685 BLAKE2B ae6c4afa9d6766f2b709294884be8f13702fd0db175291c9aa7b1838f083ffeb15b3e7a677a5f5e4c4b1bddf26f3b5b79176e0bf882ea3c42cf1eae059866cc7 SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a
-EBUILD fetchcommandwrapper-0.8.ebuild 685 BLAKE2B ae6c4afa9d6766f2b709294884be8f13702fd0db175291c9aa7b1838f083ffeb15b3e7a677a5f5e4c4b1bddf26f3b5b79176e0bf882ea3c42cf1eae059866cc7 SHA512 4fc5bba0a8524e937cfb8ace71173b10f614a1fbdc90290f1e751035c74674b7e68455ca24d73205754bcedc653a7157d4ce64bf7a7f580f88a58f5c814b857a
-MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.1.ebuild
deleted file mode 100644
index d4abf02b7dd7..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.ebuild
deleted file mode 100644
index d4abf02b7dd7..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.2.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
deleted file mode 100644
index bf638f923ccf..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild
deleted file mode 100644
index bf638f923ccf..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/gentoo/fetchcommandwrapper"
-SRC_URI="https://github.com/gentoo/fetchcommandwrapper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/aria2-1.10.2"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/metadata.xml b/app-portage/fetchcommandwrapper/metadata.xml
deleted file mode 100644
index b37944b1a238..000000000000
--- a/app-portage/fetchcommandwrapper/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="person">
-    <email>sping@gentoo.org</email>
-    <name>Sebastian Pipping</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gentoo/fetchcommandwrapper</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/flaggie-0.2.1-r1 b/app-portage/flaggie-0.2.1-r1
new file mode 100644
index 000000000000..4072abc50f47
--- /dev/null
+++ b/app-portage/flaggie-0.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A smart CLI mangler for package.* files
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/flaggie/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ebcaaeb1a6b0cb938cd52b853066bb5
diff --git a/app-portage/flaggie-9999 b/app-portage/flaggie-9999
new file mode 100644
index 000000000000..c0b1d2d26638
--- /dev/null
+++ b/app-portage/flaggie-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A smart CLI mangler for package.* files
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/flaggie/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=464d6486a595c480217c96d186b6d6d8
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
deleted file mode 100644
index 93ea0023c94c..000000000000
--- a/app-portage/flaggie/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
-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
deleted file mode 100644
index 6cf9bd001462..000000000000
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,40 +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,3_6} pypy )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn "Please denote that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	elog
-	elog "bash-completion support requires:"
-	elog "	app-shells/gentoo-bashcomp"
-	has_version app-shells/gentoo-bashcomp && \
-		elog "(installed already)"
-}
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
deleted file mode 100644
index b6b4297c035b..000000000000
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-EGIT_REPO_URI="https://github.com/mgorny/flaggie.git"
-inherit bash-completion-r1 distutils-r1 git-r3
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn "Please note that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	if ! has_version app-shells/gentoo-bashcomp; then
-		elog
-		elog "If you want to use bash-completion, you need to install:"
-		elog "	app-shells/gentoo-bashcomp"
-	fi
-}
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
deleted file mode 100644
index f4ff1e6030fa..000000000000
--- a/app-portage/flaggie/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/flaggie/issues/</bugs-to>
-		<remote-id type="github">mgorny/flaggie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/fquery-0.2.2 b/app-portage/fquery-0.2.2
new file mode 100644
index 000000000000..67e34620ecda
--- /dev/null
+++ b/app-portage/fquery-0.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=Installed package query tool for Gentoo Linux
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fquery
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/fquery/0.2.2/fquery-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9bb4de3b8ec2aaed5a3c9897a12033f
diff --git a/app-portage/fquery-0.2.3 b/app-portage/fquery-0.2.3
new file mode 100644
index 000000000000..bdee95b8e0cb
--- /dev/null
+++ b/app-portage/fquery-0.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=Installed package query tool for Gentoo Linux
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fquery
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/fquery/0.2.3/fquery-0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9bb4de3b8ec2aaed5a3c9897a12033f
diff --git a/app-portage/fquery/Manifest b/app-portage/fquery/Manifest
deleted file mode 100644
index ad3d2c2a2652..000000000000
--- a/app-portage/fquery/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fquery-0.2.2.tar.gz 14489 BLAKE2B 091c7893b835c41f071bfbd1d516b7e92aee57c67ddc3a31062e346a51002d1e235d4b35278a0d5e087c69ba1482210110a08dc7f020390a5b94304eff4aafdc SHA512 d8560a043a3e9d489232427c5911b650cca932cda1c2185c881834c8fd54d316bc650bf4d187da53cd9785adf17381e1cb7cddaf21e73d89f7854cbb33738587
-DIST fquery-0.2.3.tar.gz 14511 BLAKE2B ccc0162095cf270320c1e7a27ef6f19902ddc591ea04742b9645bbb80e67132d85c3f182d1f7fd536a819e96b64abc734b42728faf46a0f2ab01943f660705ee SHA512 0dc345b189bd18f5f1084ab2aea07390b547b6c663d03fa9cec968e5cef598fe58b6a294845ca12b020c78ff2a01ce7e5da0bb06a513c53b8b5aa357b071fb88
-EBUILD fquery-0.2.2.ebuild 597 BLAKE2B 07fbfda87d37ae6f807138400b60162d15e0d3fea785b04ba1832a6b396d1dbf38744bbba461bb7133edd69353df18c8d475cf94efab8d4047a004a3769308d4 SHA512 0812ebe50ec4d31eb2920155b588a95793cc2958c009b82b83c559ec0ce169ccc5d917f3937bdce0d51af2158058882e82fa5b8cd69b85bcb2b66a91f21dca52
-EBUILD fquery-0.2.3.ebuild 597 BLAKE2B 07fbfda87d37ae6f807138400b60162d15e0d3fea785b04ba1832a6b396d1dbf38744bbba461bb7133edd69353df18c8d475cf94efab8d4047a004a3769308d4 SHA512 0812ebe50ec4d31eb2920155b588a95793cc2958c009b82b83c559ec0ce169ccc5d917f3937bdce0d51af2158058882e82fa5b8cd69b85bcb2b66a91f21dca52
-MISC metadata.xml 290 BLAKE2B c5f2085bf717e6abb78ef95ec2221398667bd38a5bb4915ea6b89b17bb846f9b6ed47089c47b1f2c6baeab6147f8cacac9b4e913a20ac5d909432e6525863326 SHA512 89b8856e1eb7618964811ce381d36e758b17b7d3c9d364a1d715d31b4873599304c6f1883abf1f401841c760f7f7d6fa117bb1e0111702998ac79b6f08744874
diff --git a/app-portage/fquery/fquery-0.2.2.ebuild b/app-portage/fquery/fquery-0.2.2.ebuild
deleted file mode 100644
index c0d1703447b9..000000000000
--- a/app-portage/fquery/fquery-0.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Installed package query tool for Gentoo Linux"
-HOMEPAGE="http://hackage.haskell.org/package/fquery"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashtables:=
-	dev-haskell/parsec:=
-	dev-haskell/regex-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/app-portage/fquery/fquery-0.2.3.ebuild b/app-portage/fquery/fquery-0.2.3.ebuild
deleted file mode 100644
index c0d1703447b9..000000000000
--- a/app-portage/fquery/fquery-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Installed package query tool for Gentoo Linux"
-HOMEPAGE="http://hackage.haskell.org/package/fquery"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashtables:=
-	dev-haskell/parsec:=
-	dev-haskell/regex-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/app-portage/fquery/metadata.xml b/app-portage/fquery/metadata.xml
deleted file mode 100644
index 30d7a9f1b7d4..000000000000
--- a/app-portage/fquery/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		A fast replacement for equery
-	</longdescription>
-</pkgmetadata>
diff --git a/app-portage/g-cpan-0.16.5 b/app-portage/g-cpan-0.16.5
new file mode 100644
index 000000000000..c5fd23d4809f
--- /dev/null
+++ b/app-portage/g-cpan-0.16.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-lang/perl >=dev-perl/YAML-0.60 dev-perl/Shell-EnvImporter dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
+DESCRIPTION=g-cpan: generate and install CPAN modules using portage
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=dev-lang/perl >=dev-perl/YAML-0.60 dev-perl/Shell-EnvImporter dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://gentoo/g-cpan-0.16.5.tar.gz https://dev.gentoo.org/~chainsaw/distfiles/g-cpan-0.16.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d03c0b0242ece298db89121d49a4a0d4
diff --git a/app-portage/g-cpan-0.16.6 b/app-portage/g-cpan-0.16.6
new file mode 100644
index 000000000000..0fee8792a2ac
--- /dev/null
+++ b/app-portage/g-cpan-0.16.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-lang/perl >=dev-perl/YAML-0.60 >=dev-perl/Shell-EnvImporter-1.70.0-r2 dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
+DESCRIPTION=g-cpan: generate and install CPAN modules using portage
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=dev-lang/perl >=dev-perl/YAML-0.60 >=dev-perl/Shell-EnvImporter-1.70.0-r2 dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/g-cpan-0.16.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cca627dfd0cbc097895684d811b1d329
diff --git a/app-portage/g-cpan-0.16.7 b/app-portage/g-cpan-0.16.7
new file mode 100644
index 000000000000..ae90a7d16425
--- /dev/null
+++ b/app-portage/g-cpan-0.16.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:=
+DESCRIPTION=Autogenerate and install ebuilds for CPAN modules
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 >=sys-apps/portage-2.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/gentoo-perl/g-cpan/releases/download/v0.16.7/g-cpan-0.16.7.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=e568db0f0f22aa0fddc82bf1626361c5
diff --git a/app-portage/g-cpan-0.16.9-r1 b/app-portage/g-cpan-0.16.9-r1
new file mode 100644
index 000000000000..f9cde4a9000c
--- /dev/null
+++ b/app-portage/g-cpan-0.16.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:=
+DESCRIPTION=Autogenerate and install ebuilds for CPAN modules
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
+IUSE=test
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 || ( >=sys-apps/portage-2.0.0 sys-apps/portage-mgorny ) dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/gentoo-perl/g-cpan/archive/v0.16.9.tar.gz -> g-cpan-0.16.9.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0899eeda39d0cde7a21d08bcd21f0091
diff --git a/app-portage/g-cpan-9999 b/app-portage/g-cpan-9999
new file mode 100644
index 000000000000..2eda7443f9cc
--- /dev/null
+++ b/app-portage/g-cpan-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-perl/Config-Tiny virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Path-Tiny dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:= >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Autogenerate and install ebuilds for CPAN modules
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
+IUSE=test
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=dev-perl/Config-Tiny virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Path-Tiny dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 || ( >=sys-apps/portage-2.0.0 sys-apps/portage-mgorny ) dev-lang/perl:=
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=70d5815eb534d83c006e239eaee5ff22
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
deleted file mode 100644
index afe30290613e..000000000000
--- a/app-portage/g-cpan/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST g-cpan-0.16.5.tar.gz 33894 BLAKE2B e5ffee0086b9a2dcc5bd32ae21f13f01464756d2483e21bdd5e455ff0044d864767f7bfef9ad7bf6618126e921784fa08162400e6b44014d70c3f35265a0243e SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b
-DIST g-cpan-0.16.6.tar.gz 33844 BLAKE2B 3c8b4b39fbeec4e15aa49db877e24a99883112fb79538b5d94a87b60dfea436bffa6f50cbbb97f759c4a2ad75e254d30913105f3f1ee87628cbc9291be69ba87 SHA512 f8e9e211ffc09ca42d1444a42ad2b8111beb8988e4a01387cf8788f7e4a52e6133168820c2800ac82429fa022e2ff473a774c48ac140b5cde184b3d77cd6e1b1
-DIST g-cpan-0.16.7.tar.gz 33621 BLAKE2B 531c2668756b8f31dc038136580dc5fa26b4bb20307b72b4b15202f6f1135824271ae031113fbad71e6096e916d2e10c28c02d5c869d7cfa51ffb04b5a73a9a6 SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb
-DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
-EBUILD g-cpan-0.16.5.ebuild 1060 BLAKE2B 3be8d10a59f30f09900fdc04a0b1e9548f9f60e4d0d00edbff8ee104237e73d6e09414bbda59cebf717b9c2e195e17ebec0d6ebd5763f9bcc56bab2e5d5b4c73 SHA512 a2524f42f7df44c7eb2eceabb9fef72173b4d2f9981eba77d77c6728c549bc31e55eff27621ce736c46610d037dd33807d8fafe10efd2315abc6ca2f0295eb5c
-EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
-EBUILD g-cpan-0.16.7.ebuild 1444 BLAKE2B 1b080e7778c77fae162e96491b903323d465548587c592b3a6aafac263e9fed6c52dc45fd6fd574ce2ed30a0d674ca01f551649045e124db65ee9e8100cfd02e SHA512 2a89a12a6d0d096a6bbc5ff30655250f63e7c5cf9cbc271e59691972552450eca0945072cb3d485883c4eb203d4ae9ed9c1095dd752d8c197c5826a612eebca3
-EBUILD g-cpan-0.16.9-r1.ebuild 1465 BLAKE2B c3b4bcc156fb5ca09ba395800dc1a27df677318148e3fe7fb74d1302ec7e1cfca12c91035212c83b91d4dd342a7e71b8d79b52cc2ca49113c12d53c7b7289ee2 SHA512 f9d78f275a85061e6c09ce3cbf0fa12f8077304319e523c18aa9aa18a7bbf94d6a4cf7a34503355b10fecbf8d46f324f200fc39ac908ddcd0b50867c3d2473ea
-EBUILD g-cpan-9999.ebuild 1516 BLAKE2B 66c1aef06647806674803443fa3632a0a9e1a9152d82d173da516bf37f3811cabb611f3af7f429a36816d934ea0cd4a1cd46c610a5cd63a47b48707384173cdd SHA512 b9031204e3bf4b22ba8fde4d3243e33e29b908d9338930311ca25b5a120b4b6e1c031c9afa8b2f5d7252e8224a45c55ef474c39b88a76c993bcc06e781071d61
-MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
deleted file mode 100644
index a6a38e8e0d2b..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-		 https://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		dev-perl/Shell-EnvImporter
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		keepdir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
deleted file mode 100644
index 876c6180f0f3..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		>=dev-perl/Shell-EnvImporter-1.70.0-r2
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
deleted file mode 100644
index b56c85f37fb1..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	dev-perl/Log-Agent
-	virtual/perl-Memoize
-	virtual/perl-IO
-	dev-perl/Shell-EnvImporter
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/YAML-0.60
-"
-RDEPEND="${COMMONDEPEND}
-	>=sys-apps/portage-2.0.0
-"
-DEPEND="${COMMONDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.940.0 )
-"
-
-src_install() {
-		perl-module_src_install
-		diropts -m0775 -o portage -g portage
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "If you want to use g-cpan as non root user you may wish to adjust"
-	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
deleted file mode 100644
index 39bcbf8a06f6..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.9-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=6
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	dev-perl/Log-Agent
-	virtual/perl-Memoize
-	virtual/perl-IO
-	dev-perl/Shell-EnvImporter
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/YAML-0.60
-"
-RDEPEND="${COMMONDEPEND}
-	|| (
-		>=sys-apps/portage-2.0.0
-		sys-apps/portage-mgorny
-	)
-"
-DEPEND="${COMMONDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.940.0 )
-"
-
-src_install() {
-	perl-module_src_install
-	diropts -m0775 -o portage -g portage
-	dodir "/var/tmp/g-cpan"
-	dodir "/var/log/g-cpan"
-	keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "If you want to use g-cpan as non root user you may wish to adjust"
-	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
deleted file mode 100644
index 50536a4a795b..000000000000
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	dev-perl/Config-Tiny
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	dev-perl/Log-Agent
-	virtual/perl-Memoize
-	virtual/perl-IO
-	dev-perl/Path-Tiny
-	dev-perl/Shell-EnvImporter
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/YAML-0.60
-"
-RDEPEND="${COMMONDEPEND}
-	|| (
-		>=sys-apps/portage-2.0.0
-		sys-apps/portage-mgorny
-	)
-"
-DEPEND="${COMMONDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.940.0 )
-"
-
-src_install() {
-	perl-module_src_install
-	diropts -m0775 -o portage -g portage
-	dodir "/var/tmp/g-cpan"
-	dodir "/var/log/g-cpan"
-	keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "If you want to use g-cpan as non root user you may wish to adjust"
-	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/metadata.xml b/app-portage/g-cpan/metadata.xml
deleted file mode 100644
index 67070ea1bee7..000000000000
--- a/app-portage/g-cpan/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>Sergiy.Borodych@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">gentoo-perl/g-cpan</remote-id>
-		<bugs-to>https://github.com/gentoo-perl/g-cpan/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/g-octave-0.4.1-r6 b/app-portage/g-octave-0.4.1-r6
new file mode 100644
index 000000000000..1d045b9cb4bd
--- /dev/null
+++ b/app-portage/g-octave-0.4.1-r6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=doc? ( >=dev-python/sphinx-1.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A tool that generates and installs ebuilds for Octave-Forge
+EAPI=6
+HOMEPAGE=https://github.com/rafaelmartins/g-octave
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://github/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/tarball/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed -> g-octave-db-bdf02cb.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23e707393aab1432bd640e01729d570c
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
deleted file mode 100644
index 54d3c17ee15c..000000000000
--- a/app-portage/g-octave/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX g-octave-0.4.1-add_cave_support.patch 3289 BLAKE2B 9b41991021ea4bcc49b3458bf911b73386ffdecbdf61d1208b54db5b74c2aa5a515a68f26a56152420393bd266a51a5d60b5ded0f2dc3da695e7d9b86d6780fa SHA512 2903550b2f61940d3a141ed59af5ae19a2d03dcaffb3b143c66247be8e8e5262b29f2693b884c8a2b7cf6c9e1885a5e6564286dfdee77d3a34ed3a2e86ab97db
-AUX g-octave-0.4.1-fix-Makefile.patch 491 BLAKE2B c2deff7f9ff544a62ae6877ec229ddaf5c817f46c51b7f66d4200daa47b5224986dca24877ecc4c2490a2adde068b2734f44d4d173c604fa651bb04182399750 SHA512 d11269f703fa887ca6a5c42773f8891c28036d0890818a233504e4827c3221e2b69ea80ce02023c3bfe279a17318ba4084b137d2f92f281abacf5aa218492ce4
-AUX g-octave-0.4.1-fix-sourceforge-svn-root.patch 1441 BLAKE2B 89ddb026eb2b0f133ba508c3f351bc32fe7968d91034416559b7ec80319473b3a323f72a9fd5cfb7b88603b1176b91ba312580acbb7930b6f07ecde335f05037 SHA512 637a3f0a7be6cacde645768bc2f576ceccb163fa00dae60520ff0de876f8414b75568e33a04bbc225520ef05258e4339930f748577620cb9588cfcbf961fce1b
-DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
-DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
-EBUILD g-octave-0.4.1-r6.ebuild 2400 BLAKE2B 377e382f3ac1b7b11a1b2be35a3f62b0aed726100faa67238d1be5820f404d1ebe387ea63d6faeb9c78c7c15e8629c9a2d4f9617ab748a303266d4e5fd41ac4c SHA512 eab3022412af9978db1bf11982349ab08ece972d3d1710c7858520423244d930c0d90a92967098ce0143b23217eaf112b3b811bf20222e5a02fb9e56d7db7d46
-MISC metadata.xml 953 BLAKE2B c7df56688e694e153043051b897de819f4b43441399ce338d7b65a2bffa689c0c68bd03fed1ce10a5111e422e4e38c796387c8e52758d47b06a369fea10b22fa SHA512 2e9160dc06169653737491b25ac4f1e4ad4416a3a6d9789078021c8a501d67c07294a6360762beea1815608d1d2e92a089bcac4614113bfa8c9d312723bda20f
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
deleted file mode 100644
index 27468c1bba5a..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- g-octave-0.4.1/g_octave/package_manager.py	2010-10-23 23:37:26.000000000 +0200
-+++ g-octave-0.4.1/g_octave/package_manager.py	2011-05-25 12:52:10.510019006 +0200
-@@ -15,6 +15,7 @@
-     'Portage',
-     'Pkgcore',
-     'Paludis',
-+    'Cave',
- ]
- 
- import grp
-@@ -243,3 +244,56 @@
-                 packages.append(line.strip())
-         return packages
- 
-+class Cave(Base):
-+    
-+    _client = '/usr/bin/cave'
-+    _group = 'paludisbuild'
-+    
-+    post_uninstall = [
-+        'You may want to remove the dependencies too, using:',
-+        '# cave purge',
-+    ]
-+    
-+    def __init__(self, ask=False, verbose=False, pretend=False, oneshot=False, nocolor=False):
-+        self._fullcommand = [self._client]
-+        self._cmd = ['-z']
-+        oneshot and self._cmd.append('-1')
-+        not pretend and self._cmd.append('-x')
-+        #if verbose:
-+        #    self._fullcommand += [
-+        #        '--show-descriptions', 'all',
-+        #        '--show-option-descriptions', 'all',
-+        #    ]
-+        #cave doesn't support '--ask'
-+        #cave doesn't support '--no-color'
-+    
-+    def run_command(self, command):
-+        return subprocess.call(self._fullcommand + command + self._cmd)
-+    
-+    def install_package(self, pkgatom, catpkg):
-+        return self.run_command(['resolve'] + [pkgatom])
-+
-+    def uninstall_package(self, pkgatom, catpkg):
-+        return self.run_command(['uninstall'] + [pkgatom])
-+    
-+    def update_package(self, pkgatom=None, catpkg=None):
-+        cmd = ['-1','-K','s','-k','s']
-+        if pkgatom is None:
-+            pkgatom = self.installed_packages()
-+        else:
-+            pkgatom = [pkgatom]
-+        self.do_ebuilds(pkgatom)
-+        return self.run_command(['resolve'] + cmd + pkgatom)
-+    
-+    def installed_packages(self):
-+        packages = []
-+        p = subprocess.Popen([
-+            'cave',
-+            'print-ids',
-+            '--matching', 'g-octave/*::installed',
-+            '--format', '%c/%p\n',
-+        ], stdout=subprocess.PIPE)
-+        if p.wait() == os.EX_OK:
-+            for line in p.stdout:
-+                packages.append(line.strip())
-+        return packages
---- g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:25.740019020 +0200
-+++ g-octave-0.4.1/scripts/g-octave	2011-05-25 12:00:39.434019008 +0200
-@@ -217,7 +217,7 @@
-             return os.EX_DATAERR
-         return os.EX_OK
- 
--    from g_octave.package_manager import Portage, Pkgcore, Paludis
-+    from g_octave.package_manager import Portage, Pkgcore, Paludis, Cave
- 
-     if conf_prefetch.package_manager == 'portage':
-         log.info('Your package manager is: Portage')
-@@ -228,6 +228,9 @@
-     elif conf_prefetch.package_manager == 'paludis':
-         log.info('Your package manager is: Paludis')
-         pkg_manager = Paludis(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
-+    elif conf_prefetch.package_manager == 'cave':
-+        log.info('Your package manager is: Paludis (Cave)')
-+        pkg_manager = Cave(options.ask, options.verbose, options.pretend, options.oneshot, not options.colors)
-     else:
-         log.error('Invalid package manager: %s' % conf_prefetch.package_manager)
-         out.eerror('Invalid package manager: %s' % conf_prefetch.package_manager)
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
deleted file mode 100644
index af56b4f75d96..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- g-octave-0.4.1/share/g-octave.eclass	2013-05-30 19:01:07.980521612 +0200
-+++ g-octave-0.4.1/share/g-octave.eclass.new	2013-05-30 19:03:38.933514388 +0200
-@@ -48,6 +48,9 @@
- 	for filename in Makefile configure; do
- 		cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}"
- 	done
-+
-+	sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.'
-+
- 	chmod 0755 "${S}/configure"
- 	if [ -e "${S}"/src/autogen.sh ]; then
- 		cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh'
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
deleted file mode 100644
index 2700f3b100dc..000000000000
--- a/app-portage/g-octave/files/g-octave-0.4.1-fix-sourceforge-svn-root.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/contrib/manage_pkgdb.py
-+++ b/contrib/manage_pkgdb.py
-@@ -50,7 +50,7 @@ class SfUpdates:
-     # feed url from 'http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/'
-     feed_url = u'http://sourceforge.net/api/file/index/project-id/2888/mtime/desc/rss?path=%2FOctave%20Forge%20Packages%2FIndividual%20Package%20Releases'
- 
--    svnroot_url = u'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/'
-+    svnroot_url = u'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
-     categories = [u'main', u'extra', u'language', u'nonfree']
- 
-     _timestamp = None
---- a/g_octave/description.py
-+++ b/g_octave/description.py
-@@ -269,7 +269,7 @@ def __getattr__(self, name):
- 
- class SvnDescription(Description):
-     
--    _url = 'https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge'
-+    _url = 'http://svn.code.sf.net/p/octave/code/trunk/octave-forge'
-     
-     def __init__(self, category, package):
-         temp_desc = config_file = tempfile.mkstemp()[1]
---- a/share/g-octave.eclass
-+++ b/share/g-octave.eclass
-@@ -13,7 +13,7 @@
- G_OCTAVE_CAT="${G_OCTAVE_CAT:-main}"
- 
- 
--REPO_URI="https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge"
-+REPO_URI="http://svn.code.sf.net/p/octave/code/trunk/octave-forge"
- if [[ ${PV} = 9999* ]]; then
- 	inherit subversion autotools
- 	ESVN_REPO_URI="${REPO_URI}/${G_OCTAVE_CAT}/${PN}"
--- 
-1.7.10
-
diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
deleted file mode 100644
index 544b0d4318bb..000000000000
--- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-DB_COMMIT="bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed"
-DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT:0:7}"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
-HOMEPAGE="https://github.com/rafaelmartins/g-octave"
-
-SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz
-	https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} ->
-		${PN}-db-${DB_COMMIT:0:7}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
-RDEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-add_cave_support.patch"
-		"${FILESDIR}/${P}-fix-sourceforge-svn-root.patch"
-		"${FILESDIR}/${P}-fix-Makefile.patch"
-	)
-	sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
-		|| die 'failed to patch the g-octave main script'
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html || die 'failed to compile the documentation.'
-	fi
-}
-
-python_install_all() {
-	local HTML_DOCS=( ${PN}.html )
-	doman ${PN}.1 || die 'doman failed.'
-	if use doc; then
-		mv docs/_build/{html,sphinx} || die 'mv failed.'
-		HTML_DOCS+=( docs/_build/sphinx )
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	"${EPYTHON}" scripts/run_tests.py || die 'test failed.'
-}
-
-pkg_postinst() {
-	elog
-	elog 'To be able to use g-octave with the shipped package database, please'
-	elog 'edit your configuration file, clean your db directory and run:'
-	elog "    emerge --config =${PF}"
-	elog
-	elog "If you are upgrading from =${PN}-0.3, please read this:"
-	elog "http://g-octave.readthedocs.org/en/latest/upgrading/#from-0-3-to-0-4"
-	elog
-	elog 'Please install the package manager that you want to use before run g-octave'
-	elog
-}
-
-pkg_config() {
-	local db="$(g-octave --config db)"
-	mkdir -p "${db}" || die 'mkdir failed.'
-	einfo "Extracting g-octave database files to: ${db}"
-	tar -xzf "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.'
-	rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} || die 'rm db files failed.'
-	mv -f "${db}/${DB_DIR}"/* "${db}" || die 'mv failed.'
-	rm -rf "${db}/${DB_DIR}" || die 'rm db dir failed.'
-}
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
deleted file mode 100644
index 0ba35678266a..000000000000
--- a/app-portage/g-octave/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		g-octave is a tool that generates and installs ebuilds for Octave-Forge
-		packages "on-the-fly" to Gentoo Linux, using Portage. It's capable to
-		generate ebuilds and Manifest files for the packages, and to install
-		them using an autogenerated overlay (named g-octave). g-octave can also
-		handle patches to the packages automatically. The command line interface
-		tries to be very similar to the interface of the emerge tool.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rafaelmartins/g-octave</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/g-sorcery-0.1-r1 b/app-portage/g-sorcery-0.1-r1
new file mode 100644
index 000000000000..4a80c34df741
--- /dev/null
+++ b/app-portage/g-sorcery-0.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=framework for ebuild generators
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/g-sorcery
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/g-sorcery/archive/v0.1.tar.gz -> g-sorcery-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=26f768cc1426df16504b4055d2bd7157
diff --git a/app-portage/g-sorcery-0.2-r1 b/app-portage/g-sorcery-0.2-r1
new file mode 100644
index 000000000000..2b40a4851747
--- /dev/null
+++ b/app-portage/g-sorcery-0.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=framework for ebuild generators
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/g-sorcery
+IUSE=bson python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.tar.gz -> g-sorcery-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=94973ff6eaf9e00c286d4be7c7efc0bc
diff --git a/app-portage/g-sorcery-0.2.1 b/app-portage/g-sorcery-0.2.1
new file mode 100644
index 000000000000..c93f23714afb
--- /dev/null
+++ b/app-portage/g-sorcery-0.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=framework for ebuild generators
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/g-sorcery
+IUSE=bson git python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d8fb8feba609d808ecba152d4f49d4e
diff --git a/app-portage/g-sorcery-0.2.1-r1 b/app-portage/g-sorcery-0.2.1-r1
new file mode 100644
index 000000000000..bdec619abe9a
--- /dev/null
+++ b/app-portage/g-sorcery-0.2.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=framework for ebuild generators
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/g-sorcery
+IUSE=bson git python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=39940e76384e9845b65fd6594f574f6f
diff --git a/app-portage/g-sorcery-9999 b/app-portage/g-sorcery-9999
new file mode 100644
index 000000000000..8541506640b9
--- /dev/null
+++ b/app-portage/g-sorcery-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=framework for ebuild generators
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/g-sorcery
+IUSE=bson git python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2722e93634bc89ee6214cc288a7879c
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
deleted file mode 100644
index 71660d6d6c5a..000000000000
--- a/app-portage/g-sorcery/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-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 956 BLAKE2B 2f23f94741d48725ae1ef3920a3e1f919a20cb80383b16a40cb7947cc2f9d5e7ccb1fd14d7a175a4699c18c701bd0d3b13eec916809348965b3daf622b4d8ab5 SHA512 0a343b118df47532e0b0e57a2908d6c8481130ce6e9a18615850a5f0c1129b6712add6d6e6a630e42b8a6411c2e5270f5caf5e3ce8289b78f70d514b95f8e1ed
-EBUILD g-sorcery-0.2.1.ebuild 866 BLAKE2B 99748c1dc04ce8ac57784e4746dd015f52d60116651578a78aee0c37e1fadc92b012aef2dc8bc36be66adc5fd46ffd6312e5de44d42bd3ba676bedb470e95ef0 SHA512 f290aaab0f812cf104d6dc4fc0db9d4e7fd383f1743a3bba12600faa3fa03931f274760cf4ec046d27edd7daceb8ad989edef0c1b8558f0bd7bc89ad91360364
-EBUILD g-sorcery-9999.ebuild 894 BLAKE2B 7c419b97fab6213319ca2c75788c23b15dbf71c0c14bf8d2bfa41b7c539fafbf3ee6947006f02fc1df1e2db31e4712833221cb5eb2f216e80ae1bbd1c86ee9c4 SHA512 2f5665e85eba78c3f15c22cf1e52b8ac4d1a9d24091089f8391563e7669d59f2b2086d37606009b29cd12d9effe1823e741b47d0d005e51d2d8b9c34f020e5d6
-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
deleted file mode 100644
index 08cac22a5e43..000000000000
--- a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +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="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI="https://github.com/jauhien/g-sorcery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery,${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
diff --git a/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
deleted file mode 100644
index 5ee1d41cb94f..000000000000
--- a/app-portage/g-sorcery/g-sorcery-0.2-r1.ebuild
+++ /dev/null
@@ -1,38 +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})
-
-inherit distutils-r1
-
-DESCRIPTION="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
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
deleted file mode 100644
index 0837fefd4932..000000000000
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson git"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	git? ( dev-vcs/git )
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-src_prepare() {
-	hprefixify setup.py
-	default
-}
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
deleted file mode 100644
index 3c6dc9125f1c..000000000000
--- a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 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="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson git"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	git? ( dev-vcs/git )
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
deleted file mode 100644
index 8425f5282fcc..000000000000
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="git://git.gentoo.org/proj/g-sorcery.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson git"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	git? ( dev-vcs/git )
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml
deleted file mode 100644
index a61b3d383283..000000000000
--- a/app-portage/g-sorcery/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="bson">Support BSON file format for package DB</flag>
-	</use>
-	<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/g-sorcery</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/gemato-12.2 b/app-portage/gemato-12.2
new file mode 100644
index 000000000000..ae25e3e78b85
--- /dev/null
+++ b/app-portage/gemato-12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-12.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4a550e448047aa665d06cc6e16ce8817
diff --git a/app-portage/gemato-13.0-r1 b/app-portage/gemato-13.0-r1
new file mode 100644
index 000000000000..4f5b9536090b
--- /dev/null
+++ b/app-portage/gemato-13.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-13.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=81a4a9da01a0acaabac7d770c8c8471b
diff --git a/app-portage/gemato-13.1 b/app-portage/gemato-13.1
new file mode 100644
index 000000000000..9bf75f55f4a8
--- /dev/null
+++ b/app-portage/gemato-13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-13.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7bb40991e8ab750735a9eeb1878855cb
diff --git a/app-portage/gemato-9999 b/app-portage/gemato-9999
new file mode 100644
index 000000000000..7473804d253f
--- /dev/null
+++ b/app-portage/gemato-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8632b8772f0a97ce329c25d1e330d53
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
deleted file mode 100644
index 1b06bcbadfdb..000000000000
--- a/app-portage/gemato/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
-DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
-DIST gemato-13.1.tar.gz 66699 BLAKE2B f779efc2ad00c2bb6ad7eb2bbab8f6fbc8b8bc026b593bfc830844ba50a6d5ff260ca0b73190b1739268b2181461fbd4c4c45adf244b23b8ade7803d90c6773f SHA512 2cda08cee937cfdf4ff46d60b44d49e4de7af5c57bfc12ba5394e967fcdae6e4cb9ceaf131b379a2c90e92b14d8b1ec375362415fc81e16efcb3279a0ff1e46a
-EBUILD gemato-12.2.ebuild 1209 BLAKE2B bdf78ce5cddb0d78e20048fbbef5eb9011900e00b7b9d91e21eb86d0b81fb315f7fbc4831b17759dacfc5e168957a6d6d07b49a5e50a77160dee02063544bd36 SHA512 321077315648ca61ef1ff4083c8ea0d651cf919e1008a2a0f74f94d9032e255b513b2e0bb68577c2fa0f5c5dad441a9cc67853538d99823412576c59afbad5c8
-EBUILD gemato-13.0-r1.ebuild 1348 BLAKE2B 51a605d710a59a6d4ae044aa2cb9921dacdccc89d3be16f43b9f2d52569990d7f43f71ec5c88950d368ab10c1afc318dc4ed14531909ef740c018cce7fd1740c SHA512 617a34511750626d0323ec1924e73508465d5d8da42db882f6135fb62101f6fb5c83eae4f163a33caa1c755f08a3c8e3a0716dba385596adafd1daa8cbe38577
-EBUILD gemato-13.1.ebuild 1359 BLAKE2B a11de01b61ebe34eef5690da26171ace77792ca33f9c56b5b44797d64f7c523b56ddc27f8d48166839bb8322348828d4fcb9b667336ed75bb545750bb66deae7 SHA512 6ef238ca58873a050964f798d988622249cbddbb6f5f0e3a1f61f244cef6e33a4d9be7cb4689bf958e14fe230294cde3ed2c1cfdc9451593274889b357a739e4
-EBUILD gemato-9999.ebuild 1282 BLAKE2B 75d4ba974bfdc4f2834d4c2cdce2f0847335d77c63ed8ea1291ee2b5760730db550d713f3c57d914a8e7cafb327f93239605d2ba8a84305dc56fd16c3e185073 SHA512 0f0de3082c4ba6cea4f36b906cf71ec1365feec8f4c360909f7c9415f766e5c078e8f33a1ae6ddc28453ad34d768b2d261855a3643490d03c394082ded2b75b1
-MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-12.2.ebuild b/app-portage/gemato/gemato-12.2.ebuild
deleted file mode 100644
index 180af2c047e2..000000000000
--- a/app-portage/gemato/gemato-12.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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} 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,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}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gemato/gemato-13.0-r1.ebuild b/app-portage/gemato/gemato-13.0-r1.ebuild
deleted file mode 100644
index 07c61c7ea735..000000000000
--- a/app-portage/gemato/gemato-13.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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} 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 ~mips ppc ppc64 s390 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_4,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}) )"
-
-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-13.1.ebuild b/app-portage/gemato/gemato-13.1.ebuild
deleted file mode 100644
index 2c4755f0e3f8..000000000000
--- a/app-portage/gemato/gemato-13.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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} 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 ~mips ~ppc ~ppc64 ~s390 ~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_4,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}) )"
-
-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-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
deleted file mode 100644
index d58dc34eb2e5..000000000000
--- a/app-portage/gemato/gemato-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
-
-LICENSE="BSD-2"
-SLOT="0"
-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}) )
-	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}) )"
-
-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/metadata.xml b/app-portage/gemato/metadata.xml
deleted file mode 100644
index fecff7a1fcd3..000000000000
--- a/app-portage/gemato/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name='blake2'>Install dependencies needed for BLAKE2 hash
-			functions</flag>
-		<flag name='gpg'>Install dependencies needed for OpenPGP
-			signature verification support</flag>
-		<flag name='sha3'>Install dependencies needed for SHA3 hash
-			functions</flag>
-		<flag name='tools'>Install additional utilities (benchmarks,
-			hash testing tools, fast Manifest generators)
-			to /usr/share/gemato.</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/mgorny/gemato/issues/</bugs-to>
-		<remote-id type="github">mgorny/gemato</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/genlop-0.30.10 b/app-portage/genlop-0.30.10
new file mode 100644
index 000000000000..010f1927f5da
--- /dev/null
+++ b/app-portage/genlop-0.30.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+DESCRIPTION=A nice emerge.log parser
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/genlop-0.30.10.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b25549e3c48eef1417783c3667a38e1b
diff --git a/app-portage/genlop-0.30.10-r1 b/app-portage/genlop-0.30.10-r1
new file mode 100644
index 000000000000..17ef8b0d093a
--- /dev/null
+++ b/app-portage/genlop-0.30.10-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+DESCRIPTION=A nice emerge.log parser
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/genlop-0.30.10.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cae9631eef24c21471c1e625b669cd25
diff --git a/app-portage/genlop-0.30.9-r1 b/app-portage/genlop-0.30.9-r1
new file mode 100644
index 000000000000..e22ef2dc3425
--- /dev/null
+++ b/app-portage/genlop-0.30.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+DESCRIPTION=A nice emerge.log parser
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+SLOT=0
+SRC_URI=mirror://gentoo//genlop-0.30.9.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=608206f9537fb71d05743de180fa3236
diff --git a/app-portage/genlop-9999 b/app-portage/genlop-9999
new file mode 100644
index 000000000000..7b7bd85a852d
--- /dev/null
+++ b/app-portage/genlop-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A nice emerge.log parser
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7064f07533b5d95fe2800e67723a4e90
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
deleted file mode 100644
index b079f5199380..000000000000
--- a/app-portage/genlop/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1dfa0e4add517087765d056e98fdd9bfe26838ec2f94b001c14175f8e98b45f4bab95e50d99f87083910864e86ed SHA512 dfb9edf5eefac114e868590df49b36e1f799ce4849448ca081d12c70019d40dee3dd7056665281728891ad8b7cada9213f17f0260347aa867b20009c0f87781d
-AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaae7a71b73fbac55657c29973629fe580f8cf5901b0d37b3a2cae1f0405ad0a75820c45d7462c176cf06673dd29d91 SHA512 76b5663dd1c2fb5700e8519b303db82ee37e6567fa847251304eec10e04bbb0c83a13d09b47f3cc725f9196d3ad34147ae9781c1284d33820f859703399c2f93
-DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
-DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
-EBUILD genlop-0.30.10-r1.ebuild 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/files/genlop-0.30.10-sync.patch b/app-portage/genlop/files/genlop-0.30.10-sync.patch
deleted file mode 100644
index 8c798dddd18a..000000000000
--- a/app-portage/genlop/files/genlop-0.30.10-sync.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 46eb6a5a9a90049920ea84018b69b643c2809bfa Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Thu, 19 Feb 2015 09:46:47 -0600
-Subject: [PATCH] Fix genlop -r to work with new Portage sync code. (Bug
- 540050)
-
----
- genlop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/genlop b/genlop
-index e36c678..4e0faf0 100755
---- a/genlop
-+++ b/genlop
-@@ -968,7 +968,7 @@ sub rsync() {
- 		my $handle;
- 		open_file($_, \$handle);
- 		while(<$handle>) {
--			if ($_ =~ m/^(.*?)\: \=\=\= Sync completed with/) {
-+			if ($_ =~ m/^(.*?)\: \=\=\= Sync completed/) {
- 				if ($date_found) {
- 					if (datecompare($1) <= 0) {
- 						next;
--- 
-2.3.0
-
diff --git a/app-portage/genlop/files/genlop-0.30.9-display.patch b/app-portage/genlop/files/genlop-0.30.9-display.patch
deleted file mode 100644
index cd9919ee3a27..000000000000
--- a/app-portage/genlop/files/genlop-0.30.9-display.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 76cb98e439c65b5ec8d32d809100a67c653e5635 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Mon, 21 Jan 2013 15:37:19 -0600
-Subject: [PATCH] Fix issue where genlop <pkg name> no longer displays merge
- information (Bug 453382).
-
----
- genlop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/genlop b/genlop
-index 52af5ed..d5020eb 100755
---- a/genlop
-+++ b/genlop
-@@ -1127,7 +1127,7 @@ foreach my $ebuild_arg (@targets)
- 						}
- 					}
- 				}
--				if ($list_found or $ebuild_found or $time_found)
-+				if ($list_found or $ebuild_found or $time_found or !$info_found)
- 				{
- 					my $eb = $2;
- 					my $extra = $3 || "";
--- 
-1.8.1.1
-
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
deleted file mode 100644
index 6b2d28df5e7f..000000000000
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base 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 ~arm64 ~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}"
-
-# Populate the patches array for any patches for -rX releases
-PATCHES=( "${FILESDIR}"/${P}-sync.patch )
-
-src_install() {
-	dobin genlop
-	dodoc README Changelog
-	doman genlop.1
-	newbashcomp genlop.bash-completion genlop
-}
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/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
deleted file mode 100644
index 96167c0796c9..000000000000
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base bash-completion-r1
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	 dev-perl/Date-Manip
-	 dev-perl/libwww-perl"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-PATCHES=( "${FILESDIR}"/${P}-display.patch )
-
-src_install() {
-	dobin genlop || die "failed to install genlop (via dobin)"
-	dodoc README Changelog
-	doman genlop.1
-	newbashcomp genlop.bash-completion genlop
-}
diff --git a/app-portage/genlop/genlop-9999.ebuild b/app-portage/genlop/genlop-9999.ebuild
deleted file mode 100644
index a11d4f062d6b..000000000000
--- a/app-portage/genlop/genlop-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 bash-completion-r1
-
-EGIT_REPO_URI="https://github.com/gentoo-perl/genlop.git"
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-
-LICENSE="GPL-2"
-SLOT="0"
-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/genlop/metadata.xml b/app-portage/genlop/metadata.xml
deleted file mode 100644
index 310c8d376ea6..000000000000
--- a/app-portage/genlop/metadata.xml
+++ /dev/null
@@ -1,12 +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>
-<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/gentoolkit-0.3.3 b/app-portage/gentoolkit-0.3.3
new file mode 100644
index 000000000000..7e2d3b1c971a
--- /dev/null
+++ b/app-portage/gentoolkit-0.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<=app-portage/gentoolkit-dev-0.2.7 sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65f58c0f927e62d98c3f4947decd1779
diff --git a/app-portage/gentoolkit-0.4.0 b/app-portage/gentoolkit-0.4.0
new file mode 100644
index 000000000000..332190ef5b03
--- /dev/null
+++ b/app-portage/gentoolkit-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.4.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbf75d013ea52a505b912ea95e530e0a
diff --git a/app-portage/gentoolkit-0.4.1 b/app-portage/gentoolkit-0.4.1
new file mode 100644
index 000000000000..e3eef589709f
--- /dev/null
+++ b/app-portage/gentoolkit-0.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~fuzzyray/releases/gentoolkit/gentoolkit-0.4.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d93c94a1e8601e29951774b4e0dd9827
diff --git a/app-portage/gentoolkit-0.4.2-r1 b/app-portage/gentoolkit-0.4.2-r1
new file mode 100644
index 000000000000..ef09e569306c
--- /dev/null
+++ b/app-portage/gentoolkit-0.4.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/gentoolkit-0.4.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=964e7fd53ead094c1de5bac146e01488
diff --git a/app-portage/gentoolkit-9999 b/app-portage/gentoolkit-9999
new file mode 100644
index 000000000000..ae13ba41f68a
--- /dev/null
+++ b/app-portage/gentoolkit-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65283b5157823e42f3dcd7c5ae17f5b3
diff --git a/app-portage/gentoolkit-dev-0.2.8.3-r1 b/app-portage/gentoolkit-dev-0.2.8.3-r1
new file mode 100644
index 000000000000..cf7074830edb
--- /dev/null
+++ b/app-portage/gentoolkit-dev-0.2.8.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !>=app-portage/gentoolkit-0.4.0 test? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/perl sys-apps/diffutils )
+DESCRIPTION=Collection of developer scripts for Gentoo
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
+IUSE=test python_targets_python2_7 python_targets_python3_4
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/perl sys-apps/diffutils
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://gentoo/gentoolkit-dev-0.2.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b63723c3dc0a25908cd2268a20ea662a
diff --git a/app-portage/gentoolkit-dev-0.3.0 b/app-portage/gentoolkit-dev-0.3.0
new file mode 100644
index 000000000000..f48deb770cc0
--- /dev/null
+++ b/app-portage/gentoolkit-dev-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !>=app-portage/gentoolkit-0.4.0 test? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils )
+DESCRIPTION=Collection of developer scripts for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoolkit-dev-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=73f7324d593cc878f654f6d957844266
diff --git a/app-portage/gentoolkit-dev-0.3.1 b/app-portage/gentoolkit-dev-0.3.1
new file mode 100644
index 000000000000..456ed07da897
--- /dev/null
+++ b/app-portage/gentoolkit-dev-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !>=app-portage/gentoolkit-0.4.0 test? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils )
+DESCRIPTION=Collection of developer scripts for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/perl sys-apps/diffutils
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoolkit-dev-0.3.1.tar.gz https://dev.gentoo.org/~vapier/dist/gentoolkit-dev-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0621554162792e9392b8bfa86e21ca91
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
deleted file mode 100644
index 7b1324d90531..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 1542 BLAKE2B 66681886ff1dede7c1c0a90718c090ab08e039c5ddad48c20b82b31d318a4acfad34a89858bb414d6e4f5c8b8e165c75878d772baf1869cb1977ebb552e6078e SHA512 1657173f37fd6da8b9c32a0a726d4290162553fcfaf1e00315070195b12900744a1e45bf70d9fd0127ff769f20f108fee12fa83e0a5a075ddf8391ab3e4f80f7
-EBUILD gentoolkit-dev-0.3.0.ebuild 2327 BLAKE2B ca3b77ac4dc3d2fc8a2504fa0d04bad98cefbdece7c7b3ede55588b6968b119dfd39fc3416a6fde1943ed4474eda7b69fd6b3e81da7e23a528e30b1b8821b311 SHA512 205b765071102ca19233c391f0a869ad1fd8ce8efd658f9240081f64d89eb7013e4bd2ae189c722bdb815a870bb3c8726dd4f541030cd7352585c007fba549f7
-EBUILD gentoolkit-dev-0.3.1.ebuild 2402 BLAKE2B 0cf6b9bed7c0479e4fb8db446a03536affc95b8f1558130d52f42eb260379f7834294d05a57b6f43de11d4d2744f28b1dd920a9f43a78b9a1ee354eabd04ee30 SHA512 20c498a38090e3598b943774752d77030b669503311e8a327d0def7706381495b004abc6fb8701383a6abfc88c04c3a6ada98ae775968e2b0b830cfc4983a4c6
-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 c03ed4457a45..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 ~arm-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 5c750d88b85f..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 ~arm-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 3b4bf8aff4f1..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 ~arm-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/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
deleted file mode 100644
index cedfbd94fdc1..000000000000
--- a/app-portage/gentoolkit/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
-DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
-DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
-DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
-EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
-EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
-EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2206 BLAKE2B 7bf64e1730af382efcd97bcc36fe182c166ed706f773f0470bc2dff4f73eaffa39a5ab932ec78421dd4c3ce45bc8669ea8bc4fbb6d27938dad43654353f7b517 SHA512 32e06caad05b2b9c257e162478380f578bb94b1653f992b21bdf63a0ed0ec9630d48ff58a59902e7336a93aaa2f3449a049537fc39a40d84373898dfedf067e8
-EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
-MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
deleted file mode 100644
index 9ab493835d3f..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy)
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!<=app-portage/gentoolkit-dev-0.2.7
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild*
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
deleted file mode 100644
index 23bc999bd73b..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!app-portage/gentoolkit-dev
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	einfo "Starting with this version, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
deleted file mode 100644
index ed5581daa990..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://dev.gentoo.org/~fuzzyray/releases/gentoolkit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!app-portage/gentoolkit-dev
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
deleted file mode 100644
index 4d29aa18c6b4..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}
-	!app-portage/gentoolkit-dev
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-	einfo "part of the gentoolkit package."
-	einfo "The gentoolkit-dev package is now deprecated in favor of a single"
-	einfo "gentoolkit package.   The remaining tools from gentoolkit-dev"
-	einfo "are now obsolete/unused with the git based tree."
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
deleted file mode 100644
index 084927bf88c8..000000000000
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 git-r3
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}
-	!app-portage/gentoolkit-dev
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild*
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
deleted file mode 100644
index 011e78ec7428..000000000000
--- a/app-portage/gentoolkit/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="project">
-    <email>tools-portage@gentoo.org</email>
-    <name>Gentoo Portage tools team</name>
-  </maintainer>
-  <longdescription>
-Gentoolkit is a collection of useful adminstration scripts particular to
-the Gentoo Linux distribution. It contains rough drafts and
-implementations of features that may in time make it into Portage, or
-into full-fledged tools in their own right.
-</longdescription>
-</pkgmetadata>
diff --git a/app-portage/gentoopm-0.2.9-r1 b/app-portage/gentoopm-0.2.9-r1
new file mode 100644
index 000000000000..edf2f13ce6dd
--- /dev/null
+++ b/app-portage/gentoopm-0.2.9-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/epydoc ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A common interface to Gentoo package managers
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/gentoopm/
+IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=app-eselect/eselect-package-manager
+RDEPEND=|| ( sys-apps/pkgcore >=sys-apps/portage-2.1.10.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/paludis-0.64.2[python-bindings] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/gentoopm/releases/download/gentoopm-0.2.9/gentoopm-0.2.9.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c9a19cc56cc46cfe858f5b93278e6dba
diff --git a/app-portage/gentoopm-0.3.0 b/app-portage/gentoopm-0.3.0
new file mode 100644
index 000000000000..d04825d70b43
--- /dev/null
+++ b/app-portage/gentoopm-0.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A common interface to Gentoo package managers
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gentoopm/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=app-eselect/eselect-package-manager
+RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/portage-2.1.10.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/paludis-3.0.0_pre20170219[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.0.tar.gz -> gentoopm-0.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8dd9efa8c4f69f5b1d9f8f3e25f656d2
diff --git a/app-portage/gentoopm-9999 b/app-portage/gentoopm-9999
new file mode 100644
index 000000000000..7ab0f9702a4b
--- /dev/null
+++ b/app-portage/gentoopm-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A common interface to Gentoo package managers
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gentoopm/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD-2
+PDEPEND=app-eselect/eselect-package-manager
+RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/portage-2.1.10.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/paludis-3.0.0_pre20170219[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66f8f62ac268b3ba79ad5c54471a650b
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
deleted file mode 100644
index e0515359a09c..000000000000
--- a/app-portage/gentoopm/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST gentoopm-0.2.9.tar.bz2 24652 BLAKE2B 1046d4cc5dca19d2cc72e8d8d54cd0d2172164aa5594666c89a4dde9dbd994654d07982a2381fa09038b29ebb011bdd410f60ac3c340bdbf533bcfc29f4c4796 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7
-DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
-EBUILD gentoopm-0.2.9-r1.ebuild 949 BLAKE2B cddba8cbec01872603134552283f1893df14f877a5a31d855ef74a93939b354a85e988856d9163878e85fe21da8a192ea1bc61bfa0db20962c9443a13d422f5a SHA512 47f12ad7c000b293e07e8baa9a309f82014604aa37961b81328b9102df7dd98ba1ba55744029362048eb79db27e162b7ce8c336a16e89f7cb5c370e14b14eeed
-EBUILD gentoopm-0.3.0.ebuild 763 BLAKE2B 6acec5f68c2a1d0c81ccbad9aec0bc6be6d634101087f29e7c26833c4cb0c831b1c3f014b63935532dfeefa17c73ded12bf656bb738c24b2e809133072808fca SHA512 c31fbb7761f098b912988f8600dde441c15e27a720843c750377d2d3ae8ef78b02bcbe2501f5e2d4d5fcea95aa5889f83966e74dcf5991cda612d54f4c456e3d
-EBUILD gentoopm-9999.ebuild 713 BLAKE2B 7f9e351e8bd066d2e04c03ec4e3863595455767a3f1b5338cd34d77bbf522afc5785db74b3d6786af789b50874b687df1cb16f60f5ae2597609d0259b40eda22 SHA512 79792fa49fcfeebc388f7627c9cfefe3ca334ba864901849980d28cd6a90b3eef31b35c385a012472abe248339e955158459e9e92cf2ca3ddc2237584b1d3198
-MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild b/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
deleted file mode 100644
index 21be8599cc2d..000000000000
--- a/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,40 +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,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="|| (
-		sys-apps/pkgcore
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		>=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-python_compile_all() {
-	if use doc; then
-		"${PYTHON}" setup.py doc || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/* )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-portage/gentoopm/gentoopm-0.3.0.ebuild b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
deleted file mode 100644
index 1adbbdf76b0f..000000000000
--- a/app-portage/gentoopm/gentoopm-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
deleted file mode 100644
index 96a9ef4eacfc..000000000000
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		>=sys-apps/paludis-3.0.0_pre20170219[python,${PYTHON_USEDEP}] )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
deleted file mode 100644
index 96a81859dd9c..000000000000
--- a/app-portage/gentoopm/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://github.com/mgorny/gentoopm/issues/</bugs-to>
-    <remote-id type="github">mgorny/gentoopm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/getdelta-0.7.9-r2 b/app-portage/getdelta-0.7.9-r2
new file mode 100644
index 000000000000..eb486a410e28
--- /dev/null
+++ b/app-portage/getdelta-0.7.9-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=dynamic deltup client
+EAPI=5
+HOMEPAGE=http://linux01.gwdg.de/~nlissne/
+KEYWORDS=~alpha ~amd64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-portage/deltup dev-util/bdelta
+SLOT=0
+SRC_URI=http://linux01.gwdg.de/~nlissne/getdelta-0.7.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d00df2a7e4fd4bb27d0d80103686ef8d
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
deleted file mode 100644
index e1f1b7825b1b..000000000000
--- a/app-portage/getdelta/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX getdelta-0.7.9.patch 9393 BLAKE2B 1b105cccd24dc039ea5c14f119b67fb9ea570172d1e0808af905951ef23275ea1843a60cda1156cfa653904ec42ae5c869faaf4133a5c614162956dc064691c8 SHA512 c9c363c8e36245a8cd409d3a43c0d9110c409311f6972893d993f16f2911496c33c50c98e8dd9138b52bb7d7dc5ffb56b0611c28e9682ea5ac189cb27c5755dc
-DIST getdelta-0.7.8.tar.bz2 10335 BLAKE2B ab2093a805649904405d23d7ec7afb2f338e87864c91f8aeb13efa2547f5493080cc1249a28a73da8e17d6b5aaff6fc00f217fe5b8df51db4fbea2420a88a523 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2
-EBUILD getdelta-0.7.9-r2.ebuild 1391 BLAKE2B e503ede04a9315666d3229f1ca1652294417e3d34d1c1b1908de72de997607442c473254ec17bc0b8db6145a10a808aa336dd70398120aa2eb0ac50b1e66cc1f SHA512 5d50594b215d4901b7378d627d78c51162bc39ec75901ecb00722658704948bc4e8dffc4eba4467fb2c32bf0dc389c7b1d0f7930c3cfb318f16bfb1da81deb1a
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-portage/getdelta/files/getdelta-0.7.9.patch b/app-portage/getdelta/files/getdelta-0.7.9.patch
deleted file mode 100644
index 9ab117e59c95..000000000000
--- a/app-portage/getdelta/files/getdelta-0.7.9.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- getdelta.sh	2007-07-13 16:30:26.000000000 +0000
-+++ getdelta.sh	2010-08-27 17:23:31.692000002 +0000
-@@ -25,6 +25,9 @@
- VERSION="0.7"
- 
- # Changelog
-+# version 0.7.9   2008/10/08
-+#		- add second parameter for destination name (EAPI=2)
-+#		- quote more carefully
- # version 0.7.8   2007/07/13
- #		- added option -O to call of emerge when finding mirrors
- #		- replaced some calls of coreutils with bash-internals
-@@ -326,13 +329,13 @@
- 
- remove() {
- 	output "${GREEN}You have chosen to remove ${CYAN}$1\n"
--	pushd ${DISTDIR} >/dev/null 2>&1
-+	pushd -- "${DISTDIR}" >/dev/null 2>&1
- 	removeme=true
- 	for n in $(grep -v "^#" ${DO_NOT_REMOVE})
- 	do
-        		grep -q $n <<< "$1"  && removeme=false && output "${CYAN}${1}${RED} is not deleted, since it matches ${n} in ${DO_NOT_REMOVE}"
- 	done
--	$removeme && rm -f $1
-+	$removeme && rm -f -- "$1"
- 	popd >/dev/null 2>&1
- }
- 
-@@ -349,7 +352,7 @@
- 			-e "s/src4/srcDDD/g" \
- 			-e "s/src5/srcEEE/g" \
- 			-e "s/src6/srcFFF/g" \
--			-e "s/src7/srcGGG/g" <<< $MASK_FILENAME)
-+			-e "s/src7/srcGGG/g" <<< "$MASK_FILENAME")
- 	fi
- 	
- 	# ignore PR for src-files of firefox
-@@ -375,7 +378,7 @@
- 		   -e "s/rc//g" \
- 		   -e "s/[\._-]//g" \
- 		   -e "s/\+//g" \
--		   -e "s/ //g" <<< $MASK_FILENAME)
-+		   -e "s/ //g" <<< "$MASK_FILENAME")
- }
- 
- # create or update a config-file
-@@ -384,6 +387,7 @@
- add_to_configfile LOCAL_MIRROR "" "set this to one or more (space separated) URI ending with '/' if you want to check one or more local mirror(s) first\n# most people just leave it empty."
- add_to_configfile DELTUP_SERVER "http://linux01.gwdg.de/~nlissne/deltup.php" "deltup-server to use"
- add_to_configfile FETCH "/usr/bin/wget -t 1 --passive-ftp" "command to use for downloading"
-+add_to_configfile FETCHNAME "\$FETCH -O" "command to use for downloading; first parameter is the filename, second the url"
- add_to_configfile QUEUERETRY 15 "number of seconds to wait before a queued request is retried"
- add_to_configfile MAXIMUM_ACCEPTABLE_QUEUEPOS "15" "the maximum queuepos you would accept (if higher download full archive instead)"
- add_to_configfile QUEUETIMEOUT 900 "when a dtu-request is queued - how long should we wait max. before downloading the original archive instead (in seconds)"
-@@ -424,14 +428,14 @@
- add_to_donotremove "^rp-pppoe"
- 
- 
--if [ -z $1 ]
-+if [ -z "$1" ]
- then
- 	COLOR=true
- 	echo -e "${YELLOW}getdelta.sh version ${VERSION}"
- 	echo "This script has to be called like this:"
- 	echo -e "${CYAN}$0 <URI>"
- 	echo -e "\n${YELLOW}To use it, you should just put the following line into your /etc/make.conf"
--	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\${URI}\""
-+	echo -e "${GREEN}FETCHCOMMAND=\"$0 \\\"\\\${URI}\\\" \\\"\\\${FILE}\\\"\""
- 	echo -e "\n${YELLOW}There is a config-file ${CYAN}${GETDELTA_CONFIGFILE}${YELLOW} with some variables to control the behaviour of this script."
- 	echo -e "Edit it to your needs.${NORMAL}"
- 	exit 1
-@@ -464,10 +468,12 @@
- 	output "use getdelta.sh for your FETCHCOMMAND, only." &&
- 	sleep 5 && exit 1
- 
--pushd $DISTDIR >/dev/null 2>/dev/null
-+pushd -- "$DISTDIR" >/dev/null 2>/dev/null
- ORIG_URI=$1
- NEW_FILE=$(basename $ORIG_URI)
- 
-+[ -z "${NEW_FILE}" ] && NEW_FILE=${ORIG_URI##*/}
-+
- # repoman downloads metadata.dtd with FETCHCOMMAND
- # this should not be done with getdelta - so just fetch the file and exit
- 
-@@ -475,7 +481,7 @@
- # dtu files.
- if [ "${NEW_FILE}" = "metadata.dtd" ] || [ "$GETDELTA" = "0" ]
- then
--	$FETCH $@
-+	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
- 	exit $?
- fi
- 
-@@ -516,7 +522,7 @@
- #
- output "${GREEN}Searching for a previously downloaded file in ${YELLOW}${DISTDIR}\n"
- 
--first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< $NEW_FILE)
-+first_chars=$(sed 's/[[:digit:]][[:print:]]*$//' <<< "$NEW_FILE")
- length_first_chars=${#first_chars}
- [ $length_first_chars -lt 3 ] && first_chars="${NEW_FILE:0:2}"
- 
-@@ -527,7 +533,7 @@
- let len1=${#mask}
- filelist=""
- 
--for name in $( ls ${first_chars}* 2>/dev/null )
-+for name in $( ls -- "${first_chars}"* 2>/dev/null )
- do
- 	mask2=$(mask_name "${name}")
- 	# add any file, that results in the same mask or differ not more than two letters
-@@ -582,7 +588,7 @@
- 
- 	# find matching part of filename - first: frontmatch
- 	x=0;
--	a=($NEW_FILE $filelist)
-+	a=("$NEW_FILE" $filelist)
- 	match=""
- 	while [ -z "$match" ]
- 	do
-@@ -657,7 +663,7 @@
- 	FILE_IS_CORRUPT=false
- 	if $CHECK_OLD_FILE 
- 	then
--		file_digest=$(grep -h ${best_candidate} ${FILESDIR}/digest-* | sed -n 1p)
-+		file_digest=$(grep -h ${best_candidate} "${FILESDIR}"/digest-* | sed -n 1p)
- 		if [ "$file_digest" ]
- 		then
- 			file_md5=$(cut -d ' ' -f2 <<< "$file_digest") 
-@@ -669,7 +675,7 @@
- 				FILE_IS_CORRUPT=true
- 			fi
- 		else
--			if [ $(rev <<< ${best_candidate} | cut -d. -f2 | rev) = "tar" ]
-+			if [ $(rev <<< "${best_candidate}" | cut -d. -f2 | rev) = "tar" ]
- 			then
- 				output "${YELLOW}Could not find a digest-file for ${CYAN}${best_candidate}${YELLOW}. Testing file integrity with tar.\n"
- 				if ! tar -tf ${best_candidate} >/dev/null
-@@ -698,17 +704,16 @@
- 
- 		# Remember where we are, and go to a new dir there we can work
- 		tmp_dwn_dest="${DISTDIR}/.getdelta-`date +%N`-tmp"
--		mkdir ${tmp_dwn_dest}
-+		mkdir -- "${tmp_dwn_dest}"
- 		# If user abort Ctrl+C (signal 2), remove tmp-dir; enabable trap again and send it again to stop wget
--		trap "rm -r ${tmp_dwn_dest}; trap 2; kill -2 $$" 2
--		pushd ${tmp_dwn_dest} >/dev/null 2>&1
-+		trap 'rm -r -- "${tmp_dwn_dest}"; trap 2; kill -2 '$$ 2
-+		pushd -- "${tmp_dwn_dest}" >/dev/null 2>&1
- 
- 		# thanks to MATSUI Fe2+ Tetsushi for idea and patch
- 		FILESIZE=$(stat -c %s "${DISTDIR}/${best_candidate}")
- 		let TIMELIMIT=${FILESIZE}/${BANDWIDTH}
- 		[[ $TIMELIMIT -lt $QUEUETIMEOUT ]] && QUEUETIMEOUT=$TIMELIMIT
--			
--		if $FETCH "${DELTUP_SERVER}${query}"
-+		if $FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
- 		then
- 			# thanks to deelkar for this much more elegant solution to the "broken pipe" problem with "head -n1"
- 			GOTFILE=$(ls -c | sed -n 1p) 
-@@ -718,15 +723,15 @@
- 			# may have sento to us.
- 			
- 			# first: the request have been queued
--			if [ "${GOTFILE}" = "deltup-queued" ]
-+#			if [ "${GOTFILE}" = "deltup-queued" ]
-+			if [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
- 			then 
- 				let QTMOUT=$(date +%s)+QUEUETIMEOUT
--				while [ -f deltup-queued ]
-+				while [[ "$(file -bi ${GOTFILE}|cut -d ";" -f1)" != "application/x-bzip2" && "$(cat ${GOTFILE}|cut -d "," -f1)" != "sorry" ]]
- 				do
- 					output "${GREEN}destination file: ${CYAN}${NEW_FILE}\n"
--					output "${YELLOW}$(cat deltup-queued)"
--					QUEUEPOS=$(grep "has been queued" deltup-queued | cut -d. -f2 | cut -d")" -f1)
--					rm -f deltup-queued
-+					output "${YELLOW}$(cat ${GOTFILE})"
-+					QUEUEPOS=$(grep "has been queued" ${GOTFILE} | cut -d. -f2 | cut -d")" -f1)
- 					TSTAMP=$(date +%s)
- 					if ((TSTAMP<QTMOUT)) && ((QUEUEPOS<=MAXIMUM_ACCEPTABLE_QUEUEPOS))
- 					then
-@@ -741,7 +746,7 @@
- 							sleep 1
- 						done
- 						echo -n -e "${NORMAL}"
--						$FETCH "${DELTUP_SERVER}${query}"
-+						$FETCH "${DELTUP_SERVER}${query}" -O ${best_candidate}-${NEW_FILE}.dtu
- 						GOTFILE=$(ls -c | sed -n 1p)
- 					else
- 						if ((TSTAMP>=QTMOUT))
-@@ -761,20 +766,20 @@
- 				done
- 			fi
- 			
--			if [ -f ${best_candidate}-${NEW_FILE}.failed ]
-+			if [ "$(cat ${GOTFILE}|cut -d "," -f1)" = "sorry" ]
- 			then
- 				output "\n${RED}The server could not build the dtu-file for ${NEW_FILE}\n" 
--				output "${YELLOW}reason:\n${RED}$(cat ${best_candidate}-${NEW_FILE}.failed)\n" 
--				rm -rf ${best_candidate}-${NEW_FILE}.failed
-+				output "${YELLOW}reason:\n${RED}$(cat ${GOTFILE})\n" 
-+				rm -rf -- "${GOTFILE}"
- 			fi
- 
--			if [ -f ${best_candidate}-${NEW_FILE}.dtu ]
-+			if [ -f "${best_candidate}-${NEW_FILE}.dtu" ]
- 			then
- 				output "${GREEN}Successfully fetched the dtu-file - let's build ${NEW_FILE}...\n" 
--				downloadsize=$(stat -c %s  ${best_candidate}-${NEW_FILE}.dtu)
--				if deltup -p -v -D ${DISTDIR} ${best_candidate}-${NEW_FILE}.dtu 
-+				downloadsize=$(stat -c %s "${best_candidate}-${NEW_FILE}.dtu")
-+				if deltup -p -v -D "${DISTDIR}" "${best_candidate}-${NEW_FILE}.dtu"
- 				then 
--					newsize=$(stat -c %s ${NEW_FILE})
-+					newsize=$(stat -c %s "${NEW_FILE}")
- 					let savedsize=${newsize}-${downloadsize}
- 					let percent=${savedsize}*100/${newsize}
- 					unit="bytes"
-@@ -791,8 +796,8 @@
- 					esac
- 					output "${YELLOW}This dtu-file saved ${UCOLOR}${savedsize} ${unit} (${percent}%)${YELLOW} download size.\n"
- 				fi
--				mv -f ${NEW_FILE} ${DISTDIR} &&
--				${REMOVE_OLD}  && remove "${best_candidate}"
-+				mv -f -- "${NEW_FILE}" "${DISTDIR}" &&
-+				${REMOVE_OLD}  && remove ${best_candidate}
- 			fi
- 
- 		fi # if $FETCH "${DELTUP_SERVER}${query}"
-@@ -812,7 +817,7 @@
- 			read
- 		fi
- 		popd >/dev/null 2>&1
--		rm -rf ${tmp_dwn_dest}
-+		rm -rf -- "${tmp_dwn_dest}"
- 		#stop respond to trap2
- 		trap 2
- 	fi # if ! FILE_IS_CORRUPT
-@@ -824,10 +829,10 @@
- 	
- # Ok, once we are here, we should have got the delta (and used it)
- # or we still have to download the full file
--if ! [ -f ${DISTDIR}/${NEW_FILE} ] 
-+if ! [ -f "${DISTDIR}/${NEW_FILE}" ] 
- then
- 	output "${RED}The dtu could not be fetched,${YELLOW} downloading full file from original URL\n"
--	$FETCH $ORIG_URI
-+	$FETCHNAME "$NEW_FILE" "$ORIG_URI"
- # remember we had a fallback to use correct exitcode for portage
- 	FALLBACK=$?
- fi
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
deleted file mode 100644
index df2523078442..000000000000
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="dynamic deltup client"
-HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
-SRC_URI="http://linux01.gwdg.de/~nlissne/${PN}-0.7.8.tar.bz2"
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-RDEPEND="app-portage/deltup
-	dev-util/bdelta"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_install () {
-	# portage has moved make.globals, so we just hotfix it
-	sed -i -e "s:/etc/make.globals:/usr/share/portage/config/make.globals:g" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.globals path"
-
-	# make.conf has now two locations. This should fix it ( #461726 )
-	sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path"
-
-	sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die
-	dobin "${WORKDIR}"/getdelta.sh || die
-}
-
-pkg_postinst() {
-	elog "You need to put"
-	elog "FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\${URI}\""
-	elog "into your /etc/make.conf to make use of getdelta"
-
-	# make sure permissions are ok
-	touch "${ROOT}"/var/log/getdelta.log
-	mkdir -p "${ROOT}"/etc/deltup
-	chown -R portage:portage "${ROOT}"/{var/log/getdelta.log,etc/deltup}
-	chmod -R ug+rwX "${ROOT}"/{var/log/getdelta.log,etc/deltup}
-}
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
deleted file mode 100644
index f3de5f693ed8..000000000000
--- a/app-portage/getdelta/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="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-portage/golop-0.0.1 b/app-portage/golop-0.0.1
new file mode 100644
index 000000000000..d26d84cf0cca
--- /dev/null
+++ b/app-portage/golop-0.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A pure Go re-implementation of genlop
+EAPI=6
+HOMEPAGE=https://github.com/klausman/golop
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/klausman/golop/archive/v0.0.1.tar.gz -> golop-0.0.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=8785abaf519bc982bfe954cc3be987f2
diff --git a/app-portage/golop-9999 b/app-portage/golop-9999
new file mode 100644
index 000000000000..4b6facc4900d
--- /dev/null
+++ b/app-portage/golop-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A pure Go re-implementation of genlop
+EAPI=6
+HOMEPAGE=https://github.com/klausman/golop
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b7eeec429c598f671ec137ba2470af4
diff --git a/app-portage/golop/Manifest b/app-portage/golop/Manifest
deleted file mode 100644
index 0183928406ab..000000000000
--- a/app-portage/golop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST golop-0.0.1.tar.gz 8316 BLAKE2B a1e51d55ef4744f3a6d00bcba145a410c9f67e78107bb990f6195ec5912d875e31308556e5d1e993917526121857ece09bd894556328e37453ea98d0a306f6d8 SHA512 650ceeb2607871d029f97ced882d661d1045dce6792c2c43f9c79076497a37290bc944f1b619ca133faac73c9fd1a6c35f1f2afd8e84c17ddf37252b66f08650
-EBUILD golop-0.0.1.ebuild 633 BLAKE2B e6035e0bbb814381b1b5052f4fbf9d72fa8da900c4946f30a7d7c7ece2a4e28f6fa518a0db1dadcd23d66754341a40dd2a67949953f7e2a55e1ce0de068af4ef SHA512 78f05664cd421087a6aace536d3871e38913e2c2a3250debe98159aec145861a0c591553f3a98c7358a2fa4e4f290427f757e5e53ce06e0229a5459ead9d6245
-EBUILD golop-9999.ebuild 633 BLAKE2B 3872a51c5d532fd7ef4bdde7e08e875a0a6316cd9aff7af7b63867922bfd1fbf740c30e9d29663b367a5f704d4604394a6c2ebde75d308df1f49fe292f031057 SHA512 8eecca968e5dc993856c9d307ffdb58f72ac18880df63630f0c1ea6c8c015536263f569579280fb87f91cb0c2cc2793f07d635b66816f2468d5cf324877fbcd2
-MISC metadata.xml 579 BLAKE2B 0a87d4468fd6ce4306bc22ab8b66c93132beb922f0354843cf275cf75ebd9dbf413100cf26a1440aeae467b6544f6d2904df2849970e9c417d2109b41c9b43ad SHA512 8499152d39bd8922e7a3a23d87a574b44bc61ea32c85c835b1f443d933d8ebf2541802346e0a8cff69a565e781c4037662927537afff7d3d13636a607b4952fb
diff --git a/app-portage/golop/golop-0.0.1.ebuild b/app-portage/golop/golop-0.0.1.ebuild
deleted file mode 100644
index c244fad578e4..000000000000
--- a/app-portage/golop/golop-0.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-EGO_PN=github.com/klausman/golop
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A pure Go re-implementation of genlop"
-HOMEPAGE="https://github.com/klausman/golop"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-
-	declare -a DOCS
-	DOCS+=( src/${EGO_PN}/README.md )
-	einstalldocs
-}
diff --git a/app-portage/golop/golop-9999.ebuild b/app-portage/golop/golop-9999.ebuild
deleted file mode 100644
index 9e60869091a0..000000000000
--- a/app-portage/golop/golop-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-EGO_PN=github.com/klausman/golop
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A pure Go re-implementation of genlop"
-HOMEPAGE="https://github.com/klausman/golop"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-
-	declare -a DOCS
-	DOCS+=( src/${EGO_PN}/README.md )
-	einstalldocs
-}
diff --git a/app-portage/golop/metadata.xml b/app-portage/golop/metadata.xml
deleted file mode 100644
index 9cd9d4eefb09..000000000000
--- a/app-portage/golop/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>klausman@gentoo.org</email>
-		<name>Tobias Klausmann</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/klausman/golop/issues/</bugs-to>
-		<changelog>https://github.com/klausman/golop/commits/master</changelog>
-		<remote-id type="github">klausman/golop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/gpytage-0.3.0_rc1-r1 b/app-portage/gpytage-0.3.0_rc1-r1
new file mode 100644
index 000000000000..d63f3a59ce2f
--- /dev/null
+++ b/app-portage/gpytage-0.3.0_rc1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=GTK Utility to help manage Portage's user config files
+EAPI=6
+HOMEPAGE=https://gna.org/projects/gpytage
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygtk-2.14 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://download.gna.org/gpytage/gpytage-0.3.0_rc1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7943135e51e32fdcbe351ca46790d60e
diff --git a/app-portage/gpytage/Manifest b/app-portage/gpytage/Manifest
deleted file mode 100644
index 92f34377b366..000000000000
--- a/app-portage/gpytage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gpytage-0.3.0_rc1.tar.gz 45470 BLAKE2B 19198581088ee8e6051404e6ed412773bd6522ea19127e432286443aa6f939a11d7a2323907e6d5a5b141e53d8dd698b23a9f3bfd9a74893abf362a82478f5dc SHA512 82f6ecdf5a5710c5f11a22401f46dbb50410f78101086f4ae727b09e6a022065c83b1ceccc3cf6771b5b09c37fabedd9ba58a01121c941c55d0fe9185ae9d0b7
-EBUILD gpytage-0.3.0_rc1-r1.ebuild 430 BLAKE2B edd432ebf0351b8e4b8a3e8317cf93788245b2e8211fe2a033dc105613be509a8c532cf5abc60883635fa2818e203bbcc19c0afaba8635761ebc4ac6021be329 SHA512 15613ea9f3abdf7b9928845312e2f6bd0f3ffab857c9818a4016c3d5d08bfb20ba9c5a279f8cd52e30bebcf77138d213d5b32e8654bec8155c7476efca6b4000
-MISC metadata.xml 371 BLAKE2B 7013ca4d9ac135127633618d90016f96fc2422177f820d2a438189745ae7412f819ede35cc6a17c596965fbe21e69a9ca52144f62c7167b980ad8c6a0e160c42 SHA512 56a42cde34ea7c1d416374cc8f1bf10f65257f25affe9289f92c6fdfdbc59eb32d71c8c45618b410b5ef768318d9038da1de6787b6477449d01624f2f67e24ca
diff --git a/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild b/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
deleted file mode 100644
index 4f2a875c2724..000000000000
--- a/app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GTK Utility to help manage Portage's user config files"
-HOMEPAGE="https://gna.org/projects/gpytage"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2.14"
diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
deleted file mode 100644
index 55c598a89486..000000000000
--- a/app-portage/gpytage/metadata.xml
+++ /dev/null
@@ -1,12 +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>
-		<name>Brian Dolbec</name>
-	</maintainer>
-<maintainer type="project">
-		<email>tools-portage@gentoo.org</email>
-		<name>Gentoo Portage tools team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/gpyutils-0.2.1 b/app-portage/gpyutils-0.2.1
new file mode 100644
index 000000000000..061f7fbaf944
--- /dev/null
+++ b/app-portage/gpyutils-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/gpyutils/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/gpyutils/releases/download/v0.2.1/gpyutils-0.2.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe9963517fd3e58d21220ad76857ac5d
diff --git a/app-portage/gpyutils-0.2.2 b/app-portage/gpyutils-0.2.2
new file mode 100644
index 000000000000..baf6961f5adf
--- /dev/null
+++ b/app-portage/gpyutils-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gpyutils/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.2.2.tar.gz -> gpyutils-0.2.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c48ac71e5b36aeccfab130cf9101d00
diff --git a/app-portage/gpyutils-9999 b/app-portage/gpyutils-9999
new file mode 100644
index 000000000000..edfda5c3d06f
--- /dev/null
+++ b/app-portage/gpyutils-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gpyutils/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7760f67166f1d19c796c4c4179b1ff4b
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
deleted file mode 100644
index 538ef7303adc..000000000000
--- a/app-portage/gpyutils/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX implementations.txt 809 BLAKE2B 64d5776621de4f6d522c2e07529f41f154c4253f35fff9f7dc6967ac2970a8911666644401cf657a05d500665680dc0b6cbaf120fc6bacb50fa2e058fcf2901c SHA512 e3b20f8cd0d34da4d506107a38b176a36960f97090d06de1475f12167ae28f95d5dd2d062baf31942f517d0e40b91fde485581736a40eaa9de838b28855bc62a
-DIST gpyutils-0.2.1.tar.bz2 15044 BLAKE2B 44a67a70c42b07523232f3e8d6db0b9155709100c4fede41e1f96c2d3fa396a1d4a67529c7e70fa75c2729c1a8f769cff35936606784a9ddc2a59cb3d163780a SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172
-DIST gpyutils-0.2.2.tar.gz 19646 BLAKE2B b5c24817b8a5ef3122d46330d2311a328ffa9c936878f494586ed62fd9fa9d54210c4edcbd9d07f61af7c27faf410e0abf60943188e8340ea52f06d95359c6b1 SHA512 28ca27b3688b593665037bd7a811014a11b3192bc0acc4568c3e70d13cf7a163b41ba3ffd9d8caaaaf4de2758e1cb68b7dcc255d9fb26ca8448a6bfd6416e66e
-EBUILD gpyutils-0.2.1.ebuild 519 BLAKE2B 1d1f4767c7f3ab0d2e5791ac1e3fa9bba0b6e93f091273a4bfb20260beef1febb5877e4e6b6c21bdd069e421719fe6fa997b93051bdf0fada7d9c796220889b5 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e
-EBUILD gpyutils-0.2.2.ebuild 518 BLAKE2B bc896e18ced6fef2a661fcff9f6a9082f6cdd9612e14a9288c8d1011b7b2172580d52847938f6efd6ca8aac5b39c868f460032009ae34c6fd56d6a61c9c7ef97 SHA512 d5caa813addbfc2747e2727b4289548c08233f68dbc602f6a91ada537b7e20d953027a7d0f151912f98ebcf25a8bf9f958cfb6c5bb037848d82fdd222f1e5f68
-EBUILD gpyutils-9999.ebuild 498 BLAKE2B 8dbdf34500e17239e1045d9543a57d6a39471b94352d935c59130142306b32de4078bd3db80bedde5bd9f22209257b6075184740696ab1a71a07656789fca003 SHA512 d7a4e377084238a4eae3698258c33156348986a12f10cdf9a528c4d9697a30502cf628c640326f514ec034806eafb8f18cfd071f12b16ec1c449dc70a9fc6c71
-MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
deleted file mode 100644
index 63d7ec0b0f1e..000000000000
--- a/app-portage/gpyutils/files/implementations.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# python-r1	old-eclass	status	short-code
-#
-# python-r1: python-r1 eclass implementation name
-# old-eclass: python.eclass implementation name (null if not supported)
-# status: dead, old, supported, current, experimental, future
-# short-code: short string used in tabular output
-
-python2_4	2.4	dead	2.4
-python2_5	2.5	dead	2.5
-python2_6	2.6	dead	2.6
-python2_7	2.7	current	2.7
-python3_0	3.0	dead	3.0
-python3_1	3.1	dead	3.1
-python3_2	3.2	dead	3.2
-python3_3	3.3	dead	3.3
-python3_4		current	3.4
-python3_5		supported	3.5
-python3_6		supported	3.6
-python3_7		experimental	3.7
-
-pypy1_8	2.7-pypy-1.8	dead	p1.8
-pypy1_9	2.7-pypy-1.9	dead	p1.9
-pypy2_0	2.7-pypy-2.0	dead	p2.0
-
-pypy		supported	pypy
-pypy3		supported	pypy3
-
-jython2_5	2.5-jython	dead	j2.5
-jython2_7	2.7-jython	experimental	j2.7
-
-# vim:ts=16:sts=16:noet:ft=conf
diff --git a/app-portage/gpyutils/gpyutils-0.2.1.ebuild b/app-portage/gpyutils/gpyutils-0.2.1.ebuild
deleted file mode 100644
index 45dfe8370db8..000000000000
--- a/app-portage/gpyutils/gpyutils-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.2.2.ebuild b/app-portage/gpyutils/gpyutils-0.2.2.ebuild
deleted file mode 100644
index d46dffd50704..000000000000
--- a/app-portage/gpyutils/gpyutils-0.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
deleted file mode 100644
index 06e17abf9f00..000000000000
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
deleted file mode 100644
index 1d172ebd5f18..000000000000
--- a/app-portage/gpyutils/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://github.com/mgorny/gpyutils/issues/</bugs-to>
-    <remote-id type="github">mgorny/gpyutils</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/grs-0.5 b/app-portage/grs-0.5
new file mode 100644
index 000000000000..674fa2678a56
--- /dev/null
+++ b/app-portage/grs-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Suite to build Gentoo Reference Systems
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~blueness/grs
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-apps/portage sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3931f5356713860ed4442c6cce189ebe
diff --git a/app-portage/grs-0.6-r1 b/app-portage/grs-0.6-r1
new file mode 100644
index 000000000000..8eb5280f3cae
--- /dev/null
+++ b/app-portage/grs-0.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Suite to build Gentoo Reference Systems
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~blueness/grs
+IUSE=server python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.6.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=45c49b0ccd011ad9e45d3c181792bb93
diff --git a/app-portage/grs-9999 b/app-portage/grs-9999
new file mode 100644
index 000000000000..055ea62b4826
--- /dev/null
+++ b/app-portage/grs-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Suite to build Gentoo Reference Systems
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~blueness/grs
+IUSE=server python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0d6b654a8bf01193ab020a7cfd08befc
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
deleted file mode 100644
index d1fc177f392e..000000000000
--- a/app-portage/grs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
-DIST grs-0.5.tar.gz 34213 BLAKE2B 3745d68db8da65f72e3b82ed2350d8a8696848d451aa3da5c941174403be7fea9a4b7536cdf532d0d89b6014817c14f874d0dbca3408bdd8326e88396767f119 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f
-DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
-EBUILD grs-0.5.ebuild 1037 BLAKE2B 715b4ca9f91d01a445de5bb151f30704db2ceceff33d24b35183c9d42b881e7c9336608956e827face1068059d594748bc9ebfcbfc1b3c604f1f8f2558cda123 SHA512 bd97ae2e24f527e13138fd6b9bf00ac453c566e10ad0051c985fc78ff4b26a205c71e36e0f98b691f8bbd9b90b3db5af5b3521c3715f4800cae43cef5327d04b
-EBUILD grs-0.6-r1.ebuild 1136 BLAKE2B 1f7b978a9648202c738d231a27a8572a68b014fe1a461312052dc8b3cc261062360bd1fbe23ada78d7aa34f9dc52acca0d59724f7443a70537d239ff4e2273c2 SHA512 1ceafda1d51f8afa45bf412bff3870ab0aa9191798bdaf87d61403c3429543924a7634b21e709d32cc065f386515a7bd960c7f20d2658369563b69d32c46d7c0
-EBUILD grs-9999.ebuild 1362 BLAKE2B 46a18645f931045f3ab9984ce8a28b9aa82a4ca1c0021619d43e3ae20773d7e5ea32c00b2e635f5ebe73f30bdb36db26cb7f3e1a873b5d6ccacaa91f1f046c4e SHA512 034c51c2f6d9bacc504925f92ca37a2b6151b701d1b8564a8e2af39802c5d6206a5618b195d3ef4be82a79d92d3013e81e4206c2b49396d1dc138c55dcd94caa
-MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
deleted file mode 100644
index ef064c9ea51b..000000000000
--- a/app-portage/grs/grs-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-arch/tar[xattr]
-	app-crypt/md5deep
-	dev-libs/libcgroup
-	dev-vcs/git
-	net-misc/rsync
-	sys-apps/portage
-	sys-fs/squashfs-tools
-	virtual/cdrtools
-	|| (
-		sys-kernel/genkernel
-		sys-kernel/genkernel-next
-	)"
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS"
-	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-	linux-info_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-0.6-r1.ebuild b/app-portage/grs/grs-0.6-r1.ebuild
deleted file mode 100644
index 171b185d8595..000000000000
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="server"
-
-DEPEND=""
-RDEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)
-	server? (
-		app-arch/tar[xattr]
-		app-crypt/md5deep
-		dev-libs/libcgroup
-		dev-vcs/git
-		net-misc/rsync
-		sys-fs/squashfs-tools
-		virtual/cdrtools
-		|| (
-			sys-kernel/genkernel
-			sys-kernel/genkernel-next
-		)
-	)"
-
-pkg_setup() {
-	if use server; then
-		local CONFIG_CHECK="~CGROUPS"
-		local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-		linux-info_pkg_setup
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
deleted file mode 100644
index aa1fb650569d..000000000000
--- a/app-portage/grs/grs-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 linux-info
-
-ISO="ISO-1.tar.gz"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="server"
-
-DEPEND=""
-RDEPEND="
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)
-	server? (
-		app-arch/tar[xattr]
-		app-crypt/md5deep
-		dev-libs/libcgroup
-		dev-vcs/git
-		net-misc/rsync
-		sys-fs/squashfs-tools
-		virtual/cdrtools
-		|| (
-			sys-kernel/genkernel
-			sys-kernel/genkernel-next
-		)
-	)"
-
-pkg_setup() {
-	if use server; then
-		local CONFIG_CHECK="~CGROUPS"
-		local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
-		linux-info_pkg_setup
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
-	doenvd "${T}"/20grs
-	if use server; then
-		mkdir ${D}/usr/share/${PN}
-		cp "${DISTDIR}"/${ISO} ${D}/usr/share/${PN}
-	fi
-}
diff --git a/app-portage/grs/metadata.xml b/app-portage/grs/metadata.xml
deleted file mode 100644
index eec62d4496e8..000000000000
--- a/app-portage/grs/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="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<use>
-		<flag name="server">Install all the tools building systems</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-portage/gs-elpa-0.1.3 b/app-portage/gs-elpa-0.1.3
new file mode 100644
index 000000000000..da99d0c61d52
--- /dev/null
+++ b/app-portage/gs-elpa-0.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=g-sorcery backend for elisp packages
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/gs-elpa
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51f7580ff5fe65a79b876111da260adf
diff --git a/app-portage/gs-elpa-0.1.3-r1 b/app-portage/gs-elpa-0.1.3-r1
new file mode 100644
index 000000000000..ef361e146177
--- /dev/null
+++ b/app-portage/gs-elpa-0.1.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=g-sorcery backend for elisp packages
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/gs-elpa
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b26b2f4baeeaee323edbe37547ffae5
diff --git a/app-portage/gs-elpa-9999 b/app-portage/gs-elpa-9999
new file mode 100644
index 000000000000..87b16983c720
--- /dev/null
+++ b/app-portage/gs-elpa-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-portage/g-sorcery-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=g-sorcery backend for elisp packages
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/gs-elpa
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=518a7e30683ebd4d7628bac59366fe27
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
deleted file mode 100644
index 40d1973c9846..000000000000
--- a/app-portage/gs-elpa/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-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
deleted file mode 100644
index 7f67a9c0ecc7..000000000000
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${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/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
deleted file mode 100644
index 137fcd14cc02..000000000000
--- a/app-portage/gs-elpa/gs-elpa-0.1.3.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 elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${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/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
deleted file mode 100644
index 6c070907fbd6..000000000000
--- a/app-portage/gs-elpa/gs-elpa-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://github.com/jauhien/gs-elpa"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=app-portage/g-sorcery-0.2[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml
deleted file mode 100644
index ce604de6854c..000000000000
--- a/app-portage/gs-elpa/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-elpa</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/gs-pypi-0.1 b/app-portage/gs-pypi-0.1
new file mode 100644
index 000000000000..511c90b2f2f6
--- /dev/null
+++ b/app-portage/gs-pypi-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=g-sorcery backend for pypi packages
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/gs-pypi
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-pypi/archive/v0.1.tar.gz -> gs-pypi-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=32e300c15aba277d1e7ca4f5da2e8d43
diff --git a/app-portage/gs-pypi-0.2 b/app-portage/gs-pypi-0.2
new file mode 100644
index 000000000000..9ae88c8b457e
--- /dev/null
+++ b/app-portage/gs-pypi-0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/g-sorcery-0.2[bson(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=g-sorcery backend for pypi packages
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/gs-pypi
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-0.2[bson(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.tar.gz -> gs-pypi-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=591fd8aa5af22919faf164841879c874
diff --git a/app-portage/gs-pypi-0.2.1 b/app-portage/gs-pypi-0.2.1
new file mode 100644
index 000000000000..56bd76310b27
--- /dev/null
+++ b/app-portage/gs-pypi-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=g-sorcery backend for pypi packages
+EAPI=5
+HOMEPAGE=https://github.com/jauhien/gs-pypi
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.1.tar.gz -> gs-pypi-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=86bea19bf32196d680041dc33875002a
diff --git a/app-portage/gs-pypi-0.2.1-r1 b/app-portage/gs-pypi-0.2.1-r1
new file mode 100644
index 000000000000..32dc3f080ee0
--- /dev/null
+++ b/app-portage/gs-pypi-0.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=g-sorcery backend for pypi packages
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/gs-pypi
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.1.tar.gz -> gs-pypi-0.2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12c285b781c931202b0f5d25d91cad39
diff --git a/app-portage/gs-pypi-9999 b/app-portage/gs-pypi-9999
new file mode 100644
index 000000000000..7081407d2936
--- /dev/null
+++ b/app-portage/gs-pypi-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-portage/g-sorcery-9999[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=g-sorcery backend for pypi packages
+EAPI=6
+HOMEPAGE=https://github.com/jauhien/gs-pypi
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-9999[bson(-),git(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c4456cd1e31b9d91a2eb552afe09ef46
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/hackport-0.5.1 b/app-portage/hackport-0.5.1
new file mode 100644
index 000000000000..bd7ef57a6951
--- /dev/null
+++ b/app-portage/hackport-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.1/hackport-0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a9c1071ce10953cb4d1f957188fb805
diff --git a/app-portage/hackport-0.5.2 b/app-portage/hackport-0.5.2
new file mode 100644
index 000000000000..08cd247aa42f
--- /dev/null
+++ b/app-portage/hackport-0.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.2/hackport-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a9c1071ce10953cb4d1f957188fb805
diff --git a/app-portage/hackport-0.5.3 b/app-portage/hackport-0.5.3
new file mode 100644
index 000000000000..833aa1641662
--- /dev/null
+++ b/app-portage/hackport-0.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.3/hackport-0.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9cdb74c77d0dcd579e987827887aa15
diff --git a/app-portage/hackport-0.5.4 b/app-portage/hackport-0.5.4
new file mode 100644
index 000000000000..414006f7e4a3
--- /dev/null
+++ b/app-portage/hackport-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.4/hackport-0.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2afdb34370be2d2ca5d6883f04246404
diff --git a/app-portage/hackport-0.5.5-r1 b/app-portage/hackport-0.5.5-r1
new file mode 100644
index 000000000000..da2e276febee
--- /dev/null
+++ b/app-portage/hackport-0.5.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=|| ( <sys-apps/portage-2.3.0 sys-apps/portage-mgorny app-portage/repoman ) dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( <sys-apps/portage-2.3.0 sys-apps/portage-mgorny app-portage/repoman ) dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hackport/0.5.5/hackport-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a0a667d5fcf594d32fa8c6f84cc39b1c
diff --git a/app-portage/hackport-9999 b/app-portage/hackport-9999
new file mode 100644
index 000000000000..6dd520f18bb1
--- /dev/null
+++ b/app-portage/hackport-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=6
+HOMEPAGE=https://github.com/gentoo-haskell/hackport
+IUSE=test
+LICENSE=GPL-2
+RDEPEND=dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	git-r3	8f6de46b0aa318aea0e8cac62ece098b	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8e7fab816c5d499385e9aa1d882589a1
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
deleted file mode 100644
index 7b696eab4517..000000000000
--- a/app-portage/hackport/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST hackport-0.5.1.tar.gz 1390428 BLAKE2B a0791b39fe665934499fa930bda99cc3a9fe1c146ec4075985d139cac3fc49bac3fe68e37e9d26a7989e288a8e6c4c6f87dab29a4d088edb44018509f26f1fa8 SHA512 006e4457a9ebba9acff35787a73a321b903db2f6ff54423cd66e91a93390183d0ca2690e2d0c8b5c1256116c9f81cabeac45c6dcb21e537849afbb1109bd80af
-DIST hackport-0.5.2.tar.gz 1390418 BLAKE2B d9d90e86d16532a04fb387ba4d0aa3e53594ddb9c0780c1e7f05d3c1c75b60331656efbb50bd72c28b5b5736509210ab0087d7e1d441d4c8a9a8fd754538eae8 SHA512 c191421608667cde034eb8b4e3c1ae95a8ae41cc35df8f3cfad640870f871dd78711173666bee671af4efc762c069e7f20cd3693d96f64f60848d83ce185575c
-DIST hackport-0.5.3.tar.gz 1390724 BLAKE2B 666a1bbb4f5eb4abf6a5546867bbfdaf2280bcd2967773b3b57c2933f44e7a367127cd4b56c6d0cf300c3ae30bd6a066e02dd976dc962ecaa39316d70cbe937b SHA512 785a1fb9762bdd10e86f47255d687a905eb122eb46e9470b7ea562cbe98d1be882b28923d5852f41ba2481c27321de9b2322fc83b5fa77037ba9251ea5f08dcc
-DIST hackport-0.5.4.tar.gz 1390924 BLAKE2B 2fcc4ece84b813e130d860048328b7c4b704f1a37cffe15f26f24f8a9db8e7a267f083b1f8469f1d3e9753c07ad17dbbc209a2a8095770a7610fe73baf9965c1 SHA512 49593066608bf8d57678d1725c51da4f1f6213a06b1c5645d97e4a711704adc9a40c66ad4fd6a624572fc7491943874b5b48381bc02545a0e9b6d7a5619be073
-DIST hackport-0.5.5.tar.gz 1618493 BLAKE2B 939f0ef89c7bbc4117d6222e8c8d813883a02d1277466477f3ff1910ebaba418969ff4e8c170a6dae8888394254790aeb69ecc69b36e01c9f341663938aa39b5 SHA512 b91fe72884ccc3a6acb79115ba8f8418250e13f102a07542e3d06db3880b572c73d2d4b5c05622eee83af3715f3a854d2cf7142ebb92627d8b332db4152d817d
-EBUILD hackport-0.5.1.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd96d354349fed3d9da342858f0ad823df8ad66e7096d6f1d05cb25e48ad67c360ccba65627eed17c70958d70f08 SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae
-EBUILD hackport-0.5.2.ebuild 1251 BLAKE2B 4e39c3a41890d38e4aeac5657ba077cf80d5dd96d354349fed3d9da342858f0ad823df8ad66e7096d6f1d05cb25e48ad67c360ccba65627eed17c70958d70f08 SHA512 2833246aaf85bc2aa5cfd00125515b2cf4e11d564ba477b97e9b0f0c494871b8cb865d9ebacac6377fae4dabf7ba274b7c8f9e18a0c59e4f44aab8d2eb76e8ae
-EBUILD hackport-0.5.3.ebuild 1251 BLAKE2B 1fd04b8a2a0978b641307a912b68c06f3b68551340262cc7a06c7bf4cdb03839cd7ea85162d688cd50074e62756fd48c24a3c8dbf6152c1e5b58b14c43f0256f SHA512 27170b43c9cf49d89ba294bed4bdb973f4a52261d79160e8795708bc406debab65b6d1911ab8bea4d8a0dd61d7343b7a71452103c8843b3973780465895d610c
-EBUILD hackport-0.5.4.ebuild 1251 BLAKE2B a6caf0eb3c04f85c621b4f994057a4f3e5c477078aad16de3d555a2a4d6a57470e7d30a57124efdb36c164c4c1c8d00d15bd0da0f505d2e4e8860a48d4146222 SHA512 7b6b4d7028f12bf55da10c0192998488a80c9af19dd8c227cba17b49958aac7d702f4e0af82052cfed9fe6c53d8601d2540c383ea1d5dbf183284e09f72d28d2
-EBUILD hackport-0.5.5-r1.ebuild 1335 BLAKE2B 35405227a3890d7ab38993520906542e1606853e87a30e2c5cd29c88f9098ec38e32b0435bb4c1799d8a1cedd9f33fa606c098ac209b1cff4b9116f05db0ff3a SHA512 0ac5557f0d5c4f6484a4d3692de353e5080237221793e03cff98a22368fedd2aa3e899d5373892cbd40399f8c60b5443cf4137025033d16fbf8d67e121d02eae
-EBUILD hackport-9999.ebuild 1364 BLAKE2B 1e83624e23cf82608e2996db2bd6022dff5bbba215702422b6a795bedae3e0cd1d471d0b427eee70d41f19061e73783a0a2e123de6eb810ae81a2f5c99c3e6d3 SHA512 e94224507ca7bbc52d2d3fbea71a760f799651c5da9d7b964427a96b6e7d911fc33d7ea6c2aee0da6b7eab177e6aeaced60cd377f8d39c1fed9fd2bde173f20e
-MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.1.ebuild b/app-portage/hackport/hackport-0.5.1.ebuild
deleted file mode 100644
index c2ee1f280100..000000000000
--- a/app-portage/hackport/hackport-0.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.2.ebuild b/app-portage/hackport/hackport-0.5.2.ebuild
deleted file mode 100644
index c2ee1f280100..000000000000
--- a/app-portage/hackport/hackport-0.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.3.ebuild b/app-portage/hackport/hackport-0.5.3.ebuild
deleted file mode 100644
index 4c05769273e9..000000000000
--- a/app-portage/hackport/hackport-0.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.4.ebuild b/app-portage/hackport/hackport-0.5.4.ebuild
deleted file mode 100644
index 48ed10d066f3..000000000000
--- a/app-portage/hackport/hackport-0.5.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.5.5-r1.ebuild b/app-portage/hackport/hackport-0.5.5-r1.ebuild
deleted file mode 100644
index 35d3380ce9ad..000000000000
--- a/app-portage/hackport/hackport-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="
-	|| (
-		<sys-apps/portage-2.3.0
-		sys-apps/portage-mgorny
-		app-portage/repoman
-	)
-	dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-9999.ebuild b/app-portage/hackport/hackport-9999.ebuild
deleted file mode 100644
index c5936c97a158..000000000000
--- a/app-portage/hackport/hackport-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="test-suite"
-EGIT_REPO_URI="https://github.com/gentoo-haskell/hackport.git"
-
-inherit git-r3 haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="https://github.com/gentoo-haskell/hackport"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_prepare() {
-	default
-	sed -e 's/^Version:.*/&.9999/' -i ${PN}.cabal || die # just to distinct from release install
-}
-
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/metadata.xml b/app-portage/hackport/metadata.xml
deleted file mode 100644
index 91fe17ae253f..000000000000
--- a/app-portage/hackport/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A command line tool to manage an overlay of Gentoo ebuilds
-		that are generated from a hackage repo of Cabal packages.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gentoo-haskell/hackport</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/hashgen-1.0 b/app-portage/hashgen-1.0
new file mode 100644
index 000000000000..15520397f134
--- /dev/null
+++ b/app-portage/hashgen-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+DESCRIPTION=Manifest generation and verification tool written in C
+EAPI=6
+HOMEPAGE=https://prefix.gentoo.org/
+IUSE=+openmp
+KEYWORDS=~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=7fc3cf2b4baddc8b98c994b8ee024330d8f29956 -> hashgen-1.0.c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e77408472d5961dec77da07a062dd33a
diff --git a/app-portage/hashgen-1.1 b/app-portage/hashgen-1.1
new file mode 100644
index 000000000000..3d9d11b3ac25
--- /dev/null
+++ b/app-portage/hashgen-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+DESCRIPTION=Manifest generation and verification tool written in C
+EAPI=6
+HOMEPAGE=https://prefix.gentoo.org/
+IUSE=+openmp
+KEYWORDS=~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=2ea68e88531288c29c5533440d63da6c8136d477 -> hashgen-1.1.c
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ab32cc3229bed6a78f99d79cb6b401fc
diff --git a/app-portage/hashgen/Manifest b/app-portage/hashgen/Manifest
deleted file mode 100644
index c3198d5db1ed..000000000000
--- a/app-portage/hashgen/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hashgen-1.0.c 36299 BLAKE2B 4419ffd2b4c8435b05b0cf2d9e54e2df5c539f945166da8305c910ec267e5d93cd26822ef189777cf952bb8644193fbfeaafefa4e98c5b7561845fb9a1f40c0a SHA512 4f8df94e91b02ebc611553d2dd9776de4ba77989869ed1ce411b91cc7fed224c3d8715d15cce6234caa25f2143962949dfd59da79d8f1ab211c287c604c22fff
-DIST hashgen-1.1.c 38543 BLAKE2B 8830fa1ebd3494ef6e42b12bb750e4b45f0ebb975de8aacc29e67200144cc9110532846b349cf36b0a060c3b2770095a65bc24be2eb7ea997adfd5be309328d2 SHA512 84c44689e2d0061566ce990b943ea76824f5cf257d611571cd0b5932154a079670f186b7e97d3e16de3e991a629db595a63c21336c6a57f48b967b5ebb40eea8
-EBUILD hashgen-1.0.ebuild 1277 BLAKE2B 6532dedc635b96156633fc402c02656c0211d991adcecb2ab1d9c977e26a647d502b8e0137eccf48ddb626cfc9add057e2ceb2a5a898bda4939852e185611fe1 SHA512 535cf69887158b5b1c3fe764a5b14c20fbe267d6fb48ceac097f09791f8b6beb0444347ec32a1ef9e418f716c755132bec05c0b6e8e783a87a7202fabf7197e9
-EBUILD hashgen-1.1.ebuild 1277 BLAKE2B bc660f5981efc90aa771766d47e85e7822a66ebe49c7aed90fe3831dec599ab165325fe73d90479b01dd280222fad1a2ffa4fd65f0c282739f5807c076d0eadf SHA512 fb8713b4e4da5ad0a1a18df533d9f6780ef35f58dd1624a1b0340470ee389eeb8748c1d8129869c40f9f7519dfd5f421bd4dc57369e2f6962ee97a7fe2b9c61d
-MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/hashgen/hashgen-1.0.ebuild b/app-portage/hashgen/hashgen-1.0.ebuild
deleted file mode 100644
index 26a83a7bc513..000000000000
--- a/app-portage/hashgen/hashgen-1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Manifest generation and verification tool written in C"
-HOMEPAGE="https://prefix.gentoo.org/"
-GITHASH="7fc3cf2b4baddc8b98c994b8ee024330d8f29956"
-SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=${GITHASH} -> ${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-	app-crypt/libb2
-	dev-libs/openssl:*
-	sys-libs/zlib
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}"/${P}.c "${S}"/${PN}.c || die
-}
-
-src_compile() {
-	v() {
-		echo "$@"
-		"$@"
-	}
-
-	local openmp=
-	use openmp && tc-has-openmp && openmp=-fopenmp
-
-	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
-		&& append-flags -D_FILE_OFFSET_BITS=64
-
-	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
-		$(pkg-config openssl --libs) \
-		$(gpgme-config --libs) \
-		-lb2 -lz ${LDFLAGS} ${PN}.c || die
-}
-
-src_install() {
-	dobin hashgen
-	cd "${ED}"/usr/bin || die
-	ln -s hashgen hashverify || die
-}
diff --git a/app-portage/hashgen/hashgen-1.1.ebuild b/app-portage/hashgen/hashgen-1.1.ebuild
deleted file mode 100644
index eacb1653fc3e..000000000000
--- a/app-portage/hashgen/hashgen-1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Manifest generation and verification tool written in C"
-HOMEPAGE="https://prefix.gentoo.org/"
-GITHASH="2ea68e88531288c29c5533440d63da6c8136d477"
-SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=${GITHASH} -> ${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-	app-crypt/libb2
-	dev-libs/openssl:*
-	sys-libs/zlib
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}"/${P}.c "${S}"/${PN}.c || die
-}
-
-src_compile() {
-	v() {
-		echo "$@"
-		"$@"
-	}
-
-	local openmp=
-	use openmp && tc-has-openmp && openmp=-fopenmp
-
-	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
-		&& append-flags -D_FILE_OFFSET_BITS=64
-
-	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
-		$(pkg-config openssl --libs) \
-		$(gpgme-config --libs) \
-		-lb2 -lz ${LDFLAGS} ${PN}.c || die
-}
-
-src_install() {
-	dobin hashgen
-	cd "${ED}"/usr/bin || die
-	ln -s hashgen hashverify || die
-}
diff --git a/app-portage/hashgen/metadata.xml b/app-portage/hashgen/metadata.xml
deleted file mode 100644
index a53ffbea77d3..000000000000
--- a/app-portage/hashgen/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="person">
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/install-mask-0.1.1 b/app-portage/install-mask-0.1.1
new file mode 100644
index 000000000000..4200a095a581
--- /dev/null
+++ b/app-portage/install-mask-0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Handle INSTALL_MASK setting in make.conf
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/install-mask/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD
+RDEPEND=app-portage/flaggie[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/mgorny/install-mask/downloads/install-mask-0.1.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=99e86c9ada9c84cd9914214e4b33dd47
diff --git a/app-portage/install-mask-9999 b/app-portage/install-mask-9999
new file mode 100644
index 000000000000..d7574912d524
--- /dev/null
+++ b/app-portage/install-mask-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Handle INSTALL_MASK setting in make.conf
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/install-mask/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=app-portage/flaggie[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=45bf6fb480c7073bb48afa8efadc575b
diff --git a/app-portage/install-mask/Manifest b/app-portage/install-mask/Manifest
deleted file mode 100644
index 09aa40c6a9b6..000000000000
--- a/app-portage/install-mask/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX install-mask.conf 173 BLAKE2B d47372786719c1774c3dcb1cbb42a102636bbc48e640f3e07d54d334af6b061d8e8dcecc2da14d63b9f2ca964ad469e0e28b19f4d43050e14bdba623e359bfeb SHA512 3a917bf001e417667e0a44be8536b5fda9d64a91df02a95823fce6dfc54c037055393fb1015169f078ad90d9c042984fd604886261480fcb097b3bb0a9b23110
-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
-MISC metadata.xml 541 BLAKE2B a57897cc7d8924c603305bc5bfebc543f240bf20df9745716373d10799fd6a6dc645c3a1ae2861dca6fe8ad9e813a0a9d94a238b7a0a749e389772cb7c45b4b2 SHA512 637298068bdb858d10e754d6911e150ae8d0e38ebde86cb7d57d41654d53c58128e942b3cbb6675c398b9a108a67616d966bbffd6975ea54506163cf1ba49696
diff --git a/app-portage/install-mask/files/install-mask.conf b/app-portage/install-mask/files/install-mask.conf
deleted file mode 100644
index 78b49a473427..000000000000
--- a/app-portage/install-mask/files/install-mask.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example /etc/portage/sets.conf adding the @install-mask set.
-
-[install-mask]
-class = portage.sets.shell.CommandOutputSet
-command = install-mask -r
-world-candidate = False
diff --git a/app-portage/install-mask/files/location-db.conf b/app-portage/install-mask/files/location-db.conf
deleted file mode 100644
index cb050cab37c4..000000000000
--- a/app-portage/install-mask/files/location-db.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[__install-mask__]
-version=1
-
-[systemd]
-path=/usr/lib/systemd/system
-description=systemd unit and auxiliary files.
-
-[bash-completion]
-path=/usr/share/bash-completion
-
-[locale]
-path=/usr/share/locale
-description=All localizations.
-
-[logrotate]
-path=/etc/logrotate.d
-
-# vim:ft=dosini
diff --git a/app-portage/install-mask/files/location-db.xml b/app-portage/install-mask/files/location-db.xml
deleted file mode 100644
index eea4842e235c..000000000000
--- a/app-portage/install-mask/files/location-db.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<install-mask>
-	<location id="systemd">
-		<path>/usr/lib/systemd/system</path>
-		<description>
-			systemd unit and auxiliary files.
-		</description>
-	</location>
-
-	<location id="bash-completion">
-		<path>/usr/share/bash-completion</path>
-	</location>
-
-	<location id="locale">
-		<path>/usr/share/locale</path>
-		<description>
-			All localizations.
-		</description>
-	</location>
-
-	<location id="logrotate">
-		<path>/etc/logrotate.d</path>
-	</location>
-</install-mask>
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild b/app-portage/install-mask/install-mask-0.1.1.ebuild
deleted file mode 100644
index 82f83703be43..000000000000
--- a/app-portage/install-mask/install-mask-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/portage/config/sets
-	newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
deleted file mode 100644
index b551ebb532b2..000000000000
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-#if LIVE
-
-KEYWORDS=
-SRC_URI=
-#endif
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/portage/config/sets
-	newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/metadata.xml b/app-portage/install-mask/metadata.xml
deleted file mode 100644
index 34455911e2de..000000000000
--- a/app-portage/install-mask/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/install-mask/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/install-mask</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/java-ebuilder-0.1 b/app-portage/java-ebuilder-0.1
new file mode 100644
index 000000000000..9e29eefe7edb
--- /dev/null
+++ b/app-portage/java-ebuilder-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java team tool for semi-automatic creation of ebuilds from pom.xml
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/java-ebuilder
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/gentoo/java-ebuilder/archive/0.1.tar.gz -> java-ebuilder-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40a819c86c37ec154d4de39d9417c1c5
diff --git a/app-portage/java-ebuilder-0.2 b/app-portage/java-ebuilder-0.2
new file mode 100644
index 000000000000..64565d9f6b8f
--- /dev/null
+++ b/app-portage/java-ebuilder-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Java team tool for semi-automatic creation of ebuilds from pom.xml
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/java-ebuilder
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/gentoo/java-ebuilder/archive/0.2.tar.gz -> java-ebuilder-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0fa03e58d8b1182fec3668f18c246887
diff --git a/app-portage/java-ebuilder-9999 b/app-portage/java-ebuilder-9999
new file mode 100644
index 000000000000..89d06c9f0a66
--- /dev/null
+++ b/app-portage/java-ebuilder-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Java team tool for semi-automatic creation of ebuilds from pom.xml
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/java-ebuilder
+IUSE=elibc_FreeBSD elibc_FreeBSD
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3fd8e7c1d2af2cea6f987bbe63fdf962
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
deleted file mode 100644
index 9b0aafbd411c..000000000000
--- a/app-portage/java-ebuilder/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST java-ebuilder-0.1.tar.gz 22291 BLAKE2B c958ec8c02d33dba4f70877aefe9c8e11a9a8b9acadad614c4c792f736f9a25306ac45fe6730dcebcbf33bb5135d9086a7915f01c58f6273d1a3e54c0c52766c SHA512 bc058b03da53bab03d7a48b2971f34da812bfd03aff7cc64ee4a3209245f4855bf8095d12c5c506f49b896db69fba09f06814f4c35e13a25c4e8f381d6416637
-DIST java-ebuilder-0.2.tar.gz 22998 BLAKE2B 3ba143a765f2f9b6a99bce1733724aa90ea5d0472d4d3d679217d3854ad61eefb32fd760cb117ef6ecd3a9a57b477895353f471b59a3d79748b383e6bf1fec05 SHA512 c76b15d4a81413e05359202c7b73b84baa3b277faddb7aa5f904290e5e47ed2bc6d80638c7b5417acc4224d067e4f48f1687972b7e36c363da8e9a89ea7f2766
-EBUILD java-ebuilder-0.1.ebuild 1397 BLAKE2B 07fbfce5267efa90ac7f966a6df3dde4f9af59798045b0f354a5aa07ec989f9c90d4a1860015d9924924251f9d138e181040cb4255861506f2386892db539362 SHA512 0001504bf184ed2ea32b1aca77be9f2ba8584a756757169033e3c7026a0322cec24558e503c70a6444ea4996b5b0705adc61fe539e36310782b8c9e44918aae2
-EBUILD java-ebuilder-0.2.ebuild 1402 BLAKE2B 2e49b26e438423ba57aeb43354516d19f974ef35a82dd763f9c84f7ae58a23527370d1a86a5021a26d6db31cd119f84a500237ebe30d4dc57de94728f1f7c743 SHA512 cc8503ead6ca6e77c60909f304fe0b263e248ec470a06fd2d4192b9c5dc62d1941722d9803b4d6e1f34b8fca773481ea0df252882857d9e85455779994ff0172
-EBUILD java-ebuilder-9999.ebuild 1401 BLAKE2B 57f0044ff4dc0d26903c15aea2064c87bef1ae3eb2c03b2289ff096b71bffa604e54ad0d2a41dfa58576554ac6521a04215282d9dbaea563f1ce0aa4bf70d640 SHA512 b143151a16b6e1b9316f616a0fbc6edd20d0a12f4c07344e182cbf706323207466e607c91e3641aa461ff594daf0aff8674ae099f46569ecf5a2b8ff40a03773
-MISC metadata.xml 339 BLAKE2B e6068070bc51e0f0a213a76593f11fee385ebe1546b08f23088706ba46469e7352f4f73647980595b9c3aef4fecfd96d9d2d907cfe7e147897e9259c02dfb30f SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
deleted file mode 100644
index 1c42c4d5eeee..000000000000
--- a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999 ]]; then
-	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
-
-DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
-HOMEPAGE="https://github.com/gentoo/java-ebuilder"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
-	sys-process/parallel
-	>=dev-java/maven-bin-3"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
-
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
-
-java_prepare() {
-	eapply_user
-	local base_dir="target/classes/"
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
-	echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
-		>> "${base_dir}META-INF/MANIFEST.MF"
-}
-
-src_prepare() {
-	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-	eapply_user
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
-
-	insinto /var/lib/${PN}
-	doins -r maven
-	dodir /var/lib/${PN}/{poms,cache}
-
-	dodoc README maven.conf
-
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
-	dobin scripts/movl
-
-	insinto /etc
-	doins java-ebuilder.conf
-}
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
deleted file mode 100644
index f294a30ebbc8..000000000000
--- a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999 ]]; then
-	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
-
-DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
-HOMEPAGE="https://github.com/gentoo/java-ebuilder"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
-	sys-process/parallel
-	>=dev-java/maven-bin-3"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
-
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
-
-java_prepare() {
-	eapply_user
-	local base_dir="target/classes/"
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
-	echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
-		>> "${base_dir}META-INF/MANIFEST.MF"
-}
-
-src_prepare() {
-	eapply_user
-	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
-
-	insinto /var/lib/${PN}
-	doins -r maven
-	dodir /var/lib/${PN}/{poms,cache}
-
-	dodoc README maven.conf
-
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
-	dobin scripts/movl
-
-	insinto /etc
-	doins java-ebuilder.conf
-}
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
deleted file mode 100644
index 367d6061c927..000000000000
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999 ]]; then
-	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
-
-DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
-HOMEPAGE="https://github.com/gentoo/java-ebuilder"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
-	sys-process/parallel
-	>=dev-java/maven-bin-3"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
-
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
-
-java_prepare() {
-	eapply_user
-	local base_dir="target/classes/"
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
-	echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
-		>> "${base_dir}META-INF/MANIFEST.MF"
-}
-
-src_prepare() {
-	eapply_user
-	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
-
-	insinto /var/lib/${PN}
-	doins -r maven
-	dodir /var/lib/${PN}/{poms,cache}
-
-	dodoc README maven.conf
-
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
-	dobin scripts/movl
-
-	insinto /etc
-	doins java-ebuilder.conf
-}
diff --git a/app-portage/java-ebuilder/metadata.xml b/app-portage/java-ebuilder/metadata.xml
deleted file mode 100644
index 860761f67af5..000000000000
--- a/app-portage/java-ebuilder/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>
-  <upstream>
-    <remote-id type="github">gentoo/java-ebuilder</remote-id>
-  </upstream>
-  <maintainer type="person">
-     <email>heroxbd@gentoo.org</email>
-     <name>Benda Xu</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-portage/kuroo-0.90.5_p20180410 b/app-portage/kuroo-0.90.5_p20180410
new file mode 100644
index 000000000000..83f71e424b97
--- /dev/null
+++ b/app-portage/kuroo-0.90.5_p20180410
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 kde-frameworks/extra-cmake-modules:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Graphical Portage frontend based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/kuroo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kuroo-0.90.5_p20180410.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c6efedab331059326d9f1233f085c0da
diff --git a/app-portage/kuroo-9999 b/app-portage/kuroo-9999
new file mode 100644
index 000000000000..59d9be86a4bc
--- /dev/null
+++ b/app-portage/kuroo-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 kde-frameworks/extra-cmake-modules:5 sys-devel/make >=dev-util/cmake-3.9.6 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=Graphical Portage frontend based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/kuroo/
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2b26024259e8b58c2dcd9665a5b89bfc
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
deleted file mode 100644
index f1001e03a002..000000000000
--- a/app-portage/kuroo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa44127ed4d71c043c96c1ed267ec2ecd4a4ccffad4f7c65f0be539ebc40392834b4217e057c611dd6912b33d2904a7b4ba2484a0ba SHA512 fb7e746ce8354ce71a38d4a850ffa7cb270727b26d08353cb5d8661583e02e7e0b45013f03aac71a0058e2f0a567ab963669336bde8819bc212083eb19be2c1d
-DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
-EBUILD kuroo-0.90.5_p20180410.ebuild 1377 BLAKE2B f024e0cc1e5d5e36ef956a930ad5292e0a8bba33b204a7ff95268d03607a9650fdb3101f2a0118b65038a3066b9e79fe52618b8cc924e20688a5cd5917793eec SHA512 9ed7aaf28ab4321c919f60ca1d6e97b5445882829ecd7bc910ab6b022ad90c9569b9b3a4d7b9fe3c97028bda378693db578d0087827c6ad5d18868b87b0b7d31
-EBUILD kuroo-9999.ebuild 1366 BLAKE2B c7b79fd860a1e181942998e2a876422b0fe83a751db12cd431ad9f22d634bba14b8b02c33a74c0213cbacd75b76a5cbdbb738662bb5f4791d390c5e95eb4e4b2 SHA512 3c3c67e3dccd4e451a27a598c2e95cfcf7c9d6324a73b6020b33d19e6eff79c37a8b61ffbabae4b4e454fd640c3739c4c663524f95d4849b9bdf2ffd62977415
-MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch b/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
deleted file mode 100644
index b7a146e20095..000000000000
--- a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 77941829f2aba22e05142a47b689e17d594da610 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 16:27:47 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/core/categorieslistview.cpp | 5 +++--
- src/core/versionview.cpp        | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/categorieslistview.cpp b/src/core/categorieslistview.cpp
-index d499397..1246aad 100644
---- a/src/core/categorieslistview.cpp
-+++ b/src/core/categorieslistview.cpp
-@@ -22,9 +22,10 @@
- #include "categorieslistview.h"
- 
- #include <qpainter.h>
--#include <QTreeWidget>
--#include <QScrollBar>
- #include <QFrame>
-+#include <QHeaderView>
-+#include <QScrollBar>
-+#include <QTreeWidget>
- 
- #include <kglobal.h>
- 
-diff --git a/src/core/versionview.cpp b/src/core/versionview.cpp
-index 1a2b701..e83e265 100644
---- a/src/core/versionview.cpp
-+++ b/src/core/versionview.cpp
-@@ -21,6 +21,7 @@
- #include "common.h"
- #include "versionview.h"
- 
-+#include <QHeaderView>
- #include <QTreeWidget>
- 
- VersionView::VersionItem::VersionItem( QTreeWidget* parent, const QString& version, const bool& isInstalled, const int& stability )
--- 
-2.17.0
-
diff --git a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild b/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
deleted file mode 100644
index 0a8e445eadb1..000000000000
--- a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
-HOMEPAGE="https://sourceforge.net/projects/kuroo/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdelibs4support:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/ktextwidgets:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kxmlgui:5
-	kde-frameworks/threadweaver:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-portage/gentoolkit
-	kde-apps/kompare:5
-	kde-plasma/kde-cli-tools:5[kdesu]
-"
-DEPEND="${COMMON_DEPEND}
-	kde-frameworks/extra-cmake-modules:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-pkg_postinst() {
-	if ! has_version app-admin/logrotate ; then
-		elog "Installing app-admin/logrotate is recommended to keep"
-		elog "portage's summary.log size reasonable to view in the history page."
-	fi
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
deleted file mode 100644
index 84f8ce00b3a3..000000000000
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ESVN_REPO_URI="http://kuroo.svn.sourceforge.net/svnroot/kuroo/kuroo4/trunk"
-ESVN_PROJECT="kuroo4"
-inherit cmake-utils subversion
-
-DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
-HOMEPAGE="https://sourceforge.net/projects/kuroo/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdelibs4support:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/ktextwidgets:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kxmlgui:5
-	kde-frameworks/threadweaver:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-portage/gentoolkit
-	kde-apps/kompare:5
-	kde-plasma/kde-cli-tools:5[kdesu]
-"
-DEPEND="${COMMON_DEPEND}
-	kde-frameworks/extra-cmake-modules:5
-"
-
-pkg_postinst() {
-	if ! has_version app-admin/logrotate ; then
-		elog "Installing app-admin/logrotate is recommended to keep"
-		elog "portage's summary.log size reasonable to view in the history page."
-	fi
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-portage/kuroo/metadata.xml b/app-portage/kuroo/metadata.xml
deleted file mode 100644
index 880a4473e188..000000000000
--- a/app-portage/kuroo/metadata.xml
+++ /dev/null
@@ -1,24 +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>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>galiven@users.sourceforge.net</email>
-		<name>Andrew Schenck</name>
-		<description>Upstream Maintainer (please CC on bugs)</description>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kuroo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/layman-2.0.0-r1 b/app-portage/layman-2.0.0-r1
new file mode 100644
index 000000000000..6d6e8cdf2224
--- /dev/null
+++ b/app-portage/layman-2.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=http://layman.sourceforge.net/
+IUSE=bazaar cvs darcs +git mercurial subversion test python_targets_python2_7
+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 ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ae2db2fcdd97eec8e3113c3d4ade569c
diff --git a/app-portage/layman-2.0.0-r3 b/app-portage/layman-2.0.0-r3
new file mode 100644
index 000000000000..841dfb4ad8bf
--- /dev/null
+++ b/app-portage/layman-2.0.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-vcs/subversion ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=http://layman.sourceforge.net/
+IUSE=bazaar cvs darcs +git mercurial subversion test python_targets_pypy python_targets_python2_7
+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 ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6356b0d115d2b1d28c723454f05cda74
diff --git a/app-portage/layman-2.2.0-r7 b/app-portage/layman-2.2.0-r7
new file mode 100644
index 000000000000..baf1b0519696
--- /dev/null
+++ b/app-portage/layman-2.2.0-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=test? ( dev-vcs/subversion ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=http://layman.sourceforge.net
+IUSE=bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test python_targets_pypy python_targets_python2_7 python_targets_python3_4 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ssl-fetch-0.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=730f4aaabff8b41825dc723f2c4b45bc
diff --git a/app-portage/layman-2.4.1-r1 b/app-portage/layman-2.4.1-r1
new file mode 100644
index 000000000000..0a9079b5df27
--- /dev/null
+++ b/app-portage/layman-2.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=test? ( dev-vcs/subversion ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
+IUSE=bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=890bcefa865c0e82d18942585b496fd6
diff --git a/app-portage/layman-2.4.2-r1 b/app-portage/layman-2.4.2-r1
new file mode 100644
index 000000000000..77e4582df997
--- /dev/null
+++ b/app-portage/layman-2.4.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=test? ( dev-vcs/subversion ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
+IUSE=bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( || ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) !sync-plugin-portage? ( || ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=624bb28380dea726148c3a6648003f25
diff --git a/app-portage/layman-9999 b/app-portage/layman-9999
new file mode 100644
index 000000000000..a762c523c817
--- /dev/null
+++ b/app-portage/layman-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=test? ( dev-vcs/subversion ) app-text/asciidoc python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=5
+HOMEPAGE=http://layman.sourceforge.net
+IUSE=bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( || ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) !sync-plugin-portage? ( || ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1709f1ba7c60ef129170eab7a31224fc
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
deleted file mode 100644
index 9afebfd540b2..000000000000
--- a/app-portage/layman/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX layman-2.0.0.doctest.patch 933 BLAKE2B d2e9c8f4b49fdd37530981d6f0cd621a676eba9688e0c45e68cd82e774b052085f556b437a13789f0554bdf18a6a1112ce3b1503abf6a0719cfbb4efde20bc5e SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8
-AUX layman-2.0.0.svn_upgrade.patch 2447 BLAKE2B 0603c816eff3eef5824e04619c4b7634e253993028823b1c19713c76c1953d0df8160655e3a35d17a083736839628b75f77f8364e40a3e38d90035cc80c01561 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f
-AUX layman-2.2.0-adds-kwargs-debug.patch 1015 BLAKE2B b0f249a7e66606cd06f9107882d4a6edaed658b01a75c99f00ac03e8e8db8dc5fb1c2dc1e4738a8800c09645d44e7f39012d37dccf3c6c4ffc00f42833aff99e SHA512 cedf55524b2d11ae41a05192e8ba31fce677fb528560b168e4441bf2274c864c23a0d6463e79ea34c29e61ff1d4f514efba32bcee914fe6b915b6f039f8e106e
-AUX layman-2.2.0-change-for-upstream-ssl-fetch.patch 1234 BLAKE2B 1592e974a34142b62a21fe58011d98d118060a9bbc4e1e5d7ae0fdae1791a7715d325a9e3a2374a223f764fa3f40990855ec5d205a63a96d6b61cb1c3e4167d9 SHA512 bd58b813e3b364f4116537c1a66b0109a6a08fb5a30a53a691c697739197d84fed4449bbd3b751396e81d4adbb0f72101bd04e949068534bb77ced929c5c4191
-AUX layman-2.2.0-removes-doctest-remnants.patch 6172 BLAKE2B 0f6e9b68ebfb85f08c06a26e52a13bc3412edcf58d052cc72d576efbaeb8bd7c9a04268465632de0c3d611ed9fc369ae0d1dc9d2d61955a934124a70c7e46958 SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e
-AUX layman-2.4.1-sourcefileattributechanges.patch 1889 BLAKE2B b99001a1fbc19224111ab565343146230ac464add57bfb8ae3e202d339a6e7cb36dd3ba9050625cb1a9d3420ad892dc2417bbb5a5045a8bf6bf7e4e939f9a1a0 SHA512 ffb5015069c1b1725514d18abff9a7c152825335f05a7edf160d0e90a3d7cd9d0a6338fb24ed8a6ebcc24c2f23beefc4bc35d3d12fe887d86a3251bdb03fc4f2
-DIST layman-2.0.0.tar.gz 81184 BLAKE2B a1d8481f6dba7392c2c857c887284371c53f0bf64b4f013091b415fdb95c27d5695beaf004585fbc83731abcbdc08f4ecd6591dbfdc5a1caa418f3ab47aa37dc SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da
-DIST layman-2.2.0.tar.gz 116210 BLAKE2B 253fc35885e9e0bb804512db50962749a53cd25950102e3e79df48f87e683b6ad24857fcbd7d398a11a152c455a683e22a92dfa2ceaa7b80b6db764d54355514 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
-DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1a48a18331b5d936bb48568072ac4c208807baf667b346bbbc1edb6acc385cc379de1d54d96adb62484c5f085 SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
-DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.0.0-r1.ebuild 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 2289 BLAKE2B 46d9b5292320f7d091822630cb69037f0745a9dd35f1b4b5b7da8c60571a7072a82635603e0403e9b4819b80d511429025a6d2909eef14e64dd3bb37d5af93e9 SHA512 d4d2e268bba46ff1c6c33963c4ff75239db5f28c8eb64109a86d3531c7f707c61a2011d4270d2a55c3365aeb59a6344a6ccbdcabc89c0bae3405b6278c91eca1
-EBUILD layman-9999.ebuild 2223 BLAKE2B 1d32d63d9c99593e03dc8e3ed8b31d775918593bc115129433eee7dec66d115eba0424eba42864e187a2796e5bc3ea54aa5c3ac13a2d851fc81dcb18ad8d3342 SHA512 ac5a21aa58ae616b661f92ed4dfcd9cd15413be55778e496a22dded16de24efa26f707008d50a2e0bbe43a4c615dcff1333d972cde8eca2671b3c1f480c3b8d4
-MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/files/layman-2.0.0.doctest.patch b/app-portage/layman/files/layman-2.0.0.doctest.patch
deleted file mode 100644
index 6d3305ca3ef7..000000000000
--- a/app-portage/layman/files/layman-2.0.0.doctest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/layman/db.py b/layman/db.py
-index e2d740c..55a846a 100644
---- a/layman/db.py
-+++ b/layman/db.py
-@@ -93,6 +93,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
-@@ -173,6 +174,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
diff --git a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
deleted file mode 100644
index 431b9370593a..000000000000
--- a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 6 Jan 2014 22:01:12 -0800
-Subject: [PATCH] Update svn's check_upgrade() for newer svn versions.
-
-Thanks you, Arfrever, for your assistance.
----
- layman/overlays/svn.py | 32 ++++++++++++--------------------
- 1 file changed, 12 insertions(+), 20 deletions(-)
-
-diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
-index 4804925..374a516 100644
---- a/layman/overlays/svn.py
-+++ b/layman/overlays/svn.py
-@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource):
-         return
- 
-     def check_upgrade(self, target):
--        '''Code to check the installed svn version and
--        run "svn upgrade" if needed.'''
-+        '''Code to run "svn upgrade" it only takes longer
-+        than checking if it does need an upgrade if it is
-+        actually needed.
-+        '''
-         file_to_run = _resolve_command(self.command(), self.output.error)[1]
--        args = file_to_run + ' -q --version'
-+        args = " ".join([file_to_run, " upgrade", target])
--        pipe = Popen(args, shell=True, stdout=PIPE)
-+        pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE)
-         if pipe:
--            self.output.debug("SVN: check_upgrade()... have a valid pipe", 4)
--            version = pipe.stdout.readline().strip('\n')
--            self.output.debug("SVN: check_upgrade()... svn version found: %s"
--                % version, 4)
-+            self.output.debug("SVN: check_upgrade()... have a valid pipe, "
-+                "running upgrade", 4)
-+            upgrade_output = pipe.stdout.readline().strip('\n')
-+            if upgrade_output:
-+                self.output.debug("  output: %s" % upgrade_output, 4)
-+            self.output.debug("SVN: check_upgrade()... svn upgrade done", 4)
-             pipe.terminate()
--            if version >= '1.7.0':
--                self.output.debug("SVN: check_upgrade()... svn upgrade maybe",
--                    4)
--                _path = path([target,'.svn/wc.db'])
--                if not os.path.exists(_path):
--                    self.output.info("An svn upgrade needs to be run...",
--                        2)
--                    args = ["upgrade"]
--                    return self.run_command(self.command(), args,
--                        cwd=target, cmd="svn upgrade")
--                return
--        else:
--            return
-+        return
--- 
-1.8.3.2
-
diff --git a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
deleted file mode 100644
index 2020cb716449..000000000000
--- a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Sun, 7 Dec 2014 23:12:36 -0500
-Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5
-
---- a/layman/overlays/archive.py
-+++ b/layman/overlays/archive.py
-@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource):
-             connector_output = {
-                 'info': self.output.debug,
-                 'error': self.output.error,
--                'kwargs-info': {'level': 2},
-+                'kwargs-info': {'level': 5},
-+                'kwargs-debug': {'level': 2},
-                 'kwargs-error': {'level': None},
-             }
-            
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
-             'info':  self.output.info,
-             'debug': self.output.debug,
-             'error': self.output.error,
--            'kwargs-info': {'level': 2},
-+            'kwargs-info': {'level': 5},
-             'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-
diff --git a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
deleted file mode 100644
index d738b26f12c0..000000000000
--- a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 17 Oct 2014 19:40:38 -0700
-Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change
-
----
- layman/remotedb.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/layman/remotedb.py b/layman/remotedb.py
-index f0f7ea9..b866bd7 100644
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
-         self.detached_urls = []
-         self.signed_urls = []
-         self.proxies = config.proxies
--        
-+
-         self.urls  = [i.strip()
-             for i in config['overlays'].split('\n') if len(i)]
- 
-@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
-         need_gpg = [False, True, True]
-         # setup the ssl-fetch output map
-         connector_output = {
--            'info':  self.output.debug,
-+            'info':  self.output.info,
-+            'debug': self.output.debug,
-             'error': self.output.error,
-             'kwargs-info': {'level': 2},
-+            'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-         fetcher = Connector(connector_output, self.proxies, USERAGENT)
--- 
-2.0.5
-
diff --git a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
deleted file mode 100644
index 4b077140019b..000000000000
--- a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Fri, 18 Oct 2014 15:21:24 -0400
-Subject: [PATCH] Removes doctest remnants
-
---- a/layman/api.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/api.py	2014-10-18 14:29:51.184849673 -0400
-@@ -714,15 +714,3 @@
-     write = os.fdopen(fd_w, 'w')
-     read = os.fdopen(fd_r, 'r')
-     return (read, write, fd_r, fd_w)
--
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/argsparser.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/argsparser.py	2014-10-18 14:30:35.256851781 -0400
-@@ -404,14 +404,3 @@
-         self.output.debug('ARGSPARSER: Returning keys', 9)
- 
-         return keys
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/cli.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/cli.py	2014-10-18 14:32:11.456856384 -0400
-@@ -397,15 +397,3 @@
-         # blank newline  -- no " *"
-         self.output.notice('')
-         return info != {}
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/config.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/config.py	2014-10-18 14:31:02.528853086 -0400
-@@ -348,13 +348,3 @@
-         if new_defaults is not None:
-             self._defaults.update(new_defaults)
-         return
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/db.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/db.py	2014-10-18 14:32:32.160857374 -0400
-@@ -315,21 +315,3 @@
-             raise Exception('Syncing overlay "' + overlay_name +
-                             '" returned status ' + str(result) + '!' +
-                             '\ndb.sync()')
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/dbbase.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/dbbase.py	2014-10-18 14:31:14.648853666 -0400
-@@ -252,21 +252,3 @@
-         """returns a list of the overlay names
-         """
-         return sorted(self.overlays)
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/archive.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/archive.py	2014-10-18 14:31:54.640855579 -0400
-@@ -188,15 +188,3 @@
-         '''
- 
-         return self.is_supported()
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing.
--    from warnings    import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/modules/tar/tar.py	2014-10-18 14:27:13.245842116 -0400
-+++ b/layman/overlays/modules/tar/tar.py	2014-10-18 15:10:13.303965557 -0400
-@@ -94,14 +94,3 @@
-         return require_supported(
-             [(self.command(),  'tar', 'app-arch/tar'), ],
-             self.output.warn)
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/overlay.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/overlay.py	2014-10-18 14:31:38.624854813 -0400
-@@ -546,14 +546,3 @@
-     def source_types(self):
-         for i in self.sources:
-             yield i.type
--
--
--#==============================================================================
--#
--# Testing
--#
--#------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/remotedb.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/remotedb.py	2014-10-18 14:29:31.064848710 -0400
-@@ -384,14 +384,3 @@
-         self.signed_urls = [i.strip()
-             for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
-     '''
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/utils.py	2014-10-18 14:27:13.254842117 -0400
-+++ b/layman/utils.py	2014-10-18 14:30:24.088851247 -0400
-@@ -347,14 +347,3 @@
-     for key in kwargs:
-         result[key] = kwargs[key]
-     return result
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
-
diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
deleted file mode 100644
index 207f474304c7..000000000000
--- a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 10 May 2016 15:12:02 -0700
-Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
- 'sourcefile' attribute changes
-
-It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for
-backward compatibility.
-It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError.
-The filepath of the affected file for the error message had an extra leading '_'.
-Add the module name to the warning message.
----
- layman/module.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/layman/module.py b/layman/module.py
-index 08bcbc2..092418f 100644
---- a/layman/module.py
-+++ b/layman/module.py
-@@ -49,13 +49,14 @@ class Module(object):
-             kid = self.module_spec['provides'][submodule]
-             kidname = kid['name']
-             try:
-+                kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
-+            except KeyError:
-                 kid['module_name'] = '.'.join([mod_name, kidname])
--            except ImportError:
--                kid['module_name'] = '.'.join([mod_name, self.name])
--                f = self.__module.__file__
--                msg = 'Module.__initialize(); module spec is old, missing '\
-+                f = self._module.__file__
-+                msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
-                       'attribute: \'sourcefile\'.\nBackward compatibility '\
--                      'may be removed in the future.\nFile: %(f)s' % {'f': f}
-+                      'may be removed in the future.\nFile: %(f)s' % {
-+                      'module': self.name, 'f': f}
-                 self.output.warn(msg)
-             kid['is_imported'] = False
-             self.kids[kidname] = kid
--- 
-2.8.3
-
diff --git a/app-portage/layman/layman-2.0.0-r1.ebuild b/app-portage/layman/layman-2.0.0-r1.ebuild
deleted file mode 100644
index b0c313242eb5..000000000000
--- a/app-portage/layman/layman-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.doctest.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
deleted file mode 100644
index dfe874aaa77b..000000000000
--- a/app-portage/layman/layman-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.*.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
deleted file mode 100644
index c8f4f72e8786..000000000000
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	distutils-r1_python_prepare_all
-	epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch
-	epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch
-	epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch
-	rm "${S}"/"${PN}"/tests/dtest.py
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/external.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-		|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
deleted file mode 100644
index 78e7343bf953..000000000000
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
-)
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
deleted file mode 100644
index 7cd74b995ce9..000000000000
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,98 +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,3_6} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage? (
-		|| (
-			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	!sync-plugin-portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
deleted file mode 100644
index 41753c3c8898..000000000000
--- a/app-portage/layman/layman-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 git-r3 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	app-text/asciidoc
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage? (
-		|| (
-			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	!sync-plugin-portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_compile_all() {
-	# override MAKEOPTS to prevent build failure
-	emake -j1 -C doc
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
deleted file mode 100644
index 095d087db42d..000000000000
--- a/app-portage/layman/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>layman@gentoo.org</email>
-		<name>Gentoo Layman team</name>
-	</maintainer>
-	<use>
-		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
-		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
-		<flag name="darcs">Support <pkg>dev-vcs/darcs</pkg> based overlays</flag>
-		<flag name="g-sorcery">Support <pkg>app-portage/g-sorcery</pkg> based overlays</flag>
-		<flag name="git">Support <pkg>dev-vcs/git</pkg> based overlays</flag>
-		<flag name="gpg">Support <pkg>app-crypt/gnupg</pkg> signed overlays lists and manifests</flag>
-		<flag name="mercurial">Support <pkg>dev-vcs/mercurial</pkg> based overlays</flag>
-		<flag name="squashfs">Support mounting squashfs image overlays locally read-only</flag>
-		<flag name="subversion">Support <pkg>dev-vcs/subversion</pkg> based overlays</flag>
-		<flag name="sync-plugin-portage">Install the <pkg>sys-apps/portage</pkg> sync module</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">layman</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/metadata.xml b/app-portage/metadata.xml
deleted file mode 100644
index 3872164d80bc..000000000000
--- a/app-portage/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-portage category contains software which works with portage or
-		ebuilds.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-portage enthält Programme für das Arbeiten mit Portage
-		oder Ebuilds.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-portage contiene programas para trabajar con portage
-		o con ebuilds.
-	</longdescription>
-	<longdescription lang="ja">
-		app-portageカテゴリにはportageかebuildと使うソフトウェアが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-portage categorie bevat applicaties die samenwerken met portage of
-		direct met ebuilds te maken hebben.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-portage chứa các ứng dụng liên quan đến
-		portage.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-portage contiene programmi per portage o per le ebuilds.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-portage contém programas que funcionam com o portage
-		ou ebuilds.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-portage zawiera dodatkowe programy do pracy z systemem
-		Portage oraz ebuildami.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-portage/metagen-0.6.2-r1 b/app-portage/metagen-0.6.2-r1
new file mode 100644
index 000000000000..8c901dd778fc
--- /dev/null
+++ b/app-portage/metagen-0.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~neurogeek/metagen_releases/metagen-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8a96b285dca8de2ea0a8ee304e8e3419
diff --git a/app-portage/metagen-0.6.3 b/app-portage/metagen-0.6.3
new file mode 100644
index 000000000000..40c4dfbe66a0
--- /dev/null
+++ b/app-portage/metagen-0.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=addd36ddf25cd93e6833b519e5ad6246
diff --git a/app-portage/metagen-0.6.4.2 b/app-portage/metagen-0.6.4.2
new file mode 100644
index 000000000000..94302cc9a280
--- /dev/null
+++ b/app-portage/metagen-0.6.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.4.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1517286fdea20a1d8992a0651b49b56
diff --git a/app-portage/metagen-0.6.5 b/app-portage/metagen-0.6.5
new file mode 100644
index 000000000000..bd810edaaa5a
--- /dev/null
+++ b/app-portage/metagen-0.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=acbfc14d43c44068204526620bcbcc39
diff --git a/app-portage/metagen-0.6.5-r1 b/app-portage/metagen-0.6.5-r1
new file mode 100644
index 000000000000..0bf4db182f31
--- /dev/null
+++ b/app-portage/metagen-0.6.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=241e29d40f62cbb54502ec1506f55bff
diff --git a/app-portage/metagen-0.6.6-r1 b/app-portage/metagen-0.6.6-r1
new file mode 100644
index 000000000000..c4a883ff7285
--- /dev/null
+++ b/app-portage/metagen-0.6.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.6.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06e7d68c16bec9ca910400fd671a9c7c
diff --git a/app-portage/metagen-9999 b/app-portage/metagen-9999
new file mode 100644
index 000000000000..2fd9bdb4f4d5
--- /dev/null
+++ b/app-portage/metagen-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8570c1fcbbf79c8bb6a8120d174f16c8
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
deleted file mode 100644
index c1daa3429a4a..000000000000
--- a/app-portage/metagen/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST metagen-0.6.2.tar.gz 6100 BLAKE2B c5e3fb2e3b6c2f5624923a161e7a22d4b81dd1e084b68152d312dfcb73a6b96face64fe6918fc66d7f87d2d7114725028d82d1e74d72f6b7ebc1a499f0fce268 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff
-DIST metagen-0.6.3.tar.bz2 6118 BLAKE2B 1356111b23a96c6435bd997ff824682fd76074d004cc32f8af2fdff766e16eb70f395bfaa9fd9555397cebcb7859e87b16988b63fe7bd35684ca95e8cb12d9c3 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd
-DIST metagen-0.6.4.2.tar.bz2 6837 BLAKE2B a9595045fea006e53fd23e3b96da0acd884b6f33e0089fc56bc7fb118ba1d205ddc81754a8cc2bc3e5207ad9cd9f537e1a3e7b25be0e5c804ebed5e66b481abc SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c
-DIST metagen-0.6.5.tar.bz2 6973 BLAKE2B 2cac99056bde1e6420ef3bb54e6655b17fb43b27dc0024cd3eb2b5c09dcb05b5db318dc4f52c3389d562275e46c901fab863ab50bd0555a6409a8fe5c0bd8de7 SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0
-DIST metagen-0.6.6.tar.bz2 6341 BLAKE2B e45e06570cbe6c690b4fdfef036282c5828ec1c86b1773c35000f19c557df7784e777a59e20f1c27fc5ae0edf5169a6d1ebcfc2d08ffa1cc4ab77265041550ac SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca
-EBUILD metagen-0.6.2-r1.ebuild 827 BLAKE2B afd29b67e0a12245aed69718d6aff71771c33214768d32b9ef6c6a362e07bfd0769ac3aa86302864aebd20e2412f0d649e9524b83cad81f7de8596db77b3fb59 SHA512 e856e57d1cec091360241cc19e6273396af76ef10e84cf0691af6daec509546a79864a1850fd8fc37ec1e3acc6e6ae4552dfe02bc3846aa8dc6c5c7b87740c17
-EBUILD metagen-0.6.3.ebuild 825 BLAKE2B a4a5044861e9c83e27b449648616853ca2703b2a804f9b1017f0aed460c2cc3e177fddc2de2c400ae7259d4ef912d0fcfd5afb23952662a97bf29df3e04b11d2 SHA512 9b2089d4723b1542f8cb1cb44f39eb56e46bec7fff835e47c90fc5f8dae1d4bd66af142f9d5714da6887a757e3c2156e7a96ee12c87ec09bb1ee800d8e44504c
-EBUILD metagen-0.6.4.2.ebuild 829 BLAKE2B 0abf87e7e3e3be9bc00248fbb09a1fbff50cd4eee23dad358b02566a5c1e6a7de201eb6af364246db40f7b33b22ee062327d9e7f7e10c128f8d400d9542c8212 SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760
-EBUILD metagen-0.6.5-r1.ebuild 930 BLAKE2B 0c766ffbf7aca569a55b3efca68f219c7e8675cea1eaa13492c7b4947b771ab4b2f8a70f3827dec4fab48b920debe25764c910018f1b467eb300a56c9a282129 SHA512 a6e76c8f6f6b95bc89ea766e6ab5f3fe4af7728d6a3df90687f62fae934f4d3d6cd39007f37eec7bf295bdd63f9075f4a33507caa96fcc91a3802aa86a5fc3ae
-EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7157c953af8c64a93e223b8efcbdce79a08688bb220c7ae2aa5a19dce52c02b87d9f7108be4b39abc7dcebc4f SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402
-EBUILD metagen-0.6.6-r1.ebuild 872 BLAKE2B 04c208b0af3d80a60a3d3ae8844816621e0fa44914af35a77a6aaf787d6a8d8f8b3d666827baad72631c2f95548d062b3ded1fee660d94ce563dae71862e034b SHA512 b38245bd017b59ed45f2fe73aa99f0ab78c7db56d0aaedc35b4051ab9ba9c8362a131bcee87150767ba7294dade9a4394e17f333c15ba0c62b2224eb39f5ac8d
-EBUILD metagen-9999.ebuild 933 BLAKE2B 848344caaa665d2f0bf8f1f13d2ec5c97802eea12ab2ed4bcc45e6d0db23c940e0de5ab85c1dcbcfd9594ebf9955065ee783b550565b0a7f18392eb0be1a62ff SHA512 fa61cb086af549787017c3e6710600d5558b2d65952e9acf6d194678a58cf0289232df7544b96c329e6fada9a21849520db65af26e354b7c65c6079b6265fda7
-MISC metadata.xml 295 BLAKE2B b7dab399d97c12c36ca3d8312dc628a9b1d393d6eaec7c941d6cc03fc7bae3c6cf7385e91758708712fd7e155a5051e8de5bc155563f552707bc1dd0c74262b4 SHA512 68ea6ebd27bc287655010afbfa6ea291c8bb7de14cef145c91b3179c4d28e865701ef8dfe914457ea933785045731277d3b245877d935d1163915a76db9511b8
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
deleted file mode 100644
index eb3702fd181f..000000000000
--- a/app-portage/metagen/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="person">
-	<email>sping@gentoo.org</email>
-</maintainer>
-<longdescription>metagen creates metadata.xml files for ebuilds</longdescription>
-</pkgmetadata>
diff --git a/app-portage/metagen/metagen-0.6.2-r1.ebuild b/app-portage/metagen/metagen-0.6.2-r1.ebuild
deleted file mode 100644
index e8a7369e1a69..000000000000
--- a/app-portage/metagen/metagen-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
deleted file mode 100644
index 46e06ca46727..000000000000
--- a/app-portage/metagen/metagen-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
deleted file mode 100644
index 6ae80946042b..000000000000
--- a/app-portage/metagen/metagen-0.6.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5-r1.ebuild b/app-portage/metagen/metagen-0.6.5-r1.ebuild
deleted file mode 100644
index a6e19aaf00e2..000000000000
--- a/app-portage/metagen/metagen-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	|| (
-		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
-		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5.ebuild b/app-portage/metagen/metagen-0.6.5.ebuild
deleted file mode 100644
index 3eb87efbb6ec..000000000000
--- a/app-portage/metagen/metagen-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.6-r1.ebuild b/app-portage/metagen/metagen-0.6.6-r1.ebuild
deleted file mode 100644
index 4a7336fac2c0..000000000000
--- a/app-portage/metagen/metagen-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
deleted file mode 100644
index 5393a9b28614..000000000000
--- a/app-portage/metagen/metagen-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI=""
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/metagen.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	|| (
-		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/metagen.1
-}
-
-python_test() {
-	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/mirrorselect-2.2.0.1 b/app-portage/mirrorselect-2.2.0.1
new file mode 100644
index 000000000000..9fad780de2a6
--- /dev/null
+++ b/app-portage/mirrorselect-2.2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/distfiles/mirrorselect-2.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b8bb6457b41d95727b3e7a621bfccb8
diff --git a/app-portage/mirrorselect-2.2.2 b/app-portage/mirrorselect-2.2.2
new file mode 100644
index 000000000000..cd6a319727b3
--- /dev/null
+++ b/app-portage/mirrorselect-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=366bcad0e5e6ec83a410ab7b60679c1d
diff --git a/app-portage/mirrorselect-2.2.2-r2 b/app-portage/mirrorselect-2.2.2-r2
new file mode 100644
index 000000000000..8d38fc804d5e
--- /dev/null
+++ b/app-portage/mirrorselect-2.2.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0fac07cca7bbae1e89d3ef9ff0f18df3
diff --git a/app-portage/mirrorselect-2.2.3 b/app-portage/mirrorselect-2.2.3
new file mode 100644
index 000000000000..6d136bf85172
--- /dev/null
+++ b/app-portage/mirrorselect-2.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.3.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=666ee2b0c092a11ceb930fabdbe5c2ab
diff --git a/app-portage/mirrorselect-9999 b/app-portage/mirrorselect-9999
new file mode 100644
index 000000000000..c22ac5a44a86
--- /dev/null
+++ b/app-portage/mirrorselect-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4c79bb8271ae1091f212501c1ddabce4
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
deleted file mode 100644
index 217a95b53766..000000000000
--- a/app-portage/mirrorselect/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch 721 BLAKE2B 6faf73309a13a2f4b039e00555f9c8ffa01458aaf1a80eecd5ab8fb9349b869f7c9d63d2d288668f2960e230b9c4323cb6c309e9c19aad38ca87dccf5fcf9468 SHA512 032544106b1e6dad76f46131f94913b1875d9605808dbe5145ca0fd80916c158551745a850a25cf4252f9f860e8608ed76e31ca878110db66e05003e86d55127
-AUX mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch 658 BLAKE2B 21ec938fa75ec527f9670eaf25a7d308126a098ce558587fd3a1995ac02ecb82ae21ed76dcb5f0605581e777ba93c987780e11e3990cc3f15383b5a17e3f18e7 SHA512 4f2ce8c8136a380cfcd0f44489fcd51be1a8c66353dba59ff8872ca6f72901c0f19f231f8c44fe396bb5735e6e8e16b389e22bcada1f9a0a793dec20baefe604
-DIST mirrorselect-2.2.0.1.tar.gz 13138 BLAKE2B 40a2724ee8c83018e19a56a49b677cfa3f89d56450ba743ddf67a324b43881fcd8e99022f9532499b5b4d826b8d6700a5606294af3becde1f928ecaa07338f44 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad
-DIST mirrorselect-2.2.2.tar.gz 15964 BLAKE2B 96698286c05fd96ea03ec6594c8b0849fad3b1ffdd3f1ecf1a76d205005b07bd4971211e72f10952f5155c91376192fd81efbdfdd5058c9a1c60cf731b0bacd1 SHA512 91ce16d236418ba186c447c6497684c4138afd4279a0ba95ee0f069309e8ce086a5a4ce4715ef21275362b7c3772924d422d7711d188d40c1e0b90f773765cf9
-DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
-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-9999.ebuild 1053 BLAKE2B 890a869ce8ec358e55d575ca9000a4282471e0e0ad8971010013d6f41ed527c15b16867a252f76687cbcfa77dc244ed815f936e16481adc5522bd4083ea39913 SHA512 e1ec6c42a99cd00ab71ed10aadbb8a7600a388c3a56a5b20662fb15017649e8fc95afb5e27deb9a67b407aa00b16b59207a661bdb420a44bae1e27174fe205dd
-MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
deleted file mode 100644
index d170103a4657..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 27 Jan 2015 10:19:05 -0800
-Subject: [PATCH] Add missed output mode function assignment.
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index 59efad1..06dce6c 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -107,6 +107,7 @@ class Extractor(object):
- 		# setup the ssl-fetch ouptut map
- 		connector_output = {
- 			'info':self.output.write,
-+			'debug': self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
- 			'kwargs-debug': {'level':2},
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
deleted file mode 100644
index 2e5fd93c09cb..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 26 Jan 2015 18:23:05 -0800
-Subject: [PATCH] Update for ssl-fetch api change
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index ec5f299..59efad1 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -109,6 +109,7 @@ class Extractor(object):
- 			'info':self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
-+			'kwargs-debug': {'level':2},
- 			'kwargs-error': {'level':0},
- 			}
- 
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/metadata.xml b/app-portage/mirrorselect/metadata.xml
deleted file mode 100644
index ca6a7a138342..000000000000
--- a/app-portage/mirrorselect/metadata.xml
+++ /dev/null
@@ -1,13 +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 lang="en">
-		This utility is used to select the fastest mirror (distfiles) and
-		provide a nicer front-end for mirror selection
-		(both rsync + distfiles) to a user.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
deleted file mode 100644
index b45d2f38ba34..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 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 eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
deleted file mode 100644
index 725b4bf5dcce..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 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 eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch"
-	"${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch"
-)
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
deleted file mode 100644
index 88aaa45414ac..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ /dev/null
@@ -1,36 +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} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	<dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
deleted file mode 100644
index 23550f0b0158..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
deleted file mode 100644
index 4b49dae3c819..000000000000
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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_REQ_USE="xml"
-
-inherit eutils distutils-r1 git-r3 prefix
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mirrorselect.git"
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_export_best
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	distutils-r1_pkg_postinst
-
-	einfo "This is a development version."
-	einfo "Please report any bugs you encounter to:"
-	einfo "https://bugs.gentoo.org/"
-}
diff --git a/app-portage/overlint-0.5.2 b/app-portage/overlint-0.5.2
new file mode 100644
index 000000000000..f9f629d1a2ab
--- /dev/null
+++ b/app-portage/overlint-0.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Simple tool for static analysis of overlays
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/overlint.git
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://www.hartwork.org/public/overlint-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9e4714fae3862503b4320c301dca03c
diff --git a/app-portage/overlint-0.5.3-r1 b/app-portage/overlint-0.5.3-r1
new file mode 100644
index 000000000000..5350e221f593
--- /dev/null
+++ b/app-portage/overlint-0.5.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Simple tool for static analysis of overlays
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/overlint.git
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.hartwork.org/public/overlint-0.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=28345130396ab26d34692b7992c3c51a
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
deleted file mode 100644
index b74f68087cf8..000000000000
--- a/app-portage/overlint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/overlint/metadata.xml b/app-portage/overlint/metadata.xml
deleted file mode 100644
index 6d2298876faa..000000000000
--- a/app-portage/overlint/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="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/overlint/overlint-0.5.2.ebuild b/app-portage/overlint/overlint-0.5.2.ebuild
deleted file mode 100644
index bad334ae475d..000000000000
--- a/app-portage/overlint/overlint-0.5.2.ebuild
+++ /dev/null
@@ -1,19 +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="Simple tool for static analysis of overlays"
-HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage"
diff --git a/app-portage/overlint/overlint-0.5.3-r1.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild
deleted file mode 100644
index c21a4821b5d1..000000000000
--- a/app-portage/overlint/overlint-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,23 +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,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple tool for static analysis of overlays"
-HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git"
-SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
diff --git a/app-portage/perl-info-0.16 b/app-portage/perl-info-0.16
new file mode 100644
index 000000000000..d88024f7b7cd
--- /dev/null
+++ b/app-portage/perl-info-0.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl virtual/perl-Term-ANSIColor >=dev-perl/PortageXS-0.02.04
+DESCRIPTION=Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl
+EAPI=0
+HOMEPAGE=https://www.gentoo.org/proj/en/perl/
+KEYWORDS=alpha amd64 hppa ~ia64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Term-ANSIColor >=dev-perl/PortageXS-0.02.04
+SLOT=0
+SRC_URI=mirror://gentoo/perl-info-0.16.tar.gz https://dev.gentoo.org/~tove/files/perl-info-0.16.tar.gz
+_md5_=d84eaeeab630ac71912e7c34bdecc462
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
deleted file mode 100644
index 3cb4d8ba90bd..000000000000
--- a/app-portage/perl-info/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
-EBUILD perl-info-0.16.ebuild 569 BLAKE2B 95db230e7395184a8206a60921521e6b80302442dc2ca0f4ac7f5671963577e4c17fe9a3110f422c1fbbbe84bedafb64c92c7b097d9c7f21bba8f1b014a1291d SHA512 11c2a5d2208ea56d80955de8fe8085c7e122d219170e1f4984ad8951219df8977e6fe0b669391396ffceb513476113c6e55a9fc879b6324237e17615bf961949
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/perl-info/metadata.xml b/app-portage/perl-info/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/app-portage/perl-info/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>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
deleted file mode 100644
index 467d498b5fca..000000000000
--- a/app-portage/perl-info/perl-info-0.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	https://dev.gentoo.org/~tove/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/PortageXS-0.02.04"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN} || die
-}
diff --git a/app-portage/pfl-2.4-r5 b/app-portage/pfl-2.4-r5
new file mode 100644
index 000000000000..b960f7ad6371
--- /dev/null
+++ b/app-portage/pfl-2.4-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Searchable online file/package database for Gentoo
+EAPI=5
+HOMEPAGE=http://www.portagefilelist.de
+IUSE=+network-cron python_targets_python2_7
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://files.portagefilelist.de/pfl-2.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d235ae5e3d3b6e8ebcdb164e3b1c8e57
diff --git a/app-portage/pfl-3.0-r1 b/app-portage/pfl-3.0-r1
new file mode 100644
index 000000000000..85bd878f3312
--- /dev/null
+++ b/app-portage/pfl-3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Searchable online file/package database for Gentoo
+EAPI=6
+HOMEPAGE=http://www.portagefilelist.de
+IUSE=+network-cron python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://files.portagefilelist.de/pfl-3.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44099ed24cdf322718bc3ba6655bd91d
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
deleted file mode 100644
index ce6fc07852f3..000000000000
--- a/app-portage/pfl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX e-file-20110906-http-response.patch 356 BLAKE2B b995c07f558e398615fcaf74e87fae5599d651714707e72415a07206d637c1432b7e185b028f2002c54dc8a903bd6ee7c8abefd5ad314bb8d809144543453b17 SHA512 92d469ebff864e47a196db012d4b04422700b76bddbdcd03c8c2dce26015f2e354b41d4cea0e458383ca72f356843d137f3de64b78f0ddf416fb31d846dbcbab
-AUX e-file-20110906-portageq.patch 1256 BLAKE2B e7cbbc0de5c592b4088d732f4f5a8c03d32842b4a375aedbcac4d82de11760221ea170a19fbb54cc909b4383e693b9ac3a1970047b6aeca0f32ebe10cf7bb50a SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa
-AUX pfl-2.4-reponame.patch 336 BLAKE2B 246570c1c8e77a0cedbac41a9f639cf9ebf1c6c0ed40eb968f4db1c03f6c4cad6688faf86d384b81f7c835438853a43833ff27b854a5d4de41a788934284cae5 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659
-DIST pfl-2.4.tar.bz2 6274 BLAKE2B 7cf72dc4b9182b3ea43fb1661330debeb79afdaaab8a519dc2f8f0a048f5f7e66ee2466a44b4683f36eebae248f6df407d0d0fc3914f3a8eb427bc2af0692bb6 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72
-DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
-EBUILD pfl-2.4-r5.ebuild 1198 BLAKE2B f5bb1fc20d4de3e00b6bfc3dd220605148d12888b7807071d499d923133317e10944e941f38c51c96d940578d071487ee5a83fe8cc7d24bdf338c955cd89514b SHA512 146f86054a8d782bf1947ef46b9710155cc938b231aed95e27d917fab8103021592cf5a853e6418927a19c7da4fdbe7297b5b99c96c4152092b43b749cc72889
-EBUILD pfl-3.0-r1.ebuild 1078 BLAKE2B ccdd5932a5724e4e47a3f0a8b1d7c545c264ec31c21b9a6cb0bf0818f04bb2f8b010855f271148d39333316d9b6d2a408395c9a3aafb779425c57c2d6f50875b SHA512 50f8a2ba5a57776237e409e5c28eaeea7e2112453023b55eb46cbf1eeb451045877f2647e4707dadd81b6225418c0a2e6f59e59345e5fc5852598ec75b2cc5b5
-MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/files/e-file-20110906-http-response.patch b/app-portage/pfl/files/e-file-20110906-http-response.patch
deleted file mode 100644
index 672cde5f5375..000000000000
--- a/app-portage/pfl/files/e-file-20110906-http-response.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/e-file	2013-10-14 21:33:54.421701259 +0200
-+++ bin/e-file	2013-10-14 21:34:10.004702370 +0200
-@@ -25,7 +25,7 @@
- 
- URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt"
- 
--curl -s $URL | awk -v isgentoo=$isgentoo '
-+curl -s -f $URL | awk -v isgentoo=$isgentoo '
- BEGIN{
- 	FOUND=0
- 	if(isgentoo){
diff --git a/app-portage/pfl/files/e-file-20110906-portageq.patch b/app-portage/pfl/files/e-file-20110906-portageq.patch
deleted file mode 100644
index 2a65519f459b..000000000000
--- a/app-portage/pfl/files/e-file-20110906-portageq.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- bin/e-file
-+++ bin/e-file
-@@ -16,11 +16,11 @@
- 	exit 1
- fi
- 
--if type emerge >/dev/null 2>&1; then
-+if type portageq >/dev/null 2>&1; then
- 	isgentoo=1
- else
- 	isgentoo=0
--	echo 'WARNING: "emerge" no found. If your system is not gentoo, a part of function will not available!' >&2
-+	echo 'WARNING: "portageq" no found. If your system is not gentoo, a part of function will not available!' >&2
- fi
- 
- URL="http://www.portagefilelist.de/index.php/Special:PFLQuery2?file=$1&searchfile=lookup&lookup=file&txt"
-@@ -29,8 +29,7 @@
- BEGIN{
- 	FOUND=0
- 	if(isgentoo){
--		"emerge --info | grep PORTDIR" | getline
--		split($0,PORTDIR,/\"/)
-+		"portageq get_repo_path $(portageq envvar EROOT) gentoo" | getline PORTDIR
- 	}
- }
- {
-@@ -75,7 +74,7 @@
- 				}
- 			
- 				NF=0
--				cmd="(grep -h HOMEPAGE\\= " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
-+				cmd="(grep -h HOMEPAGE\\= " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
- 				cmd | getline
- 				if(NF==0){
- 					HOMEPAGE=""
-@@ -85,7 +84,7 @@
- 				}
- 				
- 				NF=0
--				cmd="(grep -h DESCRIPTION " PORTDIR[2] "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
-+				cmd="(grep -h DESCRIPTION " PORTDIR "/" pkg "/*.ebuild | tail -n 1)2>/dev/null"
- 				cmd | getline
- 				if(NF==0){
- 					DESCRIPTION=""
diff --git a/app-portage/pfl/files/pfl-2.4-reponame.patch b/app-portage/pfl/files/pfl-2.4-reponame.patch
deleted file mode 100644
index a9041d46b329..000000000000
--- a/app-portage/pfl/files/pfl-2.4-reponame.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pfl/pfl.py	(Revision 68)
-+++ pfl/pfl.py	(Arbeitskopie)
-@@ -226,6 +226,8 @@
- 				v = '%s-%s' % (v, r)
- 				
- 			repo, = self._vardbapi.aux_get(cpv, ['repository'])
-+			if len(repo) == 0:
-+				repo, = self._vardbapi.aux_get(cpv, ['REPOSITORY'])
- 
- 			# timestamp of merge
- 			mergedstamp = self._vardbapi.aux_get(cpv, ['_mtime_'])[0]
diff --git a/app-portage/pfl/metadata.xml b/app-portage/pfl/metadata.xml
deleted file mode 100644
index 534265d6749f..000000000000
--- a/app-portage/pfl/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>bugs@portagefilelist.de</email>
-			<name>Daniel Buschke</name>
-		</maintainer>
-	</upstream>
-	<use>
-		<flag name="network-cron">Adds a cron job which does a weekly submit of the package database</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-portage/pfl/pfl-2.4-r5.ebuild b/app-portage/pfl/pfl-2.4-r5.ebuild
deleted file mode 100644
index a803e6e0b359..000000000000
--- a/app-portage/pfl/pfl-2.4-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Searchable online file/package database for Gentoo"
-HOMEPAGE="http://www.portagefilelist.de"
-SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+network-cron"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/curl
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/e-file-20110906-http-response.patch \
-		"${FILESDIR}"/e-file-20110906-portageq.patch \
-		"${FILESDIR}"/pfl-2.4-reponame.patch
-}
-
-python_install_all() {
-	if use network-cron ; then
-		exeinto /etc/cron.weekly
-		doexe cron/pfl
-	fi
-
-	keepdir /var/lib/${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
-		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
-		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
-		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
-	fi
-}
diff --git a/app-portage/pfl/pfl-3.0-r1.ebuild b/app-portage/pfl/pfl-3.0-r1.ebuild
deleted file mode 100644
index 519afebf7bc5..000000000000
--- a/app-portage/pfl/pfl-3.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Searchable online file/package database for Gentoo"
-HOMEPAGE="http://www.portagefilelist.de"
-SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+network-cron"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/curl
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	if use network-cron ; then
-		exeinto /etc/cron.weekly
-		doexe cron/pfl
-	fi
-
-	keepdir /var/lib/${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
-		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
-		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
-		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
-	fi
-}
diff --git a/app-portage/portage-utils-0.62 b/app-portage/portage-utils-0.62
new file mode 100644
index 000000000000..b294faa5a261
--- /dev/null
+++ b/app-portage/portage-utils-0.62
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=4
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+KEYWORDS=m68k s390
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.62.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.62.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6e01d8dd224e13bd259ce3e4eff2b03c
diff --git a/app-portage/portage-utils-0.64 b/app-portage/portage-utils-0.64
new file mode 100644
index 000000000000..9c61f3b06224
--- /dev/null
+++ b/app-portage/portage-utils-0.64
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6fd7169fdfd567223c15053403844b12
diff --git a/app-portage/portage-utils-0.70 b/app-portage/portage-utils-0.70
new file mode 100644
index 000000000000..01ca533f4253
--- /dev/null
+++ b/app-portage/portage-utils-0.70
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.70.tar.xz https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.70.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fadeecb614e68a6cf84822a65403967f
diff --git a/app-portage/portage-utils-0.71 b/app-portage/portage-utils-0.71
new file mode 100644
index 000000000000..eff5ea3adca6
--- /dev/null
+++ b/app-portage/portage-utils-0.71
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.71.tar.xz https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.71.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fadeecb614e68a6cf84822a65403967f
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
deleted file mode 100644
index 44630ad4f2d3..000000000000
--- a/app-portage/portage-utils/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-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.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
-DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
-EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.64.ebuild 1307 BLAKE2B 19f158c23ac15aa0a9138d8f93d3c1bb6bd48ad9b89031f7e5faa4f643a026e87534857d8463db4aeda445566a1434092b0dbbf97ce96cea51d254f57b0c7549 SHA512 b5ec8a9d06cd50db047d5b758a328c7dbb31690de8f1b7368358bb700bca94f6b22bd32fa79a9f52d76f4a62182cd0cb148fa02418277f398e362b44e50ba7f1
-EBUILD portage-utils-0.70.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
-EBUILD portage-utils-0.71.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
-MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync
deleted file mode 100644
index e94ea5d0257a..000000000000
--- a/app-portage/portage-utils/files/post_sync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright 2006-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-for f in /etc/portage/postsync.d/* ; do
-	[ -x "${f}" ] && "${f}"
-done
-:
diff --git a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize
deleted file mode 100644
index 7bca1a86b3ae..000000000000
--- a/app-portage/portage-utils/files/q-reinitialize
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
-:
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
deleted file mode 100644
index a53ffbea77d3..000000000000
--- a/app-portage/portage-utils/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="person">
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
deleted file mode 100644
index 2ec9b75f23c2..000000000000
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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="m68k s390"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# 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)
-}
-
-src_install() {
-	default
-
-	exeinto /etc/portage/bin
-	doexe "${FILESDIR}"/post_sync
-	insinto /etc/portage/postsync.d
-	doins "${FILESDIR}"/q-reinitialize
-
-	# Portage fixes shebangs, we just need to fix the paths in the files
-	sed -i \
-		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
-		"${ED}"/etc/portage/bin/post_sync \
-		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
-}
-
-pkg_preinst() {
-	# preserve +x bit on postsync files #301721
-	local x
-	pushd "${ED}" >/dev/null
-	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
-	done
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync:"
-		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-		elog "Normally this should only take a few seconds to run but file systems"
-		elog "such as ext3 can take a lot longer.  To disable, simply do:"
-		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-	fi
-}
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 c717ab078c5e..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 ~arm-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-0.70.ebuild b/app-portage/portage-utils/portage-utils-0.70.ebuild
deleted file mode 100644
index 300ced4574a3..000000000000
--- a/app-portage/portage-utils/portage-utils-0.70.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls) STATIC=$(usex static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.71.ebuild b/app-portage/portage-utils/portage-utils-0.71.ebuild
deleted file mode 100644
index 300ced4574a3..000000000000
--- a/app-portage/portage-utils/portage-utils-0.71.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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_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/porthole-0.6.1-r5 b/app-portage/porthole-0.6.1-r5
new file mode 100644
index 000000000000..0f3065f7062e
--- /dev/null
+++ b/app-portage/porthole-0.6.1-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=|| ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/libglade:2.0 dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nls? ( virtual/libintl ) nls? ( >=sys-devel/gettext-0.14 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A GTK+-based frontend to Portage
+EAPI=5
+HOMEPAGE=http://porthole.sourceforge.net
+IUSE=nls python_targets_python2_7
+KEYWORDS=amd64 arm ppc ppc64 sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=|| ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/libglade:2.0 dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nls? ( virtual/libintl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/porthole/porthole-0.6.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ee949381222296e6fc858b30dda35d60
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
deleted file mode 100644
index 5a53e3be818a..000000000000
--- a/app-portage/porthole/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX porthole-0.6.1-masking_status.patch 485 BLAKE2B 92188c56635ab69207dcee949303a09dc9d962bb6d0118205a4ec66d01e05f2d66f761f12ccf648230397a65772f0515460b373e526bbb368344f4d2d7030dd6 SHA512 5df59b9ceb47c8e6c5a3ca3c4777efcfdc7ee52e43f0a2121299ac777e2ecbbe707cb330a13355d35862dc5de7fa193fee846063e4825c4537d6c0b6d790bbbe
-AUX porthole-0.6.1-missing-attribute.patch 665 BLAKE2B ac282d0f7ef0f94d125520d25c3171b3f05bf42338f399b6bd7b82f09e9f6d0740e6df06c256b7179d9889b4c361b0ffa2954fd14f9a835d024feaf71499105a SHA512 e450d7d188b7762cebdfd33e6bc586c38e63fec80fe51fd500559587a85e6f5632ad3279d8e8a4bc37781e77f3f6f3df9af8b013f1725dbb47877642177d27d2
-AUX porthole-0.6.1-missing_import.patch 858 BLAKE2B 6b338ff4425d533e6f5a7033f2372032b7184ef3119a95cd5251ff92430223cbef3e95922850ee62416f9d7f2e0dde6df015a5cad1146e227c120c2e4a902630 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd
-DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
-EBUILD porthole-0.6.1-r5.ebuild 2059 BLAKE2B b448d7d9324c1c3cedf81c30b68059c8075047226b4115c341535a1870afcf49c0eb7dd2fbd531ea1ba4ae60fff3a7d2a6be643b65d6cdd745b9fc8c4cb33ea8 SHA512 3eeb6a7fd489c4d9b4e723af91e65b269d509f78399b5557ffa10cf41343219264d5fae84e5053325fdbcd06f3952b3a77326c9f120747dc6c0007087e46e34a
-MISC metadata.xml 519 BLAKE2B 2c5fd18fa8f91cecdebd9e89292c1862e11e126cbf710db17af3358e92bd2a7abd30e5a7ff925b33c446d9d7c6937f2e3d19c171e8c35c2bbee243e2f9339947 SHA512 d149c76b00d1a0c2b3593f90b45b944de122498606d86cb90f992beb2a727bb3b32f610e823c0d0ad0377538616447698acc110c6f152860844a53610d531220
diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
deleted file mode 100644
index e626fbb3c58f..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: porthole/backends/portagelib.py
-===================================================================
---- porthole/backends/portagelib.py	(revision 1209)
-+++ porthole/backends/portagelib.py	(working copy)
-@@ -452,7 +452,11 @@
- 
- 
- def get_masking_status(ebuild):
--    return portage.getmaskingstatus(ebuild)
-+    try:
-+        status = portage.getmaskingstatus(ebuild)
-+    except KeyError:
-+        status = ['deprecated']
-+    return status
- 
- 
- def get_masking_reason(ebuild):
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
deleted file mode 100644
index aa011a174b17..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
-
---- porthole/db/user_configs.py.old	2010-11-27 13:34:35.000000000 +0600
-+++ porthole/db/user_configs.py	2010-11-27 13:31:24.000000000 +0600
-@@ -364,7 +364,7 @@
-             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
-                 "%s,\n remove: %s " %(str(add),str(remove)))
-             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
--                comment=comment, username=privileges.USER, 
-+                comment=comment, username=privileges.user, 
-                 add=add, remove=remove)
-             self.set_config_callback()
-         else:
-			 
-\ No newline at end of file
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
deleted file mode 100644
index 33c9e4ee3353..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- porthole/db/user_configs.py	2010/03/20 12:32:29	1217
-+++ porthole/db/user_configs.py	2010/03/20 14:10:46	1218
-@@ -36,6 +36,7 @@
- from porthole import backends
- portage_lib = backends.portage_lib
- from porthole.utils import debug
-+from porthole.privilege import controller as privileges
- 
- ## set up this module to act as a user configs data server,
- ## watch the user configs for changes and auto update
-@@ -363,7 +364,7 @@
-             debug.dprint("USER_CONFIGS: set_user_config(): add: " +
-                 "%s,\n remove: %s " %(str(add),str(remove)))
-             set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
--                comment=comment, username=priviliges.USER, 
-+                comment=comment, username=privileges.USER, 
-                 add=add, remove=remove)
-             self.set_config_callback()
-         else:
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
deleted file mode 100644
index 860c6eb9ffd5..000000000000
--- a/app-portage/porthole/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-		<description>Upstream Maintainer (please CC on bugs)</description>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">porthole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/porthole/porthole-0.6.1-r5.ebuild b/app-portage/porthole/porthole-0.6.1-r5.ebuild
deleted file mode 100644
index 3697141e3779..000000000000
--- a/app-portage/porthole/porthole-0.6.1-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="nls"
-LANGS="de pl ru vi it fr tr"
-
-RDEPEND="
-	|| (
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	gnome-base/libglade:2.0
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-masking_status.patch" # bug 307037
-	"${FILESDIR}/${P}-missing_import.patch" # bug 323179
-	"${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
-)
-
-src_compile(){
-	# Compile localizations if necessary
-	if use nls ; then
-		cd scripts
-		./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc TODO README NEWS AUTHORS
-
-	keepdir /var/log/porthole
-	fperms g+w /var/log/porthole
-	keepdir /var/db/porthole
-	fperms g+w /var/db/porthole
-
-	# nls
-	if use nls; then
-		# mo directory doesn't exists with nls enabled and unsupported LINGUAS
-		[[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
-	fi
-}
-
-pkg_preinst() {
-	chgrp portage "${D}"/var/log/porthole
-	chgrp portage "${D}"/var/db/porthole
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Porthole has updated the way that the upgrades are sent to emerge."
-	einfo "In this new way the user needs to set any 'Settings' menu emerge options"
-	einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
-	einfo "Other options recommended are '--noreplace'  along with '--update'"
-	einfo "They allow for portage to skip any packages that might have already"
-	einfo "been upgraded as a dependency of another previously upgraded package"
-	einfo
-}
diff --git a/app-portage/porticron-0.7.1 b/app-portage/porticron-0.7.1
new file mode 100644
index 000000000000..ba68a7caf55b
--- /dev/null
+++ b/app-portage/porticron-0.7.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=cron script to sync portage and send update mails to root
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/porticron
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-portage/gentoolkit net-dns/bind-tools
+SLOT=0
+SRC_URI=https://github.com/gentoo/porticron/archive/v0.7.1.tar.gz -> porticron-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=e9b5d504d08f28594b03daea1c0fded8
diff --git a/app-portage/porticron-0.7_p20140126 b/app-portage/porticron-0.7_p20140126
new file mode 100644
index 000000000000..7f3846642889
--- /dev/null
+++ b/app-portage/porticron-0.7_p20140126
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=cron script to sync portage and send update mails to root
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/porticron
+KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86
+LICENSE=BSD
+RDEPEND=app-portage/gentoolkit net-dns/bind-tools
+SLOT=0
+SRC_URI=https://github.com/hollow/porticron/tarball/df727fe -> porticron-0.7_p20140126.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=576ae157a0b12ab15d70d45762bbcf40
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
deleted file mode 100644
index 98ed3f9c6ce1..000000000000
--- a/app-portage/porticron/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX porticron-0.7_p20140126-portage-2.2.8.patch 760 BLAKE2B 40c6f2c2516c09ff76182b15e85e96a391f71059e903c5a38426490cb4945fe9c24ff9916ec457a5eddd855262b1cfdeeebeeefa265b6642fb5e0f8fd6f0499b SHA512 4822999104a803f1d053ecde0b3332f13c81e1cb83c57fc142cac65895d3ffffa1c40e6c3ee35e791da4b650bf1e526de0e296944e854f5f8d477cefc6ae74a9
-DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
-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
diff --git a/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch b/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
deleted file mode 100644
index 4531ab638fd8..000000000000
--- a/app-portage/porticron/files/porticron-0.7_p20140126-portage-2.2.8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a7002d5af62d0a4791a386cdc3560330f27f1c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
-Date: Sun, 26 Jan 2014 23:23:03 +0100
-Subject: [PATCH] Avoid the deprecated `portageq portdir'
-
-This implements the fix proposed in hollow/porticron#6.
----
- bin/porticron | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/porticron b/bin/porticron
-index d168b27..86a1f70 100755
---- a/bin/porticron
-+++ b/bin/porticron
-@@ -117,7 +117,7 @@ FQDN=$(hostname --fqdn)
- HOST=$(hostname -s)
- IP=$(dig +short ${FQDN} | tr '\n' ' ')
- DATE=$(date -R)
--PORTDIR=$(portageq portdir)
-+PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)
- 
- # replace variables
- for var in FQDN HOST IP DATE; do
--- 
-1.8.5.1
-
diff --git a/app-portage/porticron/metadata.xml b/app-portage/porticron/metadata.xml
deleted file mode 100644
index ffc8ad5b4f61..000000000000
--- a/app-portage/porticron/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="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gentoo/porticron</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
deleted file mode 100644
index 1c9da925a281..000000000000
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils vcs-snapshot
-
-DESCRIPTION="cron script to sync portage and send update mails to root"
-HOMEPAGE="https://github.com/gentoo/porticron"
-SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-portage/gentoolkit
-	net-dns/bind-tools
-"
-DEPEND=""
-
-src_install() {
-	dosbin bin/porticron
-	insinto /etc
-	doins etc/porticron.conf
-}
diff --git a/app-portage/porticron/porticron-0.7_p20140126.ebuild b/app-portage/porticron/porticron-0.7_p20140126.ebuild
deleted file mode 100644
index 26330c1b01f8..000000000000
--- a/app-portage/porticron/porticron-0.7_p20140126.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils vcs-snapshot
-
-DESCRIPTION="cron script to sync portage and send update mails to root"
-HOMEPAGE="https://github.com/gentoo/porticron"
-SRC_URI="https://github.com/hollow/${PN}/tarball/df727fe -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	app-portage/gentoolkit
-	net-dns/bind-tools
-"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-portage-2.2.8.patch
-}
-
-src_install() {
-	dosbin bin/porticron
-	insinto /etc
-	doins etc/porticron.conf
-}
diff --git a/app-portage/portpeek-2.1.21 b/app-portage/portpeek-2.1.21
new file mode 100644
index 000000000000..0f841da4187a
--- /dev/null
+++ b/app-portage/portpeek-2.1.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=5
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=amd64 arm ppc sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-portage/gentoolkit-0.3.2-r1 >=sys-apps/portage-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.21.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3981c0f02ac313186df2ceb9f6ae2d56
diff --git a/app-portage/portpeek-2.1.24 b/app-portage/portpeek-2.1.24
new file mode 100644
index 000000000000..6eb3253d8096
--- /dev/null
+++ b/app-portage/portpeek-2.1.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=5
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-portage/gentoolkit-0.3.3 >=sys-apps/portage-2.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.24.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df9603dfc663fd720fe56ac415153281
diff --git a/app-portage/portpeek-2.1.25 b/app-portage/portpeek-2.1.25
new file mode 100644
index 000000000000..7869f2d52480
--- /dev/null
+++ b/app-portage/portpeek-2.1.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-portage/gentoolkit-0.4.0 >=sys-apps/portage-2.3.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.25.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f4f4869c03a779732ff2f5ae295d85d7
diff --git a/app-portage/portpeek-2.1.26 b/app-portage/portpeek-2.1.26
new file mode 100644
index 000000000000..eb8cc81752e9
--- /dev/null
+++ b/app-portage/portpeek-2.1.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-portage/gentoolkit-0.4.0 || ( >=sys-apps/portage-2.3.19-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.26.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a77fdf35a9259a4efc088b9c2fd3d014
diff --git a/app-portage/portpeek-2.1.26-r1 b/app-portage/portpeek-2.1.26-r1
new file mode 100644
index 000000000000..d81882216b18
--- /dev/null
+++ b/app-portage/portpeek-2.1.26-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-portage/gentoolkit-0.4.0 || ( >=sys-apps/portage-2.3.19-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.26.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b246a995dc83362d9cc367c268192844
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
deleted file mode 100644
index 8f71a248a782..000000000000
--- a/app-portage/portpeek/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST portpeek-2.1.21.tar.gz 12624 BLAKE2B fbf70d10799e4264832644a04b197816aa5824a7dd1063458bad1182441ebd70b6b05084f2577b097ba1bce5837728b2aeeb7f2e0c33dcd6d8779f2f3c946287 SHA512 7b430c85dcba4ac0d29e6fd680eaed2b59a60b5d21f0b93e90ff2e3ca7018f141e858accf10a035b75463c067444ef1be718be198bb6cc237827c9b7e67df76e
-DIST portpeek-2.1.24.tar.gz 12736 BLAKE2B 5d4d30e3c7d853e2a3be7e094ad7a40861300ee2f1582dd35d352f91354bcff504dcb8b53830a5b13dd31accf64095a0b2e3836147663d2505016acc381369f2 SHA512 fa702483c6182685242a26401ba1b058f276ff6fd18839fd7f566d48cb62c2cb78029789089267cbacc1b435f1aa815c0df51ace06afa71f242298511fa79d7a
-DIST portpeek-2.1.25.tar.gz 12864 BLAKE2B 1b0522b1d6beee25451f461c8601923666712470493f278378c8d314b48e3070d6a8853579d3636bee86cb59d3ed3a42cb1695a25d41a256b78220b8c99a4c79 SHA512 9d40ad387d252bb42a66e27de00c63f2f4725a794da7bb35fc5519ab5342e309c823090005336b22add81e4e043b0fa4f97ecdb86bb20bf595fd4188bda437f9
-DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62c69acb7ef4b7efcab17a60d0918c98f6d1fd2ec149379f2408f4a932d3389ff19c720c9a63e4dc197021d4e2f8 SHA512 0bf139381629118cc216c1fb21e65d9a317eaa0f1a200f8032f6050dea12940ab6bfc440a0001e2f26d74a21698d8de14001309342c202ae9837923d703b7ad3
-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 756 BLAKE2B 0237f012275b1de58b1cb9c7497a1e115550bbcacb2ad63c4313363863d0a4a903c3cb4e265fa94fecc6ec9cb48efe3bb8a65f0eb0586b7a5dfd22fe6763a54b SHA512 fba92d9cf82681e4bfcf5b8707657ed02c9726e1b98b6a9f7f403f03c0c8a14b7b2578b195ba0a4c9466e04a616a21de7215a18417f0c0008ee66ead92f58b4c
-EBUILD portpeek-2.1.26.ebuild 712 BLAKE2B c6a539332fa2d7d90723bce8721e004557ef1b9d77d1bfe814d57ce015073a3122cc167c1c1fef9884c719698648ddb3a108fddd4f13d5faeadaca4c356911ab SHA512 a054bbaaa443406ee70ecb8473d36113b14057e8622d066eb22517c08015e3a214756bba8c4e4bc6d2361a703477f4fb3da8dace7ed4677b6a36e1df876aae14
-MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/metadata.xml b/app-portage/portpeek/metadata.xml
deleted file mode 100644
index 542792de7f1b..000000000000
--- a/app-portage/portpeek/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mpagano@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-portage/portpeek/portpeek-2.1.21.ebuild b/app-portage/portpeek/portpeek-2.1.21.ebuild
deleted file mode 100644
index a737d6375ca0..000000000000
--- a/app-portage/portpeek/portpeek-2.1.21.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.3.2-r1
-	>=sys-apps/portage-2.3.0[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.24.ebuild b/app-portage/portpeek/portpeek-2.1.24.ebuild
deleted file mode 100644
index f10e14f839ac..000000000000
--- a/app-portage/portpeek/portpeek-2.1.24.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.3.3
-	>=sys-apps/portage-2.3.5[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.25.ebuild b/app-portage/portpeek/portpeek-2.1.25.ebuild
deleted file mode 100644
index e44085c02489..000000000000
--- a/app-portage/portpeek/portpeek-2.1.25.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.4.0
-	>=sys-apps/portage-2.3.8[${PYTHON_USEDEP}]"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.1.26-r1.ebuild b/app-portage/portpeek/portpeek-2.1.26-r1.ebuild
deleted file mode 100644
index 801252517706..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=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.4.0
-	|| (
-		>=sys-apps/portage-2.3.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
deleted file mode 100644
index 06eb5a6cda32..000000000000
--- a/app-portage/portpeek/portpeek-2.1.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.4.0
-	|| (
-		>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/pqlop-0.02-r1 b/app-portage/pqlop-0.02-r1
new file mode 100644
index 000000000000..2412bd0a206d
--- /dev/null
+++ b/app-portage/pqlop-0.02-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=emerge.log parser written in python
+EAPI=5
+HOMEPAGE=https://bitbucket.org/LK4D4/pqlop
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://bitbucket.org/LK4D4/pqlop/raw/0.02/pqlop.py -> pqlop-0.02.py
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=19f32c664a528bb27ef26ab05e8e8dd7
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
deleted file mode 100644
index 7f82958cf23d..000000000000
--- a/app-portage/pqlop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pqlop-0.02.py 14920 BLAKE2B 0fb3f11a928ac0997094e95d676bba0df19738006e7475332c9dcd207fea3296b5839fd259cb2240c093fb28c0721f4a73331e1ab6083c2fbf0eee5d425ac50e SHA512 6c2cca73b5280ac8563573a81baff56cf43420c18688fae497ff014ec5668806d589473a2cb8093fdc07675761e8c4124f18eb568a74e1816f573541459d633f
-EBUILD pqlop-0.02-r1.ebuild 673 BLAKE2B f07f8f2f7f4dbb106ace96cafcbb27ec5cfab4ac50c682f23870e9da52a44e1b4b48e9bb0f0e49b3b02a36f12750be4576628af29d05352e4ef6d5ba14306ebf SHA512 198889e516c2cb5bb3b6212c445174e6143088683de81ab6e8e323bac5622635e8ce9a6e6f94edbd17520653814c62abf60a249d1012951787ad64e773f9d672
-MISC metadata.xml 328 BLAKE2B 1d54242b34507f9e056c0948f164b1766fc4f0a89c48ff7be9b9f4872869312f951f2705516bdffd30ae87313c60103a4eeafc7f46cfcf597088f9716b3d768d SHA512 653d8afce656d149a859cc3565346e38de8d5188d4f94464eaed6802aadcca41eb44d8dccabf7040d1d06a483f28f57f41fb54ae8bf4c37726eccecdd60961cd
diff --git a/app-portage/pqlop/metadata.xml b/app-portage/pqlop/metadata.xml
deleted file mode 100644
index e9a94d23548d..000000000000
--- a/app-portage/pqlop/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="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">LK4D4/pqlop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
deleted file mode 100644
index 25140d6226f1..000000000000
--- a/app-portage/pqlop/pqlop-0.02-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="emerge.log parser written in python"
-HOMEPAGE="https://bitbucket.org/LK4D4/pqlop"
-SRC_URI="https://bitbucket.org/LK4D4/pqlop/raw/${PV}/pqlop.py -> ${P}.py"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed"
-	python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed"
-}
diff --git a/app-portage/prefix-chain-setup-0.6 b/app-portage/prefix-chain-setup-0.6
new file mode 100644
index 000000000000..c4c38618f8a7
--- /dev/null
+++ b/app-portage/prefix-chain-setup-0.6
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Chained EPREFIX bootstrapping utility
+EAPI=6
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~ppc-aix ~x64-cygwin ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+SLOT=0
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=a35e0e7a94434ea786c127bb1f1192af
diff --git a/app-portage/prefix-chain-setup-0.7 b/app-portage/prefix-chain-setup-0.7
new file mode 100644
index 000000000000..2989c5b828f3
--- /dev/null
+++ b/app-portage/prefix-chain-setup-0.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Chained EPREFIX bootstrapping utility
+EAPI=6
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=sys-apps/portage[prefix-chaining]
+SLOT=0
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=5cca1651d52cb69c412ab4299e2ec833
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/repo-commit-0.4.1-r1 b/app-portage/repo-commit-0.4.1-r1
new file mode 100644
index 000000000000..e176eee88eca
--- /dev/null
+++ b/app-portage/repo-commit-0.4.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422
+DESCRIPTION=A repository commit helper
+EAPI=4
+HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) sys-apps/portage-mgorny ( sys-apps/portage app-portage/gentoolkit-dev ) )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/gentoo/repo-commit/downloads/repo-commit-0.4.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1cb19388ad8269d01c21f64c1b45a460
diff --git a/app-portage/repo-commit-9999 b/app-portage/repo-commit-9999
new file mode 100644
index 000000000000..da053520fdc6
--- /dev/null
+++ b/app-portage/repo-commit-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A repository commit helper
+EAPI=5
+HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
+LICENSE=BSD
+RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) sys-apps/portage-mgorny ( sys-apps/portage app-portage/gentoolkit-dev ) )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=159a20fb55557af088797536e20be671
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
deleted file mode 100644
index 881e0efc1951..000000000000
--- a/app-portage/repo-commit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST repo-commit-0.4.1.tar.bz2 54416 BLAKE2B 85b4c9608baac4fc267047cb3177a80fa9d5ef761cb70a7d752acf5448607330c873ec1180c207a399e81b55d82ebf23816cfefed380ecb2de0d5eff3fc63b61 SHA512 25d4ec02605454e49dafb59a753abbe6b28b2e07225d5479bfa0e0d493d3dd6bd2302dd4efaa2d6a6af5f8c7e41a5029ac8edb9d7b1dd8ec9349a057d1d61622
-EBUILD repo-commit-0.4.1-r1.ebuild 565 BLAKE2B 5158900b66b782a08cebada3b71c3a88c0208f63b6c9cad33b023a2dac224a264dea1acde1f0bb241c64a2febbb6fec2b67af1394e27959e7ac5c2ccdc619233 SHA512 9344eddc2d5f4ab47d95cb0de7ceffddc286a283f417d70a7505be7a80eb6065b733f62ee3376289620eb1728ca6b4ad73f5394407c7afb55b875e4060d7d869
-EBUILD repo-commit-9999.ebuild 714 BLAKE2B 65ef8c52eef4f77ce1be989ff41bc5f93f380894ac1338760fcc19ad61beb34b34b8a4639ec0e77d9f4cfd287b4609263cf05753aad61ceb323e7eb301ea6475 SHA512 37db547812a58842dc56d9cd0c78cb3c1b689f95a3fdc57514c00c61d131f5b8e02a5ff9a10831d1aef21d2bcb62c624670e294bca33c321d3aded21273bd1c3
-MISC metadata.xml 430 BLAKE2B dd1a44ffd6c5bfcb12270c03220891674e21e6de4313a40f37821e053eb04cac8680c1558cc8961db61d71be918330eaeac4eaacc63f1e385bc471899d07afe0 SHA512 e8f0ae4509498e5fa1f2ac9949b6a5ffd12b86d0a15968fb0f31c65624eef062e31ff36431bd5366560a37fc48ef96f54d6a0a6baccc61d0c2ab3144556ce966
diff --git a/app-portage/repo-commit/metadata.xml b/app-portage/repo-commit/metadata.xml
deleted file mode 100644
index fe018c7b42aa..000000000000
--- a/app-portage/repo-commit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <maintainer status="active">
-      <email>binki@gentoo.org</email>
-      <name>Nathan Phillip Brink</name>
-    </maintainer>
-    <bugs-to>https://bitbucket.org/gentoo/repo-commit/issues/</bugs-to>
-    <remote-id type="bitbucket">gentoo/repo-commit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
deleted file mode 100644
index 456a5e1868b1..000000000000
--- a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A repository commit helper"
-HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
-SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=sys-apps/portage-2.2.0_alpha86
-		( >=sys-apps/portage-2.1.10.30
-			<sys-apps/portage-2.2.0_alpha )
-		sys-apps/portage-mgorny
-		( sys-apps/portage
-			app-portage/gentoolkit-dev )
-	)"
diff --git a/app-portage/repo-commit/repo-commit-9999.ebuild b/app-portage/repo-commit/repo-commit-9999.ebuild
deleted file mode 100644
index ad2905116f17..000000000000
--- a/app-portage/repo-commit/repo-commit-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://bitbucket.org/gentoo/${PN}.git"
-
-inherit git-r3
-#endif
-
-inherit autotools-utils
-
-DESCRIPTION="A repository commit helper"
-HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
-SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=sys-apps/portage-2.2.0_alpha86
-		( >=sys-apps/portage-2.1.10.30
-			<sys-apps/portage-2.2.0_alpha )
-		sys-apps/portage-mgorny
-		( sys-apps/portage
-			app-portage/gentoolkit-dev )
-	)"
-#if LIVE
-
-KEYWORDS=
-SRC_URI=
-#endif
diff --git a/app-portage/repoman-2.3.0-r1 b/app-portage/repoman-2.3.0-r1
new file mode 100644
index 000000000000..9e9a3de738fa
--- /dev/null
+++ b/app-portage/repoman-2.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/python-exec:2 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/python-exec:2 !<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.6.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gentoo/repoman-2.3.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0.tar.bz2 https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af57b41fb7eb0b192ca445de1e0cb1d4
diff --git a/app-portage/repoman-2.3.6 b/app-portage/repoman-2.3.6
new file mode 100644
index 000000000000..08a3e2aac971
--- /dev/null
+++ b/app-portage/repoman-2.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-apps/portage-2.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.6.tar.bz2
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bdbc2e64f77d8e287b8f35829b4f2e9a
diff --git a/app-portage/repoman-2.3.9 b/app-portage/repoman-2.3.9
new file mode 100644
index 000000000000..5fbb4ecd7940
--- /dev/null
+++ b/app-portage/repoman-2.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-apps/portage-2.3.27[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.27[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.9.tar.bz2
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=667890313bb9380e6ffd8fd41222abea
diff --git a/app-portage/repoman-9999 b/app-portage/repoman-9999
new file mode 100644
index 000000000000..d4db53475723
--- /dev/null
+++ b/app-portage/repoman-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4ea855b7607ef2144e05fae5017ab9d1
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
deleted file mode 100644
index efc0141119fc..000000000000
--- a/app-portage/repoman/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e
-DIST repoman-2.3.0-bug-586864.patch 1074 BLAKE2B f29ed4b9b66540bf765cd9bdf46ed10d99845ca141df4ad9701d94d8283343bb2e9101cf44e10ed2dc2dd11d02c5dea68e113f624db82d420dac5e846dd44c59 SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8
-DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e9cae8fdeed8fe4cbc6915d0fd4473381a0eed99c16fc67394fda996c12b9784b7511ebe07267496e39d683258 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c
-DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
-DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7
-EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0
-EBUILD repoman-2.3.6.ebuild 1852 BLAKE2B 778490890dd38fa7ff51d7de8e3ab122a9e58a02515bea423a097d883706bfdbd3bef081c6091e6a671d7e0a26f2ee8cd9b4f2a0f226329cc164fb02f7bb5f96 SHA512 e4df9e66171dcc2ab07a9f3cecaa26a8d8185e0ff4e2291bd134ae83a797c66698804b7c0f1a3557571835b540b2c174133efa12bc2cfc4451130ac29b3dd617
-EBUILD repoman-2.3.9.ebuild 2113 BLAKE2B 477165a48ea4c5df4553b1d4e582ddf0b6dfbd283ac17ea8042034f6af05e677d3ba105a2191b8faf3665be8a70fdb0c67f49c1dacc93ad9b396b7efa8c8cfee SHA512 2cddc8d1d4a9fccfdc5a67f1507979611a5559d612de8dd2a6b13e0064b7e2f8860feedcd866a1877bbf5ccfcc407988710631360e42b865ba184c7aee891152
-EBUILD repoman-9999.ebuild 1936 BLAKE2B ff54893cab6ea28fb8f394d75ca95a4662cfb83efe3b8d9596b039a0cbd433f24d53df89475959d6ede55f091e73f82768daa8de03473820bc386d997d4793f0 SHA512 9de9e9c7541e6b9f97ff58b90165f77211b82df8b4bc5d477e0337d4996573b0a839c3af867e5524b885739d5e9f9635a886436d1cac201fe59fd14550b2a321
-MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
deleted file mode 100644
index adba72fdcc57..000000000000
--- a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Thu, 23 Jun 2016 23:22:41 -0700
-Subject: repoman: skip QA checks in manifest mode (bug 586864)
-
-The relevent Scanner loop control logic broke in commit 4062c69dc27a
-because it was relying on the return value from the Manifest module's
-"check" method.
-
-Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py")
-X-Gentoo-Bug: 586864
-X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864
----
- pym/repoman/scanner.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
-index d7cd81f..8999751 100644
---- a/pym/repoman/scanner.py
-+++ b/pym/repoman/scanner.py
-@@ -294,6 +294,8 @@ class Scanner(object):
- 
- 			if self.generate_manifest:
- 				manifest.Manifest(**self.kwargs).update_manifest(checkdir)
-+				if self.options.mode == 'manifest':
-+					continue
- 			checkdirlist = os.listdir(checkdir)
- 
- 			dynamic_data = {
--- 
-cgit v0.12
-
diff --git a/app-portage/repoman/metadata.xml b/app-portage/repoman/metadata.xml
deleted file mode 100644
index c15cfac45369..000000000000
--- a/app-portage/repoman/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
-    <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
-    <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
-  </upstream>
-  <maintainer type="project">
-    <email>dev-portage@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
deleted file mode 100644
index b2fb3350b5f8..000000000000
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/python-exec:2"
-
-RDEPEND="
-	dev-lang/python-exec:2
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0
-	"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch"
-
-python_prepare_all() {
-	epatch "${DISTDIR}/repoman-2.3.0-bug-586864.patch"
-	distutils-r1_python_prepare_all
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
deleted file mode 100644
index 8c7504b338c7..000000000000
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ /dev/null
@@ -1,60 +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} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.14[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.9.ebuild
deleted file mode 100644
index cd3bc0292adb..000000000000
--- a/app-portage/repoman/repoman-2.3.9.ebuild
+++ /dev/null
@@ -1,67 +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} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.27[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed 's:FileNotFoundError:EnvironmentError:' -i pym/repoman/config.py || die
-	sed 's:file\.size\.fatal:file.size-fatal:' -i pym/repoman/modules/scan/fetch/fetches.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
deleted file mode 100644
index 9d1ee5500780..000000000000
--- a/app-portage/repoman/repoman-9999.ebuild
+++ /dev/null
@@ -1,61 +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} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	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="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/smart-live-rebuild-1.3.5 b/app-portage/smart-live-rebuild-1.3.5
new file mode 100644
index 000000000000..f796c0565cc5
--- /dev/null
+++ b/app-portage/smart-live-rebuild-1.3.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Check live packages for updates and emerge them as necessary
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 arm ~mips x86 ~x86-fbsd
+LICENSE=BSD-2
+RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgorny/smart-live-rebuild/releases/download/v1.3.5/smart-live-rebuild-1.3.5.tar.bz2
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b7e42917bc7278e9f25ff1a30ea4d0e
diff --git a/app-portage/smart-live-rebuild-9999 b/app-portage/smart-live-rebuild-9999
new file mode 100644
index 000000000000..2c1d385bc5f5
--- /dev/null
+++ b/app-portage/smart-live-rebuild-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Check live packages for updates and emerge them as necessary
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD-2
+RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e6e0e2af5b2d3f67694d074372f4f5a
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
deleted file mode 100644
index 42d495afec35..000000000000
--- a/app-portage/smart-live-rebuild/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST smart-live-rebuild-1.3.5.tar.bz2 16004 BLAKE2B fa1fcb13c739ef15b343de3460b029a311a4c08be3ec44ff5c0c89fef4d07fde7fa5558444b25ce234d64b03465b4a401593600f3fec5cbbfba76bdc76fcca34 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2
-EBUILD smart-live-rebuild-1.3.5.ebuild 828 BLAKE2B c41e1faaca3e824ef91b121fdf103bb2ba23646ac887fcaf7f41fc454683c586667d683767c2817d0b30dc70e56890769cdc53c2f42ac196da3160cca1ffcd0f SHA512 518cbbed81af2d38863bbd3c43ae4a3bb159234c17016f8c459a7eca77d937ccf68a9a4f7a0f80ff12ab43bb4c6d8cddf6a88b3f4f6b7dca1b43441fb2b75f34
-EBUILD smart-live-rebuild-9999.ebuild 736 BLAKE2B 0935bb883cd0f84a9a0fa634cd16ec0fc76f89176cec3c80bfef7425061bb5addb92c7a1bf1596c4a539db874a0d1adef18443cd54249353c6ae64702523b09d SHA512 84782417c0aa0fa96fd1638b6d25cb2bb22fa0b9ae82de28395cec71c58c818251d3310603e48c97cefce86d3822b48329a45d8cdb21c5bcc2137fe96ad40abf
-MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/metadata.xml b/app-portage/smart-live-rebuild/metadata.xml
deleted file mode 100644
index fd31fc1dbcf4..000000000000
--- a/app-portage/smart-live-rebuild/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<longdescription>
-		A smart replacement for various live package rebuilding
-		solutions. smart-live-rebuild tries to update the source
-		checkouts of live packages and calls emerge to rebuild those
-		which are out-of-date.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
-		<remote-id type="github">mgorny/smart-live-rebuild</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
deleted file mode 100644
index 31ec3b6360b7..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-# Tests need to be fixed
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example smart-live-rebuild.conf
-}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
deleted file mode 100644
index c8a7533d0933..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example smart-live-rebuild.conf
-}
diff --git a/app-portage/splat-0.08-r1 b/app-portage/splat-0.08-r1
new file mode 100644
index 000000000000..07bf2162e52f
--- /dev/null
+++ b/app-portage/splat-0.08-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Portage Log Analyzer Tool
+EAPI=5
+HOMEPAGE=http://www.l8nite.net/projects/splat/
+KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.l8nite.net/projects/splat/downloads/splat-0.08.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=009c52e4c6fade1a8c156c13978c80fc
diff --git a/app-portage/splat/Manifest b/app-portage/splat/Manifest
deleted file mode 100644
index e2de02a25896..000000000000
--- a/app-portage/splat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX splat-0.08-prefix.patch 853 BLAKE2B aee44a919b6ae692d354d65b7ee622d78e0ed73a6d4ebfe9858b45ad6500a5c7e8d3d52a5953f74d395e8bd30da3cecabfec570f632fe79abe5e16dac7441528 SHA512 946764f7eb2eea8155806b842f6d5fd979bdf7e2a955c62d10cee0e652df51f70c0a0e7d9d4069cae3824c87bf6756edb0f0ca94e120a0d43bb6787705d62cf2
-DIST splat-0.08.tar.bz2 12180 BLAKE2B 9276bb0b2b8436b8becb6b502cf9b9d19f9d0a88928535939d043f88121ce3afb208de72971546f7ee8eb1ed44aff6ea4aa8d758638eec82dc7991c414542441 SHA512 18be949f601cd7ba61babc667a26df9bc5ba7ece33c9b680be7c3541418ea65f3ecf1ae402a70fa3499b79ca2b000c36a58e202d06456cbb7745bec749b1374f
-EBUILD splat-0.08-r1.ebuild 592 BLAKE2B b3a88e282f2497c8a2b69532ae3286df4f8b054128a333a98df4e8f0ab7faa733beaa971f7a8463adc0f63de62a8dbddcc93539fcc0f1163b346382e9b2cae16 SHA512 b4fbea2df6442a020a60dcdeac89cfb6715099d5af958a51b9c66f2fd5c9c0ffa6955d788abfd68584d2eaccbd48eae5380442d809554750465cf8a7ded06e13
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-portage/splat/files/splat-0.08-prefix.patch b/app-portage/splat/files/splat-0.08-prefix.patch
deleted file mode 100644
index e2599deb8bf5..000000000000
--- a/app-portage/splat/files/splat-0.08-prefix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- splat.pl
-+++ splat.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
- 
- # Copyright 2003; Shaun Guth <l8nite@l8nite.net>
- #
-@@ -65,13 +65,13 @@
- 			return unless /\.ebuild$/;
- 
- 			my $basedir = dirname($File::Find::name);
--			   $basedir =~ s/^\/var\/db\/pkg//;
-+			   $basedir =~ s|^@GENTOO_PORTAGE_EPREFIX@/var/db/pkg||;
- 			my $package = join('/',(splitdir($basedir))[1,2]);
- 
- 			$INSTALLED{$package} = 1;
- 
- 		}, 'no_chdir' => 1, },
--		'/var/db/pkg',
-+		'@GENTOO_PORTAGE_EPREFIX@/var/db/pkg',
- 	);
- 
- 	&parse_command_line();
-@@ -320,7 +320,7 @@
- 	# no logfile defined? Let's check make.conf
- 	if( !defined($logfile) || $logfile eq "" )
- 	{
--		$logfile = '/var/log/emerge.log';
-+		$logfile = '@GENTOO_PORTAGE_EPREFIX@/var/log/emerge.log';
- 
- 		if( $OPT->{'verbose'} ) {
- 			warn "*** No log file specified.\n";
diff --git a/app-portage/splat/metadata.xml b/app-portage/splat/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-portage/splat/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-portage/splat/splat-0.08-r1.ebuild b/app-portage/splat/splat-0.08-r1.ebuild
deleted file mode 100644
index dee572b6fb0b..000000000000
--- a/app-portage/splat/splat-0.08-r1.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 eutils prefix
-
-DESCRIPTION="Simple Portage Log Analyzer Tool"
-HOMEPAGE="http://www.l8nite.net/projects/splat/"
-SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify splat.pl
-}
-
-src_install() {
-	newbin splat.pl splat
-	dodoc ChangeLog
-}
diff --git a/app-portage/tatt-0.4 b/app-portage/tatt-0.4
new file mode 100644
index 000000000000..396cd7d21e4b
--- /dev/null
+++ b/app-portage/tatt-0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=arch testing tool
+EAPI=6
+HOMEPAGE=https://github.com/kensington/tatt
+IUSE=+templates python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/kensington/tatt/archive/v0.4.tar.gz -> tatt-0.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=346b8a8ccb6150d1b4093db4d2601500
diff --git a/app-portage/tatt-0.5 b/app-portage/tatt-0.5
new file mode 100644
index 000000000000..53d2ba148877
--- /dev/null
+++ b/app-portage/tatt-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=arch testing tool
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/tatt
+IUSE=+templates python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/tatt/archive/v0.5.tar.gz -> tatt-0.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=928d77ca7585dea201635e9f191205ef
diff --git a/app-portage/tatt-9999 b/app-portage/tatt-9999
new file mode 100644
index 000000000000..f82f5bd65c46
--- /dev/null
+++ b/app-portage/tatt-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=arch testing tool
+EAPI=6
+HOMEPAGE=https://github.com/gentoo/tatt
+IUSE=+templates python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=409409af3565b1b6f1fb964a57981f51
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
deleted file mode 100644
index 3c0fe436b660..000000000000
--- a/app-portage/tatt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/metadata.xml b/app-portage/tatt/metadata.xml
deleted file mode 100644
index 5029e3c544e6..000000000000
--- a/app-portage/tatt/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>kensington@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="templates">Install template scripts to be used with tatt</flag>
-  </use>
-  <longdescription lang="en">
-Tatt arch testing tool can be use to automatically generate scripts for various boring tasks during arch work.  
-It aims at developers. If you are a normal user you will not need tatt.
-</longdescription>
-  <upstream>
-    <remote-id type="github">kensington/tatt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.4.ebuild
deleted file mode 100644
index 78be3080366b..000000000000
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/kensington/tatt"
-SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
deleted file mode 100644
index 0971d8130bdb..000000000000
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ /dev/null
@@ -1,38 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
deleted file mode 100644
index 18cb809559db..000000000000
--- a/app-portage/tatt/tatt-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-EGIT_REPO_URI="https://github.com/gentoo/tatt.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/app-portage/ufed-0.91 b/app-portage/ufed-0.91
new file mode 100644
index 000000000000..83dd0b06087b
--- /dev/null
+++ b/app-portage/ufed-0.91
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Gentoo Linux USE flags editor
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= dev-lang/perl
+SLOT=0
+SRC_URI=mirror://gentoo/ufed-0.91.tar.bz2 https://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.91.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=acd1a8bb16d4035924147e82b7067183
diff --git a/app-portage/ufed-0.92 b/app-portage/ufed-0.92
new file mode 100644
index 000000000000..4ad4b022b613
--- /dev/null
+++ b/app-portage/ufed-0.92
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Gentoo Linux USE flags editor
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= dev-lang/perl
+SLOT=0
+SRC_URI=mirror://gentoo/ufed-0.92.tar.bz2 https://dev.gentoo.org/~fuzzyray/distfiles/ufed-0.92.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=28f9ef3251eaab11a19f04e2b74ad821
diff --git a/app-portage/ufed-9999 b/app-portage/ufed-9999
new file mode 100644
index 000000000000..67e6ec7ee512
--- /dev/null
+++ b/app-portage/ufed-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Gentoo Linux USE flags editor
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Ufed
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= dev-lang/perl
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e9aa1efcaf448d8191046b497d22741a
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
deleted file mode 100644
index ba6cf7fdca78..000000000000
--- a/app-portage/ufed/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ufed-0.91.tar.bz2 61466 BLAKE2B 63671c875f7dae13a6e76995204a278703691ed3c081a95853a6cbd9a57d1f88cf1c7625f1d524bfc1a816f1344282577126865160e0433cf6692d8067596f59 SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35
-DIST ufed-0.92.tar.bz2 61606 BLAKE2B b01c409d5852d59a3237748bff49348a2eab386d06c55389d5eee54ad1002575d67ab5138334e99ed2da434a8af05862d769fdf7e692bee2e77bd9c41b793762 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408
-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
-MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
deleted file mode 100644
index f2984ddd5aa8..000000000000
--- a/app-portage/ufed/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>yamakuzure@gmx.net</email>
-		<name>Sven Eden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/app-portage/ufed/ufed-0.91.ebuild b/app-portage/ufed/ufed-0.91.ebuild
deleted file mode 100644
index 918b9d05bfc2..000000000000
--- a/app-portage/ufed/ufed-0.91.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~fuzzyray/distfiles/${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"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses:0="
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-	base_src_prepare
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
deleted file mode 100644
index 439c65b2bb97..000000000000
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~fuzzyray/distfiles/${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"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses:0="
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-	# epatch "${PATCHES[@]}"
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
deleted file mode 100644
index 6ab99b399c04..000000000000
--- a/app-portage/ufed/ufed-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib git-r3 autotools
-
-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="
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[9999-${EGIT_VERSION}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}
diff --git a/app-portage/unsymlink-lib-12-r1 b/app-portage/unsymlink-lib-12-r1
new file mode 100644
index 000000000000..71f486e0dc49
--- /dev/null
+++ b/app-portage/unsymlink-lib-12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v12.tar.gz -> unsymlink-lib-12.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8521c687378b01fa5ed6bd2984064591
diff --git a/app-portage/unsymlink-lib-13 b/app-portage/unsymlink-lib-13
new file mode 100644
index 000000000000..50e03b89d5bd
--- /dev/null
+++ b/app-portage/unsymlink-lib-13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v13.tar.gz -> unsymlink-lib-13.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3f5764f47ec959fc1e43a99d17feb8f8
diff --git a/app-portage/unsymlink-lib-9999 b/app-portage/unsymlink-lib-9999
new file mode 100644
index 000000000000..6761b9794d3d
--- /dev/null
+++ b/app-portage/unsymlink-lib-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+LICENSE=BSD-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e96cd916289b373db451014b10409314
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
deleted file mode 100644
index 8d346a18bfcf..000000000000
--- a/app-portage/unsymlink-lib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST unsymlink-lib-12.tar.gz 8689 BLAKE2B 3c170886bfa3980ef0d51be1e3636afcd700aad94514a2783a1bf221970022fb4812640ac0c2f54e6b0d3b93244a64221b092768425faa1ddcfdc21ba76d9cd1 SHA512 e964cf8dae4107cbe0f5a304e693794d50316b914cca6cdf068ac3e715c8a6fab44d96ec38bd34e5c4f65dd169629bcaca3a0b6ce3256c3d40dbff69dac56fe5
-DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2
-EBUILD unsymlink-lib-12-r1.ebuild 641 BLAKE2B f967256636c88afa1d80c73359cedec7f29f73403796ddeceb4b1ebf98f5b30d0dc968cc1633ced1ee3a922715f06a565359dc05f7e5f320e9a787d7432a5861 SHA512 29232685faf31b790a027e2ea862de4b309d9a9423585bf1d12d63cdf298a20b2e6fd68f8a1917fbac14b7ffd3e6a287d1c358c2744e597ccaeaa32cba279b75
-EBUILD unsymlink-lib-13.ebuild 642 BLAKE2B e1ce43723f37bf64282ead110a404ef10757dc7f992a9a496e8e0369c6e1d031703cfe100bfefd0ff6c6ad25bd6f9ad0761c07067a9fdf303f241c91d86413ff SHA512 44f67eae9ba735173d9fd0312ced7154134cfb0b31109578a8fc5329687cc4b43c65be01b8788423e576b28a0dbf506145fe2f2a3fe04fc8eaae78482a39df52
-EBUILD unsymlink-lib-9999.ebuild 627 BLAKE2B 4ebcd4f34b4326174f4c32cbc5c23572e8ca57a5bdaa3f170c60ca5bb2d4a9ac31b9a8203093bd7891eb78fb62642a4b9cb9f0e5fb16aa276e9561d4b0ff1a96 SHA512 e8a09ca9ebc84eb8702334de9c72f508bbe168961d0eba7f113c24f6e08e477d63ffde2f79927d7c1b6b0f2056e4ea6fb42c5c60156e92700088e70429b108d4
-MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/metadata.xml b/app-portage/unsymlink-lib/metadata.xml
deleted file mode 100644
index 975c323b5133..000000000000
--- a/app-portage/unsymlink-lib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/mgorny/unsymlink-lib/issues/</bugs-to>
-		<remote-id type="github">mgorny/unsymlink-lib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-12-r1.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-12-r1.ebuild
deleted file mode 100644
index 2fcdf5eb3a90..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-12-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
deleted file mode 100644
index 44bf45283e34..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
deleted file mode 100644
index 0a8f8ce3adaa..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit git-r3 python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/unsymlink-lib.git"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
commit	d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree	246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-portage
parent	71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)