gentoo resync : 14.07.2018

2774 files changed, 10402 insertions, 71120 deletions

diff --git a/dev-util/App-SVN-Bisect-1.1-r1 b/dev-util/App-SVN-Bisect-1.1-r1
new file mode 100644
index 000000000000..effbaf073761
--- /dev/null
+++ b/dev-util/App-SVN-Bisect-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-perl/Module-Build test? ( dev-perl/Test-Exception dev-perl/Test-Output dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Binary search through svn revisions
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/App-SVN-Bisect/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IN/INFINOID/App-SVN-Bisect-1.1.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_=556e485c6136172f61e6ff9aac11077a
diff --git a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
deleted file mode 100644
index 09f6de5e8c09..000000000000
--- a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="INFINOID"
-
-inherit perl-module
-
-DESCRIPTION="Binary search through svn revisions"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-lang/perl
-	dev-perl/YAML-Syck
-	dev-perl/IO-All
-	dev-vcs/subversion"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( dev-perl/Test-Exception
-		dev-perl/Test-Output
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-util/App-SVN-Bisect/Manifest b/dev-util/App-SVN-Bisect/Manifest
deleted file mode 100644
index 4dd4d660785f..000000000000
--- a/dev-util/App-SVN-Bisect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST App-SVN-Bisect-1.1.tar.gz 20534 BLAKE2B 047625fb0ff9495dd5873ab3fe958102bae81d14ce4afcabb9e3c0a6747d7b16c5d84f263da1a7b40400035a9c3d3d0c71fc4c103c03a86933307f3dee1c2dec SHA512 8eeab59dc83273aed8de751ff2c175a9bea9d858e112d24cb21be616582106e69824e2496b8d5860acbfcec4c01e79b1a8ddace5b0ca68a88d9cd9804ed84e57
-EBUILD App-SVN-Bisect-1.1-r1.ebuild 526 BLAKE2B e1669dde70b0fdecfda4e6c62d0f7fb21d1715034e996ebc1d4d683c13c8b9e5858dcd4c4ae3f4383fe89a6074651be679ecb7d1fd5c2924760e7cb0efb39cbc SHA512 da9067dd7e3b9ad5b2440c675f835ef39b15fbd109aff2ce1dbc4ae2ec11e0a285e290dac5e657188023881e7e04febbc7e7a987af7108898bf777592d6a10cf
-MISC metadata.xml 323 BLAKE2B 98d76ef31692a4bd1aa87b1acf8122b60789b2e5d8624b88d65ea32b2965f86d7d50a2b00ce17681849a38276ff0ec25cff5995964135ba51481aaa04d5cc7d7 SHA512 f12735c8cfcce8601c9cd5cf1dff4b4984ba0de68ba52ea99be0ac796f9c1b6bf250745c5a16ca3ed98161b8259f3b35311b1fe3e6f1a823c349c81451922be0
diff --git a/dev-util/App-SVN-Bisect/metadata.xml b/dev-util/App-SVN-Bisect/metadata.xml
deleted file mode 100644
index 8058de7ba305..000000000000
--- a/dev-util/App-SVN-Bisect/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>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpan">App-SVN-Bisect</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c164dc051a6e..9b17be2860f1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange-3.4.5-r3 b/dev-util/Orange-3.4.5-r3
new file mode 100644
index 000000000000..e41665002a4c
--- /dev/null
+++ b/dev-util/Orange-3.4.5-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/anyqt[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-python/bottleneck-1.0.0[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-python/CommonMark-0.5.5[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-python/dill[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-python/chardet-2.3.0[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-python/joblib-0.9.4[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-python/keyring[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-python/keyrings_alt[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-python/pylint[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-python/pip-9.0.1[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-python/pyqtgraph-0.10.0[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-python/PyQt5[webkit,svg,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-python/radon[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(-)] virtual/python-typing[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-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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-python/setuptools[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-python/numpy-1.9.0[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(-)] 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=Open source data visualization and analysis for novice and experts.
+EAPI=6
+HOMEPAGE=https://orange.biolab.si/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/anyqt[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-python/bottleneck-1.0.0[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-python/CommonMark-0.5.5[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-python/dill[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-python/chardet-2.3.0[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-python/joblib-0.9.4[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-python/keyring[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-python/keyrings_alt[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-python/pylint[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-python/pip-9.0.1[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-python/pyqtgraph-0.10.0[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-python/PyQt5[webkit,svg,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-python/radon[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(-)] virtual/python-typing[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-python/xlrd-0.9.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(-)] >=sci-libs/scipy-0.11.0[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(-)] >=sci-libs/scikits_learn-0.18.1[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(-)] 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://github.com/biolab/orange3/archive/3.4.5.tar.gz -> Orange-3.4.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_=80c6372d17aeafff2389cfb327394c7d
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
deleted file mode 100644
index 2aa51aff64a7..000000000000
--- a/dev-util/Orange/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.4.5-r3.ebuild 1420 BLAKE2B c5b889661340e9b4a62d15e223d7476d226e1ffb5fee9845fd9b49b2dff6cf6823aefc814117bcf8dfcba78b85b5effddbd024cc5a76697f5c7f1f72f3f6c285 SHA512 3e6cf85941c321bcce743d392900bd1b53064372911b81ecb84551ce9c37b383fb887bbbef8e8b8fa91d13d2f66013573cc988a01d61ee486ceed81aab9dcf3d
-MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
deleted file mode 100644
index a6e1066b6a6a..000000000000
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source data visualization and analysis for novice and experts."
-HOMEPAGE="https://orange.biolab.si/"
-SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/anyqt[${PYTHON_USEDEP}]
-	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
-	dev-python/dill[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings_alt[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
-	dev-python/PyQt5[webkit,svg,${PYTHON_USEDEP}]
-	dev-python/radon[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.11.0[${PYTHON_USEDEP}]
-	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/orange3-${PV}"
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/Orange/metadata.xml b/dev-util/Orange/metadata.xml
deleted file mode 100644
index 007aaf442ea7..000000000000
--- a/dev-util/Orange/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>amynka@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/abi-compliance-checker-2.2 b/dev-util/abi-compliance-checker-2.2
new file mode 100644
index 000000000000..3818319c2150
--- /dev/null
+++ b/dev-util/abi-compliance-checker-2.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=A tool for checking backward compatibility of a C/C++ library
+EAPI=6
+HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-util/abi-dumper dev-util/ctags
+SLOT=0
+SRC_URI=https://github.com/lvc/abi-compliance-checker/archive/2.2.tar.gz -> abi-compliance-checker-2.2.tar.gz
+_md5_=4680fc63c39665d6005f740b24463081
diff --git a/dev-util/abi-compliance-checker-2.3 b/dev-util/abi-compliance-checker-2.3
new file mode 100644
index 000000000000..8ec6b621ce18
--- /dev/null
+++ b/dev-util/abi-compliance-checker-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=A tool for checking backward compatibility of a C/C++ library
+EAPI=6
+HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/perl dev-util/abi-dumper dev-util/ctags
+SLOT=0
+SRC_URI=https://github.com/lvc/abi-compliance-checker/archive/2.3.tar.gz -> abi-compliance-checker-2.3.tar.gz
+_md5_=ad2122b81a57df19c321df06694cb185
diff --git a/dev-util/abi-compliance-checker-9999 b/dev-util/abi-compliance-checker-9999
new file mode 100644
index 000000000000..8d1ef364b7e7
--- /dev/null
+++ b/dev-util/abi-compliance-checker-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A tool for checking backward compatibility of a C/C++ library
+EAPI=6
+HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/perl dev-util/abi-dumper dev-util/ctags
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=1d57c8502ec31829d441911ad0fb687f
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
deleted file mode 100644
index b1727b605941..000000000000
--- a/dev-util/abi-compliance-checker/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST abi-compliance-checker-2.2.tar.gz 229812 BLAKE2B 8cbbaab1b4063a93a794a6d68acbf4d2c2356eb759b6d5dea2836173887937aca3e23cc3ea54b716a472a43e3e7841f749c2e15286cf5d12780577841b792685 SHA512 4bfdad1d708f2498187a0c06cbabced3c34a05b44900231d453a8dcea88df3f381a180aa2d4cbb4c3df14d0013660b355f630e890e3715c79ce8af3a385759e7
-DIST abi-compliance-checker-2.3.tar.gz 228691 BLAKE2B cf472c81d0cb5a64588b9b889c6797399f99b368842066fb6a8b464aa04414ea02c261283396a0dbd95e65a3d9e0e19cf7637a012c433a9d2c579d0e5ad30f13 SHA512 dda5b65c36028da302ed2a8070de72f85fa0ecbc573bdc73d9a06fc6162f8850773b586c7bef8fd48b5ccb2918fbfdf8e70dd16de94cc5fa70617d35579edf2b
-EBUILD abi-compliance-checker-2.2.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
-EBUILD abi-compliance-checker-2.3.ebuild 603 BLAKE2B 28eb7ef1f221ff96ac227155be1ccc84edf94e4911d9544a0d7b2b0d7d34f6de2e31da1e9f0d03b58e8dd1f10c8e407f368e51d3b6e511386ee86e4602e7cba2 SHA512 a74cf6aefe43c9af71e0cfd15861e5cbb2b129891cea75a66663439c1e466782fbea0545ec8792721bb22932eb17fe1ac9dd074523dca54bce956c1f1a5e16a1
-EBUILD abi-compliance-checker-9999.ebuild 593 BLAKE2B 8f81e659becfd4de9a5d37655bcfef544e9a3c43f8a250edc91897e9c6f7ef07fbd3ebeb3df381904e4ea03ff26c2d40abfaf21640d5e815afd46835581dceb9 SHA512 73aa89f03caa5a7e4482024836743889cb75863bbc1522c2992f84800b7e1610da1cc770d69ab95e8a69b66750f1a4d12a3e7cc5a701bdc968b7282c7dbc75cd
-MISC metadata.xml 445 BLAKE2B 4a2c82729f916f7ae374040aa2e4008d45b0623fde7ffd41dbf54906690115441feb930695ee39c01cf3dd440d385414618781aa6a0d8a6e1e7a4256b668649e SHA512 a71d08620d61505c7cf7c6b56503c9275795980c97a1c4897bc20455674c60bd6b09bb5002a5faa0360be992fc775152c95b2a3366966cd7e636103e480d9dd2
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild
deleted file mode 100644
index 1057874dcfaa..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-2.3.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-2.3.ebuild
deleted file mode 100644
index e821544b1a85..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-2.3.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="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
deleted file mode 100644
index d9351e95a936..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/lvc/${PN}.git"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
deleted file mode 100644
index 66d00240ad20..000000000000
--- a/dev-util/abi-compliance-checker/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>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lvc/abi-compliance-checker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/abi-dumper-1.1 b/dev-util/abi-dumper-1.1
new file mode 100644
index 000000000000..2094951b179a
--- /dev/null
+++ b/dev-util/abi-dumper-1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Dump ABI of an ELF object containing DWARF debug info
+EAPI=6
+HOMEPAGE=https://github.com/lvc/abi-dumper
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-libs/elfutils dev-util/vtable-dumper
+SLOT=0
+SRC_URI=https://github.com/lvc/abi-dumper/archive/1.1.tar.gz -> abi-dumper-1.1.tar.gz
+_md5_=e60871ffd4d5c119a18a0206c9381a7c
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
deleted file mode 100644
index aa3292abca2f..000000000000
--- a/dev-util/abi-dumper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8394277ae53c5ea9b981c4008c5895d3137e3ca0a5cfd64f2d2425cb13a0912f6dada048adfa290dd144ab58ed SHA512 28b791de74dafd0b3d78314c1c722d03bfeb0daa5cb702def9268e4c64f49c79b4fd92d4adf89a20f79c745ef70bc18d2b1143fbe0c7ad192b2f64cb1551b371
-EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
-MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
diff --git a/dev-util/abi-dumper/abi-dumper-1.1.ebuild b/dev-util/abi-dumper/abi-dumper-1.1.ebuild
deleted file mode 100644
index fcf03f1cc2b8..000000000000
--- a/dev-util/abi-dumper/abi-dumper-1.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
-
-DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
-HOMEPAGE="https://github.com/lvc/abi-dumper"
-SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-libs/elfutils
-	dev-util/vtable-dumper"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-dumper/metadata.xml b/dev-util/abi-dumper/metadata.xml
deleted file mode 100644
index 410510d0f021..000000000000
--- a/dev-util/abi-dumper/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>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lvc/abi-dumper</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/abootimg-20150323 b/dev-util/abootimg-20150323
new file mode 100644
index 000000000000..7dedaa37327c
--- /dev/null
+++ b/dev-util/abootimg-20150323
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-apps/util-linux
+DESCRIPTION=Manipulate Android boot images.
+EAPI=6
+HOMEPAGE=https://gitlab.com/ajs124/abootimg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux
+SLOT=0
+SRC_URI=https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=1ebeb393252ab5aeed62e34bc439b6728444f06e -> abootimg-20150323.tar.gz
+_md5_=a02de4318ebf419ad52af4d19b57abe4
diff --git a/dev-util/abootimg/Manifest b/dev-util/abootimg/Manifest
deleted file mode 100644
index 6e79a3254481..000000000000
--- a/dev-util/abootimg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST abootimg-20150323.tar.gz 19311 BLAKE2B d9e9d1de33be581dcca2940000300b433675c4bf98c19dd29a622767d914cc71bf8900120fc4150c542506af5a3faa7a3e03dbfab3f92bfd975a6bde51eac5ed SHA512 38e633c5c32bae472cd1ade9f4a3fa9a5e8ecd17da947aeaf976f639966007ba776a3ac877a607c9f3a416c67682afc9f7789e1560625b75aeaf78a88dfce558
-EBUILD abootimg-20150323.ebuild 540 BLAKE2B af4b584a23650f4ae222e9a6717901e5756ade0485c7f31de89e33197bc1a6cf7d22618898fe8315d67faaa7c8a9fde22c25d46c88b0d5789e95855bfefa0d90 SHA512 649fbbf27edc8d5cc38e9462571de0fb5bee72899d9d950d96a6c55f14cd6c6236c50afe912b2dd3fd2a999f670e60f568eee32d0444b8f0e9e135a7131a26bd
-MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/dev-util/abootimg/abootimg-20150323.ebuild b/dev-util/abootimg/abootimg-20150323.ebuild
deleted file mode 100644
index 8939a70bcb37..000000000000
--- a/dev-util/abootimg/abootimg-20150323.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
-
-COMMIT="1ebeb393252ab5aeed62e34bc439b6728444f06e"
-DESCRIPTION="Manipulate Android boot images."
-HOMEPAGE="https://gitlab.com/ajs124/abootimg"
-SRC_URI="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$COMMIT -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/util-linux"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}-${COMMIT}"
-
-src_install() {
-	dobin abootimg
-}
diff --git a/dev-util/abootimg/metadata.xml b/dev-util/abootimg/metadata.xml
deleted file mode 100644
index 915f00227065..000000000000
--- a/dev-util/abootimg/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>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/ald-0.1.7-r2 b/dev-util/ald-0.1.7-r2
new file mode 100644
index 000000000000..ad8e5b91afa9
--- /dev/null
+++ b/dev-util/ald-0.1.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=ncurses? ( sys-libs/ncurses:= ) >=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=Assembly Language Debugger
+EAPI=6
+HOMEPAGE=http://ald.sourceforge.net/
+IUSE=debug ncurses
+KEYWORDS=x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/ald/ald-0.1.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7eb38d6b97dd8bc46e28051d6d72c997
diff --git a/dev-util/ald/Manifest b/dev-util/ald/Manifest
deleted file mode 100644
index 071b8db754cd..000000000000
--- a/dev-util/ald/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ald-0.1.7.tar.gz 665998 BLAKE2B 52cdd01f5927a4fedc2bdd7728cd063aa3b48fda7dd3af36c4b9299b62d7cbd199f2a8ebb06457bf29c62a5024fb158944d82260b4aac77838e4338acdd33a25 SHA512 dbde0929beebe51ef5f77055b5f396630e16fd01ded4210d828f9ce97c676e7863700a98bf02d26e10cc2d8481adf329d8c8cb11c866302361221f072dbf45bf
-EBUILD ald-0.1.7-r2.ebuild 624 BLAKE2B 50a18b520cb2fe74a5a212713fcd7a631023829af9b7c51c067870c16efba31546503983b7af826d12fbb117e05d50aeac6bf01ad58f6f9c6e1eef42ef7d75b0 SHA512 4d490fb004e138d4f008fd5c91b398bd2d37a87555c95d0c11382c9739e4a0a2fe81573f747614b10165214b89e7c88bcaf25569bea49f7701a3b576fb209c19
-MISC metadata.xml 522 BLAKE2B e8b5a7832ee9ebe762e8cbfb551c05c6474457145b904da65aeac848587915e177c71b47f7345a257b180d9f29c8bc64de04ceb54a9ca4749579a8288494a8b6 SHA512 6744b2c2ef3204f09694e7570d390d01ef869fcdb3475638a4f122c9769fd5dab4147861303fb3175b59f90a063eca254ede69a8021db6b74842a5d959158c01
diff --git a/dev-util/ald/ald-0.1.7-r2.ebuild b/dev-util/ald/ald-0.1.7-r2.ebuild
deleted file mode 100644
index cb433ceca656..000000000000
--- a/dev-util/ald/ald-0.1.7-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Assembly Language Debugger"
-HOMEPAGE="http://ald.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ald/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# respect CFLAGS (bug #240268)
-	sed -i -e "/^CFLAGS/d" configure.ac || die 'sed on CFLAGS failed'
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ncurses curses) \
-		$(use_enable debug assert)
-}
diff --git a/dev-util/ald/metadata.xml b/dev-util/ald/metadata.xml
deleted file mode 100644
index f3f424427bc7..000000000000
--- a/dev-util/ald/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">ald</remote-id>
-  </upstream>
- <longdescription>
-    Assembly Language Debugger --- a tool for debugging executable programs at the assembly level.
-    It currently runs only on Intel x86 platforms.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-util/amtterm-1.6 b/dev-util/amtterm-1.6
new file mode 100644
index 000000000000..03b11b650f82
--- /dev/null
+++ b/dev-util/amtterm-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.91 )
+DESCRIPTION=A nice tool to manage amt-enabled machines
+EAPI=5
+HOMEPAGE=https://www.kraxel.org/blog/linux/amtterm/
+IUSE=gtk
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.91 ) dev-perl/SOAP-Lite
+SLOT=0
+SRC_URI=https://www.kraxel.org/releases/amtterm/amtterm-1.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_=70414ee09747b21644481247de7c9042
diff --git a/dev-util/amtterm/Manifest b/dev-util/amtterm/Manifest
deleted file mode 100644
index 480a4d9633f1..000000000000
--- a/dev-util/amtterm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST amtterm-1.6.tar.gz 40804 BLAKE2B a682bb6646e7ed57e3ee8f17f25bdd60fed37d614eb3e66f6b05fa4062ef99237c24d69e4795e7a9d8b83579728c8f8423389bf7e042d981b3e84a0037e56b0d SHA512 b10777727cf7f931e4b04fff7c621ea6e94989738833fe4f830bd795c8be3b0e983100b34a2ea5feb48221f022b3498a819c9f4fba9c7722226d56d374a1d986
-EBUILD amtterm-1.6.ebuild 1007 BLAKE2B a6e31ec74289ee24c57c5bd328874a28f89ffa68cecd8812a8005e923fda2819f2b649296c5aa0d5b861b4c7782d50333c26e404e9ea137978626b5cc125895d SHA512 1404756ba763dcd93dcbee6de2bee4413940fc304f4ae88af4829a88f6e1ed6451e1ec1f25adf6cbcaa00d956c1169650f2ccf8834f7bf1d6576d259eefd7e20
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/amtterm/amtterm-1.6.ebuild b/dev-util/amtterm/amtterm-1.6.ebuild
deleted file mode 100644
index d9222f8bf2e6..000000000000
--- a/dev-util/amtterm/amtterm-1.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A nice tool to manage amt-enabled machines"
-HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
-SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="gtk"
-
-DEPEND="gtk? (
-	x11-libs/gtk+:3
-	x11-libs/vte:2.91 )"
-RDEPEND="${DEPEND}
-	dev-perl/SOAP-Lite"
-
-src_prepare() {
-	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
-}
-
-src_configure() {
-	echo "LIB := $(get_libdir)" > Make.config || die
-
-	# enable gamt
-	echo "HAVE_GTK := $(usex gtk)" >> Make.config || die
-	echo "HAVE_VTE := $(usex gtk)" >> Make.config || die
-}
-
-src_compile() {
-	prefix="/usr" emake || die
-}
-
-src_install() {
-	prefix="/usr" emake DESTDIR=${ED} install || die
-
-	if ! use gtk; then
-		rm -rf "${D}"/usr/share/applications || die
-		rm -rf "${D}"/usr/share/man/man1/gamt* || die
-	fi
-}
diff --git a/dev-util/amtterm/metadata.xml b/dev-util/amtterm/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-util/amtterm/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/dev-util/android-ndk-10 b/dev-util/android-ndk-10
new file mode 100644
index 000000000000..095d69360482
--- /dev/null
+++ b/dev-util/android-ndk-10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+IUSE=+target-32 target-64
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10-linux-x86.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10-linux-x86.tar.bz2 ) ) amd64? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10-linux-x86_64.tar.bz2 ) )
+_md5_=83ab7bfd30026070fa3843902523c5c6
diff --git a/dev-util/android-ndk-10b b/dev-util/android-ndk-10b
new file mode 100644
index 000000000000..8e74bc7b68ec
--- /dev/null
+++ b/dev-util/android-ndk-10b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+IUSE=+target-32 target-64
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86.tar.bz2 ) ) amd64? ( target-32? ( https://dl.google.com/android/ndk/android-ndk32-r10b-linux-x86_64.tar.bz2 ) target-64? ( https://dl.google.com/android/ndk/android-ndk64-r10b-linux-x86_64.tar.bz2 ) )
+_md5_=83ab7bfd30026070fa3843902523c5c6
diff --git a/dev-util/android-ndk-10d b/dev-util/android-ndk-10d
new file mode 100644
index 000000000000..5adf0ec43a03
--- /dev/null
+++ b/dev-util/android-ndk-10d
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin -> android-ndk-10d-x86.7z ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin -> android-ndk-10d-amd64.7z )
+_md5_=0386acd00f161a12ad16396c54d8e3b7
diff --git a/dev-util/android-ndk-10e b/dev-util/android-ndk-10e
new file mode 100644
index 000000000000..bd641478fa99
--- /dev/null
+++ b/dev-util/android-ndk-10e
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5 sys-libs/ncurses:5/5 )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin -> android-ndk-10e-x86.7z ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -> android-ndk-10e-amd64.7z )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=2f9da792fdd5f2bc2fb773f4dd191e66
diff --git a/dev-util/android-ndk-11c b/dev-util/android-ndk-11c
new file mode 100644
index 000000000000..28cc94a30088
--- /dev/null
+++ b/dev-util/android-ndk-11c
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5 sys-libs/ncurses:5/5 )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=7295a22762e548c72d0ab0e7473f105d
diff --git a/dev-util/android-ndk-11c-r1 b/dev-util/android-ndk-11c-r1
new file mode 100644
index 000000000000..76cad6eebd9f
--- /dev/null
+++ b/dev-util/android-ndk-11c-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses:5/5[tinfo] )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=e8d4e3b2b09da979350616de8369f86d
diff --git a/dev-util/android-ndk-13b b/dev-util/android-ndk-13b
new file mode 100644
index 000000000000..55a6d08e698b
--- /dev/null
+++ b/dev-util/android-ndk-13b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses:5/5[tinfo] )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=e8d4e3b2b09da979350616de8369f86d
diff --git a/dev-util/android-ndk-14b b/dev-util/android-ndk-14b
new file mode 100644
index 000000000000..5ea609acefbc
--- /dev/null
+++ b/dev-util/android-ndk-14b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses:5/5[tinfo] )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=76ae632f4ee0611c2ec4b7d6ec455a53
diff --git a/dev-util/android-ndk-16b b/dev-util/android-ndk-16b
new file mode 100644
index 000000000000..b19bbb53316b
--- /dev/null
+++ b/dev-util/android-ndk-16b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=app-arch/p7zip
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-libs/ncurses:0/5[tinfo] sys-libs/ncurses:5/5[tinfo] )
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=23700297895a0fa9ee58da1ac97cdf1d
diff --git a/dev-util/android-ndk-9 b/dev-util/android-ndk-9
new file mode 100644
index 000000000000..cb07d1aa5047
--- /dev/null
+++ b/dev-util/android-ndk-9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+IUSE=legacy-toolchains
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 ) ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 ) )
+_md5_=55f0a52ac5d772fb60183f5831a408b0
diff --git a/dev-util/android-ndk-9b b/dev-util/android-ndk-9b
new file mode 100644
index 000000000000..770b3a367718
--- /dev/null
+++ b/dev-util/android-ndk-9b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+IUSE=legacy-toolchains
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 ) ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2 legacy-toolchains? ( https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 ) )
+_md5_=55f0a52ac5d772fb60183f5831a408b0
diff --git a/dev-util/android-ndk-9c b/dev-util/android-ndk-9c
new file mode 100644
index 000000000000..483660c9d476
--- /dev/null
+++ b/dev-util/android-ndk-9c
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9c-linux-x86.tar.bz2 ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 )
+_md5_=abc2d357e133d2e97115f0f9f6a591cc
diff --git a/dev-util/android-ndk-9d b/dev-util/android-ndk-9d
new file mode 100644
index 000000000000..5b41bb090b32
--- /dev/null
+++ b/dev-util/android-ndk-9d
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Open Handset Alliance's Android NDK (Native Dev Kit)
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/ndk/
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81
+RESTRICT=mirror strip installsources test
+SLOT=0
+SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r9d-linux-x86.tar.bz2 ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r9d-linux-x86_64.tar.bz2 )
+_md5_=abc2d357e133d2e97115f0f9f6a591cc
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
deleted file mode 100644
index f6eb4b4eb6fb..000000000000
--- a/dev-util/android-ndk/Manifest
+++ /dev/null
@@ -1,42 +0,0 @@
-DIST android-ndk-10d-amd64.7z 459151600 BLAKE2B a624109010c317da74b0fe2d392016f7019e30bfea8794bac57460f25f36dd5133a438e55b34c834c90747f24edb83ee3d2b1b6d2e5ff77a6c930cbf8f264c54 SHA512 b2ba10d7757ed7189b4e6dc2ecd38fce0c32dc6701151542b9e225e890faee84dded30dd4e907b0e42473e2a6df8ef4d46f37514edc270a04e1129d9c9e677fa
-DIST android-ndk-10d-x86.7z 449997190 BLAKE2B b7bf8434635e34e3008cfffa0ac048365ec6a0ce7c7997033ae1799fba45fc7e5cde7a34848d79580f2ce9178dc86d02721fa25b78bcb82655609d929dcab82f SHA512 8d66229f6f07d6fba00650a96267c3c4a8308d296d9f13aa359af34ad49f57ba3a02e39f14d2b04609816e5f28ed939e71024043a0f08dc3711895a42e39f771
-DIST android-ndk-10e-amd64.7z 401522849 BLAKE2B 2a43b6300bbf18895c31293341215c767307cc7765fb1aa80754a44c97e5eed270acb7e2143aaed18fd080f1f5866bbcc5f98d9954950a9dbc27f558d22e9fa7 SHA512 8948c7bd1621e32dce554d5cd1268ffda2e9c5e6b2dda5b8cf0266ea60aa2dd6fddf8d290683fc1ef0b69d66c898226c7f52cc567dbb14352b4191ac19dfb371
-DIST android-ndk-10e-x86.7z 394281908 BLAKE2B 22c5b0e42c275f9266b11676435ea03af0ca40ea784f507bb154827846369ff8b0fc765be7aa61cde936b768619e6d05583766be9477c28fc6123a13c5e522f6 SHA512 fdce2537c4f9bca980948961448ec746bca0626b92c1edf0db46df34819b6ea2f6acb4f0921c3ff8da8e20dd6b414749c6cb3b973d7d1cdecccb4b8f4f2e0679
-DIST android-ndk-r11c-linux-x86_64.zip 794135138 BLAKE2B e048c6c7172aafce47e5961669e8130780a060190854316edde8e2aca763055cba8bb739dcb8aa51227a798d19b36a11bf2e7591f817070c153f05a2e5d74fd4 SHA512 c0de562061c9f08bcd1ae05b1de26898788e71cc7dc40502348214edd5a90f1bf8125721e587b341f6fe774fc79b1a6e28b3f702f3275e016baa0382fcea2767
-DIST android-ndk-r13b-linux-x86_64.zip 687311866 BLAKE2B 2db7bfd9fa937d5f28fa238494e73ad1d09c539627308aa7f4e2c4114c6762dc908b1752b42dccf792f9c71ff7e3b5e08b2b03e7eac3ff5bea497c33d479d60a SHA512 39f3bd2d0e1daca11870df2e2ef318ad070b19163a55e2c1c4a1a871e02f8ec51263d7cf4b6da54eaadbe4253b5c11b85f4c5aeb67fccfff9147a5c420589d12
-DIST android-ndk-r14b-linux-x86_64.zip 840626594 BLAKE2B 5032893ee34e7167c5af5216d7b1357c3f9dcef136d63fa9a1d6c4849471430ac21a741e1c2439ec62b5cb1fa79af9ff39b46c31073e47e7a6f7c41e1a1a448b SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a
-DIST android-ndk-r16b-linux-x86_64.zip 852525873 BLAKE2B 18f6e602d88ef0a8f1a7f31bc127547c32bc2fb133d5c87ca4d2f7099f79b54d67f578a68fcd59e94c84934ca2006decca5b09eac566f2f99d609862d4036e48 SHA512 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7
-DIST android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 241172797 BLAKE2B c3aad099b68a1a605f06fdb9d93b929374c81481d6ba1502e9ad363c7437032465cd516bc9bdf205a4f9f8ea536865755970046f0f7db4070f32e0f18f65c606 SHA512 4c8f1c9c6dfe264f227959124dc19f9fc9596c166076b8ec82b37f033101285ccd5832962e233d2605869308b2367280665a1f53f4693cb753434b480c49af25
-DIST android-ndk-r9-linux-x86.tar.bz2 419862465 BLAKE2B 2e41071a2b17104cd9b5ceb543ca154936a1358722f5fc33ab221227e6a254954fe687fe7a83e2dee72b189f0ac8ef5a11419297c1a36fb45451f797cc2bb85e SHA512 9c2da6b52df00ff6177ac18314f7c7abef585d2297362d426a9b0a28c8319531d684c1515971066050181178ab205210a7f25ec1de9be843fd0da7c1e897747e
-DIST android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 244427866 BLAKE2B ad7c6e83ff0a8509750bb2ed302eff20dd4c451e5b55ff2be07268f007361a5023e1b4c8a175efc896e9041df6b1def54946a028dca31d432e48105161303171 SHA512 dde193474b46ac2ceb69f5ad3ba106eb840daf18470538d85e147b17dff8b1b1b848d499727e28bb8e76bdd16dd4bb99dc073c06f80949080551ae0437f08eed
-DIST android-ndk-r9-linux-x86_64.tar.bz2 425113267 BLAKE2B 8f0143553d952592e68600d096acdbfc23f9365c40e746ba5140790ed2d16fa7b211b747eab4fedc94b03cb2f635222b3348bf3beb6a1f4eb5c6b3b9137b4fb7 SHA512 4196a71c20ad2f12bb5d3fe994179e76ba6e535a5460c34ff07974e74afc362ed271a20c24ac565e8f8863bca152f24befdd1954711d844200a676ba08e1a0aa
-DIST android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 125676842 BLAKE2B dde44911f2e8f9d187c7331391781ae3199a43fa86c410f99a47cfb78bece7d9220b0f4acf2b363adcc2497d696bb4f8afa4f42776616ac038a5f9e2ce461560 SHA512 a6f7189b033a55b4623d4831c35adc635faf80393da217aeabc959d97a246347b8d67150b086ed8f13cd93313d06563f54aa8f29f887d23ffaf8f8a3ac5d3876
-DIST android-ndk-r9b-linux-x86.tar.bz2 361394055 BLAKE2B 391ae66c8d7c7169f8856524912872765a677bca9e9c80e7aa8d32b3d6c9bbbcc0e7b40b67ee98d7ae24eeb22584612f169a2f3833066e2cc4c7291bfa50d436 SHA512 e8448f2dda591a1e18bb2dc40d6682c19ca01b7d6914fd079e7e6b86cdc152a3c05f7a3853714bfa5b1df7c3eb3f124ba7912caef53fd0d0a335b89c352e8a94
-DIST android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 127742633 BLAKE2B 4179d354f2dc0da2ca47038040ecf7f6c6432f8e6331799c12e5cef5c1123c237a63544353c0cc0871e886131163a3fa0180d09805675f20d32b295c60e33fbd SHA512 eeddc80ec3cb75a248ab8e66948a5e5001812cb19213541e5fb85b9b30cae6aac62849c91c9dfd3af2f822382060b069d2efc21294d2f87824be695e9d9abc50
-DIST android-ndk-r9b-linux-x86_64.tar.bz2 366988131 BLAKE2B 7bde89583735c76fdcae5cc62650fd52ab96387abe33625304fa65a93e4abb84033ef154ebe268de3de9b3accbc9b2907c781f1ad1b2e02c21bd00d22153af3c SHA512 99eb950ceff8a6fc931859fadb1151326b9fbcfddf1ac8027076b3a4ba5d746b31c38cbde925ab6882510a7b39d93b93b0ff346d452db5c364997bff1bdc0887
-DIST android-ndk-r9c-linux-x86.tar.bz2 365412557 BLAKE2B 85cf37c729ef1c904e5925b59729373f5ecefe316a6a047d9b270ebf3834691ae97e1261bf365452248f0324a3d8500dd0bddb5d0792113bc521996107b76680 SHA512 ebd85d9670956db60fb3842a827288d32df70a7b2febc0477fd2ec63531fa8fa61a89a3c3916decf6dba7ef3f2794121ffdd3c1b8263b0e9c259650e44dfb675
-DIST android-ndk-r9c-linux-x86_64.tar.bz2 371254928 BLAKE2B 5ab13083f7322acc5d8cec44f9cbbc2e115ad0693f3f720004d951ae3ab3392dcf493fc8e3f62956978a284f25f2a70461ab6f498979095df0a6a06216ea7f56 SHA512 317a3904561c850b9129a855fd353a7ba706986f08bde709d16ef10c6adffe546cdf3cb48e5e19a0261f33edde4b2d3b6f5ae9aa59280ec0742dbdacbba93755
-DIST android-ndk-r9d-linux-x86.tar.bz2 405218267 BLAKE2B 477dd60f45e7305615873e62ecfab91c02e0cf903df51ce38fd1096371d48585632df402944c79372c4b78104c70444eb2538e8bbaa83b59caa6305a5dd8df1c SHA512 9ba1603d3ac5daf8816dbc7ba998d6b93d4f3d197a30beaaccb02fefe785554769b453462c90fe19194200808b38128396e77c32425c8d0872652c81a916304e
-DIST android-ndk-r9d-linux-x86_64.tar.bz2 412879983 BLAKE2B efbab13b52c6653b7a9ca5997992feb87a637fb42f2b560b3d7bb5c7c8a645c21dbe3deb3d0a85b35c3d084089fd7da6870ced1fc1977388513572eb60cc1767 SHA512 b6b663533785fb6cbc10e467a109cf47f4a49d87abc72f03439ac7b3aa57350e1602d766793bf6c3c5f6e4f4ab8733311ef1c761ac335691566b2e936f853af3
-DIST android-ndk32-r10-linux-x86.tar.bz2 420078216 BLAKE2B c8c8c8b36478d80644cd6e960876bec90b854217d9031345f03d6b2beb4f249a8ff324a7d348c15cc107815089481f48dd973183eacdf0b410171d26436aca51 SHA512 c3acf611b360bea4d559341c4093d1194fa3131ad807ad9aa8f6c159c12bd4979cadc65388b9826baad89c0ba6a4a03f192ddd885c50f0066022ae3265d8e59c
-DIST android-ndk32-r10-linux-x86_64.tar.bz2 420671390 BLAKE2B 75e2419882bfe7f4eed2e594a00319813873a87e9e8e1f03e2ce983e3946f9e6506a5fb43fbc0698cea9c0a12a1e3cc1b020c7e1f8b8c0c9bc6b7989567df641 SHA512 004e223b741c8b63ab86bd37f2c83d89457d5144e18221e792676e070ffb9b23078568b52abee2067de7daa0dbe5e8152bcc82685273d60e1a243b3c5f159f84
-DIST android-ndk32-r10b-linux-x86.tar.bz2 421052081 BLAKE2B a67e476b3db70c4c156dcd696eb2003283f8a5896269e0ae14efc0f199b3a724916c2d3f2b001d246f7d882faed1fd181f03eb6a1c1599a75642a9c453e87681 SHA512 ecd270244c9f00b9bf883014f65a04459a5cd422e65239b13a463c363b9e82d7907495792bbe1287dee082117c03356b1f8d869339a4cf1966f2a56ae664aeb9
-DIST android-ndk32-r10b-linux-x86_64.tar.bz2 422237011 BLAKE2B 8fe0c4d997601dae7a8b5fe2b55208b38d243b43be7e454bd513c9b3753893c6ca1f2f14ca88069fd0012b37be6f2c593506ab377154a7c740c006c6d267435d SHA512 6b7ec25a7c2d6cef94ba61403274276a912c5fa757dda5206548619fb155e97bd6eab0eb3354f51f703b82300a754ec8da352aeb20cdcdf80884aaa4bcd97a6f
-DIST android-ndk64-r10-linux-x86.tar.bz2 338544906 BLAKE2B db13857a6cf2363c1ea211edfc13155b3c3331c2a473826d56371874d766603b6c786893a1aa7c0135d56f7ae17fdb594f44dfb41697fae07ec0403152b4e9c1 SHA512 09a54fb86a7a157e9dac5a682f2cbae9492fe8c2f64a23f613d7e331844eb682e8e4affbaea116895310f417514bd85b66e6841755197b9add4e84237114d4f5
-DIST android-ndk64-r10-linux-x86_64.tar.bz2 339708042 BLAKE2B 4b674564a66a431d54e17095a946a3f36e51649591dcd930efa5792d9ad3ca9e4f54b2af4036200a4328bb0b17a6b28f08971487d7d3fb60c4672b3169a24560 SHA512 2d2a9689912c72e1f3ef5c14acef1b747460531b234d9fc9af25de7102a0195406c47e5c6e98cd5be2a58163fbf76eb1cbf3098a84f93b5c68c18eec94625a9e
-DIST android-ndk64-r10b-linux-x86.tar.bz2 358060577 BLAKE2B ac5c54840b273c5c0527bf2654228f86a5b301cf60fcb702c0d4ca033622da1c667f8f75d9c89962ef73b47e2128d1f79612032d3292744027cfa3c7aa3d4bb0 SHA512 c951a3a50d0db66c435190a6a8000467785932fa1ff000d59b9f4c5917ddf78874df3e2163b5757c019a68a3dcb13492f486248f30d0c762279ff5d67327f26b
-DIST android-ndk64-r10b-linux-x86_64.tar.bz2 358835298 BLAKE2B 79ac6c56c24eb642b53420a9c3dc125b9e44aa359436d153b20644178b2800f8705f27fb4aed509cf66a868b92643def9d7e746acb4a9f2fec760189237cacdf SHA512 95627d327db205b7a3ec1fb940a8f1509dcde3c2367d779cc06dd7bb2ffd41f3d2eece79bf4578279a571a42233f58109eb6586330b11844f98c79fa410f2c37
-EBUILD android-ndk-10.ebuild 1803 BLAKE2B 5ad88577a7b11adef940e76e18b00ebff26406c8f455982ada23fcae596fea36cc34d478d5037bcc7540357f67f78da235778dd73c80685c252975f3dfbc9dee SHA512 97915f453de3d42d5b933ee2a442b858de0ccac744797f680dd7abb12c6bee8a8c27aaa26ef21009a6ba7f298d59119a8ab1ddc5d0479e51c0b2f3ce3639e0c3
-EBUILD android-ndk-10b.ebuild 1803 BLAKE2B 5ad88577a7b11adef940e76e18b00ebff26406c8f455982ada23fcae596fea36cc34d478d5037bcc7540357f67f78da235778dd73c80685c252975f3dfbc9dee SHA512 97915f453de3d42d5b933ee2a442b858de0ccac744797f680dd7abb12c6bee8a8c27aaa26ef21009a6ba7f298d59119a8ab1ddc5d0479e51c0b2f3ce3639e0c3
-EBUILD android-ndk-10d.ebuild 1615 BLAKE2B e297ee050ec362c2db5ce9e3ea082b6ec88740528d39250c350a367c2156f44bb30e678b0ed823d1142b5b1864940b2158adcc0c5bffe36735465fc835e5cb34 SHA512 0d2d21d1361f616029bd8e2e5fe40b1ea54123ab13b5d7aace6096be09aeb39310307bd3f81f21fa82692d0c57df89fea72d85ea9c0489e4dc2949d457d54ba6
-EBUILD android-ndk-10e.ebuild 1798 BLAKE2B 5f569d9eb79a4fe6ea4fd28e114bbccf9ecaaec6ebb9a46d12b00ca4c70b841e662324f825f7a3e77af5e8def6525755ce3aa7046fa3ca93349902de04e343c7 SHA512 805abf5fcee1cdf95dc39a2cdaa4d85723ce55c41e6ac4597f305d4ddba99727dad27496245aa6515b06fc1783c38d6cab55748f3b8b0c2c4d010784513cd637
-EBUILD android-ndk-11c-r1.ebuild 1657 BLAKE2B 5897883bba07fef24f7955dd96e3733a98d0ae5936b6caf82ed5a3829a2e13ffb3716a118d2c7d2d3cdcadf84763eb200078359e0b2f19223f3a8767474cb29b SHA512 b7391a8201943fbcecb8a061e136214d30ab7a842ae5977550f3ef3723937cc17f7e79f537ef51a302edae7204b949d5f0ec1da19f89efa147649746c6539319
-EBUILD android-ndk-11c.ebuild 1643 BLAKE2B f530d2bc7c158147db0c5c33db2177da866c963255db3c999eb5b1c3d0b166dd8b2beab7f0fd008e6950ac9ffa6ad989a65317fc51ea2c7f5d1580277ae14906 SHA512 cde70bc40cb22ea02f5c953fbafa3ffc636d5bb72ff41bc9f7c4cb5c486865fefe18c94a1f4e52d344cb015fa300f02378a818680711c23028b32fd9b07f812b
-EBUILD android-ndk-13b.ebuild 1657 BLAKE2B 5897883bba07fef24f7955dd96e3733a98d0ae5936b6caf82ed5a3829a2e13ffb3716a118d2c7d2d3cdcadf84763eb200078359e0b2f19223f3a8767474cb29b SHA512 b7391a8201943fbcecb8a061e136214d30ab7a842ae5977550f3ef3723937cc17f7e79f537ef51a302edae7204b949d5f0ec1da19f89efa147649746c6539319
-EBUILD android-ndk-14b.ebuild 1626 BLAKE2B 629a4ae59e8f07d97ebb50c8ae47076253bd7965bb6ba7d77e94a0b3bd67479a2b224689d3f98d9d4f87a7c789edc0ca18d97daf754da3edda4a0bb8e8ab3022 SHA512 b2519362c364bc5a406301c12a87480f25eb23d4a492c715fa514ae9797dd17729a739afd6766fa30e35a96b8f38d06f8094766a1321c4fe79db65cc286ed066
-EBUILD android-ndk-16b.ebuild 1626 BLAKE2B 83960ba8eb48f0833b4ae9c6035bdd9bd317d9d2bac1447cd9423a35708e653c01634957891d9b01754b1803022bf8281738233fb08ccb6ffcf1de061d05227e SHA512 5793f1f26df9e6a9e4da5b44c7047dbc5270669aea32b8a7ad663333cf6fc5dcf48c37c7601db1b5e9475333564c4f761cfcf2bb116b818f5aa6fd8d0a92b444
-EBUILD android-ndk-9.ebuild 1807 BLAKE2B d985e58d00574d3402a76c520717fc75ced5cfb4f582bfe3a21c2fc5c98ad516b827ff49c5c43c5ee2e2403f5622079ce587b6c0e2e2f908219591cd19747d4a SHA512 2b4898867cf7b30fdccaee7004ce9b41df1462ac17d90d68a031c12fa36ee428d6115c9921c80625bf0a9dfa2f5444d36c8f6e48e03d6974f31a4f7c253880c6
-EBUILD android-ndk-9b.ebuild 1807 BLAKE2B d985e58d00574d3402a76c520717fc75ced5cfb4f582bfe3a21c2fc5c98ad516b827ff49c5c43c5ee2e2403f5622079ce587b6c0e2e2f908219591cd19747d4a SHA512 2b4898867cf7b30fdccaee7004ce9b41df1462ac17d90d68a031c12fa36ee428d6115c9921c80625bf0a9dfa2f5444d36c8f6e48e03d6974f31a4f7c253880c6
-EBUILD android-ndk-9c.ebuild 1575 BLAKE2B 26dab48031bab81bc817a8bbc921af22f2342e08ca883c777021e99792e5ebc1c73523e8f9663545ff1124959cd04060f874d0d71e29c05a31849011b0a86a0e SHA512 d6c518b4641d72c01bba26b550c03cf6cc5cbe369256fac81acc86eef03c2a6b18be011f96ceaaa34c6c94241258d2ea6c2fec734697e703fe5d8f044cb65aeb
-EBUILD android-ndk-9d.ebuild 1575 BLAKE2B 26dab48031bab81bc817a8bbc921af22f2342e08ca883c777021e99792e5ebc1c73523e8f9663545ff1124959cd04060f874d0d71e29c05a31849011b0a86a0e SHA512 d6c518b4641d72c01bba26b550c03cf6cc5cbe369256fac81acc86eef03c2a6b18be011f96ceaaa34c6c94241258d2ea6c2fec734697e703fe5d8f044cb65aeb
-MISC metadata.xml 446 BLAKE2B 9630bc6c3dbf1e3fb2b9f19d09e96063a8ecff18e0bc83164798b06eda48d09716eaba5331c0451ae61c8b27790af513f0ea8516f6ce743faeaf90248a861ecf SHA512 aa4e337d6a8dc9a9189a8adf9c963237ebac937cf2a7ecb9c81e17ca7cd496000bd0fb34de9314c18c360b100b77fab8e4a923d21228694003553a80c7b17ff3
diff --git a/dev-util/android-ndk/android-ndk-10.ebuild b/dev-util/android-ndk/android-ndk-10.ebuild
deleted file mode 100644
index 27ec24979504..000000000000
--- a/dev-util/android-ndk/android-ndk-10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
-		target-64? ( https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
-	amd64? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
-		target-64? (  https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+target-32 target-64"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10b.ebuild b/dev-util/android-ndk/android-ndk-10b.ebuild
deleted file mode 100644
index 27ec24979504..000000000000
--- a/dev-util/android-ndk/android-ndk-10b.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
-		target-64? ( https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
-	amd64? ( target-32? ( https://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
-		target-64? (  https://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+target-32 target-64"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
deleted file mode 100644
index 632defda31a1..000000000000
--- a/dev-util/android-ndk/android-ndk-10d.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
-	amd64? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
deleted file mode 100644
index 5abb2ebaafe9..000000000000
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
-	amd64? ( https://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5
-		sys-libs/ncurses:5/5
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild
deleted file mode 100644
index 703cae635c36..000000000000
--- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild
deleted file mode 100644
index ae39d95ef377..000000000000
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5
-		sys-libs/ncurses:5/5
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild
deleted file mode 100644
index 703cae635c36..000000000000
--- a/dev-util/android-ndk/android-ndk-13b.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild
deleted file mode 100644
index 5f92e3300036..000000000000
--- a/dev-util/android-ndk/android-ndk-14b.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-16b.ebuild b/dev-util/android-ndk/android-ndk-16b.ebuild
deleted file mode 100644
index c1adc83a200f..000000000000
--- a/dev-util/android-ndk/android-ndk-16b.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="6G"
-inherit check-reqs
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror strip installsources test"
-
-DEPEND="app-arch/p7zip"
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)"
-
-S="${WORKDIR}/${PN}-r${PV}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9.ebuild b/dev-util/android-ndk/android-ndk-9.ebuild
deleted file mode 100644
index 29c231420c94..000000000000
--- a/dev-util/android-ndk/android-ndk-9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="legacy-toolchains"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9b.ebuild b/dev-util/android-ndk/android-ndk-9b.ebuild
deleted file mode 100644
index 29c231420c94..000000000000
--- a/dev-util/android-ndk/android-ndk-9b.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
-	legacy-toolchains? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="legacy-toolchains"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9c.ebuild b/dev-util/android-ndk/android-ndk-9c.ebuild
deleted file mode 100644
index 1e683e59f570..000000000000
--- a/dev-util/android-ndk/android-ndk-9c.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/android-ndk-9d.ebuild b/dev-util/android-ndk/android-ndk-9d.ebuild
deleted file mode 100644
index 1e683e59f570..000000000000
--- a/dev-util/android-ndk/android-ndk-9d.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-r${PV}"
-
-DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
-HOMEPAGE="http://developer.android.com/sdk/ndk/"
-SRC_URI="x86? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
-	amd64? ( https://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip installsources test"
-
-DEPEND=""
-RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81"
-
-S="${WORKDIR}/${MY_P}"
-
-ANDROID_NDK_DIR="opt/${PN}"
-
-QA_PREBUILT="*"
-PYTHON_UPDATER_IGNORE="1"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir "/${ANDROID_NDK_DIR}"
-	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
-
-	fowners -R root:android "/${ANDROID_NDK_DIR}"
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
-	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
-
-	dodir "/${ANDROID_NDK_DIR}/out"
-	fowners root:android "/${ANDROID_NDK_DIR}/out"
-	fperms 3775 "/${ANDROID_NDK_DIR}/out"
-
-	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
-	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
-
-	for i in toolchains/*/prebuilt/linux-*/bin
-	do
-		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
-	done
-
-	printf '%s' \
-		"PATH=\"${ANDROID_PATH}\"" \
-		$'\n' \
-		> "${T}/80${PN}"  || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
-		> "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-}
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
deleted file mode 100644
index a4cb54d29397..000000000000
--- a/dev-util/android-ndk/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>perfinion@gentoo.org</email>
-		<name>Jason Zaman</name>
-	</maintainer>
-	<use>
-		<flag name="legacy-toolchains">Install legacy toolchains</flag>
-		<flag name="target-32">Support for 32-bit targets</flag>
-		<flag name="target-64">Support for 64-bit targets</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/android-sdk-update-manager-21 b/dev-util/android-sdk-update-manager-21
new file mode 100644
index 000000000000..77def88e7bd4
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r21-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2df98f13c897a3b72ad07d09240257b9
diff --git a/dev-util/android-sdk-update-manager-21.1 b/dev-util/android-sdk-update-manager-21.1
new file mode 100644
index 000000000000..e3d7317c4ce0
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-21.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r21.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=824fc58981d0d1461a4e7299d29488e4
diff --git a/dev-util/android-sdk-update-manager-22 b/dev-util/android-sdk-update-manager-22
new file mode 100644
index 000000000000..ddfee815ef65
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99c20d34c8af0c2282827d68957594d7
diff --git a/dev-util/android-sdk-update-manager-22.0.1 b/dev-util/android-sdk-update-manager-22.0.1
new file mode 100644
index 000000000000..915926ffb300
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99c20d34c8af0c2282827d68957594d7
diff --git a/dev-util/android-sdk-update-manager-22.0.1-r1 b/dev-util/android-sdk-update-manager-22.0.1-r1
new file mode 100644
index 000000000000..a4533ac61c58
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca34cd98f195faeb1b17089b165c948f
diff --git a/dev-util/android-sdk-update-manager-22.0.4 b/dev-util/android-sdk-update-manager-22.0.4
new file mode 100644
index 000000000000..8dd5fdf3897f
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca34cd98f195faeb1b17089b165c948f
diff --git a/dev-util/android-sdk-update-manager-22.0.5 b/dev-util/android-sdk-update-manager-22.0.5
new file mode 100644
index 000000000000..a8736681baa6
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca34cd98f195faeb1b17089b165c948f
diff --git a/dev-util/android-sdk-update-manager-22.0.5-r1 b/dev-util/android-sdk-update-manager-22.0.5-r1
new file mode 100644
index 000000000000..3b442bad29da
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64ed1ca00482c822f01fdc5d64282748
diff --git a/dev-util/android-sdk-update-manager-22.2.1 b/dev-util/android-sdk-update-manager-22.2.1
new file mode 100644
index 000000000000..8ca93c3595a6
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.2.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64ed1ca00482c822f01fdc5d64282748
diff --git a/dev-util/android-sdk-update-manager-22.3 b/dev-util/android-sdk-update-manager-22.3
new file mode 100644
index 000000000000..b7c401d95452
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.3-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8189526f55920102ecb861df2315965d
diff --git a/dev-util/android-sdk-update-manager-22.6 b/dev-util/android-sdk-update-manager-22.6
new file mode 100644
index 000000000000..5d507c743b80
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.6-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8189526f55920102ecb861df2315965d
diff --git a/dev-util/android-sdk-update-manager-22.6.1 b/dev-util/android-sdk-update-manager-22.6.1
new file mode 100644
index 000000000000..9283e0c007cf
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-22.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8189526f55920102ecb861df2315965d
diff --git a/dev-util/android-sdk-update-manager-23 b/dev-util/android-sdk-update-manager-23
new file mode 100644
index 000000000000..c9b9d4f73903
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) sys-libs/zlib[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3c2875e8568e23cb6220af91a76b63fa
diff --git a/dev-util/android-sdk-update-manager-23-r1 b/dev-util/android-sdk-update-manager-23-r1
new file mode 100644
index 000000000000..dad1ef88767a
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-23-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) sys-libs/zlib[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1404a9bdfde2927752d5a0c4195959a7
diff --git a/dev-util/android-sdk-update-manager-24.4.1 b/dev-util/android-sdk-update-manager-24.4.1
new file mode 100644
index 000000000000..0c7700fcb809
--- /dev/null
+++ b/dev-util/android-sdk-update-manager-24.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
+DESCRIPTION=Open Handset Alliance's Android SDK
+EAPI=5
+HOMEPAGE=https://developer.android.com
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] ) sys-libs/zlib[abi_x86_32(-)]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1404a9bdfde2927752d5a0c4195959a7
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
deleted file mode 100644
index c12c8e76761e..000000000000
--- a/dev-util/android-sdk-update-manager/Manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-AUX 80-android.rules 284 BLAKE2B a45cd541f9812a9657312ae7c83ee36f9d6c3c53d2caa036d1649455389bd7244efa277d41c3e6eec4a0b10d9a97d5e81acd0d17aac8df3bfa3ec72bad5e8d87 SHA512 f78834e2b33afa88f59a636f9fb7804d341847568a638a68beba9ca842e78e40a52a9ad8396ae79d105d87e52f585d523e8f0d847fc7708ddc3351c031571f19
-AUX android-sdk-update-manager.desktop 346 BLAKE2B 6ff5cd618d7816ad5719ed864cc91a83042ac320c2aa1965e5ab95e7f7b6f05f56a8f5401a4ffe17fc5798a82ad02f07f87bf4e3409b0d1866b45b230b34cca4 SHA512 9f97d7d3bf0aa76686be3722b3f686c012c4d627d583275eaaaf91d43f1b355a9d4b7f42412435489b758a3161fd9fcf8c36f5d1777662af3fbcd11bdc0d7aca
-DIST android-sdk_r21-linux.tgz 91378351 BLAKE2B ed16738d018c3ff8c51bb833ecd329594379280e55e6558a5f5e5731c4e11f6f562675d8a79a252e318b01d5c20f0d13aa2ff6bcd4160a527d85816abb6d94e7 SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c
-DIST android-sdk_r21.1-linux.tgz 91617112 BLAKE2B 0b566613d0143b0136844a88f3d4f916a79b4e21588d828bc1bbd037f5290c0a6686cae4de1c34adc3b925132627ee7541501019438b659c12ce5158f82f878d SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24
-DIST android-sdk_r22-linux.tgz 99643077 BLAKE2B 58bf529757a4ff0061961be89b080faf8250a0282354bf7742cde395ab2fa91cafd85a36037c02d04fd9bc230437120f4ce91582c9fa2f539a24dd420bf7f025 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d
-DIST android-sdk_r22.0.1-linux.tgz 105617062 BLAKE2B 026158fa5be24756f9da3c4dc1258f990d1b04169f6ff88d78da48ebe34e03639b56e77831000ffd805c9057b4d8b561a15ff2919a13b1ae2f4af2b87bbb493f SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7
-DIST android-sdk_r22.0.4-linux.tgz 105640988 BLAKE2B 30e26a4b23cb44a045353b2878f5c9584dcb783860c42203145471c3c5e384dd979b416661050ec2a294d357f9addc6c8592f3ff8c634cd33bbbf881f15d84d2 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612
-DIST android-sdk_r22.0.5-linux.tgz 105641005 BLAKE2B 938bafd72bb023bf2ae306944035cc77b34dea843e8fa2d22b27b8e76231aa256b0835bcfb83403ba8168f9e78071c5174054eadcfb025f23573bf9c89e863f1 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81
-DIST android-sdk_r22.2.1-linux.tgz 100918342 BLAKE2B ddd1bc701c554af04f0c9de995c5f30531a702e5e18eca709265b96210c99afb23092fc975b47c714d26ceb52e8f407b36993405c635be1f6e720f6df4e473f1 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef
-DIST android-sdk_r22.3-linux.tgz 100968558 BLAKE2B 41f853635fba6973a0e78465553ac455fa9a995421327a31d554b80aef0f80305237c8ee2da2440ad27513b0e9b263ebed293f898bca13fedd6e5511e25d1654 SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3
-DIST android-sdk_r22.6-linux.tgz 100992666 BLAKE2B f3dd0d6ab53f7323dd911af4e4271cd2169627bd3ebf11901e1afea942b3f4af4b29a9192c88d6c71887a79762d34109666c1fb922d96871ac9126c8398d5baf SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322
-DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B b1eb0a3a298bab8f4c4e085831221f795fe0e668ab407d71c2c79778b921d09e57ad393dfe53d34e7d8c49cb05dd655762ca266b82982c898b0eea8f5a0e6035 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca
-DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
-DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
-EBUILD android-sdk-update-manager-21.1.ebuild 2942 BLAKE2B 820b6e694097d46d0e28ab459cbb48afcd7b0d27b6d1e635592c1f052a9e72dc6c1aec925ad978506f33b5256b1cb92c82c3eb9f2a0d5298c732c2921b4857e8 SHA512 89ac1e255b9b100fb54d62b7b92c91a498771abb31e41f4c5db6c9811f84c042bc128791ebbb6ed1438f6e07027faa629ddd8b0f5338e47953643b6bef291904
-EBUILD android-sdk-update-manager-21.ebuild 2957 BLAKE2B 352bab8594bad1837ea79ae669dfc94285f6a6a5136d939421615e067d97390768c6666b6a9ce9d62576cc099d7966cf04be6ebd4a11673c72791b18ee2163ff SHA512 22d1559c207806c8d984298ae280d6e256dccc1ad04675369f68869b878305ec47874ff9de22592a703e90358d8a6c57bf60d34d7ac96b375d316d058f273636
-EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
-EBUILD android-sdk-update-manager-22.0.1.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
-EBUILD android-sdk-update-manager-22.0.4.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
-EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3238 BLAKE2B 074b920536e66c12460be69f4461ae0757019ff60f081c18e6e672de3f013ce2da0fdafd2d999bd2851c2c700e06b1e4a68d0f15b39bb5cee6dc3cd3dfc3533e SHA512 8b9544106151ba64e00971af1d528a66d8c3868741f719caec5f434969a78072fe0fbbd3d6ac16d165ca45fe20de46b84295550af96bebc13c93f3c1618aa201
-EBUILD android-sdk-update-manager-22.0.5.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
-EBUILD android-sdk-update-manager-22.2.1.ebuild 3238 BLAKE2B 074b920536e66c12460be69f4461ae0757019ff60f081c18e6e672de3f013ce2da0fdafd2d999bd2851c2c700e06b1e4a68d0f15b39bb5cee6dc3cd3dfc3533e SHA512 8b9544106151ba64e00971af1d528a66d8c3868741f719caec5f434969a78072fe0fbbd3d6ac16d165ca45fe20de46b84295550af96bebc13c93f3c1618aa201
-EBUILD android-sdk-update-manager-22.3.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
-EBUILD android-sdk-update-manager-22.6.1.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
-EBUILD android-sdk-update-manager-22.6.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
-EBUILD android-sdk-update-manager-22.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
-EBUILD android-sdk-update-manager-23-r1.ebuild 3343 BLAKE2B 841a1f84bcd734bc483c44f2be45fd5329063e2e68e9f9b4d9413309e3926dea1bfef5a4b600292e96f360fa030393caa804ea3fad643cde5ab89bf9a664cfe3 SHA512 efb7660073bc65dd201144abf823c8a53a5afffd59bb1b97d2157a12a4f2e0e5ab60f1d6e109578c06265c8edd07b7940b7cdd623064212843a7196d3bde8391
-EBUILD android-sdk-update-manager-23.ebuild 3337 BLAKE2B 74e0a1c8369337da880f72f875bb0ad57e7966c85c4533630b3edfbfe2213f6838d35693c1db2d13e457900d4d25de5dfe367cf2a4d72388c4dfdcb2dde0bf0a SHA512 4f4d8ba928d5f5bc5ad27fea644a4e4222b1261cf9f4baa4cb771d97ff05a9487c4540e667e65e966a3c41196b61700a7443419e8722a803e370f0ec171f002d
-EBUILD android-sdk-update-manager-24.4.1.ebuild 3343 BLAKE2B 841a1f84bcd734bc483c44f2be45fd5329063e2e68e9f9b4d9413309e3926dea1bfef5a4b600292e96f360fa030393caa804ea3fad643cde5ab89bf9a664cfe3 SHA512 efb7660073bc65dd201144abf823c8a53a5afffd59bb1b97d2157a12a4f2e0e5ab60f1d6e109578c06265c8edd07b7940b7cdd623064212843a7196d3bde8391
-MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
deleted file mode 100644
index 7403186e3daf..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
deleted file mode 100644
index 6a654da49cba..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND="
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
deleted file mode 100644
index f812d83f4ede..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
deleted file mode 100644
index 602463fce91e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
deleted file mode 100644
index f812d83f4ede..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
deleted file mode 100644
index 173fd895298f..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
deleted file mode 100644
index f812d83f4ede..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
deleted file mode 100644
index 173fd895298f..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
deleted file mode 100644
index 56e4c80f1379..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
deleted file mode 100644
index 56e4c80f1379..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
deleted file mode 100644
index 56e4c80f1379..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
deleted file mode 100644
index 602463fce91e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
deleted file mode 100644
index 5178faa3931e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
deleted file mode 100644
index 20463eb949fa..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
deleted file mode 100644
index 5178faa3931e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare(){
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/files/80-android.rules b/dev-util/android-sdk-update-manager/files/80-android.rules
deleted file mode 100644
index e6eda7c938a0..000000000000
--- a/dev-util/android-sdk-update-manager/files/80-android.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="android"
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
deleted file mode 100644
index 83f1d25990ca..000000000000
--- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Android SDK update-manager
-Type=Application
-Comment=Manage/update Android SDK (tools).
-Terminal=false
-Exec=/opt/android-sdk-update-manager/tools/android
-Icon=/opt/android-sdk-update-manager/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
-Categories=Development;
-GenericName=Android SDK update-manager
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
deleted file mode 100644
index e97c89c421c2..000000000000
--- a/dev-util/android-sdk-update-manager/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>rich0@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/android-studio-3.1.2.0.173.4720617 b/dev-util/android-studio-3.1.2.0.173.4720617
new file mode 100644
index 000000000000..33f36d4f29c6
--- /dev/null
+++ b/dev-util/android-studio-3.1.2.0.173.4720617
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.1.2.0/android-studio-ide-173.4720617-linux.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3bc4804f233bbf58205ad8f6eb9f76b8
diff --git a/dev-util/android-studio-3.1.3.0.173.4819257 b/dev-util/android-studio-3.1.3.0.173.4819257
new file mode 100644
index 000000000000..02df28486fa6
--- /dev/null
+++ b/dev-util/android-studio-3.1.3.0.173.4819257
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.1.3.0/android-studio-ide-173.4819257-linux.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed15285059d46a5914357520ce9af871
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
deleted file mode 100644
index f67e08029d5c..000000000000
--- a/dev-util/android-studio/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
-DIST android-studio-ide-173.4819257-linux.zip 894877040 BLAKE2B 159d57c0c0d6d6958d1a08e7ff4ff0314c0cb2b15c5126dd3d357e1dc696d32dfee78ae6b2d35a628cbf000bc014d61c20ad48acce12c10356b0db8183c27318 SHA512 c399897bc85ce1399ac8ce1df4749d7f1bff4501cb90b13efbd61a56173ab1f6f9b0c7c1f852dceb7a76bc631d83ca4efab9b39c4d3c76e3b4454f4803611251
-EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
-EBUILD android-studio-3.1.3.0.173.4819257.ebuild 2946 BLAKE2B 8c832ef656ab9e82c5e48613724674fb48086b04faa1a856b1f1b8874ae775a874c74ebf695a9b27298cb4f6a1e60c354940be8ed57f85f037ce8d161175c331 SHA512 419443ce002b2bb60105681a5fb622265eb47e19dc6e9a9cf23488eaa33350abe95aee15707c5c989f938ae94d7b785fca32963f28b624ec21392f374970c65a
-MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
deleted file mode 100644
index cc5bd95dc8b5..000000000000
--- a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
-
-if [[ $(get_version_component_count) -eq 6 ]]; then
-	STUDIO_V=$(get_version_component_range 1-4)
-	BUILD_V=$(get_version_component_range 5-6)
-else
-	STUDIO_V=$(get_version_component_range 1-3)
-	BUILD_V=$(get_version_component_range 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/zip
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	eapply_user
-	# This is really a bundled jdk not a jre
-	rm -R "${S}/jre" || die "Could not remove bundled jdk"
-
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	# Replaced bundled jre with system vm/jdk
-	# This is really a bundled jdk not a jre
-	doins -r *
-
-	rm -rf "${D}${dir}/jre" || die
-	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
-
-	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
-	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild
deleted file mode 100644
index 1ac8561ea03c..000000000000
--- a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 eapi7-ver
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	eapply_user
-	# This is really a bundled jdk not a jre
-	rm -R "${S}/jre" || die "Could not remove bundled jdk"
-
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	# Replaced bundled jre with system vm/jdk
-	# This is really a bundled jdk not a jre
-	doins -r *
-
-	rm -rf "${D}${dir}/jre" || die
-
-	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
-	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
deleted file mode 100644
index 35dce41ecd40..000000000000
--- a/dev-util/android-studio/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>perfinion@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/android-tools-5.1.1_p13 b/dev-util/android-tools-5.1.1_p13
new file mode 100644
index 000000000000..9b176caa3c14
--- /dev/null
+++ b/dev-util/android-tools-5.1.1_p13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre
+DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
+EAPI=5
+HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
+IUSE=libressl
+KEYWORDS=amd64 x86 ~arm-linux ~x86-linux
+LICENSE=Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre
+SLOT=0
+SRC_URI=https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.tar.gz -> android-tools-5.1.1_r13-arch.tar.gz https://github.com/android/platform_system_core/archive/android-5.1.1_r13.tar.gz -> android-tools-5.1.1_r13-core.tar.gz mirror://gentoo/android-tools-5.1.1_r13-extras.tar.gz mirror://gentoo/android-tools-5.1.1_r13-libselinux.tar.gz mirror://gentoo/android-tools-5.1.1_r13-f2fs-tools.tar.gz
+_eclasses_=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_=21fae743da9a7c60d584909733e290bb
diff --git a/dev-util/android-tools-6.0.1_p79 b/dev-util/android-tools-6.0.1_p79
new file mode 100644
index 000000000000..a57da10a11f6
--- /dev/null
+++ b/dev-util/android-tools-6.0.1_p79
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre virtual/rubygems
+DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
+EAPI=6
+HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
+IUSE=libressl
+KEYWORDS=amd64 x86 ~arm-linux ~x86-linux
+LICENSE=Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre
+SLOT=0
+SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> android-tools-6.0.1_r79-arch.tar.gz https://github.com/android/platform_system_core/archive/android-6.0.1_r79.tar.gz -> android-tools-6.0.1_r79-core.tar.gz mirror://gentoo/android-tools-6.0.1_r79-extras.tar.gz mirror://gentoo/android-tools-6.0.1_r79-libselinux.tar.gz mirror://gentoo/android-tools-6.0.1_r79-f2fs-tools.tar.gz
+_eclasses_=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_=95c1d667326557854417bcbfea156fe0
diff --git a/dev-util/android-tools-8.1.0_p1 b/dev-util/android-tools-8.1.0_p1
new file mode 100644
index 000000000000..7fae8642809f
--- /dev/null
+++ b/dev-util/android-tools-8.1.0_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= dev-lang/go dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
+EAPI=6
+HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
+IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86 ~arm-linux ~x86-linux
+LICENSE=Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= python? ( 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(-)] )
+SLOT=0
+SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> android-tools-8.1.0_r1-arch.tar.gz https://github.com/android/platform_system_core/archive/android-8.1.0_r1.tar.gz -> android-tools-8.1.0_r1-core.tar.gz https://github.com/google/boringssl/archive/14308731e5446a73ac2258688a9688b524483cb6.tar.gz -> boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz mirror://gentoo/android-tools-8.1.0_r1-extras.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-extras.tar.xz mirror://gentoo/android-tools-8.1.0_r1-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-selinux.tar.xz mirror://gentoo/android-tools-8.1.0_r1-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-f2fs-tools.tar.xz mirror://gentoo/android-tools-8.1.0_r1.ninja.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1.ninja.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=424f5e5dba00f1aa97ab9404a9cd56f5
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
deleted file mode 100644
index b341ba014ca2..000000000000
--- a/dev-util/android-tools/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-AUX android-tools-8.1.0_p1-build.patch 545 BLAKE2B 27b2adf298df89972eac73349118378c5210e9a1d4177292eff44a587627a9f16c8ad0eaca075b4f924e4e7733f73afc954ee10eeed3d465262102bbd012f313 SHA512 67d4f7a772ae48d23f253a385575203ff50d2559ba784832b177bbd9adbda614a7f868a3362e564af98ca840297213446a0c808b380e0ff7cce4cca78437f623
-AUX make-tarballs.sh 3176 BLAKE2B 7438c5dc63c355f1789309b5e825373396788808223f64718da227066a3b870fdb0fdcc827d0dbefd56d8d72fa6740a8b8c64e75b58dcda1a79eddebb064f001 SHA512 aebcc6e6c336932b4c9770ff21bb2ee3beff6947a04e88904b6ac1d1475c0c1e0eb5ccd774d9cc07aef6a9f849bd8dcf5b344012cec9c9b595d1aff916fc30c3
-DIST android-tools-5.1.1_r13-arch.tar.gz 4078 BLAKE2B 718f94b0854189533f11545a8962c2cc85bc01797057a77525babd7f5e01c76f12764cab0da30cf8abe364c0ec757193cc8c49bef3278925076efd3633fc5fcf SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3
-DIST android-tools-5.1.1_r13-core.tar.gz 1210720 BLAKE2B 0ec56b07c206ab122d1286dfa55424c3ffa4382cbe3f55f6ca351ca9e4555537e9404a5ee239adb90667d91c9212de85c8c264662489b69d3b7846c4b4bcd80d SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15
-DIST android-tools-5.1.1_r13-extras.tar.gz 282690 BLAKE2B b0be4168ca4cdf6c7ed359f01104b2b20cf36678153bae00ffb8cdc9d79e0518f850d9f1ad3eb3a2f998418a6fcd1c54cf4199a2ae37c696e5f657bbed8c778c SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83
-DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 BLAKE2B 658bae1a0d713887522eba2264971ae1f68093d9f3cf8ac1c2de96600219fc9f3624595de273ca3af76a69edf3a36b8136d9bb6b75a147beb2fc804864fd7b82 SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656
-DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 BLAKE2B 50136b205fd6a6b055f82b16fe4e234bf060d40400e62e2a53c9943f67181d35564b000ec27fa060c2e01f7e4dea441079c5b06d1b5de21a9bcd15e8fa271a9b SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f
-DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
-DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
-DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
-DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
-DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
-EBUILD android-tools-5.1.1_p13.ebuild 2088 BLAKE2B 5cb17a2be1150d399d12624525cdf1aabdc3ee4f775194c3c8a4aa1554e09fb8f3d3ceaa91469cd9fd576b292c69eb1b224c5980051d56b619fbd28daf99a955 SHA512 a557d31b6488a3a96164339f9e2508cfd71c6f749e5b3f7829b79bcba85ef75985e1865a9ce528556ef0976ebc1e2f52ae8c1368bc6f75bf78c7e70649327dcc
-EBUILD android-tools-6.0.1_p79.ebuild 2831 BLAKE2B 751d21e94536b18ba028038e264515b4e6c9ea89d94ea5a1350cfabb8f693380cd2940eac9f0acea3bca8d5d071c8621e9bd31308ce385055b47a674b4d767bc SHA512 034baa131865bfbcc2bd8d8eb894ecd62b2ee5535b29c2541e151705dca29a1e457bbbfbb5590faa927d3007e0358a79c496a985fb815baa46ca17cb55c4eb8e
-EBUILD android-tools-8.1.0_p1.ebuild 3980 BLAKE2B 74f5792d1fb1ea62086a0b3257a232c98afcf0ec6d17ad795c01d85edaf5a9fba478884b78c81b1a82a2ed01e23fa2e29db2801e30665b3ad63ae0573aa80555 SHA512 2fc66d84f177b009bf97889dc452d709fa59ceddc539204532d45b9365153428a184f18b3980982e1fde80e10d07fa652ecf764398bcddbb2e6f9f9b678fef3d
-MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
deleted file mode 100644
index 7900622e6ed8..000000000000
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils toolchain-funcs
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# For stable digests, git tarballs generated by android.googlesource.com
-# are fetched from mirror://gentoo/.
-SRC_URI="https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.tar.gz -> ${MY_P}-arch.tar.gz
-https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-mirror://gentoo/${MY_P}-extras.tar.gz
-mirror://gentoo/${MY_P}-libselinux.tar.gz
-mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	local dir filename
-	for filename in ${A}; do
-		if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
-			dir=${BASH_REMATCH[1]}
-			mkdir -p "${dir}" || die
-			pushd "${dir}" >/dev/null
-			unpack "${filename}"
-			popd > /dev/null
-		else
-			die "unrecognized file in \${A}: ${filename}"
-		fi
-	done
-}
-
-src_prepare() {
-	mv core/*/* core/ || die
-	sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \
-		-i extras/f2fs_utils/f2fs_utils.c  || die
-	mv arch/*/trunk/Makefile ./ || die
-	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i extras/ext4_utils/sha1.{c,h} || die #580686
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	newbashcomp arch/*/trunk/bash_completion fastboot
-}
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
deleted file mode 100644
index 3da6d296e886..000000000000
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 eutils toolchain-funcs
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# Downloading git tarballs generated by android.googlesource.com
-# Archlinux package contains patches and build script generation mechanism.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> ${MY_P}-arch.tar.gz
-https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-mirror://gentoo/${MY_P}-extras.tar.gz
-mirror://gentoo/${MY_P}-libselinux.tar.gz
-mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/libpcre"
-# dev-lang/ruby is necessary for build script generation.
-DEPEND="${RDEPEND}
-	virtual/rubygems"
-
-S=${WORKDIR}
-
-src_unpack() {
-	local dir filename
-	for filename in ${A}; do
-		if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
-			dir=${BASH_REMATCH[1]}
-			mkdir -p "${dir}" || die
-			pushd "${dir}" >/dev/null
-			unpack "${filename}"
-			popd > /dev/null
-		else
-			die "unrecognized file in \${A}: ${filename}"
-		fi
-	done
-}
-
-src_prepare() {
-	mv core/*/* core/ || die
-	epatch arch/*/trunk/fix_build.patch
-	cp arch/*/trunk/generate_build.rb ./ || die
-	sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i extras/ext4_utils/sha1.{c,h} || die #580686
-	default
-}
-
-src_compile() {
-	# Dynamically detect rubygems interpreter (bug 631398).
-	local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success=
-	for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
-		"${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \
-			{ success=1; break; }
-	done
-	if [[ -z ${success} ]]; then
-		cat "${ruby_error_log}" >&2
-		die "${ruby_bin} ./generate_build.rb failed"
-	fi
-	sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
-	chmod +x build.sh || die
-	tc-export CC CXX
-	bash -e ./build.sh || die
-}
-
-src_install() {
-	dobin adb
-	dobin fastboot
-	dobin mkbootimg
-	# Omitting, app-shells/bash-completion contains completion for adb
-	#newbashcomp arch/*/trunk/bash_completion.adb adb
-	newbashcomp arch/*/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
deleted file mode 100644
index a1e81887fcd1..000000000000
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ /dev/null
@@ -1,124 +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} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
-	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
-IUSE="python"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.gz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	cd "${S}"/core
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/${P}-build.patch
-	sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
-
-	cd "${S}"/selinux
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/extras
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i ext4_utils/sha1.{c,h} || die #580686
-
-	cd "${S}"
-	default
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-
-	sed -i \
-		-e "s:@CC@:$(tc-getCC):g" \
-		-e "s:@CXX@:$(tc-getCXX):g" \
-		-e "s:@CFLAGS@:${CFLAGS}:g" \
-		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-		-e "s:@PV@:${PV}:g" \
-		build.ninja || die
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb fastboot
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
deleted file mode 100644
index f3d664ef70a3..000000000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
- 
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
- 
- // Clang-only nullability specifiers
---- a/libcutils/include/cutils/trace.h
-+++ b/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
- 
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh
deleted file mode 100755
index 5a0a775c1290..000000000000
--- a/dev-util/android-tools/files/make-tarballs.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Create the various tarballs we need.  GoB does not provide stable archives (unlike github),
-# and some repos are uselessly fat, so we have to create things by hand.  Fun times.
-
-set -e
-
-die() {
-	echo "error: $*" >&2
-	exit 1
-}
-
-fetch_boringssl() {
-	local ver=$1 tag=$2
-	local content hash
-
-	echo "checking boringssl in ${tag}"
-	content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -)
-	hash=$(echo "${content}" | base64 -d)
-	echo "using boringssl ${hash}"
-
-	local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
-	if [[ ! -e ${tar} ]] ; then
-		# We use github as it provides stable tarballs.  GoB does not (includes timestamps).
-		# https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
-		wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# The extras repo has ballooned to ~200MB, so we have to strip the large useless
-# files and random binaries.
-fetch_extras() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		local prune=(
-			ioshark
-			memory_replay
-			perfprofd
-			simpleperf
-		)
-		local dir="${tag}-extras"
-		rm -rf "${dir}"
-		mkdir "${dir}"
-		cd "${dir}"
-
-		wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz
-		tar xf extras.tar.gz
-		rm -rf "${prune[@]}" extras.tar.gz
-
-		cd ..
-		tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
-		rm -rf "${dir}"
-
-		mv "${dir}.tar.xz" "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_selinux() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_f2fs() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-usage() {
-	local status=$1
-
-	[[ ${status} -eq 1 ]] && exec 1>&2
-
-	cat <<-EOF
-	Usage: $0 <android version>
-
-	To find the next available version, consult:
-	https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
-
-	They have some helper scripts for building the files directly.
-
-	Example:
-	$0 android-8.1.0_r1
-	EOF
-
-	exit ${status}
-}
-
-main() {
-	[[ $# -ne 1 ]] && usage 1
-	[[ $1 == "-h" || $1 == "--help" ]] && usage 0
-
-	if [[ -z ${DISTDIR} ]] ; then
-		eval $(portageq -v envvar DISTDIR)
-	fi
-	if [[ -z ${DISTDIR} ]] ; then
-		die "Please set \$DISTDIR first"
-	fi
-
-	local ver="${1#android-}"
-	local tag="android-${ver}"
-	fetch_boringssl "${ver}" "${tag}"
-	fetch_extras "${ver}" "${tag}"
-	fetch_selinux "${ver}" "${tag}"
-	fetch_f2fs "${ver}" "${tag}"
-}
-main "$@"
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
deleted file mode 100644
index 27a6743c2701..000000000000
--- a/dev-util/android-tools/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>
-	<upstream>
-		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
-		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
-		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
-		<remote-id type="github">android/platform_system_core</remote-id>
-		<remote-id type="launchpad">ubuntu</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/anjuta-3.22.0 b/dev-util/anjuta-3.22.0
new file mode 100644
index 000000000000..e4cd4497cb47
--- /dev/null
+++ b/dev-util/anjuta-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.32 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A versatile IDE for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
+IUSE=debug devhelp glade +introspection packagekit subversion terminal test vala python_targets_python2_7
+KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.32 ) ) gnome-base/gsettings-desktop-schemas packagekit? ( app-admin/packagekit-base )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=600a810138a3227cc0a8f4aaeaf4cc32
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
deleted file mode 100644
index f2f64bd9ab8a..000000000000
--- a/dev-util/anjuta/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST anjuta-3.22.0.tar.xz 6363016 BLAKE2B 8b02f3dc0f97d0e195039cfd462bb6db64199c92d689fbf751e8a88141f65a4dc604bbf848342d73e398ba755e89b3d934df375aad50c9cee12c38df8a8c2d9e SHA512 64689392bfe6102698ef8a1ce62aac37bffd793b917ef6ffc53cb5b8aa9eb5b8961a999c32db559e9e348bcf46a7ec0ca9448100910b52885ddff898a62f3295
-EBUILD anjuta-3.22.0.ebuild 3520 BLAKE2B a537f055c2f8fc5f5411512ad248abcc3f5af309617d09f3d0191481ddea3802a60ab27b06a3e2ff1c6e93879692d3ea2f43ffcfe132d6b2d1cc1dd3f4fbc1ba SHA512 5e19000cbe233a2688ebc24afd74f761b6395576b5ed3bf83f3870cfa7a855d10650e447853250a93ee2c9c1b366291a1240998401b7c7f613ab5816befa7530
-MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.22.0.ebuild b/dev-util/anjuta/anjuta-3.22.0.ebuild
deleted file mode 100644
index d68d2eee168f..000000000000
--- a/dev-util/anjuta/anjuta-3.22.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.32"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-
-IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	subversion? (
-		>=dev-vcs/subversion-1.8:=
-		>=net-libs/serf-1.2:1=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!dev-libs/gnome-build
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# Do not build benchmarks, they are not installed and for dev purpose only
-	sed -e '/SUBDIRS =/ s/benchmark//' \
-		-i plugins/symbol-db/Makefile.{am,in} || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-neon \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable subversion serf) \
-		$(use_enable terminal plugin-terminal) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
deleted file mode 100644
index 0073ebca1b62..000000000000
--- a/dev-util/anjuta/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>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-    <flag name="devhelp">Enable devhelp integration</flag>
-    <flag name="glade">Build glade plugin for anjuta</flag>
-    <flag name="packagekit">Use packagekit to search for missing tools</flag>
-    <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-util/antlrworks-1.2.3 b/dev-util/antlrworks-1.2.3
new file mode 100644
index 000000000000..dd9ae5de12e1
--- /dev/null
+++ b/dev-util/antlrworks-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/stringtemplate:0 dev-java/antlr:0 >=dev-java/antlr-3.1.3:3 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A novel grammar development environment for ANTLR v3 grammars
+EAPI=2
+HOMEPAGE=http://www.antlr.org/works/index.html
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.5 dev-java/stringtemplate:0 dev-java/antlr:0 >=dev-java/antlr-3.1.3:3 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=http://www.antlr.org/download/antlrworks-1.2.3-src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=20c178c5e77f44a61a6321ca1de3dedc
diff --git a/dev-util/antlrworks/Manifest b/dev-util/antlrworks/Manifest
deleted file mode 100644
index 73bd2e2ec102..000000000000
--- a/dev-util/antlrworks/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX antlr-3.1.3.patch 1585 BLAKE2B 4d5f50e9f8620023cf13449210ae3b7c21eb87c24da2a84b592c0b25cd9f9aae0c68245bfc00c1bfda712a15e6c972018082def72c4b9efc762ef37cb5cf4504 SHA512 3224c968f87560f046dd34b063ce198795157a97a3070526a69c638ba0c3b215c1a6e9f5155e9ba8949a9e0c43410b09f394eca9c83e796031018dd654454970
-DIST antlrworks-1.2.3-src.zip 2993008 BLAKE2B 27092d499a51e3dcdd22860ba5027a384e29573a893386dda196cb77c6cd39716212c0d84de4a6a58378be18a5132ce9ed587d473dd9860219d8dac8cae6c753 SHA512 7ec39d30b3f22fd8f07d031841e2a71729c8080a8976c6f23fb217881b625cca349d4fa5f69d799abe81fc9a88b2b10156b54a33496197bc301f28fb58005806
-EBUILD antlrworks-1.2.3.ebuild 1222 BLAKE2B 114076e8019106393ea3a03a6f434f34afa914db7a6b1b15889f9e7108cff797d489c72e34ac70baf8549aa2359100df620dacda545a8efe54e10e6d442685ec SHA512 fdfbe603178efae55a05444cdc78a0e5c5015e5e9c4ff52ee3642863c2885c77dc3e9291823af4a5bf7c07ada6db085e42a211d208abd708bfa4ffdfc865905b
-MISC metadata.xml 1095 BLAKE2B 39e0dd85c048e9e3c4485907e0020d48a30821adef6a4d405748dbce80fddd0569b3708f3a87533b86e8ba9b2a83ad91113b9461a3f3fcf7267b2e92e40b0f4e SHA512 50b89e09c5ab4564c8356fb6d7a0a811ffcdd294fa23cd59e9ca1b124a4266bfc1725fed56cdaec5b3ee62e4b232ece52a1d90a9ce483ff274e5a81fe89cd186
diff --git a/dev-util/antlrworks/antlrworks-1.2.3.ebuild b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
deleted file mode 100644
index e14282c5f00c..000000000000
--- a/dev-util/antlrworks/antlrworks-1.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit java-pkg-2
-
-DESCRIPTION="A novel grammar development environment for ANTLR v3 grammars"
-HOMEPAGE="http://www.antlr.org/works/index.html"
-SRC_URI="http://www.antlr.org/download/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP="
-	dev-java/stringtemplate:0
-	dev-java/antlr:0
-	>=dev-java/antlr-3.1.3:3
-	dev-java/jgoodies-forms:0
-"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	epatch "${FILESDIR}/antlr-3.1.3.patch"
-	rm -vr src/aw/org/antlr/xjlib/appkit/app/MacOS/ || die
-	rm -v lib/*.jar || die
-	mkdir build
-}
-
-src_compile() {
-	find src/aw -name "*.java" > "${T}/source.list"
-	ejavac -d build -classpath \
-		$(java-pkg_getjars antlr,antlr-3,jgoodies-forms,stringtemplate) \
-		"@${T}/source.list"
-
-	local dest="${S}/${PN}.jar"
-
-	cd src/aw || die
-	jar cf "${dest}" $(find -type f -and -not -name "*.java" ) || die
-
-	cd "${S}/build" || die
-	jar uf "${dest}" org || die
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-	java-pkg_dolauncher ${PN} --main "org.antlr.works.IDE"
-}
diff --git a/dev-util/antlrworks/files/antlr-3.1.3.patch b/dev-util/antlrworks/files/antlr-3.1.3.patch
deleted file mode 100644
index 3ab2d49c9f48..000000000000
--- a/dev-util/antlrworks/files/antlr-3.1.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur work.old/src/aw/org/antlr/works/dialog/DialogAbout.java work/src/aw/org/antlr/works/dialog/DialogAbout.java
---- work.old/src/aw/org/antlr/works/dialog/DialogAbout.java	2009-03-30 11:56:30.000000000 +0300
-+++ work/src/aw/org/antlr/works/dialog/DialogAbout.java	2009-03-30 11:57:34.000000000 +0300
-@@ -65,7 +65,7 @@
-         if(IDE.isPlugin()) {
-             tableModel.addInfo("ANTLRWorks Plugin", IDE.getPluginVersionShort());
-         }
--        tableModel.addInfo("ANTLR", Tool.VERSION);
-+        tableModel.addInfo("ANTLR", new Tool().VERSION);
-         tableModel.addInfo("StringTemplate", StringTemplate.VERSION);
-         tableModel.addInfo("Java", System.getProperty("java.version")+" ("+System.getProperty("java.vendor")+")");
-         tableModel.fireTableDataChanged();
-diff -ur work.old/src/aw/org/antlr/works/utils/HelpManager.java work/src/aw/org/antlr/works/utils/HelpManager.java
---- work.old/src/aw/org/antlr/works/utils/HelpManager.java	2009-03-30 11:56:30.000000000 +0300
-+++ work/src/aw/org/antlr/works/utils/HelpManager.java	2009-03-30 11:57:21.000000000 +0300
-@@ -60,7 +60,7 @@
-     public static void sendFeedback(Container parent) {
-         StringBuilder url = new StringBuilder(Localizable.getLocalizedString(Localizable.FEEDBACK_URL));
-         url.append("?ANTLRVersion=");
--        url.append(XJUtils.encodeToURL(Tool.VERSION));
-+        url.append(XJUtils.encodeToURL(new Tool().VERSION));
-         url.append("&StringTemplateVersion=");
-         url.append(XJUtils.encodeToURL(StringTemplate.VERSION));
-         url.append("&ANTLRWorksVersion=");
diff --git a/dev-util/antlrworks/metadata.xml b/dev-util/antlrworks/metadata.xml
deleted file mode 100644
index 00d9f93e90c7..000000000000
--- a/dev-util/antlrworks/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="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		ANTLRWorks is a novel grammar development environment for ANTLR v3
-		grammars written by Jean Bovet (with suggested use cases from
-		Terence Parr). It combines an excellent grammar-aware editor with an
-		interpreter for rapid prototyping and a language-agnostic debugger
-		for isolating grammar errors. ANTLRWorks helps eliminate grammar
-		nondeterminisms, one of the most difficult problems for beginners
-		and experts alike, by highlighting nondeterministic paths in the
-		syntax diagram associated with a grammar. ANTLRWorks' goal is to make
-		grammars more accessible to the average programmer, improve
-		maintainability and readability of grammars by providing excellent
-		grammar navigation and refactoring tools, and address the most common
-		questions and problems encountered by grammar developers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/apitrace-7.1 b/dev-util/apitrace-7.1
new file mode 100644
index 000000000000..a7e3c01eaf41
--- /dev/null
+++ b/dev-util/apitrace-7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= sys-process/procps x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] media-libs/waffle[egl] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
+EAPI=5
+HOMEPAGE=https://github.com/apitrace/apitrace
+IUSE=+cli egl qt5 system-snappy abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT BSD CC-BY-3.0 CC-BY-4.0 public-domain
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= sys-process/procps x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] media-libs/waffle[egl] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/apitrace/apitrace/archive/7.1.tar.gz -> apitrace-7.1.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19438b6c962b9a7eaee7b5d2bfa3bc20
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
deleted file mode 100644
index 84809624988e..000000000000
--- a/dev-util/apitrace/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX apitrace-7.1-disable-multiarch.patch 1250 BLAKE2B eaa7b29dc07abd6a86962ed8986772db070c0f3f01882a227193d853b3d296a9973b7ab3b04a77bae10b58c3bc3570a7db963aa80fdfcfe8a528a6bae91d84b2 SHA512 f9ec915c3221697ae81f9d49fcd56d846a5cc8d2f5e44d3da5df0ee3674c790370dbb4d58350d631d735f725a63fc323b1386f5399b89ae311ec783e29b0d396
-AUX apitrace-7.1-docs-install.patch 526 BLAKE2B 0b0412e17de8e5ad10fbca93afcb94031b87261ad1616d1a5a5f6c32ec1cc693887351e00a864358a9c38c42d8e202ca5eb5b9180aec6cdc0b87edda342b6b19 SHA512 530d232c41a447ce0e95f5b9d25bd0f48cfcad2867c7efd69e69b7179d85fd35d60a27adce1295e9499a6449f968ef3989c9e5f874224fb11086b92a714e5831
-AUX apitrace-7.1-glxtrace-only.patch 1022 BLAKE2B 1265fd4dc70702f6cba1d50437a55177ca19867e1a1c0b9ee0ab1f52b85864aa3a109fc7852aa60225de328cb67c6b987af37bf797aa03eac61b5b81af6980d2 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1
-AUX apitrace-7.1-snappy-license.patch 240 BLAKE2B ef144dba8882466d0fce8da74ffaa008840ca1d9fc411f37e56ec7bfa3ab1637c001b87fb80186b1844abe7694419719a0c1ad011bba5002752d4c1fcc448e96 SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c
-DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
-EBUILD apitrace-7.1.ebuild 2514 BLAKE2B e715ce5917aff9a84e2a26b38176e53d16fe8c6e11f5d1347b6a216ec95f90cf04064cb14a09e7adc763f56c04125c384802972faf0db69e53d6ad419a40c3dd SHA512 c65aeb52b0ec152d4413d569172b2235434bdf2b17326e84cd85205880b028f0f390f2262a7a2d4aa1ca11dad48f208ab16daf0d0511a856eefd5fb583492595
-MISC metadata.xml 721 BLAKE2B ac714ac582205e96e3728c64d84f9d69b11625bd29cbea77a00009ff92634eb61caa809c0926e00f75f7bd07a6559738c6d0bac7c23cfe7495f9bde95502d8d7 SHA512 961e99dd94af7d8fefdecdd4ea91fed6ff934ca0c047721a079f43aa8e3b566523fe57a136063155dda0cc3f058133e14fe58401a5a39c35ab8149a7259b76a1
diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1.ebuild
deleted file mode 100644
index 7eeab3135213..000000000000
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ /dev/null
@@ -1,97 +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 cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-LICENSE+=" BSD CC-BY-3.0 CC-BY-4.0 public-domain" #bundled snappy
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-devel/gcc-4.7:*
-	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	egl? (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		media-libs/waffle[egl]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.1-glxtrace-only.patch
-	"${FILESDIR}"/${PN}-7.1-disable-multiarch.patch
-	"${FILESDIR}"/${PN}-7.1-docs-install.patch
-	"${FILESDIR}"/${PN}-7.1-snappy-license.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
-	if use system-snappy ; then
-		rm -rf "${S}"/thirdparty/snappy || die
-	fi
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-			$(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt5 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	rm docs/INSTALL.markdown
-	dodoc docs/* README.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch
deleted file mode 100644
index 53d470d8705d..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
-
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -359,15 +359,6 @@
- ##############################################################################
- # Installation directories
- 
--if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--endif()
--
- if (WIN32 OR APPLE)
-     # On Windows/MacOSX, applications are usually installed on a directory of
-     # their own
-@@ -376,12 +367,8 @@
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
--    else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    endif ()
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- 
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
diff --git a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch b/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
deleted file mode 100644
index 9fdc04ffe996..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -553,20 +553,6 @@
- ##############################################################################
- # Packaging
- 
--install (
--    FILES
--        README.markdown
--        docs/BUGS.markdown
--        docs/NEWS.markdown
--        docs/USAGE.markdown
--    DESTINATION ${DOC_INSTALL_DIR}
--)
--install (
--    FILES LICENSE
--    DESTINATION ${DOC_INSTALL_DIR}
--    RENAME LICENSE.txt
--)
--
- set (CPACK_PACKAGE_VERSION_MAJOR "7")
- set (CPACK_PACKAGE_VERSION_MINOR "0")
- 
diff --git a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
deleted file mode 100644
index 91867affca26..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 5.0 version of patch to apply against 7.1.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,6 +44,8 @@
- 
- option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON)
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
- # etc.) in order to ship a single set of binaries across multiple
- # distributions.  Given that apitrace wrapper modules will be loaded into those
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -12,6 +12,8 @@
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -368,3 +370,5 @@
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
-     install_pdb (d3dretrace DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch b/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
deleted file mode 100644
index 2b211dc5ddb7..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-+++ apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-@@ -16,8 +16,3 @@
-     snappy-c.cc
- )
- 
--install (
--    FILES COPYING
--    DESTINATION ${DOC_INSTALL_DIR}
--    RENAME LICENSE-snappy.txt
--)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
deleted file mode 100644
index 6dbcc5997c0a..000000000000
--- a/dev-util/apitrace/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="person">
-		<email>EoD@xmw.de</email>
-		<name>EoD</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="cli">Enable command line interface</flag>
-		<flag name="egl">Enable EGL support</flag>
-		<flag name="system-snappy">Link dynamic against app-arch/snappy</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">apitrace/apitrace</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/appdata-tools-0.1.7 b/dev-util/appdata-tools-0.1.7
new file mode 100644
index 000000000000..86a7fe29b1b3
--- /dev/null
+++ b/dev-util/appdata-tools-0.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/glib-2.14 >=net-libs/libsoup-2.4 >=x11-libs/gdk-pixbuf-2.0 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt nls? ( >=dev-util/intltool-0.35.0 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=CLI designed to validate AppData descriptions for standards and style compliance
+EAPI=5
+HOMEPAGE=https://github.com/hughsie/appdata-tools/
+IUSE=nls
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.14 >=net-libs/libsoup-2.4 >=x11-libs/gdk-pixbuf-2.0
+SLOT=0
+SRC_URI=https://github.com/hughsie/appdata-tools/archive/appdata_tools_0_1_7.tar.gz -> appdata-tools-0.1.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=61dfaf0963b9006b1116c2dcbb0b0cc4
diff --git a/dev-util/appdata-tools-0.1.8-r1 b/dev-util/appdata-tools-0.1.8-r1
new file mode 100644
index 000000000000..b58142247d26
--- /dev/null
+++ b/dev-util/appdata-tools-0.1.8-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=CLI designed to validate AppData descriptions for standards and style compliance
+EAPI=5
+HOMEPAGE=https://github.com/hughsie/appdata-tools/
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=metapackage
+RDEPEND=>=dev-libs/appstream-glib-0.3.2
+SLOT=0
+_md5_=1f3bc8ab7a1f4d2bd7f6d0e3100b0c2f
diff --git a/dev-util/appdata-tools/Manifest b/dev-util/appdata-tools/Manifest
deleted file mode 100644
index 1d999381ff56..000000000000
--- a/dev-util/appdata-tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST appdata-tools-0.1.7.tar.gz 124580 BLAKE2B 1e57c06f79108f7e1f5eed9543fd5412393e498d8cde36d0a1a35fee5d2788f1164e2f6e1e70db20dcaea002bcf2476f7c2bfe1c56b534d203bfa8396459d5da SHA512 d0e32a2028f54482bd9715627bbc2050cfecfaea4be37fc3eeef273cdf989aa270a55112cbc81406dadedea87ae3521d26acf0011834d0055a473083147dcdc7
-EBUILD appdata-tools-0.1.7.ebuild 854 BLAKE2B 34c1125fde353afaff4df871166b01c3eda3969839feb73cd2bb0804e399d9443b328995b2f8e415bc86904a39a6a2f1bea49cafc1504d55a97a6b6d6c41204c SHA512 254f76a902e6c6b74b1154e11c07ab6b1050b63b0c39d210a4b0ef662f3402eb1e16427bd71acc05162628f1b8a1a2bf4ff843f53e651a81f01073b9487ff32a
-EBUILD appdata-tools-0.1.8-r1.ebuild 450 BLAKE2B 1c4843d123d008961b7da15a5204a5d673e925a434b6481c47ba745a8bfa7a136825f8daf6f21ae1960f9d49f02f949d9957cb3f92b0c143f54092aba510a4f2 SHA512 d7b024aa8e38aff70d9c9ca8f65daf62e69e81a25d8c9d958793db2657e5d57996c41bbbaf1158f1936df7b896f6032bad0f41e324b38a1c8490130c6ea407de
-MISC metadata.xml 451 BLAKE2B df7d5ccf4c6318efb44f840abaa9c42346b302739acee4f21e0ac85653ee44e3fde2050be164474c27c0cdd97b280f891a3ccff8ef738174dbbfe09a54d8d365 SHA512 35a3d284a2adfaa5eeafd5be63757734ef8602e1350a8c616c4e35fbef9a52dfa5fa5c9d08b9570ffe0e537e16054dceed6ba1d5f43277af40d4134a2606e2d9
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
deleted file mode 100644
index cdb3f6c3c48f..000000000000
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-MY_P="${PN/-/_}_${PV//./_}"
-
-DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
-HOMEPAGE="https://github.com/hughsie/appdata-tools/"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=net-libs/libsoup-2.4
-	>=x11-libs/gdk-pixbuf-2.0"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	nls? ( >=dev-util/intltool-0.35.0
-		sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-man \
-		--disable-schemas
-}
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
deleted file mode 100644
index 308d6bfef72c..000000000000
--- a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
-HOMEPAGE="https://github.com/hughsie/appdata-tools/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# Superseeded by appstream-glib.
-RDEPEND=">=dev-libs/appstream-glib-0.3.2"
diff --git a/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
deleted file mode 100644
index 678390232d25..000000000000
--- a/dev-util/appdata-tools/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hughsie/appdata-tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/appinventor-1.1 b/dev-util/appinventor-1.1
new file mode 100644
index 000000000000..e156e97b4da6
--- /dev/null
+++ b/dev-util/appinventor-1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=MIT App Inventor Setup package
+EAPI=4
+HOMEPAGE=http://www.appinventor.mit.edu/
+KEYWORDS=~amd64 ~x86
+LICENSE=android
+RDEPEND=>=virtual/jre-1.6.0
+SLOT=0
+SRC_URI=https://dl.google.com/dl/appinventor/installers/linux/appinventor-setup_1.1.tar.gz
+_md5_=5736013652ef6e065e296b818c10b6f4
diff --git a/dev-util/appinventor/Manifest b/dev-util/appinventor/Manifest
deleted file mode 100644
index 8ffb8c3d070c..000000000000
--- a/dev-util/appinventor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST appinventor-setup_1.1.tar.gz 85941449 BLAKE2B 35369899c93b9df1f594e9bb34883707e99685392578d46001b30857a368c0661fc48eff3877adaa169361063323239012e0b9305386df08bf5048782977f767 SHA512 fb04e6dda57e55602cc1f1a556062b7468ce9386c35710f3e84394500077c50bb7969b909cff785c100c46620794daa943c80f5feef22756a6ef8f809cf383e7
-EBUILD appinventor-1.1.ebuild 852 BLAKE2B 7ea24546f9c02628cc234841d3ad2a93a6be431baf18713ce3822c425493a903a0a2faac39fbeafee8c64c45221a6e6810ee922fd12389bbaa35e2d9a5c925b5 SHA512 670fe6d12b830f964d33510c95b1055a166e16e935cc9066d098c66d5149bdb97bb512faabc49cc1b8a22257db13f87731875eaa09d74443c4e4f1e92513d70d
-MISC metadata.xml 467 BLAKE2B aa23438d2e3d170a0e105ea60ab8ea153fb0d332aefc5d4f0da32d928d4a0a45ab8bba9f2312d7379893707161829cb13ec3d3682005752be52305643a4417b3 SHA512 299434ef32fc681ffa14021b39524deefd1f21d454b446b57693876feb6addee47c966aecf3111119ff1cb65437e5a12e3ca14ab92acb609ab08675aecfc796e
diff --git a/dev-util/appinventor/appinventor-1.1.ebuild b/dev-util/appinventor/appinventor-1.1.ebuild
deleted file mode 100644
index 6e3baf91d344..000000000000
--- a/dev-util/appinventor/appinventor-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_P="${PN}-setup_${PV}"
-DESCRIPTION="MIT App Inventor Setup package"
-HOMEPAGE="http://www.appinventor.mit.edu/"
-SRC_URI="https://dl.google.com/dl/${PN}/installers/linux/${MY_P}.tar.gz"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6.0"
-
-APP_INSTALL_DIR="/opt/${PN}"
-S="${WORKDIR}/${MY_P}"
-QA_PREBUILT="/opt/appinventor/commands-for-Appinventor/adb
-	/opt/appinventor/commands-for-Appinventor/emulator
-	/opt/appinventor/commands-for-Appinventor/mksdcard"
-
-src_install() {
-	insinto ${APP_INSTALL_DIR}
-	dodir ${APP_INSTALL_DIR}
-	doins -r "${PN}"/extras
-	doins -r "${PN}"/from-Android-SDK
-	exeinto "${APP_INSTALL_DIR}"/commands-for-Appinventor/
-	doexe "${PN}"/commands-for-Appinventor/*
-}
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
deleted file mode 100644
index b20d56f2f1c4..000000000000
--- a/dev-util/appinventor/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>gentoo.power@gmail.com</email>
-	<name>Iván Atienza</name>
-</maintainer>
-<maintainer type="person">
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/archdiff-1.1.6 b/dev-util/archdiff-1.1.6
new file mode 100644
index 000000000000..330e5afc8ac0
--- /dev/null
+++ b/dev-util/archdiff-1.1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/libarchive[bzip2?,lzma?] gzip? ( app-arch/libarchive[zlib] ) dev-libs/rremove
+DESCRIPTION=Utility to view the differences between two source code archives
+EAPI=4
+HOMEPAGE=https://frigidcode.com/code/archdiff/
+IUSE=+bzip2 +lzma +gzip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/libarchive[bzip2?,lzma?] gzip? ( app-arch/libarchive[zlib] ) dev-libs/rremove app-misc/colordiff
+SLOT=0
+SRC_URI=https://frigidcode.com/code/archdiff/archdiff-1.1.6.tar.gz
+_md5_=b94364bb5aa9fc99167fc2e6b53ada1a
diff --git a/dev-util/archdiff/Manifest b/dev-util/archdiff/Manifest
deleted file mode 100644
index d8a4aa21c709..000000000000
--- a/dev-util/archdiff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST archdiff-1.1.6.tar.gz 96743 BLAKE2B 387d9476d0c47540a415993799476a5f5648dff4a25ba786fda8bf810897469f0a9edc1247699c17ad7ab343865dd719f56bb0a83be3a130b1e0e2c938c6051f SHA512 0f924418c2aea8bc966b6967038b60d40d727037739e75fa785a4f4fa452558287cc6e2c51d93a3066994e67cbac989e96120561e460a4d543c451229f7420b2
-EBUILD archdiff-1.1.6.ebuild 614 BLAKE2B bb4ab3c3efda3406b825e4ede654e49e69bab315d2bf871ca2e6622470f6f74fd9a8454702f979c301dcde128a6e4e9521b13546575b3f30b181428626c2a916 SHA512 aa7108a99986fb2bc96f998eb0f077ddf8d8899b946f0fd734472505d4f6d964efacfc1dbb7ac0488351b45470e418d2a7ce3efd9476fcce724559761da6411a
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/dev-util/archdiff/archdiff-1.1.6.ebuild b/dev-util/archdiff/archdiff-1.1.6.ebuild
deleted file mode 100644
index acc017fc655d..000000000000
--- a/dev-util/archdiff/archdiff-1.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Utility to view the differences between two source code archives"
-HOMEPAGE="https://frigidcode.com/code/archdiff/"
-SRC_URI="https://frigidcode.com/code/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bzip2 +lzma +gzip"
-
-DEPEND="app-arch/libarchive[bzip2?,lzma?]
-	gzip? ( app-arch/libarchive[zlib] )
-	dev-libs/rremove"
-RDEPEND="${DEPEND}
-	app-misc/colordiff"
-
-src_configure() {
-	econf \
-		$(use_enable bzip2) \
-		$(use_enable gzip) \
-		$(use_enable lzma)
-}
diff --git a/dev-util/archdiff/metadata.xml b/dev-util/archdiff/metadata.xml
deleted file mode 100644
index 78e64a5cf1ad..000000000000
--- a/dev-util/archdiff/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/argouml-0.34 b/dev-util/argouml-0.34
new file mode 100644
index 000000000000..d979f7a02964
--- /dev/null
+++ b/dev-util/argouml-0.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Modelling tool that helps you do your design using UML
+EAPI=6
+HOMEPAGE=http://argouml.tigris.org
+IUSE=doc elibc_FreeBSD
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.34/ArgoUML-0.34.tar.gz http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip doc? ( http://argouml-downloads.tigris.org/nonav/argouml-0.34/manual-0.34.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.34/quickguide-0.34.pdf )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41399d11164547d708f4bb5e7836009f
diff --git a/dev-util/argouml/Manifest b/dev-util/argouml/Manifest
deleted file mode 100644
index 5f756823de0c..000000000000
--- a/dev-util/argouml/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ArgoUML-0.34.tar.gz 16504818 BLAKE2B 9a68d1e48ae16469a91f8ebc44fb0dc5387cfed9bab121898d94776b7acf455e442716cf68aa6a4790966b7e34d121d69e8d9bcf55120120c166609f8fe7efd9 SHA512 111d5ff588fe895274b02f5d5a8385455bf3130918a371f3e549c0a7d41c8bd1d109c976b2039ceae26847fac29689aa4339e35916352be633d1fe1a277d79e5
-DIST dbuml-module-1.0.4.zip 6231786 BLAKE2B e00e1a87ceed8128b6303b1d38e64c1497fdd8287c4716b15e7dc1f225ca4da67bffa17529b9ed44ff484c3ee057e5dc9096674b152b71df81eb8ffbfec3f5d8 SHA512 a281a8bb8b8422cfceaf704e6b26a0c8b7c8ee393756ebee86ede8a8681b0ba9f8f5b5e568899e6e7b55fba20edba74f9e7a532f647dbf1549f582b3226028b6
-DIST manual-0.34.pdf 3405949 BLAKE2B f52ac83c62a243ca0034237a75d8ce2cdffb7a6668c3562012d4577c742823c092f1d42bba0d1a56ce52885511b3eb6e9a0055cdf0d00baddc2a412964cb8d98 SHA512 1dfaf66485beb82d309a58f3868f7c150575d99d652dbef261991429df85073ffce0cf8d73f44f4f9c13299be3cd11f92826da695901846c7b8dc6561b0090d8
-DIST quickguide-0.34.pdf 58334 BLAKE2B cfd2dd38ac1117ef7253d0193bdf264a0160bf55776b5d1f42efafb9c73924287e12ac2c53bae6e7fd9a6ee29a172e0205909785bbe695ce8b01bc2479c41660 SHA512 0bcdeaa643d400e17b12d92c78eddb33a202220ccb26e5a9933528faa0e8d3fccde432a1fba2103b28bec59d3df75e1176ed2918308533f7e490fbdb5d60a82d
-EBUILD argouml-0.34.ebuild 1397 BLAKE2B 723bee8cf0e204c8cc139c20b7cb8367486134b54124fb9587cdf9dd887036555d3fab2642d79f02a140a383245fe11ab6a5aecae252c8715b505c3138462c66 SHA512 c86b36ad663191056060a728b1eb6b299966861de7846b67a410de6db9a7808fd9aa2d259651dedc23aa22a907f62b0a8729f0dc411afafb5dbb7edbf4472a6a
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
deleted file mode 100644
index fd031b69ec0f..000000000000
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop xdg-utils java-pkg-2
-
-DESCRIPTION="Modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/manual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt
-
-	if use doc; then
-		find release/ \( -name Thumbs.db -o -name filelist.xml \) \
-			-delete || die
-		HTML_DOCS=( release/{Readme.htm,www} )
-		DOCS=(
-			"${DISTDIR}"/manual-${PV}.pdf
-			"${DISTDIR}"/quickguide-${PV}.pdf
-		)
-		einstalldocs
-	fi
-
-	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-util/argouml/metadata.xml b/dev-util/argouml/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-util/argouml/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>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/artifactory-bin-4.16.0-r1 b/dev-util/artifactory-bin-4.16.0-r1
new file mode 100644
index 000000000000..c19a23e38475
--- /dev/null
+++ b/dev-util/artifactory-bin-4.16.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.0.zip -> artifactory-4.16.0.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b4484668b2047f40133f9f19250cd485
diff --git a/dev-util/artifactory-bin-4.16.1 b/dev-util/artifactory-bin-4.16.1
new file mode 100644
index 000000000000..35e9f53b65b7
--- /dev/null
+++ b/dev-util/artifactory-bin-4.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.1.zip -> artifactory-4.16.1.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b4484668b2047f40133f9f19250cd485
diff --git a/dev-util/artifactory-bin-5.3.2 b/dev-util/artifactory-bin-5.3.2
new file mode 100644
index 000000000000..689183b3a811
--- /dev/null
+++ b/dev-util/artifactory-bin-5.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.3.2.zip -> artifactory-5.3.2.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.4.4 b/dev-util/artifactory-bin-5.4.4
new file mode 100644
index 000000000000..87d3f920e370
--- /dev/null
+++ b/dev-util/artifactory-bin-5.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.4.zip -> artifactory-5.4.4.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.4.6 b/dev-util/artifactory-bin-5.4.6
new file mode 100644
index 000000000000..f524d9e89f93
--- /dev/null
+++ b/dev-util/artifactory-bin-5.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.6.zip -> artifactory-5.4.6.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.5.1 b/dev-util/artifactory-bin-5.5.1
new file mode 100644
index 000000000000..71f5e93e7cc8
--- /dev/null
+++ b/dev-util/artifactory-bin-5.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.1.zip -> artifactory-5.5.1.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.5.2 b/dev-util/artifactory-bin-5.5.2
new file mode 100644
index 000000000000..5ad09b0cb777
--- /dev/null
+++ b/dev-util/artifactory-bin-5.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.2.zip -> artifactory-5.5.2.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.6.2 b/dev-util/artifactory-bin-5.6.2
new file mode 100644
index 000000000000..485280866573
--- /dev/null
+++ b/dev-util/artifactory-bin-5.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.2.zip -> artifactory-5.6.2.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin-5.6.3 b/dev-util/artifactory-bin-5.6.3
new file mode 100644
index 000000000000..588f91526034
--- /dev/null
+++ b/dev-util/artifactory-bin-5.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.3.zip -> artifactory-5.6.3.zip
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
deleted file mode 100644
index ca95351f082c..000000000000
--- a/dev-util/artifactory-bin/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-AUX artifactory.xml 244 BLAKE2B 86e840e7ba680a87c7f5b00013f5019f4f2f8cd8a4d83fef82c8b51aa86e3cc4fde6c801aaf00c0b5c07c5499e49dce94ef797953304045970c45bf297003450 SHA512 582ba26a9b36a99266ebc35cf6ccad3e58c17c5b6e6a9168732a24842c67478fde72197b7592275e11cc3836ea1ed337785d90b8f3e6181e5f7fc1c102a45f55
-AUX confd 252 BLAKE2B 3c9999b9ee9ea39eda3f548bd0e0143d17e545de89efc7bf3a30aac163b5837b5812544b0bb8f86b00e639794b0efdc7b9219297982831b554019dca9d30822b SHA512 ae3c7e47ae34ce163799ffa57ec4b8a479eecc36a6c3620f30e351ddf8dea3e55d04a6ef459ed7ccefae6b0d39af8ebcf73cac3eea5f7d9355b9a1de7715b1e7
-AUX initd-r2 5371 BLAKE2B 68f4ebafcada8002b7981a101e2b5f6323140469fbe7834a492adcf142dd210362e65d604d52bb3bd55a9a998c2bec8080ddb1595181aae5b92eacda6d4b5bc4 SHA512 c19994a2918cb317a074898b7de294193a8aae1b5ec37d407bd5b60971c40d7c808ead5376c6d48219f41b15b72b2dca85959db677e81052d224a73bfb39cbfb
-AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94c3002f3cc21bd88405fcf38ea2161f9efde0c2ea2dad67979713a1cd99fc78e790ff0bca93 SHA512 89ef20e27296318cf844130c09e17b16f63c27b3188e53400f8b1dcf170d0d6acfb5a56592eb8580b8fa1281c2fcaa7f2edc4cde43803eaf20ce345030ce3f98
-AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
-DIST artifactory-4.16.0.zip 41455447 BLAKE2B 0f9f575d5ce3ba983c905e70c8e3545946065ff458f9a1c0f0e346bebeffe002bbea4214b7a23829e3a11d8ccf6aec4548f6ba5abd405d30165d3c07e2372e98 SHA512 e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14
-DIST artifactory-4.16.1.zip 41489457 BLAKE2B 7854710a5cf4dd52d7c92581a030259df6b0b8038f9843e528b0c57211eafd405a114b709ba5407a9c83e4d693f1ecb8eafe3d5e98bb22542d5c48e15bc3cf6f SHA512 b8f5441f011966837861073c928512704961c7683fadac4603f2177df1c64861432f894c5fe0669c4842a4b7d008553169e88aaffdde6e3d6e6bbdff6adf9d78
-DIST artifactory-5.3.2.zip 45729254 BLAKE2B 1fe6ec8a5a33d8735bd92d480e8fb7b035af2b27bf9034791f1bdca3c3d2a13794ba06613fb508ea8f221cc1647f2a8e213994ef7603d92c88b17037fd3c7266 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d
-DIST artifactory-5.4.4.zip 76841935 BLAKE2B d763122cf0d2d1237fad41b825f68ecd6ec3c3453e5ec0a76a5b367c70c5aec4ee3cd81b9ab453628c879db22e0a292fc9b43d2b3d3d5461fc63d43bffde7b2d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8
-DIST artifactory-5.4.6.zip 76857888 BLAKE2B 04185e4c585a6e8121b9b6d78a4565c5107381cae53fe3d8aea647ea6ebb0920f9775a7275ba79d282a0c87a7e0544f6382a2ed10dbecb6b279679be0fd94066 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe
-DIST artifactory-5.5.1.zip 77406287 BLAKE2B be60fbbc3b8c61fc9d1a7272889219de7ea4e5b8c760afaa7e0003f6bff48d41783f76d62ac64b81ffa42393a265ed184ad4a4a23789dc79955907290035dae1 SHA512 7327135be0c2a08dd97c575b05be1c3e4be99b38354864313d201334d3276912bcff0c6b0743fb83a2433a82fc8fcf4ec43e98f4183287fc34f1807342abedf8
-DIST artifactory-5.5.2.zip 77438814 BLAKE2B b77d9348fbae8bf871e4fb6716e2a9d357cd0d268d65360ec7509b0999db78a8b80f68eb22cbbc0a85ee2980fbc72c7aa390a60c8129451506441d7cbfd9f776 SHA512 fd052e66316ec050599f6262274cdf5232ebb1385fedd2c19c6ba8e3dca0d9fe86d7a89fddbb8974b28e0f9dc3d7ccda1aac6b3f9159f0b77bfc51873ffd5e3b
-DIST artifactory-5.6.2.zip 91577071 BLAKE2B 1f9687bef239519171bdb28fb033368e5dea10186ef350c7ee7d9e4a33ce99c5e965692d8052d82454c83f42c84e79c18edafbb98540da4b818b65b577a9ac72 SHA512 b4bde9bcf53d2af6901a8e80827f3b09d685a8bbe7073badad586401b6881d046e5cade4165fa68843e981dea2912374c187518e29ab1ee86d3d0fac134a54f0
-DIST artifactory-5.6.3.zip 91592176 BLAKE2B 1214bac4d5bd6f15915e05a2e42de4b6b55b885210fa06ee4b4b63599b8f3c13c6fe46a04569e790ea6e274c4837a09b260736412805119e7f93f7867be8e421 SHA512 a2348b8667a1d936e90dc6fd42e3967f63cc88cc99bf425ea26731ff4c54f0177ea386c5b19be97a4ac8f89ce41e65237d14593112b38656d60ada45d3b62371
-EBUILD artifactory-bin-4.16.0-r1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
-EBUILD artifactory-bin-4.16.1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
-EBUILD artifactory-bin-5.3.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.4.4.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.4.6.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.5.1.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.5.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.6.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-EBUILD artifactory-bin-5.6.3.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
-MISC metadata.xml 368 BLAKE2B 1a5f91a194a1eb7b58ddc795cae9c3e52b33aca6b716b286069b8185c2393bd6b5281219f4a0e6446c9a8a930f18168b0f5923df9423ffd6b20d0d7ec08c48c8 SHA512 889ab0f86261be62dc4988fc99c8526212c7936b3fbb8a078d644046047f653108b3120cef9cc65bce00a1c267227e58dae0cb1eb7d86ac1f4966408fa783beb
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
deleted file mode 100644
index cb6e42f39ffa..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
deleted file mode 100644
index cb6e42f39ffa..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
deleted file mode 100644
index 242019ded03b..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/files/artifactory.xml b/dev-util/artifactory-bin/files/artifactory.xml
deleted file mode 100644
index 19042bcb97a0..000000000000
--- a/dev-util/artifactory-bin/files/artifactory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Context path="/artifactory" docBase="${artifactory.home}/webapps/artifactory.war" processTlds="false">
-    <Manager pathname="" />
-    <Valve className="org.apache.catalina.valves.RemoteIpValve" protocolHeader="x-forwarded-proto"/>
-</Context>
diff --git a/dev-util/artifactory-bin/files/confd b/dev-util/artifactory-bin/files/confd
deleted file mode 100644
index fd7e6e22582c..000000000000
--- a/dev-util/artifactory-bin/files/confd
+++ /dev/null
@@ -1,5 +0,0 @@
-ARTIFACTORY_HOME=/opt/artifactory
-ARTIFACTORY_PID=$ARTIFACTORY_HOME/run/artifactory.pid
-ARTIFACTORY_USER=artifactory
-JAVA_OPTIONS="-server -Xms2g -Xmx8g -Xss256k -XX:PermSize=128m -XX:MaxPermSize=256m -XX:+UseG1GC"
-TOMCAT_HOME=$ARTIFACTORY_HOME/tomcat
diff --git a/dev-util/artifactory-bin/files/initd-r2 b/dev-util/artifactory-bin/files/initd-r2
deleted file mode 100644
index c9fbb05bd834..000000000000
--- a/dev-util/artifactory-bin/files/initd-r2
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/openrc-run
-
-description="Manages the services needed to run Artifactory on a dedicated Tomcat"
-command="/opt/artifactory/tomcat/bin/catalina.sh"
-pidfile="/opt/artifactory/run/artifactory.pid"
-procname="artifactory"
-user=${ARTIFACTORY_USER:-artifactory}
-group=${group:-artifactory}
-
-# Artifactory can be very slow to start, and without locking,
-# restarting via runscript is very error prone
-CATALINA_LOCK_FILE="$(dirname $pidfile)/lock"
-
-CATALINA_MGMT_PORT=8015
-REQUIRED_JAVA_VERSION="1.8"
-START_TIMEOUT=300
-
-# Helper functions:
-is_mgmt_port_used() {
-    mgmt_port_used=$(netstat -vatn | grep LISTEN | grep $CATALINA_MGMT_PORT | wc -l)
-}
-
-get_pid_info() {
-    pidValue=""
-    javaPs=""
-    if [ -e "$pidfile" ]; then
-        pidValue=$(cat $pidfile)
-        if [ -n "$pidValue" ]; then
-            javaPs="$(ps -p $pidValue | grep java)"
-        fi
-    fi
-}
-
-depend() {
-    need net nginx
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "$ARTIFACTORY_HOME" ] || [ ! -d "$ARTIFACTORY_HOME" ]; then
-        eerror "Artifactory home folder not defined or does not exists at $ARTIFACTORY_HOME"
-        return 1
-    fi
-
-    if [ -z "$pidfile" ]; then
-        eerror "Artifactory pid destination pidfile was not set!"
-        return 1
-    fi
-
-    if [ -z "$TOMCAT_HOME" ] || [ ! -d "$TOMCAT_HOME" ]; then
-        eerror "Tomcat Artifactory folder not defined or does not exists at $TOMCAT_HOME"
-        return 1
-    fi
-
-    if [ -z "$ARTIFACTORY_USER" ]; then
-        ARTIFACTORY_USER=$user
-    fi
-
-    current_open_file_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -n")
-    desired_open_file_limit=32000
-    if [ "$current_open_file_limit" != "unlimited" ] && [ $current_open_file_limit -lt $desired_open_file_limit ]; then
-        eerror "Maximum number of open files ($current_open_file_limit) is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nofile $desired_open_file_limit"
-        eerror "artifactory hard nofile $desired_open_file_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    current_max_process_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -u")
-    desired_max_process_limit=1024
-    if [ "$current_max_process_limit" != "unlimited" ] && [ $current_max_process_limit -lt $desired_max_process_limit ]; then
-        eerror "Number of processes $current_max_process_limit is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nproc $desired_max_process_limit"
-        eerror "artifactory hard nproc $desired_max_process_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-        einfo "Found java executable in $JAVA_HOME"
-        _java="$JAVA_HOME/bin/java"
-    elif command -v java > dev/null 2>&1 ; then
-        _java=java
-    else
-        eerror "No Java Runtime Environment (jre) found! At least java-$REQUIRED_JAVA_VERSION is required."
-        return 1
-    fi
-    if [ "$_java" ]; then
-        java_version=$($_java -version 2>&1 | grep 'version' | cut -d ' ' -f3 | tr -d \")
-        java_major=$(echo $java_version | cut -d . -f1-2)
-        if [ "$java_major" != "$REQUIRED_JAVA_VERSION" ] ; then
-            eerror "Java version $java_version is too old, java-$REQUIRED_JAVA_VERSION is required."
-            return 1
-        fi
-    fi
-}
-
-# We have to pass start/stop through to catalina.sh, which doesn't understand restart (and restart can't be overridden in OpenRC):
-start() {
-    get_pid_info
-    is_mgmt_port_used
-    if [ $mgmt_port_used -ne 0 ] || [ -n "$javaPs" ]; then
-        eerror "$RC_SERVICE already started!"
-        return 1
-    else
-        ebegin "Starting $RC_SERVICE"
-        start-stop-daemon --exec $command --pidfile $pidfile --user $user:$group --wait $START_TIMEOUT start
-        RETVAL=$?
-        eend $RETVAL "start-stop-daemon failed to start $RC_SERVICE"
-    fi
-
-
-    is_mgmt_port_used
-    seconds=1
-    while [ $mgmt_port_used -eq 0 ] && [ $seconds -lt $START_TIMEOUT ]; do
-        sleep 1
-        ((seconds=seconds+1))
-        is_mgmt_port_used
-    done
-    if [ $mgmt_port_used -eq 0 ]; then
-        eerror "$RC_SERVICE did not start in $START_TIMEOUT seconds!"
-        return 1
-    elif [ $mgmt_port_used -eq 1 ]; then
-        einfo "$RC_SERVICE started"
-        [ $RETVAL=0 ] && touch $CATALINA_LOCK_FILE
-    else
-        eerror "Got unexpected result when checking port $CATALINA_MGMT_PORT"
-        return 1
-    fi
-    return $RETVAL
-}
-
-stop() {
-    ebegin "Stopping $RC_SERVICE"
-    start-stop-daemon --stop --pidfile $pidfile --wait $START_TIMEOUT stop
-    RETVAL=$?
-    eend $RETVAL "Failed to stop $RC_SERVICE!"
-
-    [ $RETVAL=0 ] && rm -f "$CATALINA_LOCK_FILE" "$pidfile"
-    return $RETVAL
-}
-
-status() {
-    is_mgmt_port_used
-    if [ $mgmt_port_used -eq 0 ]; then
-        if [ -e "$pidfile" ]; then
-            eerror "$RC_SERVICE stopped but the pid file $pidfile still exists!"
-            RETVAL=1
-        else
-            if [ -e "$CATALINA_LOCK_FILE" ]; then
-                eerror "$RC_SERVICE is stopped but the lock file $CATALINA_LOCK_FILE still exists!"
-                RETVAL=2
-            else
-                eerror "$RC_SERVICE is stopped"
-                RETVAL=3
-            fi
-        fi
-    else
-        einfo "$RC_SERVICE is running"
-        RETVAL=0
-    fi
-    return $RETVAL
-}
diff --git a/dev-util/artifactory-bin/files/initd-r3 b/dev-util/artifactory-bin/files/initd-r3
deleted file mode 100644
index 5a9a6e214efb..000000000000
--- a/dev-util/artifactory-bin/files/initd-r3
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/openrc-run
-
-description="Manages the services needed to run Artifactory on a dedicated Tomcat"
-command="/opt/artifactory/tomcat/bin/catalina.sh"
-pidfile="/opt/artifactory/run/artifactory.pid"
-procname="artifactory"
-user=${ARTIFACTORY_USER:-artifactory}
-group=${group:-artifactory}
-
-# Artifactory can be very slow to start, and without locking,
-# restarting via runscript is very error prone
-CATALINA_LOCK_FILE="$(dirname $pidfile)/lock"
-
-CATALINA_MGMT_PORT=8015
-REQUIRED_JAVA_VERSION="1.8"
-START_TIMEOUT=300
-
-# Helper functions:
-is_mgmt_port_used() {
-    mgmt_port_used=$(netstat -vatn | grep LISTEN | grep $CATALINA_MGMT_PORT | wc -l)
-}
-
-get_pid_info() {
-    pidValue=""
-    javaPs=""
-    if [ -e "$pidfile" ]; then
-        pidValue=$(cat $pidfile)
-        if [ -n "$pidValue" ]; then
-            javaPs="$(ps -p $pidValue | grep java)"
-        fi
-    fi
-}
-
-depend() {
-    need net nginx
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "$ARTIFACTORY_HOME" ] || [ ! -d "$ARTIFACTORY_HOME" ]; then
-        eerror "Artifactory home folder not defined or does not exists at $ARTIFACTORY_HOME"
-        return 1
-    fi
-
-    if [ -z "$pidfile" ]; then
-        eerror "Artifactory pid destination pidfile was not set!"
-        return 1
-    fi
-
-    if [ -z "$TOMCAT_HOME" ] || [ ! -d "$TOMCAT_HOME" ]; then
-        eerror "Tomcat Artifactory folder not defined or does not exists at $TOMCAT_HOME"
-        return 1
-    fi
-
-    if [ -z "$ARTIFACTORY_USER" ]; then
-        ARTIFACTORY_USER=$user
-    fi
-
-    current_open_file_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -n")
-    desired_open_file_limit=32000
-    if [ "$current_open_file_limit" != "unlimited" ] && [ $current_open_file_limit -lt $desired_open_file_limit ]; then
-        eerror "Maximum number of open files ($current_open_file_limit) is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nofile $desired_open_file_limit"
-        eerror "artifactory hard nofile $desired_open_file_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    current_max_process_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -u")
-    desired_max_process_limit=1024
-    if [ "$current_max_process_limit" != "unlimited" ] && [ $current_max_process_limit -lt $desired_max_process_limit ]; then
-        eerror "Number of processes $current_max_process_limit is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nproc $desired_max_process_limit"
-        eerror "artifactory hard nproc $desired_max_process_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-        einfo "Found java executable in $JAVA_HOME"
-        _java="$JAVA_HOME/bin/java"
-    elif command -v java > dev/null 2>&1 ; then
-        _java=java
-    else
-        eerror "No Java Runtime Environment (jre) found! At least java-$REQUIRED_JAVA_VERSION is required."
-        return 1
-    fi
-    if [ "$_java" ]; then
-        java_version=$($_java -version 2>&1 | grep 'version' | cut -d ' ' -f3 | tr -d \")
-        java_major=$(echo $java_version | cut -d . -f1-2)
-        if [ "$java_major" != "$REQUIRED_JAVA_VERSION" ] ; then
-            eerror "Java version $java_version is too old, java-$REQUIRED_JAVA_VERSION is required."
-            return 1
-        fi
-    fi
-}
-
-# We have to pass start/stop through to catalina.sh, which doesn't understand restart (and restart can't be overridden in OpenRC):
-start() {
-    get_pid_info
-    is_mgmt_port_used
-    if [ $mgmt_port_used -ne 0 ] || [ -n "$javaPs" ]; then
-        eerror "$RC_SERVICE already started!"
-        return 1
-    else
-        ebegin "Starting $RC_SERVICE"
-        start-stop-daemon --exec $command --pidfile $pidfile --user $user:$group --wait $START_TIMEOUT start
-        RETVAL=$?
-        eend $RETVAL "start-stop-daemon failed to start $RC_SERVICE"
-    fi
-
-
-    is_mgmt_port_used
-    seconds=1
-    while [ $mgmt_port_used -eq 0 ] && [ $seconds -lt $START_TIMEOUT ]; do
-        sleep 1
-        seconds=$((seconds+1))
-        is_mgmt_port_used
-    done
-    if [ $mgmt_port_used -eq 0 ]; then
-        eerror "$RC_SERVICE did not start in $START_TIMEOUT seconds!"
-        return 1
-    elif [ $mgmt_port_used -eq 1 ]; then
-        einfo "$RC_SERVICE started"
-        [ $RETVAL=0 ] && touch $CATALINA_LOCK_FILE
-    else
-        eerror "Got unexpected result when checking port $CATALINA_MGMT_PORT"
-        return 1
-    fi
-    return $RETVAL
-}
-
-stop() {
-    ebegin "Stopping $RC_SERVICE"
-    start-stop-daemon --stop --pidfile $pidfile --retry $START_TIMEOUT stop
-    RETVAL=$?
-    eend $RETVAL "Failed to stop $RC_SERVICE!"
-
-    [ $RETVAL=0 ] && rm -f "$CATALINA_LOCK_FILE" "$pidfile"
-    return $RETVAL
-}
-
-status() {
-    is_mgmt_port_used
-    if [ $mgmt_port_used -eq 0 ]; then
-        if [ -e "$pidfile" ]; then
-            eerror "$RC_SERVICE stopped but the pid file $pidfile still exists!"
-            RETVAL=1
-        else
-            if [ -e "$CATALINA_LOCK_FILE" ]; then
-                eerror "$RC_SERVICE is stopped but the lock file $CATALINA_LOCK_FILE still exists!"
-                RETVAL=2
-            else
-                eerror "$RC_SERVICE is stopped"
-                RETVAL=3
-            fi
-        fi
-    else
-        einfo "$RC_SERVICE is running"
-        RETVAL=0
-    fi
-    return $RETVAL
-}
diff --git a/dev-util/artifactory-bin/files/server.xml b/dev-util/artifactory-bin/files/server.xml
deleted file mode 100644
index ba87175ff549..000000000000
--- a/dev-util/artifactory-bin/files/server.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Server port="8015" shutdown="SHUTDOWN">
-
-    <Service name="Catalina">
-        <Connector port="8081" protocol="HTTP/1.1"
-         maxThreads="500" minSpareThreads="20"
-         enableLookups="false" disableUploadTimeout="true"
-         backlog="100"/>
-        <!-- This is the optional AJP connector -->
-        <Connector port="8019" protocol="AJP/1.3"/>
-
-        <Engine name="Catalina" defaultHost="localhost">
-            <Host name="localhost" appBase="webapps"/>
-        </Engine>
-
-    </Service>
-</Server>
-
diff --git a/dev-util/artifactory-bin/metadata.xml b/dev-util/artifactory-bin/metadata.xml
deleted file mode 100644
index b9b43a436113..000000000000
--- a/dev-util/artifactory-bin/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>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
-  <longdescription>
-  Respository manager for Maven (among other binary package formats).
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/aruba-0.6.2-r1 b/dev-util/aruba-0.6.2-r1
new file mode 100644
index 000000000000..4edbf7f0501c
--- /dev/null
+++ b/dev-util/aruba-0.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby24] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=5
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/aruba-0.6.2.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ca2e66640f8d6f1c13ff275fc0301ea
diff --git a/dev-util/aruba-0.6.2-r2 b/dev-util/aruba-0.6.2-r2
new file mode 100644
index 000000000000..d5b2abebdca7
--- /dev/null
+++ b/dev-util/aruba-0.6.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby24] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby25] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/aruba-0.6.2.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9df1daab8029ee2ac369d5e54e67832
diff --git a/dev-util/aruba-0.8.1 b/dev-util/aruba-0.8.1
new file mode 100644
index 000000000000..861c0bf942a9
--- /dev/null
+++ b/dev-util/aruba-0.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby23] =dev-ruby/childprocess-0*[ruby_targets_ruby23] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby23] >=dev-util/cucumber-1.3.19[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby24] =dev-ruby/childprocess-0*[ruby_targets_ruby24] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby24] >=dev-util/cucumber-1.3.19[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=5
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby23] =dev-ruby/childprocess-0*[ruby_targets_ruby23] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby23] >=dev-util/cucumber-1.3.19[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby24] =dev-ruby/childprocess-0*[ruby_targets_ruby24] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby24] >=dev-util/cucumber-1.3.19[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/aruba-0.8.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=697dedf5c45cf8cec2ff824b6afe5f52
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
deleted file mode 100644
index f0ec6217ed63..000000000000
--- a/dev-util/aruba/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
-EBUILD aruba-0.6.2-r1.ebuild 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
-EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
-EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
-MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
deleted file mode 100644
index da7f77095675..000000000000
--- a/dev-util/aruba/aruba-0.6.2-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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
deleted file mode 100644
index ad124494699c..000000000000
--- a/dev-util/aruba/aruba-0.6.2-r2.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
deleted file mode 100644
index 389a430d1663..000000000000
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0*
-	>=dev-ruby/contracts-0.9:0
-	>=dev-ruby/rspec-expectations-2.99:2
-	>=dev-util/cucumber-1.3.19"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-	sed -i -e '1i require "time"' spec/spec_helper.rb || die
-
-	# Remove references to git ls-files and fix childprocess dependency
-	sed -i -e '/git ls-files/d' \
-		-e '/childprocess/ s/0.5.6/0.5/' \
-		aruba.gemspec || die
-
-	# Avoid scenarios making broken assumptions on ${HOME}
-	sed -i -e '/Scenario: Use ~ in path/i @wip' \
-			features/api/core/expand_path.feature || die
-	rm -f features/configuration/home_directory.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/metadata.xml b/dev-util/aruba/metadata.xml
deleted file mode 100644
index 3b124787be6d..000000000000
--- a/dev-util/aruba/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/aruba</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/astyle-3.0.1-r1 b/dev-util/astyle-3.0.1-r1
new file mode 100644
index 000000000000..9cd920791887
--- /dev/null
+++ b/dev-util/astyle-3.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Artistic Style is a re-indenter and reformatter for C++, C and Java source code
+EAPI=6
+HOMEPAGE=http://astyle.sourceforge.net/
+IUSE=examples java static-libs elibc_FreeBSD java
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/3.0
+SRC_URI=mirror://sourceforge/astyle/astyle_3.0.1_linux.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9bfd340df4265dc629865757d3f380f
diff --git a/dev-util/astyle-3.1-r2 b/dev-util/astyle-3.1-r2
new file mode 100644
index 000000000000..bca9003e6656
--- /dev/null
+++ b/dev-util/astyle-3.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Artistic Style is a re-indenter and reformatter for C++, C and Java source code
+EAPI=6
+HOMEPAGE=http://astyle.sourceforge.net/
+IUSE=examples java static-libs elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/3.1
+SRC_URI=mirror://sourceforge/astyle/astyle_3.1_linux.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c10fd0c1f4f7851480eb48aeadcbca5b
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
deleted file mode 100644
index a78fe5316106..000000000000
--- a/dev-util/astyle/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
-DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-EBUILD astyle-3.0.1-r1.ebuild 2401 BLAKE2B c27dd1d6b4e886cf68a795563d15d3fc942b62480aeae96116f108ea70dc0c6383a2d4efa5622c2aab03dda4d8ecb8d202eb7fa95c4ada8e2f8229be0f5a98dd SHA512 868aa688a44823004342598fe128af286aa78a071612cecdf335410cf7ccd88ebe91774d3385afd68c29f00fb5d26e95c235f0a2c4afb0650c75b2d802aef67a
-EBUILD astyle-3.1-r2.ebuild 2409 BLAKE2B e3e29396801ed158bf96660d80617ed202b4482e989491ecd31c73605e95f65239a7179498ee73e29f5ed08f371d258bd3a0195ddaa5c2ec4be171af68580bbf SHA512 1682a25a8327cc5bb7fdb0ef23c4341946926b27a119d413f33b0c4c8808520ae5dbb7d24704549c0acf3442d991ea6b4b2d9e17ef56dd1b118efe943db3f52e
-MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
deleted file mode 100644
index 2d3fd9cf88ce..000000000000
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
-
-DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="examples java static-libs"
-
-DEPEND="app-arch/xz-utils
-	java? ( >=virtual/jdk-1.6:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if use java ; then
-		java-pkg-opt-2_src_prepare
-		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
-			-e "s:ar crs:$(tc-getAR) crs:" \
-			-i build/gcc/Makefile || die
-	else
-		default
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	# ../build/clang/Makefile is identical except for CXX line.
-	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
-		${PN} \
-		shared \
-		$(usev java) \
-		$(usex static-libs static '')
-}
-
-src_install() {
-	doheader src/${PN}.h
-
-	pushd src/bin >/dev/null || die
-	dobin ${PN}
-
-	local libastylename="lib${PN}.so.${PV}"
-	local libastylejname="lib${PN}j.so.${PV}"
-	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
-
-	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
-	if use java ; then
-		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
-	fi
-	if use static-libs ; then
-		dolib.a lib${PN}.a
-	fi
-	popd >/dev/null || die
-	if use examples ; then
-		docinto examples
-		dodoc -r file/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	local HTML_DOCS=( doc/. )
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
deleted file mode 100644
index 4394e1defb22..000000000000
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
-
-DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="examples java static-libs"
-
-DEPEND="app-arch/xz-utils
-	java? ( >=virtual/jdk-1.6:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if use java ; then
-		java-pkg-opt-2_src_prepare
-		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
-			-e "s:ar crs:$(tc-getAR) crs:" \
-			-i build/gcc/Makefile || die
-	else
-		default
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	# ../build/clang/Makefile is identical except for CXX line.
-	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
-		${PN} \
-		shared \
-		$(usev java) \
-		$(usex static-libs static '')
-}
-
-src_install() {
-	doheader src/${PN}.h
-
-	pushd src/bin >/dev/null || die
-	dobin ${PN}
-
-	local libastylename="lib${PN}.so.${PV}.0"
-	local libastylejname="lib${PN}j.so.${PV}.0"
-	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
-
-	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
-	if use java ; then
-		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
-	fi
-	if use static-libs ; then
-		dolib.a lib${PN}.a
-	fi
-	popd >/dev/null || die
-	if use examples ; then
-		docinto examples
-		dodoc -r file/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	local HTML_DOCS=( doc/. )
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
deleted file mode 100644
index 0491ce853e32..000000000000
--- a/dev-util/astyle/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<longdescription>
-		astyle is a code formatter for C, C++, and Java source code, with many
-		granular formatting options to assist in enforcing code formatting
-		standards in projects.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>jimp03@email.com</email>
-			<name>Jim Pattee</name>
-		</maintainer>
-		<remote-id type="sourceforge">astyle</remote-id>
-		<bugs-to>https://sourceforge.net/p/astyle/bugs/</bugs-to>
-		<doc>http://astyle.sourceforge.net/astyle.html</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/atomic-install-0.1.1 b/dev-util/atomic-install-0.1.1
new file mode 100644
index 000000000000..2ee0502ffc48
--- /dev/null
+++ b/dev-util/atomic-install-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=xattr? ( sys-apps/attr ) doc? ( >=dev-util/gtk-doc-1.18 ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A library and tool to atomically install sets of files
+EAPI=4
+HOMEPAGE=https://github.com/mgorny/atomic-install/
+IUSE=doc static-libs xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=xattr? ( sys-apps/attr )
+SLOT=0
+SRC_URI=mirror://github/mgorny/atomic-install/atomic-install-0.1.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_=1bf61ae76d6a5b040784fad6c21e6665
diff --git a/dev-util/atomic-install-9999 b/dev-util/atomic-install-9999
new file mode 100644
index 000000000000..e11219ecd49e
--- /dev/null
+++ b/dev-util/atomic-install-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=xattr? ( sys-apps/attr ) doc? ( >=dev-util/gtk-doc-1.18 ) >=dev-util/gtk-doc-1.18 dev-vcs/git >=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 library and tool to atomically install sets of files
+EAPI=4
+HOMEPAGE=https://github.com/mgorny/atomic-install/
+IUSE=doc static-libs xattr
+LICENSE=BSD
+RDEPEND=xattr? ( sys-apps/attr )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=91129ce5efd63cfed252470701b78c4a
diff --git a/dev-util/atomic-install/Manifest b/dev-util/atomic-install/Manifest
deleted file mode 100644
index 1ddebc697780..000000000000
--- a/dev-util/atomic-install/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST atomic-install-0.1.1.tar.bz2 279555 BLAKE2B 7665cf291243f208f809a5a22508df122ddeb2e2206431c6fe601f0db19e5c1991a3e1277259666fdef2ed08ccb2384c0af93efe71a4c6b9ae3b7395e3520d69 SHA512 6614b47ab24f3ce480dd977983c2117836418915a13689e301922dce3091cfbb4dfec412402fa4c68f77d15c7dc297f14d70c12aeccab98d77af0a3534f29c8a
-EBUILD atomic-install-0.1.1.ebuild 610 BLAKE2B cf5f492631a6b50e51cab008c49496753b74b6e2433fd07bf7885bc4071faddafb1f6780a2a1df5b2b135704b4eef62413ae5c38fc978b9375b8f0488b19d14b SHA512 10e44dbe933675968f207f4914f5e887a08807f7aa75a0da57b0a4bc5b070693c8b49fbcf22776fad36800d7d0ce17720a45e981e62747935231da3266454836
-EBUILD atomic-install-9999.ebuild 799 BLAKE2B 0bbcfdcf12f511211770892332429cfd75f825bff77adbd3eddd27cd5b05fbfec8ef6aed63a92ba4dd4c2738ad65960ced13eaeb96a630d311dea3a6c0c04259 SHA512 8615d57d85455021b77e3d75993691b7acd2dd587172b7e7b3171fe3d0141bbe76e694276f28f11e059ee3d0732d622146cd6bf81b72acb2aaff7e5967899c2e
-MISC metadata.xml 517 BLAKE2B 3ac8353d6bdac253a9787dce4ce6645122345bc7603be533bcf63c2b8bed8b3b0820d38e9e92f02dc901cebd530b9da5002798812688e679250f74ac7d87f405 SHA512 713871c6f0f876eadce53dfe9bfb1e8792b02bac46f88a9a79d00bd9b08c6155ae97f23dd4bb20ba6a060e441c2abf3bce38fa6329fe3d502d9c63c2deabbdbb
diff --git a/dev-util/atomic-install/atomic-install-0.1.1.ebuild b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
deleted file mode 100644
index 6ee38de78ef3..000000000000
--- a/dev-util/atomic-install/atomic-install-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A library and tool to atomically install sets of files"
-HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable doc gtk-doc)
-		$(use_enable xattr libattr)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
deleted file mode 100644
index 824d3967cbff..000000000000
--- a/dev-util/atomic-install/atomic-install-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-inherit git-2
-#endif
-
-inherit autotools-utils
-
-DESCRIPTION="A library and tool to atomically install sets of files"
-HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-#if LIVE
-KEYWORDS=
-SRC_URI=
-DEPEND="${DEPEND}
-	>=dev-util/gtk-doc-1.18"
-#endif
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable doc gtk-doc)
-		$(use_enable xattr libattr)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/atomic-install/metadata.xml b/dev-util/atomic-install/metadata.xml
deleted file mode 100644
index 92f08657ac2d..000000000000
--- a/dev-util/atomic-install/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/atomic-install/issues/</bugs-to>
-		<remote-id type="github">mgorny/atomic-install</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/autodia-2.140.0-r1 b/dev-util/autodia-2.140.0-r1
new file mode 100644
index 000000000000..387d960429a5
--- /dev/null
+++ b/dev-util/autodia-2.140.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) test? ( dev-perl/Test-Pod ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Parses source code, XML or data and produces an XML document in Dia format
+EAPI=5
+HOMEPAGE=http://www.aarontrevena.co.uk/opensource/autodia/ http://search.cpan.org/dist/Autodia/
+IUSE=graphviz test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-util/Autodia-2.14-dbi.patch.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6b3d04551b30fe197cd09a0e45467bb6
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
deleted file mode 100644
index d17fa7b2bae3..000000000000
--- a/dev-util/autodia/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
-DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r1.ebuild 782 BLAKE2B 1f4484cf458ae5723d02bd67a7cd8bd3e0ad1d334cb2b7cfc7b31b1dc54c2a3773776a88faf2fb789d8fce9c70f09d62b0b28462170a0b6bc0995f53bc292355 SHA512 0ddb9e5061e30d392e0e41731e1f8e6d61657b1defcaaf6fe36562d13026015c9b9459514658aebcbdbf0f57ad7cab61a1e96aad0cfb8217ba6386c58167c7a8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r1.ebuild
deleted file mode 100644
index da836e9aeda0..000000000000
--- a/dev-util/autodia/autodia-2.140.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=Autodia
-MODULE_VERSION=2.14
-MODULE_AUTHOR=TEEJAY
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app multilib
-
-DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
-HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
-SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN}-2.14-dbi.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz test"
-
-RDEPEND="
-	dev-perl/Template-Toolkit
-	dev-perl/XML-Simple
-	graphviz? (
-		dev-perl/GraphViz
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-	)
-"
-
-SRC_TEST=do
-PATCHES=( "${WORKDIR}"/${MY_PN}-2.14-dbi.patch )
-mydoc="DEVELOP"
diff --git a/dev-util/autodia/metadata.xml b/dev-util/autodia/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/autodia/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/dev-util/autoproject-0.20 b/dev-util/autoproject-0.20
new file mode 100644
index 000000000000..964d64197b24
--- /dev/null
+++ b/dev-util/autoproject-0.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=sys-devel/automake sys-devel/autoconf test? ( sys-apps/texinfo )
+DESCRIPTION=Start a programming project using autotools and a command line parser generator
+EAPI=0
+HOMEPAGE=http://packages.debian.org/unstable/devel/autoproject
+IUSE=test
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/automake sys-devel/autoconf
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/autoproject/autoproject_0.20.orig.tar.gz mirror://debian/pool/main/a/autoproject/autoproject_0.20-3.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a7029ac7a9274280aa3d21dd7cd398a
diff --git a/dev-util/autoproject-0.20_p5 b/dev-util/autoproject-0.20_p5
new file mode 100644
index 000000000000..265f5652501f
--- /dev/null
+++ b/dev-util/autoproject-0.20_p5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=sys-devel/automake sys-devel/autoconf test? ( sys-apps/texinfo )
+DESCRIPTION=Start a programming project using autotools and a command line parser generator
+EAPI=0
+HOMEPAGE=http://packages.debian.org/unstable/devel/autoproject
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-devel/automake sys-devel/autoconf
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/autoproject/autoproject_0.20.orig.tar.gz mirror://debian/pool/main/a/autoproject/autoproject_0.20-5.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1feeead753afe4ee5eba4d38dc03503e
diff --git a/dev-util/autoproject/Manifest b/dev-util/autoproject/Manifest
deleted file mode 100644
index 96f212858731..000000000000
--- a/dev-util/autoproject/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST autoproject_0.20-3.diff.gz 4704 BLAKE2B f94227d5792477f7bab8d9535fcc4a927a8d779121974ca1ea0b342859ca9946693d107514c874e216bbb202c1e9c7a02ee3fedf7d0dc0508965cfe0471d4c3f SHA512 8058fb2430010ddc8613c9e310c262b28379eb3d38b7e9badca7e3adb3560e5965bbe6612a0211d38920094a4851502471f9e1670e694ea3ef7d29bbfde340e9
-DIST autoproject_0.20-5.diff.gz 5287 BLAKE2B 3bc26c42876606c8a8a879a888ec1c51fac8de2b380ef10c1c346a35dcd4747b21264cf4d2161e55ea31d49393569a897aa98ff1b0a8576465fd5e06b77fd27a SHA512 156f8feff53936c3113bda9d8a3f2e19679f249656ace69aacb1f0a13ae93066eef49de3e5a268c47ed3e440144de629f6b84a477ecfc6a3f793c41412cc9b5a
-DIST autoproject_0.20.orig.tar.gz 151101 BLAKE2B 657a4a4baae35b038392c2cc78a1ab0e657229587e64105f0a6150ce83c29cd2305b716b12e706ea31fc31f091f21fc8b00f89dbcd753453944ee26f7fbc01f1 SHA512 eb6ba12af96e03f4da51b6b9fc0db618180d92b8a363f30182013a003bb13f5b66ee12b28531a234f6035b64bda29bb0f838466ccbeaddbce06a437a18c05288
-EBUILD autoproject-0.20.ebuild 774 BLAKE2B 5e7845e2f0fd3b0172e1c291e081d8ecd1e58c47658c3866bdbe54c86b69d11e1a0071d9f8ca703f98321452fafad513cf65b43bf37270a89cb64bcb65308ad4 SHA512 b6a2c8064d7774c09bded4ff170f557a273a5339ee21f34fc5a7104952ade04df5948f5f4c675e8c6e8e03a10866f175760058369581289394cce4db4c1f0fdb
-EBUILD autoproject-0.20_p5.ebuild 873 BLAKE2B b95bdb9de4bb8e0f4569c11d7cd888ebe088d7148000df140de2515124c70eeb811d14f08f625bd5f773217b92a7cb519dba05a8d95e38014e029ba4ca218641 SHA512 d248f8249106279717206a419cc50ee617b4bf92fde07a1808c6d5c9033b8666fcf881074ee6502f86938494320d8ccbb47c3eea4aaa9d46159a6e4ae051a487
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
deleted file mode 100644
index cce818573a50..000000000000
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DEB_VER=3
-DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/texinfo )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
deleted file mode 100644
index 239a51de78ec..000000000000
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PV=${PV%_p*}
-DEB_VER=${PV#*_p}
-DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="test"
-
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/texinfo )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${MY_PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
diff --git a/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/dev-util/autoproject/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>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/babeltrace-1.2.3 b/dev-util/babeltrace-1.2.3
new file mode 100644
index 000000000000..1a567d76dd53
--- /dev/null
+++ b/dev-util/babeltrace-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux sys-devel/bison sys-devel/flex
+DESCRIPTION=A command-line tool and library to read and convert trace files
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
+SLOT=0
+SRC_URI=http://lttng.org/files/babeltrace/babeltrace-1.2.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_=40f014a3e8fcd75aa506c7ff3c8c14f0
diff --git a/dev-util/babeltrace-1.2.4 b/dev-util/babeltrace-1.2.4
new file mode 100644
index 000000000000..df4bc08e24ab
--- /dev/null
+++ b/dev-util/babeltrace-1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux sys-devel/bison sys-devel/flex
+DESCRIPTION=A command-line tool and library to read and convert trace files
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
+SLOT=0
+SRC_URI=http://lttng.org/files/babeltrace/babeltrace-1.2.4.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_=ee6dc696750d4bf2a7db14b07f203adb
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
deleted file mode 100644
index c79ccc22aaa0..000000000000
--- a/dev-util/babeltrace/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST babeltrace-1.2.3.tar.bz2 995094 BLAKE2B b917002ab3207e3c2763d556f98c190e691d0fe8bd20f6d03e1d2b4477fb374548b04eed591519fb88b15ef3133c847f33b1670cd35fd6a762f12d5fd40c0dd2 SHA512 de231c9e25797d0f3cfb8692fc75b8ce4159d317bb861806955f098a99d5749b627c830111d37788d0da486fdef92c83c020588a6598b4e95bcff6cbf9fce77f
-DIST babeltrace-1.2.4.tar.bz2 995829 BLAKE2B 99b4455000dd403bc86917ce1c5c6f32b7df8754c61197a03cbd3ec28c5756ae858965b81b06ed8cd72b910c2f0e5885c986d229f607f5c9179688cd1ccdd3b5 SHA512 5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9
-EBUILD babeltrace-1.2.3.ebuild 598 BLAKE2B 6a9ea008da9a3c2de21867a3d0c63c00b9b5567a5826c8e308cd59122ef6134a06858c61f22ffd443ec4f567fee93eefae6353513ad7c02c3f1e711f62b0bc32 SHA512 fe8b5fa3c0e4e0437938eb064bb258a69acd78ca095a2f9db955f06e5de61e209aec4f4ab999fde25c26686c77ecaf998b4efcc67062f8dea37bdc9fb82c47ce
-EBUILD babeltrace-1.2.4.ebuild 603 BLAKE2B 84e65f70d1721646e12683b54e73f3d47f54d539d70b75c02968d2874207300384517728ee5c01432f0b702d7efd43128eacd46a98f0f35d0a3081ae43c7d856 SHA512 ed6306db096030b9f3353d6316efddd33bba4852713c26d33ad9388b305615cf8ae9925ec5cf9f80d95fa880d785a15cc02c2f31e4090883a41aa37e484f2a69
-MISC metadata.xml 463 BLAKE2B 72758379b046978592bcebdc6d11a07aae6b14e052bf00fd3f40a45dc2858e59305d39fb1bbfba81ea3abdbf1dc81ce08bc6c57d7efa0bce77db322c55744a0a SHA512 385f56632473bd068e1a2b1aa15190eafe5cc25fc5fda59f91bd35355dbc549f7937d4a3f5fbd82c2009385b2c5113a93aa3954a18fefb4d9fbae933cfb52fd3
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
deleted file mode 100644
index 6fe8e9289c0e..000000000000
--- a/dev-util/babeltrace/babeltrace-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A command-line tool and library to read and convert trace files"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/popt
-	sys-apps/util-linux
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	"
-src_configure() {
-	econf $(use_enable test glibtest)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-util/babeltrace/babeltrace-1.2.4.ebuild b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
deleted file mode 100644
index 65412aef2de2..000000000000
--- a/dev-util/babeltrace/babeltrace-1.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A command-line tool and library to read and convert trace files"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/popt
-	sys-apps/util-linux
-	"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	"
-src_configure() {
-	econf $(use_enable test glibtest)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-util/babeltrace/metadata.xml b/dev-util/babeltrace/metadata.xml
deleted file mode 100644
index f4dd282d520c..000000000000
--- a/dev-util/babeltrace/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>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-	<longdescription>
-		Babeltrace is a command-line tool and library to read and convert trace files to and from different formats. It supports the CTF format, which is outputted by the LTTng 2.0 tracers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/bakefile-0.2.9-r1 b/dev-util/bakefile-0.2.9-r1
new file mode 100644
index 000000000000..f3e59f67043b
--- /dev/null
+++ b/dev-util/bakefile-0.2.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Native makefiles generator
+EAPI=5
+HOMEPAGE=http://bakefile.sourceforge.net
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/bakefile/bakefile-0.2.9.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=89bf4ae3bfdb88103cce32b929e953f6
diff --git a/dev-util/bakefile/Manifest b/dev-util/bakefile/Manifest
deleted file mode 100644
index 2b1258e5585f..000000000000
--- a/dev-util/bakefile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bakefile-0.2.9.tar.gz 775528 BLAKE2B e8e70c30cf6b4469323d28d0ea86d202243eb64b9b5eb438a84cfadbaf3dfdf96e3accfaa4435ba3c9fa4872240cc96ddde0c7a397305a36f26eb0f94ff89aef SHA512 dc28a3a68c080dababef68b9f39ad141739ecb5e4e1129620274bd80ac13f68cddd6e5625776f23c508f20e1f984a8830a949c425457cfeada8b44081873102f
-EBUILD bakefile-0.2.9-r1.ebuild 637 BLAKE2B 878c800fa390cac58884ab89f2cf0b143bee2214deaec17d8c62ce2ebce53f705fc4cae3510baaf9c7d5392f47642156b3d1382c7a2cf197db5a673221531410 SHA512 bb4556ee7062292d09e1e187847514c152ad9286a06e0900ecb963d4f5ac51a0f456b9d43d2845c31bb13ba6a4e268dc28527ab7dfbb56b3c26ce354b75fdb20
-MISC metadata.xml 339 BLAKE2B 11a2e8e327beea6eef5502ddb4a20c0dca53152fc0773d919eed549022850d1080b5e351735f61684fa274e1a451c16069c77310714703fdb5268f33e0d60007 SHA512 bf67f77aac46a6857d646fe777216a776ba8f79f0a7dadec1b505fa8c914e1352dfda1a9f2470b4d36ffa3559aaf4674a2069377054d262498c39dc3623e0d8c
diff --git a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild b/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
deleted file mode 100644
index 6c9d3f6e3600..000000000000
--- a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,33 +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 python-single-r1 bash-completion-r1
-
-DESCRIPTION="Native makefiles generator"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://bakefile.sourceforge.net"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
-
-src_install () {
-	default
-
-	if use doc ; then
-		dohtml -r doc/html/.
-	fi
-
-	# TODO: symlink the two
-	newbashcomp bash_completion bakefile
-	newbashcomp bash_completion bakefile_gen
-}
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
deleted file mode 100644
index 58052d45a7e1..000000000000
--- a/dev-util/bakefile/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>wxwidgets@gentoo.org</email>
-		<name>Gentoo wxWidgets Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bakefile</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bam-0.4.0-r1 b/dev-util/bam-0.4.0-r1
new file mode 100644
index 000000000000..2ef3edcd85bc
--- /dev/null
+++ b/dev-util/bam-0.4.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-lang/lua:= doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Fast and flexible Lua-based build system
+EAPI=5
+HOMEPAGE=https://matricks.github.com/bam/
+IUSE=doc test
+KEYWORDS=amd64 x86
+LICENSE=ZLIB
+RDEPEND=dev-lang/lua:=
+SLOT=0
+SRC_URI=https://github.com/downloads/matricks/bam/bam-0.4.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b96f480bf604336fdbee3473bec0dab
diff --git a/dev-util/bam/Manifest b/dev-util/bam/Manifest
deleted file mode 100644
index ed2042005910..000000000000
--- a/dev-util/bam/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.4.0/Makefile 508 BLAKE2B e3da9902bfb7252513b106df127b299ac80a595a9134be88622d1fdefec3d2ee9ebbd037bbfe19a045d1698cced6bc8c0eb919bae8a4ef59486f0a5bd9df3fb8 SHA512 9738df23d15a19aec675d9988163c3e64e028b51e77a555509273496358061af7e851a244561cbaa8dfa3bb2e5b8be54b1b5b6517da19800d13203fe2204b577
-AUX 0.4.0/bam-0.4.0-test.py.patch 266 BLAKE2B 48ea5564bf8c59f708f26f72a98fcd1f9f365c465ab4f79ed58f88d837bcdce3e7ceb24ab2e9b314bb6880d1302e48fa8ceeb818fe06bf9a32e2ba278a7a9d39 SHA512 5e6e3106f05ce2a3fa8cd6a51d9125700f3c962a7f5eeabbaf7cc2c64b98ebbb508f109c9587efc8ec58f377b4a78407e81d3deaac68e0bf220e92c1b78705bb
-DIST bam-0.4.0.tar.bz2 164033 BLAKE2B 75c3ccc2c0a22e793ebaf116257ad735db097870b84dd3cb7e9c12068e97b38ae2317c148f04b3d9b45e39a415e595d519d003c6c58af1230ab066538f93e2de SHA512 10ba53b05ac1604a9e9a01f4c008a8cbdc4e4e9df2fc039c8ca59251461e4c5f95770b5b72945d07693db7abe7cd312bc38725686b4d509d5dc21a585fffc810
-EBUILD bam-0.4.0-r1.ebuild 950 BLAKE2B e56940f3136bd376cd7840aa3f2a2f1e2580b2a857f899707dde46d552687178ff6130abf2514b603a4c00a82be7e4027b1e91cabf0cdd5ea29c4a8270e473e1 SHA512 f87fe39e0acbaf0cc5c798e01e6428da5fefe03ac71c8be31b750908be219358b4be2218fadb282ed163b82be5839427ef16ceafc3bb505629f20a3f1863723f
-MISC metadata.xml 250 BLAKE2B bd1ea3247aed63356bdac68d882e6cff2c996f3052a4590dd0a404dd0838bdc6b512db7ecef1563aa9d508f995d13d02bdfab7119cc3822b1c75bcd1425283cb SHA512 abe615c77678bf004cbb59192db454cbd48846b5715037375f15dcc44b331da47f462bb625251ef8cb2e06c809dfc8abd69bb997c827ceedbaef6b54128c0834
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
deleted file mode 100644
index 96a42af25130..000000000000
--- a/dev-util/bam/bam-0.4.0-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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Fast and flexible Lua-based build system"
-HOMEPAGE="https://matricks.github.com/bam/"
-SRC_URI="https://github.com/downloads/matricks/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-lang/lua:="
-DEPEND="${RDEPEND}
-	doc? ( ${PYTHON_DEPS} )
-	test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/Makefile "${S}"/Makefile || die "cp failed"
-	epatch "${FILESDIR}"/${PV}/${P}-test.py.patch
-	tc-export CC
-}
-
-src_compile() {
-	emake ${PN}
-	if use doc; then
-		"${PYTHON}" scripts/gendocs.py || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use doc; then
-		dohtml docs/${PN}{.html,_logo.png}
-	fi
-}
diff --git a/dev-util/bam/files/0.4.0/Makefile b/dev-util/bam/files/0.4.0/Makefile
deleted file mode 100644
index d64f43abcd11..000000000000
--- a/dev-util/bam/files/0.4.0/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-LIBS		+= -lm -lpthread -llua -ldl
-TARGETS	= txt2c internal_base bam
-BAM_OBJ	= $(patsubst %.c,%.o,$(wildcard src/*.c))
-TXT2C_LUA	= $(wildcard src/*.lua)
-
-all: $(TARGETS)
-
-txt2c: src/tools/txt2c
-
-internal_base: src/internal_base.h
-
-src/internal_base.h:
-	src/tools/txt2c $(TXT2C_LUA) > src/internal_base.h
-
-bam: txt2c internal_base $(BAM_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BAM_OBJ) $(LIBS)
-
-test: $(TARGETS)
-	python scripts/test.py
-
-clean:
-	rm -f $(BAM_OBJ) $(TARGETS) src/internal_base.h src/tools/txt2c
diff --git a/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch b/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
deleted file mode 100644
index 5ea2acd3e440..000000000000
--- a/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/test.py.old	2010-03-22 19:23:23.000000000 +0100
-+++ scripts/test.py	2010-03-22 19:23:43.000000000 +0100
-@@ -178,6 +178,8 @@
- 	print "FAILED TESTS:"
- 	for t in failed_tests:
- 		print "\t"+t
-+	sys.exit(1)
- else:
- 	print "ALL TESTS PASSED!"
-+	sys.exit(0)
- 
diff --git a/dev-util/bam/metadata.xml b/dev-util/bam/metadata.xml
deleted file mode 100644
index 3d17928aa2c6..000000000000
--- a/dev-util/bam/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-needed -->
-	<upstream>
-		<remote-id type="github">downloads/matricks</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bats-0.4.0 b/dev-util/bats-0.4.0
new file mode 100644
index 000000000000..d59dbad94af7
--- /dev/null
+++ b/dev-util/bats-0.4.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install test
+DESCRIPTION=An automated testing system for bash
+EAPI=6
+HOMEPAGE=https://github.com/sstephenson/bats/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz -> bats-0.4.0.tar.gz
+_md5_=3c7f7358b8809305ccd1b1461705b146
diff --git a/dev-util/bats-0.4.0_p20170219 b/dev-util/bats-0.4.0_p20170219
new file mode 100644
index 000000000000..6b182247a062
--- /dev/null
+++ b/dev-util/bats-0.4.0_p20170219
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install test
+DESCRIPTION=An automated testing system for bash
+EAPI=6
+HOMEPAGE=https://github.com/sstephenson/bats/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/sstephenson/bats/archive/03608115df2071fff4eaaff1605768c275e5f81f.tar.gz -> bats-0.4.0_p20170219.tar.gz
+_md5_=99f2dd80d59dd5bc46545573a4aee88a
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
deleted file mode 100644
index 87f0d332e1be..000000000000
--- a/dev-util/bats/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
-DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
-EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 658 BLAKE2B 5ca6fe1c1822722ccca8687173d7555539b319c78aecf89869d8266479b5cdeaad97bd1dcda6b677b68d01449174c23e99abf24e584b141c879258d5f85691fa SHA512 92ff0bb55481e30b5c770430681a29dfee5d5db2e56d8c88a4edf2f60e010949034c023b49e3898bd9f728eb6915ae141992b9c3ba7aae91bc5a479ce01dda36
-MISC metadata.xml 896 BLAKE2B bde071263574d67573e1ff65d1be19ce34a7a91ba8fea97300a296ed163e08ff7693d126cab84109a3669683ce8a4880b0b7d64ff2827d8bce9b3c6ad89c7945 SHA512 da70a0d89d4b892128e2ce7544d2a1db3b11fbd47c17aca53b220af2d3f46c77e99abb02fdfb814bc5010f2a54cd91841ed60b894b3655d0b910b303fa75a482
diff --git a/dev-util/bats/bats-0.4.0.ebuild b/dev-util/bats/bats-0.4.0.ebuild
deleted file mode 100644
index 0af7a00bf20f..000000000000
--- a/dev-util/bats/bats-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	einstalldocs
-
-	dobin libexec/*
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
deleted file mode 100644
index 8bff3f4e87f1..000000000000
--- a/dev-util/bats/bats-0.4.0_p20170219.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
-
-COMMITHASH="03608115df2071fff4eaaff1605768c275e5f81f"
-
-DESCRIPTION="An automated testing system for bash"
-HOMEPAGE="https://github.com/sstephenson/bats/"
-SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-S="${WORKDIR}/bats-${COMMITHASH}"
-
-src_test() {
-	bin/bats --tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/bats
-	doexe libexec/*
-	dosym ../libexec/bats/bats /usr/bin/bats
-
-	dodoc README.md
-	doman man/bats.1 man/bats.7
-}
diff --git a/dev-util/bats/metadata.xml b/dev-util/bats/metadata.xml
deleted file mode 100644
index b8f6a46a9071..000000000000
--- a/dev-util/bats/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nelo@wallus.de</email>
-		<name>Nelo-Thara Wallus</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sstephenson/bats</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		Bats is a TAP-compliant testing framework for Bash. It provides a simple
-		way to verify that the UNIX programs you write behave as expected.
-
-		A Bats test file is a Bash script with special syntax for defining test
-		cases. Under the hood, each test case is just a function with a description.
-
-		Bats is most useful when testing software written in Bash, but you can use
-		it to test any UNIX program.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/bazel-0.10.1 b/dev-util/bazel-0.10.1
new file mode 100644
index 000000000000..48de960a0bd5
--- /dev/null
+++ b/dev-util/bazel-0.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-dist.zip
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd053d77145261f0907712e4e36dff19
diff --git a/dev-util/bazel-0.13.0 b/dev-util/bazel-0.13.0
new file mode 100644
index 000000000000..8314f22565e4
--- /dev/null
+++ b/dev-util/bazel-0.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.13.0/bazel-0.13.0-dist.zip
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd053d77145261f0907712e4e36dff19
diff --git a/dev-util/bazel-0.14.1 b/dev-util/bazel-0.14.1
new file mode 100644
index 000000000000..1a425c290def
--- /dev/null
+++ b/dev-util/bazel-0.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.14.1/bazel-0.14.1-dist.zip https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2dd6025935b45aca84167e5ec82511b0
diff --git a/dev-util/bazel-0.7.0 b/dev-util/bazel-0.7.0
new file mode 100644
index 000000000000..f547034d9a58
--- /dev/null
+++ b/dev-util/bazel-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.7.0/bazel-0.7.0-dist.zip
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8de5f5400f2cfb076637782a186dbdd3
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
deleted file mode 100644
index 37dfa6b90af3..000000000000
--- a/dev-util/bazel/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST bazel-0.10.1-dist.zip 92973197 BLAKE2B a1d681407e2c72a57b3dcbb5e2afc49e59670be65da3d7d038dc3b8593bc0ab5b4a06c8dd8fc8a617a92eef2fc26a049b6de9a1eab0d05f31efb2fbeeb9ce711 SHA512 1894c951fd39a084011f89dd0d458e182525c2bfd6c80da071865e981e21a8c2b8363530ab53af18e6deae4a488744d6d2b7a5a4acf04715c2e26560a01df707
-DIST bazel-0.13.0-dist.zip 90105262 BLAKE2B cb065025524123babef187bac2e1f54f43645d08cb1282a5fe8f8c8b090e595570646072e2380836e2c43403f7953f97321becc24b743d7b9ab43ad208cf2c2d SHA512 3c128e551cff1b685250a68892ca3e1ad6be8b152ee2b8eb527c94adbb8fd50c70e703a363bb938916275030ddb14d756c14e4dc238e7a7b40289c700c5d53c7
-DIST bazel-0.14.1-dist.zip 89415405 BLAKE2B 7be5d4630d024d235a66f6bdf495c282b04a4034dde156c50d37a7e2eb3bf98df0caead7887f421b664fe92486e6baa5cd90e61b1e82b07b1691dc509ab93a68 SHA512 02c7125438f060d8e5e25b91ce3ca76fac6681b4f12033d807955a4ca5a5c22a3508a7229581b7349f35f343911f8408f43f8d78d54601277576dd32539e4681
-DIST bazel-0.7.0-dist.zip 84669893 BLAKE2B 2f8bbe3a48224a797bdebdaad8f7c403c8b0232ada5eee8c8619f241e9670dda311b9280f48b5e2013079f959891d94f55aee2af0dfae9fc4f6a486663fa245d SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4
-DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
-EBUILD bazel-0.10.1.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
-EBUILD bazel-0.13.0.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
-EBUILD bazel-0.14.1.ebuild 3603 BLAKE2B 3cc3d61b45ea0595ad543d240c13b7f61ff6f76ae5cd34f7f2ba60823fcbb3ad31653fbc09b5a7030df7f0750ae33d3c0c454d162e72911e0cb2944036fd71f2 SHA512 9369b64769351b94d119323f1d506ffe9816b3ab3a2a33f4f1977b2aeede49b85833aa3454a4ce1b0b4a8026fffe731302b60aaab42c326c1ec733cb20aec332
-EBUILD bazel-0.7.0.ebuild 2070 BLAKE2B c9e36a90c5d0233f282608f645db158d5449a2d2305209ff5b2268fb64d8208295316641123fe749446b2775098b7da38ce0fe753af959599995ebb24508cc39 SHA512 25e3293a33aae17cfbe2b4f7c3106bac1ff4362e72bf6becc4cd040088d9dab2cf64b3dca61d5de80631f00925f89a2a3aa24f49ac7520af50dec00181aae0f1
-MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.10.1.ebuild b/dev-util/bazel/bazel-0.10.1.ebuild
deleted file mode 100644
index bb11e0536acc..000000000000
--- a/dev-util/bazel/bazel-0.10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.13.0.ebuild b/dev-util/bazel/bazel-0.13.0.ebuild
deleted file mode 100644
index bb11e0536acc..000000000000
--- a/dev-util/bazel/bazel-0.13.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.14.1.ebuild b/dev-util/bazel/bazel-0.14.1.ebuild
deleted file mode 100644
index b972de19c2d7..000000000000
--- a/dev-util/bazel/bazel-0.14.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-
-bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
-	${bazel_external_uris}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS}; do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	local s d uri rename
-	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
-
-	while read uri rename d; do
-		[[ -z "$uri" ]] && continue
-		if [[ "$rename" == "->" ]]; then
-			s="${uri##*/}"
-			einfo "Copying $d to bazel distdir $s ..."
-		else
-			s="${uri##*/}"
-			d="${s}"
-			einfo "Copying $d to bazel distdir ..."
-		fi
-		cp "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
-	done <<< "${bazel_external_uris}"
-}
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack ${P}-dist.zip
-}
-
-src_prepare() {
-	load_distfiles
-	default
-
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	cat > "${T}/bazelrc" <<-EOF
-	build --verbose_failures
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --experimental_distdir=${T}/bazel-distdir
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
-	test --verbose_failures --verbose_test_summary
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-	EOF
-
-	echo "import ${T}/bazelrc" >> "${S}/.bazelrc"
-}
-
-src_compile() {
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.7.0.ebuild b/dev-util/bazel/bazel-0.7.0.ebuild
deleted file mode 100644
index 0a5efcceeb51..000000000000
--- a/dev-util/bazel/bazel-0.7.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
deleted file mode 100644
index 7ddb1068e6a0..000000000000
--- a/dev-util/bazel/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>zmedico@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>perfinion@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bazelbuild/bazel</remote-id>
-	</upstream>
-	<longdescription>
-		Bazel is Google's own build tool. Bazel has built-in support for
-		building both client and server software, including client
-		applications for both Android and iOS platforms. It also provides
-		an extensible framework that you can use to develop your own build
-		rules.
-	</longdescription>
-	<use>
-		<flag name="tools">Install extra bazel tools to build from sources</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/bbe-0.2.2 b/dev-util/bbe-0.2.2
new file mode 100644
index 000000000000..86c265503ad7
--- /dev/null
+++ b/dev-util/bbe-0.2.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare
+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
+DESCRIPTION=Sed-like editor for binary files
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/bbe-/
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/bbe-/bbe-0.2.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2fef6d26d6e73142ecd4181f5d9a9c0b
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
deleted file mode 100644
index 84eeb217fbbb..000000000000
--- a/dev-util/bbe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
-EBUILD bbe-0.2.2.ebuild 532 BLAKE2B 9ffb9cf809fc504b5c771cb43a39a3a3ae91b9e1637080379901d11b0f5c0922a292e4b93462e0d0fbc6c07520acdecfdf743f58ab3667862797be1acb128f8e SHA512 2d68c7af9c3ac3784ceaf9d4c837392cee405c2d9e92645b5707b9e188f221183c98dfc9b130b354e378fdb7d7c3b45e4a80810ede6ac46d3adc1146f8407b34
-MISC metadata.xml 323 BLAKE2B 4bcf6d746791f68582290bf43697ff941344dbfe4e07111b9a164077f0cd2080ac4d477785b2952898e5a75f37cfa3e2081458366d0f6b2180335baf20812fbe SHA512 58f9102a7e5a4c09bd8d16c7e66ba1088cd9e8b6f78998c5ba5930634fb7778d7f06a126e4c6dc33bc1d37574dfda200f71d2b7dc6a471daa3b22e3624462fa0
diff --git a/dev-util/bbe/bbe-0.2.2.ebuild b/dev-util/bbe/bbe-0.2.2.ebuild
deleted file mode 100644
index 0d506f35d5cd..000000000000
--- a/dev-util/bbe/bbe-0.2.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
-
-inherit autotools
-
-DESCRIPTION="Sed-like editor for binary files"
-HOMEPAGE="https://sourceforge.net/projects/bbe-/"
-SRC_URI="mirror://sourceforge/${PN}-/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	sed -i -e '/^htmldir/d' doc/Makefile.am || die
-	eaclocal
-	eautoreconf
-}
-
-src_configure() {
-	econf --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
diff --git a/dev-util/bbe/metadata.xml b/dev-util/bbe/metadata.xml
deleted file mode 100644
index ff635f4eb948..000000000000
--- a/dev-util/bbe/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>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bbe-</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bcc-0.5.0_p20171230 b/dev-util/bcc-0.5.0_p20171230
new file mode 100644
index 000000000000..29f0843e17c5
--- /dev/null
+++ b/dev-util/bcc-0.5.0_p20171230
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=6
+HOMEPAGE=https://iovisor.github.io/bcc/
+IUSE=kernel_linux 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 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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(+)?]
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bcc/archive/82ef5a0d999b687d26059e5adfdaac3e605f2339.tar.gz -> bcc-0.5.0_p20171230.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b9ccfa5e1af189823d70a4d33c22ffc7
diff --git a/dev-util/bcc-0.6.0 b/dev-util/bcc-0.6.0
new file mode 100644
index 000000000000..2a98daa1a06d
--- /dev/null
+++ b/dev-util/bcc-0.6.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=6
+HOMEPAGE=https://iovisor.github.io/bcc/
+IUSE=kernel_linux 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 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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(+)?]
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bcc/archive/v0.6.0.tar.gz -> bcc-0.6.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5497fa616b2703b7e6da106f9e2f85f
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
deleted file mode 100644
index 9f7c9b81430f..000000000000
--- a/dev-util/bcc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
-DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80
-EBUILD bcc-0.5.0_p20171230.ebuild 1171 BLAKE2B 5d895b41e7608473e636fae524091fad9da737394216b71077cd364c5cf5f044b1409fcf6e90afb56de0a4fa852ad479491ec1d84be3c65dcd3727cab6e45be5 SHA512 d1b25d2299af9430a5814109c9be17b9047b18e84d57feb92f3d3efbc82e665afc849624384ff21812cf342c8cf3b9378ba164943e54d6702b365cccc4a71f83
-EBUILD bcc-0.6.0.ebuild 1137 BLAKE2B d9c11470ea2fc096cbeaba592d0181652376d8c4774c1e69c4b9a0cf38ae8835824a4090b75dc6def4dace3b26be263aa12c52f1283912c86580dc9334ff6f82 SHA512 bdbf5614a9ab1fb148594cdcf9c2c53069d2909bc88a244f47395bfc4b9b4851d965feec460ec08ea2289b6f0198cec2d41d3ad22de0c02626577df9d8528605
-MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
deleted file mode 100644
index a37a5992ad07..000000000000
--- a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
+++ /dev/null
@@ -1,51 +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 cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="82ef5a0d999b687d26059e5adfdaac3e605f2339"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild
deleted file mode 100644
index 42ab57d08a2a..000000000000
--- a/dev-util/bcc/bcc-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +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 cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
deleted file mode 100644
index 43eb746c3b02..000000000000
--- a/dev-util/bcc/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>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">iovisor/bcc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/bcpp-20150811-r1 b/dev-util/bcpp-20150811-r1
new file mode 100644
index 000000000000..3bed85be7226
--- /dev/null
+++ b/dev-util/bcpp-20150811-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Indents C/C++ source code
+EAPI=6
+HOMEPAGE=http://invisible-island.net/bcpp/
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=ftp://invisible-island.net/bcpp/bcpp-20150811.tgz
+_md5_=85385c7a14d6f698440f4f29284201f5
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
deleted file mode 100644
index b17f2682f44e..000000000000
--- a/dev-util/bcpp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
-EBUILD bcpp-20150811-r1.ebuild 912 BLAKE2B 83362edbe78e6587ff3df1ccd6e32a919aa39094170ee5670fbc3716d7825039d075b01547cd89a31af302f0e9550eedcf1aa4ac9a601c51581e713176fc0717 SHA512 b76858bb46a572a0fb64184496146b6b2c47a87330095b96562d62617f2179b9c3f442692296614e2f02cccf206a34163823cff0840a707b51b754057c6eea58
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20150811-r1.ebuild b/dev-util/bcpp/bcpp-20150811-r1.ebuild
deleted file mode 100644
index 32f56aaee9d7..000000000000
--- a/dev-util/bcpp/bcpp-20150811-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Indents C/C++ source code"
-HOMEPAGE="http://invisible-island.net/bcpp/"
-SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_compile() {
-	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
-}
-
-src_install() {
-	default
-	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
-		txtdocs/manual.txt
-
-	insinto /etc/bcpp
-	doins bcpp.cfg indent.cfg
-}
-
-pkg_postinst() {
-	elog "Check the documentation for more information on how to"
-	elog "Run bcpp.  Please note that in order to get help for"
-	elog "bcpp, please run bcpp -h and not the command by itself."
-	elog ""
-	elog "Configuration files are at /etc/bcpp."
-	elog "To use them, use the -c option followed by the filename."
-}
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/bcpp/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/dev-util/bdelta-0.3.1-r1 b/dev-util/bdelta-0.3.1-r1
new file mode 100644
index 000000000000..b1e754a3fc0d
--- /dev/null
+++ b/dev-util/bdelta-0.3.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Binary Delta - Efficient difference algorithm and format
+EAPI=6
+HOMEPAGE=https://github.com/jjwhitney/BDelta
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux
+LICENSE=MPL-2.0
+SLOT=0
+SRC_URI=https://github.com/jjwhitney/BDelta/tarball/v0.3.1 -> bdelta-0.3.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=3e5575c4e0cf3d6bab822f8ad3a95377
diff --git a/dev-util/bdelta/Manifest b/dev-util/bdelta/Manifest
deleted file mode 100644
index 921465903c78..000000000000
--- a/dev-util/bdelta/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bdelta-0.3.1-gcc-6.patch 876 BLAKE2B 9530a66a10a72d5553b3c9013d4bab31df5a5764d5b6c8e963eb871bb81985e2242f8ceab7529b106fbab0e6edb7b8cea6d63551186684d062a9a6e952ff1082 SHA512 d6b152bdfff022dc7edb0f234d1cece02518335a22b366a633e2288ac8bacd0a8b435935da4640b9888418aaf6ccadc937607b32ff8368034eb9426872279714
-AUX bdelta-0.3.1-soname.patch 722 BLAKE2B c729dd83f5d9243b0f6591abcb370b59a8e4d5310176de39f48bf5f03c6edc1f94a8dd5081cfdbb4eecbb946bac3ba42705c449826903fd0a9a8e5cbd16d7e53 SHA512 2b70edefae1fe811e905b74a4ddbdedd0d51889b888f7d26c65b428634dd89e189c9a25ccb90cd74cd0ba2d2069f6fb4be9980db14d6799735c352b971e86e0c
-DIST bdelta-0.3.1.tar.gz 14476 BLAKE2B 6086b692551c5dd5e6868b064277a4d79d6ba2200a260d4ce2f13debcc62652cbb448b1e56f3244750d50cf450dcc9da60d0c4ca46d5b5c12d887d3662eaca5a SHA512 914e5c38297a273c446cddc17fc4cf312b4f54e6fe332e4ef0474104af559a6dca327cfb069f2d224b7cf63b8c81ae1cc4b384371b8fcc8c01cedc199ee871be
-EBUILD bdelta-0.3.1-r1.ebuild 957 BLAKE2B b4914b70de9b3c9b29aa9bd5036f44a1fb73c73baa3791872e3ccd5a257d04bc593028ad8fdcb91bf16dce49191267723236d14ddb691eac270ebfc32b018d33 SHA512 1226e66278741c8b31eeb61fd2a5ff07d200701b27da7b61ecb9517ddfd17162df5e4ed9af3f475975e17f08f0adadeba40732caa422b65c151bd6abf521ee6b
-MISC metadata.xml 475 BLAKE2B 4c6bd1ac719098de30df8d1cf7bccf6a7d5ed3506120082978c612e41cd322c7dcdc1859928bcc4660a01185b06d76e22984e4e47db97ff32561cb611563920f SHA512 e1476972d1d04e3ee8b5cf5fccefe7df50c8fb816594b9405ea9a4bd37a9837be03385ca57adda55bf8a3ad8853b7eeee65b7b84fd857a5c1a08a95ddcb24f47
diff --git a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
deleted file mode 100644
index 9bbc378a96af..000000000000
--- a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jjwhitney/BDelta.git"
-	UNPACKER_ECLASS="git-2"
-	LIVE_EBUILD=yes
-else
-	UNPACKER_ECLASS="vcs-snapshot"
-fi
-
-inherit toolchain-funcs ${UNPACKER_ECLASS}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
-	SRC_URI="https://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
-HOMEPAGE="https://github.com/jjwhitney/BDelta"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-soname.patch
-	"${FILESDIR}"/${P}-gcc-6.patch
-)
-
-src_compile() {
-	emake -C src \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake -C src install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	dodoc README
-}
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
deleted file mode 100644
index 9c998de37c3e..000000000000
--- a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp
-index b11bb2b..d769b0d 100644
---- a/src/libbdelta.cpp
-+++ b/src/libbdelta.cpp
-@@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1, unsigned p2, unsigned b
- // Iterator helper function
--template <class T>
--inline T prior(T i) {return --i;}
--template <class T>
--inline T next(T i) {return ++i;}
--
-+template <class T> inline T bdelta_next(T i) {return ++i;}
- 
-@@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize, unsigned minMatchSize,
- 				if (! maxHoleSize || (u1.num <= maxHoleSize && u2.num <= maxHoleSize))
--					if (! (flags & BDELTA_SIDES_ORDERED) || (next(u1.ml) == u1.mr && next(u2.ml) == u2.mr))
-+					if (! (flags & BDELTA_SIDES_ORDERED) || (bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr))
- 						bdelta_pass_2(b, blocksize, minMatchSize, &u1, 1, &u2, 1);
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
deleted file mode 100644
index 360a16d7c0da..000000000000
--- a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 65fb88d..3b4a261 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,6 +3,7 @@ PREFIX   ?= /usr
- BINDIR   ?= $(PREFIX)/bin
- LIBDIR   ?= ${PREFIX}/lib
- CXXFLAGS += -O2
-+DYLIB_LDFLAGS ?= -Wl,-soname,libbdelta.so
- 
- ifeq ($(shell uname -s),Darwin)
- 	SHAREDLIB := libbdelta.dylib
-@@ -19,7 +20,7 @@ libbdelta.a: libbdelta.cpp compatibility.h checksum.h file.h
- 	$(AR) rs $@ $<.o
- 
- libbdelta.so: libbdelta.cpp compatibility.h checksum.h file.h
--	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
-+	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $(DYLIB_LDFLAGS) $< -o $@
- 
- libbdelta.dylib: libbdelta.cpp compatibility.h checksum.h file.h
- 	$(CXX) -dynamiclib $(CXXFLAGS) $< -o $@
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
deleted file mode 100644
index 85db5a5c5266..000000000000
--- a/dev-util/bdelta/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>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>tools-portage@gentoo.org</email>
-    <name>Gentoo Portage tools team</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jjwhitney/BDelta</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/biew-6.1.0-r3 b/dev-util/biew-6.1.0-r3
new file mode 100644
index 000000000000..515d524410f3
--- /dev/null
+++ b/dev-util/biew-6.1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gpm? ( sys-libs/gpm )
+DESCRIPTION=A portable viewer of binary files, hexadecimal and disassembler modes
+EAPI=4
+HOMEPAGE=http://beye.sourceforge.net/
+IUSE=gpm cpu_flags_x86_mmx cpu_flags_x86_sse
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=gpm? ( sys-libs/gpm )
+REQUIRED_USE=cpu_flags_x86_mmx cpu_flags_x86_sse
+SLOT=0
+SRC_URI=mirror://sourceforge/beye/6.1.0/biew-610-src.tar.bz2
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2a1091860f9e10b69d703c01fbdad2e8
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
deleted file mode 100644
index 8d5607d6839b..000000000000
--- a/dev-util/biew/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX biew-610-crash.patch 1254 BLAKE2B daf3918abab9b8e552c968229c77d57658ca925ad88c0b0a421e92b0a214c63f28860cfb8935e970d45bd6fc9bbd24c72cd30e11b848150016cac44945cf1998 SHA512 ec71e70aacd171125100e2482fd888002d47f95cbeb909ba78acc1c2383a70bad5b8f8fb7acb709989e1466722e974b5a4689394fcdad96903354bd32306746e
-AUX biew-610-fix_localedep-1.patch 1003 BLAKE2B 6c6d81692a4ed14e1f0a229e31aa2f6432a0f093e8a38a20d523127b3d58838bc45c5d63332615460c3fca0ec1048d10d534b5b9d2cf8e3eaf15909fc64f6deb SHA512 d141df509fda58d2044fc8488bb73eca8b908fa33dd0449724475d8e6109e186d67245506c4af3100d24378d51866367da1b09bffbb664e91ff79f6bde7e68eb
-AUX biew-610-portable_configure-1.patch 4932 BLAKE2B 077f437ef02e20220c6f18b0baa472a73fc8de070b292e2ad5f75bbcd95616da110c3d723d42ac206eaa87d39500a43c893d623126dcf254e03ddb414bccfa06 SHA512 cce6564e9d65b6f8c6c4a8dba1919dcfffbc22641ddfcb4fdf1bcab45d56b437dedbee328c86426c1b821b57b923e3d8cc97fdcf140662deb794f64e29c6847c
-DIST biew-610-src.tar.bz2 860517 BLAKE2B 23ccb5e17dc3d99c6eeb303ad26a9779faa5a648208e0a7291b7f120f492db80f0995449ca2e6982de73543cbc7d9210c3f56077eeffceef46e4ea17cb838b5a SHA512 df8d3c10c30e30db1bc5fdba73601a148f7a1480e69a3d03a02ec303534f37db9c5a9eb7ac087d8f1d8cc64d4a0f6e11548c5b385e132e3a981a6f328e3b5742
-EBUILD biew-6.1.0-r3.ebuild 1737 BLAKE2B 9d0dea71af9358332d8e1f97583022c03ece983d6bdb9a51c5b6837003dfc64d11c05ea6e458da42cc23d83467d54f34008a18042e58a03ee0cdf49d3b7915f7 SHA512 17c0f8d50d00c1eb9a90ca1527737cf4728401c94845baba5c71cde5f1f095e4cadf2088ed2b939f6e3b4540718246e4c1ca3f2eac50f421cbf5b29e02c604f5
-MISC metadata.xml 327 BLAKE2B f4e3b7d00a6084b3b0cbffc2dcec2ffbea9d73717119295f8bb46b9a17c928086a61a01eccad85aedbd511ec5d9d73c52b5f0f3ab1944f9bce5d5da5c853abb1 SHA512 0e157ba1f9c8d78c203108d72e2871cda917a404223cd7d8b8ff261f72ec69be630a59e6e205112a0798d7daee06bfd60a3feaa950b327041187ae25701a24f2
diff --git a/dev-util/biew/biew-6.1.0-r3.ebuild b/dev-util/biew/biew-6.1.0-r3.ebuild
deleted file mode 100644
index d35ab26a9595..000000000000
--- a/dev-util/biew/biew-6.1.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_P=${PN}-$(replace_all_version_separators "")
-
-DESCRIPTION="A portable viewer of binary files, hexadecimal and disassembler modes"
-HOMEPAGE="http://beye.sourceforge.net/"
-SRC_URI="mirror://sourceforge/beye/${PV}/${MY_P}-src.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gpm cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RDEPEND="gpm? ( sys-libs/gpm )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	append-flags -mmmx -msse #362043
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
-	epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
-	epatch "${FILESDIR}/${PN}-610-crash.patch"
-	sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
-}
-
-src_configure() {
-	if use gpm; then
-		append-cppflags -DHAVE_MOUSE
-	else
-		append-cppflags -UHAVE_MOUSE
-	fi
-	./configure --datadir=/usr/share/${PN} \
-		--prefix=/usr \
-		--cc="$(tc-getCC)" \
-		--ld="$(tc-getCC)" \
-		--ar="$(tc-getAR) -rcu" \
-		--as="$(tc-getAS)" \
-		--ranlib="$(tc-getRANLIB)" || die "configure failed."
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/{biew_en,release,unix}.txt
-}
-
-pkg_postinst() {
-	elog
-	elog "Note: if you are upgrading from <=dev-util/biew-6.1.0 you will need"
-	elog "to change the paths in the setup dialog (F9) from /usr/share/ to"
-	elog "/usr/share/biew/ Alternatively, you can delete ~/.biewrc and it will"
-	elog "automatically determine the correct locations on the next run."
-	elog
-}
diff --git a/dev-util/biew/files/biew-610-crash.patch b/dev-util/biew/files/biew-610-crash.patch
deleted file mode 100644
index 244f94a7ad53..000000000000
--- a/dev-util/biew/files/biew-610-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-If .biewrc does not exist, the setup dialog appears at program start. If you try
-to click a checkbox with the mouse, biew tries to dereference a null pointer
-(because the MainWindow is not yet set).
-
-This patch adds a workaround. Note that you actually cannot click a checkbox.
-But that is what users might expect. (Maybe the biew code should be changed to
-handle this properly.) Well, it is better not to crash, even if the checkboxes
-are not clickable.
-
- –nico
-
-
-diff -Naur biew-610.orig/events.c biew-610/events.c
---- biew-610.orig/events.c	2009-09-03 16:57:40.000000000 +0000
-+++ biew-610/events.c	2011-09-06 09:41:01.000000000 +0000
-@@ -118,7 +118,11 @@
-                     }
-                     else
-                     {
--                      X1 = 0; X2 = twGetClientWidth(MainWnd); Y1 = 1; Y2 = twGetClientHeight(MainWnd) - 1;
-+                      TWindow *wnd =
-+                              MainWnd ? MainWnd :  /*XXX:drop this line?*/
-+                              twGetWinAtPos(mx, my);
-+                      if(!wnd) return KE_MOUSE;
-+                      X1 = 0; X2 = twGetClientWidth(wnd); Y1 = 1; Y2 = twGetClientHeight(wnd) - 1;
-                     }
-                     wdh = X2 - X1;
-                     hght = Y2 - Y1;
diff --git a/dev-util/biew/files/biew-610-fix_localedep-1.patch b/dev-util/biew/files/biew-610-fix_localedep-1.patch
deleted file mode 100644
index babe994e070a..000000000000
--- a/dev-util/biew/files/biew-610-fix_localedep-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The configure script of biew-6.1.0 fails with
-    Checking for C compiler name ... gcc-Version
-if using the de_DE.UTF-8 locale and sys-devel/gcc-4.5.2. It may fail with other
-locales and/or compilers, too. The problem occurs due to the fact that the
-string “gcc version” written by gcc for ‘gcc -v’ is translated according to the
-language (German in the case mentioned above).
-
-This patch makes sure that the POSIX locale is used when the biew configure
-script checks for the name of the compiler. This allows the configure script to
-parse the output properly.
-
- –nico
-
-
-diff -Naur biew-610.orig/configure biew-610/configure
---- biew-610.orig/configure	2009-11-13 15:52:36.000000000 +0100
-+++ biew-610/configure	2011-01-13 11:11:59.000000000 +0100
-@@ -497,7 +497,7 @@
- 
- _cdefos="-DDATADIR='\"$_datadir\"'"
- 
--cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
-+cc_name=`LC_ALL=POSIX $_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
- cc_version=`$_cc -dumpversion`
- 
- echocheck "C compiler name"
diff --git a/dev-util/biew/files/biew-610-portable_configure-1.patch b/dev-util/biew/files/biew-610-portable_configure-1.patch
deleted file mode 100644
index c64f6280ba08..000000000000
--- a/dev-util/biew/files/biew-610-portable_configure-1.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-Changes the biew-610 configure script to use portable test constructs. See the
-Autoconf manual <URL:https://www.gnu.org/software/autoconf/manual/html_node/
-Limitations-of-Builtins.html#index-g_t_0040command_007btest_007d-1725> for
-explanations.
-
- –nico
-
-
-diff -Naur biew-610.orig/configure biew-610/configure
---- biew-610.orig/configure	2009-11-13 14:52:36.000000000 +0000
-+++ biew-610/configure	2011-02-24 09:44:10.000000000 +0000
-@@ -171,7 +171,7 @@
- # 1st: print out help
- 
- for parm in "$@" ; do
--  if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then
-+  if test "X$parm" = "X--help" || test "X$parm" = "X-help" || test "X$parm" = "X-h" ; then
-     cat << EOF
- 
- Usage: $0 [OPTIONS]...
-@@ -235,7 +235,7 @@
- _cp=cp
- _libext=a
- _libprefix=lib
--test "$CC" && _cc="$CC"
-+test "X$CC" != X && _cc="$CC"
- _prefix="/usr/local"
- _datadir=
- _libdir=
-@@ -340,11 +340,11 @@
-     ;;
-   esac
- done
--test -z "$_datadir" && _datadir=$_prefix"/share/biew"
--test -z "$_libdir" && _libdir=$_prefix"/lib/biew"
-+test "X$_datadir" = X && _datadir=$_prefix"/share/biew"
-+test "X$_libdir" = X && _libdir=$_prefix"/lib/biew"
- 
- for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
--  test "$I" && break
-+  test "X$I" != X && break
- done
- 
- TMPLOG="config.log"
-@@ -357,8 +357,8 @@
- _tee="tee -a $TMPLOG"
- 
- echocheck "architecture"
--if test "$_target_arch" = auto ; then
--  if test -z "$host_arch" ; then
-+if test "X$_target_arch" = Xauto ; then
-+  if test "X$host_arch" = X ; then
-   host_arch=`( uname -p ) 2>&1`
-   log "uname -p :" "$host_arch"
-   case "$host_arch" in
-@@ -416,8 +416,8 @@
- x86_64  && _bitness=64
- 
- echocheck "target OS"
--if test "$_target_system" = auto ; then
--  if test -z "$system_name" ; then
-+if test "X$_target_system" = Xauto ; then
-+  if test "X$system_name" = X ; then
-     # OS name
-     system_name=`uname -s`
-     log "uname -s :" "$system_name"
-@@ -461,8 +461,8 @@
-   fi
- fi
- 
--if test "$_target_system" = auto ; then
--  if test -z "$system_name" ; then
-+if test "X$_target_system" = Xauto ; then
-+  if test "X$system_name" = X ; then
-     # OS name
-     system_name=`/bin/sh --version 2>&1 | sed -n 's/^.*\([(]\)./\1/p'`
-     log "/bin/sh --version:" "$system_name"
-@@ -549,7 +549,7 @@
-     ;;
- esac
- 
--if test -z "$_x11incdir" ; then
-+if test "X$_x11incdir" = X ; then
- echocheck "X11 headers"
-   for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
-     if test -d "$I/X11" ; then
-@@ -559,11 +559,11 @@
-     fi
-   done
- fi
--if test -z "$_x11incdir" ; then
-+if test "X$_x11incdir" = X ; then
-     echores "x11inc not found"
- fi
- 
--if test -z "$_x11libdir" ; then
-+if test "X$_x11libdir" = X ; then
- echocheck "X11 libs"
-   for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
-     if test -d "$I" ; then
-@@ -573,24 +573,24 @@
-     fi
-   done
- fi
--if test -z "$_x11libdir" ; then
-+if test "X$_x11libdir" = X ; then
-     echores "x11lib not found"
- fi
- 
--test -z "$_debug" && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
--if test "$_profile" -o "$_debug" -o "$_gcov"; then
-+test "X$_debug" = X && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
-+if test "X$_profile" != X || test "X$_debug" != X || test "X$_gcov" != X ; then
-   _cdefos="-W -Wall -O2 -fno-builtin $_debug $_profile $_gcov $_cdefos"
-   _osldef="$_debug $_profile $_osldef"
--elif test -z "$CFLAGS" ; then
-+elif test "X$CFLAGS" = X ; then
-     _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
-     x86 && _cdefos="-mmmx -msse $_cdefos"
- else
-     _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos"
- fi
--test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
--test -n "$LIBS" && _osldef="$LIBS $_osldef"
-+test "X$LDFLAGS" != X && _osldef="$LDFLAGS $_osldef"
-+test "X$LIBS" != X && _osldef="$LIBS $_osldef"
- 
--if test "$_target_system" = dos ; then
-+if test "X$_target_system" = Xdos ; then
- # disable cc_check call for DJGPP due bugs in bash
- _cdefos="-D__HAVE_PRAGMA_PACK__=1 $_cdefos"
- else
-@@ -668,10 +668,10 @@
- 	_curseslib=
- 	disable _curses
- 	cc_check -lcurses && _curseslib="-lcurses"
--	if test -z "$_curseslib" ; then
-+	if test "X$_curseslib" = X ; then
- 	    cc_check -lncurses && _curseslib="-lncurses"
- 	fi
--	if test -n "$_curseslib" ; then
-+	if test "X$_curseslib" != X ; then
- 	    enable _curses
- 	    _cdefos="-D_CURSES_ -D__OS_NAME__='\"Unix/Curses\"' $_cdefos"
- 	    _oslibs="$_curseslib $_oslibs"
-@@ -711,10 +711,10 @@
- enabled sys_resource_h && _cdefos="-DHAVE_SYS_RESOURCE=1 $_cdefos"
- echores "$sys_resource_h"
- 
--if test -z "$_x11libdir" ; then
-+if test "X$_x11libdir" = X ; then
-  _cdefos="$_cdefos"
- else
--  if test -z "$_x11incdir" ; then
-+  if test "X$_x11incdir" = X ; then
-    _cdefos="$_cdefos"
-   else
-     _cdefos="-DHAVE_X11 $_cdefos"
-@@ -738,7 +738,7 @@
- fi
- 
- # Checking for INSTALL
--if test -z $_install
-+if test "X$_install" = X
- then
-     _install="install"
-     $_install --version 1>/dev/null 2>/dev/null || _install=""
diff --git a/dev-util/biew/metadata.xml b/dev-util/biew/metadata.xml
deleted file mode 100644
index 5894b06df22b..000000000000
--- a/dev-util/biew/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="sourceforge">beye</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/bin_replace_string-0.2 b/dev-util/bin_replace_string-0.2
new file mode 100644
index 000000000000..cd9e25eff81d
--- /dev/null
+++ b/dev-util/bin_replace_string-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-text/txt2man ) virtual/libelf:0 >=app-portage/elt-patches-20170422
+DESCRIPTION=A tool to edit C strings in compiled binaries
+EAPI=4
+HOMEPAGE=http://ohnopub.net/~ohnobinki/bin_replace_string
+IUSE=doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=AGPL-3
+RDEPEND=virtual/libelf:0
+SLOT=0
+SRC_URI=ftp://mirror.ohnopub.net/mirror/bin_replace_string-0.2.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_=4412c553d8b140eec95a64d4b7eccb74
diff --git a/dev-util/bin_replace_string/Manifest b/dev-util/bin_replace_string/Manifest
deleted file mode 100644
index 4e966bd1e2e6..000000000000
--- a/dev-util/bin_replace_string/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bin_replace_string-0.2.tar.bz2 69287 BLAKE2B 214c3a0b36971d22e5a2801334c6e3d6a8f25bb8c9293d78c4b4adcf9bcf5acfc73e39cf6e863bb135d3674eccbc48f69c090cdf5344cff7d84fb2b4123b708c SHA512 1dc369a036df48afb199d90438db34139c58ddb9bff61ccec11b78ff2173130bf8124eac784088b3ec3f376a515a543df22e81f8bbac201abc3e3e5dec8d1a92
-EBUILD bin_replace_string-0.2.ebuild 562 BLAKE2B 9724307f9ac5c2f3efdb5dab83b02f3a1c8193842cd3f6143d11c2d2007b69aeb114be62d1225ed81353c738bfdb2660695b3645755d812de7f5456635a185dd SHA512 5e963ac669d4f94864d078f174a47e697e3a6e2fdc78261da39737d02c9a29f6cbc3595fe0819fc90a26176e6fd14e30e7ebcb4e5c52003b7deb24c0891eb673
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild b/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild
deleted file mode 100644
index d51ab7696095..000000000000
--- a/dev-util/bin_replace_string/bin_replace_string-0.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=4
-
-inherit autotools-utils
-
-DESCRIPTION="A tool to edit C strings in compiled binaries"
-HOMEPAGE="http://ohnopub.net/~ohnobinki/bin_replace_string"
-SRC_URI="ftp://mirror.ohnopub.net/mirror/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-RDEPEND="virtual/libelf:0"
-DEPEND="doc? ( app-text/txt2man )
-	${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/bin_replace_string/metadata.xml b/dev-util/bin_replace_string/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/bin_replace_string/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/bitcoin-tx-0.15.1 b/dev-util/bitcoin-tx-0.15.1
new file mode 100644
index 000000000000..653eb849e63c
--- /dev/null
+++ b/dev-util/bitcoin-tx-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] >=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=Command-line Bitcoin transaction tool
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)]
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz https://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c63f17aa64a6617d6eb3f38e5f0e5a4f
diff --git a/dev-util/bitcoin-tx-0.16.0 b/dev-util/bitcoin-tx-0.16.0
new file mode 100644
index 000000000000..19e243f4b0c8
--- /dev/null
+++ b/dev-util/bitcoin-tx-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=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=Command-line Bitcoin transaction tool
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9b66491f9a76f7a59a344e1b213fa04a
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
deleted file mode 100644
index 5b4fceb6014e..000000000000
--- a/dev-util/bitcoin-tx/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
-EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
-EBUILD bitcoin-tx-0.16.0.ebuild 2432 BLAKE2B ed1721e555bcfa9490b7291e9d9dd0e901ec713ecf7a1316a930c13f337076ca27a0757afd562776a124a2553e3690a383884e850aa1156e2f457681ef4f60df SHA512 fb46d29926d4c7a1058a5452f36087c27d916608e853beb25ae79e13ea38bbd70842467a22a2170a1c73c0f1b1edc40c9f93e5e1643d5c96db9571a07973eee3
-MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
deleted file mode 100644
index d4d855fafc42..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2010-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
-KNOTS_PV="${PV}.knots20171111"
-KNOTS_P="${MyPN}-${KNOTS_PV}"
-
-IUSE="knots libressl"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
-	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-KNOTS_DESC="https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
-	dev-libs/univalue
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md )
-
-S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		einfo "You are building ${PN} from Bitcoin Knots."
-		einfo "For more information, see ${KNOTS_DESC}"
-	else
-		einfo "You are building ${PN} from Bitcoin Core."
-		einfo "For more information, see ${CORE_DESC}"
-	fi
-}
-
-KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
-
-src_prepare() {
-	eapply "$(KNOTS_PATCH syslibs)"
-
-	if use knots; then
-		eapply "$(KNOTS_PATCH f)"
-		eapply "$(KNOTS_PATCH branding)"
-		eapply "$(KNOTS_PATCH ts)"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-experimental-asm
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
deleted file mode 100644
index e0f97bebbc18..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
+++ /dev/null
@@ -1,98 +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
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
-IUSE="knots libressl"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
deleted file mode 100644
index 62d40fbeff4c..000000000000
--- a/dev-util/bitcoin-tx/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>luke-jr+gentoobugs@utopios.org</email>
-		<name>Luke Dashjr</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">bitcoin/bitcoin</remote-id>
-		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bite-9999 b/dev-util/bite-9999
new file mode 100644
index 000000000000..44f080c1f437
--- /dev/null
+++ b/dev-util/bite-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=bug, issue, and ticket extraction library and command line tool
+EAPI=6
+HOMEPAGE=https://github.com/bite/bite
+IUSE=doc test python_targets_python3_6
+LICENSE=BSD
+RDEPEND=>=dev-python/requests-2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/multidict[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( 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_=da7815820869cdaff699112e22266dbf
diff --git a/dev-util/bite/Manifest b/dev-util/bite/Manifest
deleted file mode 100644
index cb54affe202f..000000000000
--- a/dev-util/bite/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD bite-9999.ebuild 1452 BLAKE2B 2dfaa75c4cea242833a8d84fc1fbd91a340d16379cbaad63d69667cd2fb91d345a2d2f9adf386b6cca2621a3c1453c40c503289e61b4677067f1a9094d94a649 SHA512 d3fa7b51f7d0841009aa133a530b8e52629aa4834a1d3513bbc46d0c1635d3227c7ccb1dff9b43f77c58acac5206b2ba6188a7fe3868634a7e7d471b31b8fd22
-MISC metadata.xml 330 BLAKE2B 84591ee05d14a0a3c7db1cd1fc966aca6a614c129babd365d5c2717ca19845a3b391c280e1861ae8c900e8a6124b725a15c775292181f2fc8cf6e5dc000eee01 SHA512 790542c11e1210fef48d1235385493814128da8cb6f1ab33e569e0f37e862b568ffe92f4a18ad6cf0ac8f8917bd884513fe40597540ad299af9feaf7722d2bb8
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
deleted file mode 100644
index 9460f20c7e4d..000000000000
--- a/dev-util/bite/bite-9999.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
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/bite/bite.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/bite/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="bug, issue, and ticket extraction library and command line tool"
-HOMEPAGE="https://github.com/bite/bite"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/requests-2[${PYTHON_USEDEP}]
-	dev-python/multidict[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-if [[ ${PV} == *9999 ]] ; then
-	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8[${PYTHON_USEDEP}]"
-	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
-DEPEND="
-	${SPHINX}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	esetup.py build_man $(usex doc "build_docs" "")
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install install_man \
-		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/bite/metadata.xml b/dev-util/bite/metadata.xml
deleted file mode 100644
index f5edf41502cc..000000000000
--- a/dev-util/bite/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>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bite/bite</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/bitrise-1.16.1 b/dev-util/bitrise-1.16.1
new file mode 100644
index 000000000000..64684aaa174c
--- /dev/null
+++ b/dev-util/bitrise-1.16.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Run your Bitrise.io automations on any Mac or Linux machine
+EAPI=6
+HOMEPAGE=https://www.bitrise.io/cli
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.16.1.tar.gz -> bitrise-1.16.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
+_md5_=cfbd86d69101118f94c61d30da3f6db0
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
deleted file mode 100644
index 6dc0a9f83fd5..000000000000
--- a/dev-util/bitrise/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
-EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
-MISC metadata.xml 1068 BLAKE2B 998f8032d11dfb6271d2fa37e6b56b66c3cbde70690a4eaac731e4cfd3a17c91bb0a3787f6001ad8fd8f213edfdca433ef9ab1d577257bd8fe490dacbe9fd4d3 SHA512 f5ab34d1cf7d68f1b79f379e6edf08533d0621ad06144d906160ad223df351713077dd1d26751fbb1995d4561f90862ce1104be279348079d2e01294c9ba716e
diff --git a/dev-util/bitrise/bitrise-1.16.1.ebuild b/dev-util/bitrise/bitrise-1.16.1.ebuild
deleted file mode 100644
index 35fbfb5fcaf7..000000000000
--- a/dev-util/bitrise/bitrise-1.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
-HOMEPAGE="https://www.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
-}
-
-src_test() {
-	export PULL_REQUEST_ID=""
-	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/bitrise
-	dodoc README.md
-	use doc && dodoc -r _docs
-}
diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml
deleted file mode 100644
index d00260bae974..000000000000
--- a/dev-util/bitrise/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>karol.wrotniak@droidsonroids.pl</email>
-		<name>Karol Wrótniak</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>Run your Bitrise automations with this CLI tool on any Mac or Linux machine, and use the same configuration on bitrise.io (automation service, with a mobile app focus). Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with stepman and envman. For a nice &amp; quick intro you should check: https://www.bitrise.io/cli</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/bitrise-io/bitrise/issues</bugs-to>
-		<changelog>https://github.com/bitrise-io/bitrise/blob/master/CHANGELOG.md</changelog>
-		<doc>https://github.com/bitrise-io/bitrise/blob/master/README.md</doc>
-		<remote-id type="github">bitriseio/bitrise</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bless-0.6.0-r2 b/dev-util/bless-0.6.0-r2
new file mode 100644
index 000000000000..9329621cf6de
--- /dev/null
+++ b/dev-util/bless-0.6.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21 app-text/rarian >=sys-devel/gettext-0.15 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK# Hex Editor
+EAPI=6
+HOMEPAGE=https://github.com/bwrsandman/Bless/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ikelos/devoverlay-distfiles/bless-0.6.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3df14ca155fef0ee20a72af5452b939
diff --git a/dev-util/bless-0.6.0-r3 b/dev-util/bless-0.6.0-r3
new file mode 100644
index 000000000000..b3a82256bc37
--- /dev/null
+++ b/dev-util/bless-0.6.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21 app-text/rarian >=sys-devel/gettext-0.15 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK# Hex Editor
+EAPI=6
+HOMEPAGE=https://github.com/bwrsandman/Bless/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ikelos/devoverlay-distfiles/bless-0.6.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a3ca6b7535d2b8e46a40485b4ffda53
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
deleted file mode 100644
index 1cb01d0601db..000000000000
--- a/dev-util/bless/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bless-0.6.0-docpath.patch 2250 BLAKE2B ff47974243983f00bd1b17aa3df7d3649da2b8d55eb64ea4f42418a013cafbfb888d3c4e54cd8f838eefc519ddb7c267d1dacd421b81e81c87503dbae3b4ddee SHA512 f5917b220db0b143dc77ba00fc517c5b397cdabea67627630fd92b942ae406b67bb48e1f63b68d8e53fa8b979e800130036fdb4782525102abfc70c751094dc1
-AUX bless-0.6.0-mono-4.patch 969 BLAKE2B 63799c54f2fdd18017d619b97603d15d9b6302f84d6fcfa4e4fa7b4aa4044d57bb3b5cba3e8f290c0379abc303f0f3836d5fef0910018011b27ac45e633d72e6 SHA512 729efc197b66a53931079b5e4969b62dda3842a0d13358b62fa53cfbf673351c9622908976651d343d060d7ac37e35968733243719e76bd5f066e842ac641f84
-AUX bless-0.6.0-pixmap.patch 493 BLAKE2B 25ebbf9d3f6be6d928354dd33289ce84315c002c954cc454af1f3aff0fcdc033569d7cd0fa69c5972489887e0d8bad5007f40f014aeb9a854301689d8283294d SHA512 0fc6281e8cb6b981f5a73e98bf86a93bf635cd77133c7d3e964ef0b2ce7e855f38cb4db6216bc876f9435d5b2f4293a39cb859cb443381569e5b56a364ac30ee
-DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c22444426bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb
-EBUILD bless-0.6.0-r2.ebuild 1168 BLAKE2B 49e5afe0fc3fb0e5df9b5c87573b73a6bcbddc012f296b98f00ac30a2304843924424c2c4e9643a4f95a8825e9db0e73b588c7a6e4cb15e2b6a77e045b40f251 SHA512 da7b40fc1ef0926ff4ae773c9c6a4d7b5c82f2ed90e4f1d40f76ce3ad7d0ac98715213ccf8aed325ea7bb8075172d1e05405f23158700cfa7f5fd5ea30124403
-EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
-MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild
deleted file mode 100644
index 3f33877017b0..000000000000
--- a/dev-util/bless/bless-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-}
-
-src_prepare() {
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-	eapply "${FILESDIR}/${P}-pixmap.patch"
-	eapply "${FILESDIR}/${P}-docpath.patch"
-	eapply "${FILESDIR}/${P}-mono-4.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
diff --git a/dev-util/bless/bless-0.6.0-r3.ebuild b/dev-util/bless/bless-0.6.0-r3.ebuild
deleted file mode 100644
index d4c3ef7205fd..000000000000
--- a/dev-util/bless/bless-0.6.0-r3.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
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-	eapply "${FILESDIR}/${P}-pixmap.patch"
-	eapply "${FILESDIR}/${P}-docpath.patch"
-	eapply "${FILESDIR}/${P}-mono-4.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch
deleted file mode 100644
index b1121424d88b..000000000000
--- a/dev-util/bless/files/bless-0.6.0-docpath.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 33f265b..346326d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,9 @@
- EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
-              bless.mdp bless.mds bless.spec autogen.sh bless.mi
- 
-+doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \
-+           README README.packaging bless.spec
-+
- SUBDIRS = po builder src bin data doc . tests
- 
- DIST_SUBDIRS= po builder src bin doc data tests
-@@ -34,11 +37,5 @@ bless-builder:
- dist-hook:
- 	bzr log > $(distdir)/ChangeLog
- 
--install-data-local:
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
--	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
--			README README.packaging bless.spec     \
--			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
--
- uninstall-local:
- 	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b18e94a..d7eecc6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,4 +1 @@
- SUBDIRS= developer user
--
--uninstall-local:
--	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
-index 729b295..58a1358 100644
---- a/doc/user/Makefile.am
-+++ b/doc/user/Makefile.am
-@@ -7,6 +7,11 @@ CLEANFILES=$(OMF)
- 
- noinst_SCRIPTS=$(OMF)
- 
-+docmandir=$(docdir)/user
-+docfigsdir=$(docmandir)/figures
-+
-+docfigs_DATA=$(FIGURES)
-+docman_DATA=$(DOCS) $(wildcard *.html)
- 
- $(OMF): $(OMF).in
- 	if [ -x `which scrollkeeper-preinstall` ]; then \
-@@ -27,11 +32,6 @@ dist-hook: doc
- 	rm html_file_list
- 
- install-data-local:
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
--	$(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
--			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
--	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
- 	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- 	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- if WITH_SCROLLKEEPER
-@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER
- endif
- 
- uninstall-local:
--	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
- 	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
- if WITH_SCROLLKEEPER
- 	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch
deleted file mode 100644
index 92b1100cf0e7..000000000000
--- a/dev-util/bless/files/bless-0.6.0-mono-4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs
-index 0f62e92..7edb1ab 100644
---- a/builder/ModuleBuilder.cs
-+++ b/builder/ModuleBuilder.cs
-@@ -119,7 +119,7 @@ public class ModuleBuilder
- 		//System.Console.WriteLine("gmcs {0}", sb.ToString());
- 		System.Console.WriteLine(">> Building module {0}...", module.Name);
- 
--		Process buildProcess = Process.Start("gmcs", sb.ToString());
-+		Process buildProcess = Process.Start("mcs", sb.ToString());
- 		buildProcess.WaitForExit();
- 
- 		if (buildProcess.ExitCode == 0) {
-@@ -137,4 +137,4 @@ public class ModuleBuilder
- }
- 
- 
--}
-\ No newline at end of file
-+}
-diff --git a/configure.ac b/configure.ac
-index 415cc64..a8e527c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then
- fi
- 	
- # C# compiler
--AC_PATH_PROG(MCS, gmcs, no)
-+AC_PATH_PROG(MCS, mcs, no)
- 
--CS="gmcs C#"
-+CS="mcs C#"
- if test "x$MCS" = "xno"  ; then
- 	AC_MSG_ERROR([No $CS compiler found])
- fi
diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch
deleted file mode 100644
index de77cb84e750..000000000000
--- a/dev-util/bless/files/bless-0.6.0-pixmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== modified file 'src/gui/drawers/HexDrawer.cs'
---- a/src/gui/drawers/HexDrawer.cs	2007-06-13 12:20:53 +0000
-+++ b/src/gui/drawers/HexDrawer.cs	2009-04-10 23:21:41 +0000
-@@ -57,11 +57,14 @@
- 
- 		//System.Console.WriteLine(s);
- 
--		pangoLayout.SetText(s);
-+		pangoLayout.SetText(s.Substring(0,256));
- 
- 
- 		gc.RgbFgColor = fg;
- 		pix.DrawLayout(gc, 0, 0, pangoLayout);
-+		
-+		pangoLayout.SetText(s.Substring(256,256));
-+		pix.DrawLayout(gc, 128*2*width, 0, pangoLayout);
- 
- 		return pix;
- 	}
-
diff --git a/dev-util/bless/metadata.xml b/dev-util/bless/metadata.xml
deleted file mode 100644
index fb8810c0659e..000000000000
--- a/dev-util/bless/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>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/bloaty-0_p20170420 b/dev-util/bloaty-0_p20170420
new file mode 100644
index 000000000000..b9302a3205a4
--- /dev/null
+++ b/dev-util/bloaty-0_p20170420
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=dev-libs/re2-0.2017.03.01
+DESCRIPTION=A size profiler for binaries
+EAPI=6
+HOMEPAGE=https://github.com/google/bloaty
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/re2-0.2017.03.01
+SLOT=0
+SRC_URI=https://github.com/google/bloaty/archive/73594cde8c9a52a102c4341c244c833aa61b9c06.tar.gz -> bloaty-0_p20170420.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=81ff8352ce80f7c828031f67b0bdf9bb
diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest
deleted file mode 100644
index edc308ce4c21..000000000000
--- a/dev-util/bloaty/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bloaty-0_p20170420.tar.gz 3100016 BLAKE2B 74a3b44a5e63f8f06da7b554588be0ced62a0f6792513984fbf7cfab520f6f6173868d588427dd9ca322c6fbc29fd1b8931453ec045c591fd8de58904178bf2c SHA512 93947fd0c49c3223c1ec216c88fe22b24e68654511d4b9d4fb2bcbc816b92bbdaf47344abc1dc8f80ed0b38a8c8b09909f862f916fd9182048235582aa10feb0
-EBUILD bloaty-0_p20170420.ebuild 771 BLAKE2B 4ae64b49ea5409c692772834a7e6cd3b602551535f043caae15edd13ffb0a914189dd3cd2c0f7273e7de2041ad06516a3cdf70dca7868606c81feeed0798f99b SHA512 bb7c2e8461920737f157df3dfeadb8e8bcce290c23c88862e5870b36ebd1f6a568779117302dae9446f9343ba667f264738e120a047ed023cbe81e4ec855cac8
-MISC metadata.xml 245 BLAKE2B bb69925f4ce8806c3ae58c2bff19a846fbde514f04037a61c8c7280d2639eca514c08ad611f4d8c6202c1dcc652d9f7f9662f9ef8cc69a286288cd234d8dd40c SHA512 1e3616356c21ccb0027e00a1cda28ca8a90b05a1f5ef89c11ffb44033365216ab541dafcbff7b728b5ab852a4db539cdf5db54865b69c4d9c250233d43e70702
diff --git a/dev-util/bloaty/bloaty-0_p20170420.ebuild b/dev-util/bloaty/bloaty-0_p20170420.ebuild
deleted file mode 100644
index e26da812ab42..000000000000
--- a/dev-util/bloaty/bloaty-0_p20170420.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
-
-inherit vcs-snapshot toolchain-funcs
-
-COMMIT="73594cde8c9a52a102c4341c244c833aa61b9c06"
-
-DESCRIPTION="A size profiler for binaries"
-HOMEPAGE="https://github.com/google/bloaty"
-SRC_URI="https://github.com/google/bloaty/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/re2-0.2017.03.01"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s#\$(RE2_[AH])##"\
-		-e "s#\tar #\t$(tc-getAR) #"\
-		-e "s#-lpthread#-lre2 -lpthread#"\
-		-e "/^CXXFLAGS/ s#-I third_party/re2##"\
-		Makefile || die
-}
-
-src_compile() {
-	CXX=$(tc-getCXX) emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-}
diff --git a/dev-util/bloaty/metadata.xml b/dev-util/bloaty/metadata.xml
deleted file mode 100644
index 146d5f454ee7..000000000000
--- a/dev-util/bloaty/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-needed -->
-	<upstream>
-		<remote-id type="github">google/bloaty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bnfc-2.8 b/dev-util/bnfc-2.8
new file mode 100644
index 000000000000..47dd67069d5d
--- /dev/null
+++ b/dev-util/bnfc-2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compiler front-end generator
+EAPI=5
+HOMEPAGE=http://bnfc.digitalgrammars.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.8
+SRC_URI=mirror://hackage/packages/archive/BNFC/2.8/BNFC-2.8.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_=a0eae429b149e9ad3b080284a1ab1449
diff --git a/dev-util/bnfc-2.8.1 b/dev-util/bnfc-2.8.1
new file mode 100644
index 000000000000..8b17759e068f
--- /dev/null
+++ b/dev-util/bnfc-2.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compiler front-end generator
+EAPI=5
+HOMEPAGE=http://bnfc.digitalgrammars.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.8.1
+SRC_URI=mirror://hackage/packages/archive/BNFC/2.8.1/BNFC-2.8.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_=37d3e51646f3e7072ae660e59967a5d3
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
deleted file mode 100644
index 1c2b77db9fcc..000000000000
--- a/dev-util/bnfc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb9eae80caec36b9a9b27d62e01727d23e2d716806c18e7e414def483dc192a1c7c8dbca1a5841c7278f40487264 SHA512 6d467ff25b7e8ef70c99b80f4f847b2c22ad39890f72a9a2dee851783af45a91567629f87685e0f8a2d3d64213161713cd7282feed4cd927aff7feab38b97b48
-DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
-DIST BNFC-2.8.tar.gz 183591 BLAKE2B cc14079bba767d85ae59a05057cba7db11bc7fcc39e28c29a5151e1ffae1c5b712351085eaa8affe79a36cac66e79df26335d48cfc24fbf41dff018727aa8dd6 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb
-EBUILD bnfc-2.8.1.ebuild 851 BLAKE2B 6a0b6bbf4e3dd27ff036e9624cd4224443a6a7d0f2279b7c3ed992dc03431bce373f464286011080c32d67ca8b1ae2d95420e009fa55847ebbe5b5f173be2e89 SHA512 25b3cdf3dd18e9a5043cbf8f2db6032234cc334613ddb69b8940e601fea80271bf3600cba3c492e43c5acf50505df020e2ec27917281a2a0e39aff6f7f06476b
-EBUILD bnfc-2.8.ebuild 914 BLAKE2B 4f2d216fb413e32f0808ce2147f8b426084fa4491272cf28d65720a3d9b61bd82136c707751bf8fd9d20d5c51d34ba9df6c4eaeab3d02737b9f260761f15d9ac SHA512 a4977c0c5cbbd29f3003efdf1c21f66815e889ff9e2b96c5761eb9c64bc6bb345f0e2358edba3ef91d0d67551a45816cb3a7d7d109abb0d760c31d250f281c55
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
deleted file mode 100644
index 054b7ddd2bc9..000000000000
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ /dev/null
@@ -1,39 +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 lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="http://bnfc.digitalgrammars.com/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/temporary )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
deleted file mode 100644
index 661b7ce9b92e..000000000000
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="http://bnfc.digitalgrammars.com/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/temporary )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
-}
diff --git a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch b/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
deleted file mode 100644
index e9834830e257..000000000000
--- a/dev-util/bnfc/files/bnfc-2.8-alex-3.1.6.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/LexBNF.x b/src/LexBNF.x
-index 927e15d..aea3386 100644
---- a/src/LexBNF.x
-+++ b/src/LexBNF.x
-@@ -11,2 +11,3 @@ import qualified Data.Bits
- import Data.Word (Word8)
-+import Data.Char (ord)
- }
diff --git a/dev-util/bnfc/metadata.xml b/dev-util/bnfc/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-util/bnfc/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>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/boost-build-1.62.0-r1 b/dev-util/boost-build-1.62.0-r1
new file mode 100644
index 000000000000..f7905348d588
--- /dev/null
+++ b/dev-util/boost-build-1.62.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=6
+HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+IUSE=examples python test python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Boost-1.0
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9368679d44e8fa0e13452cd7682c9300
diff --git a/dev-util/boost-build-1.63.0 b/dev-util/boost-build-1.63.0
new file mode 100644
index 000000000000..e992030dc67f
--- /dev/null
+++ b/dev-util/boost-build-1.63.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=6
+HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+IUSE=examples python test python_targets_python2_7
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~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=Boost-1.0
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=731696f1637dbe739fe34fe4747492fd
diff --git a/dev-util/boost-build-1.65.0 b/dev-util/boost-build-1.65.0
new file mode 100644
index 000000000000..64c9a7642901
--- /dev/null
+++ b/dev-util/boost-build-1.65.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=6
+HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+IUSE=examples python test python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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=Boost-1.0
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=494b2b1412d3b6342fce8a31a13d4e53
diff --git a/dev-util/boost-build-1.66.0 b/dev-util/boost-build-1.66.0
new file mode 100644
index 000000000000..f0271ca4ad5b
--- /dev/null
+++ b/dev-util/boost-build-1.66.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=6
+HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
+IUSE=examples python test python_targets_python2_7
+LICENSE=Boost-1.0
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b655da4795f6ed4ac23ccda5870119d7
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
deleted file mode 100644
index 4840eac1e6a9..000000000000
--- a/dev-util/boost-build/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX boost-build-1.48.0-disable_python_rpath.patch 341 BLAKE2B 5b25023aa0297f83134a403ca305141a8ad2381659453a4af49bdff85087f685974b4f96b5d8005f67a1fec0ec9ba1ff5298e7412f5173c550bd9180ea7e5c2b SHA512 1bc89bcf7210d6f3fcf88b48c7d173fc76c16dae804a9c927509f7ff525c6c77b09d9fa5c1f02e77ec36dac303d516b3d00bed08626007852a22c400adc992a4
-AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 651 BLAKE2B f5db950724eae738b6caf3cb2a5e52f334b0e905173c7fe6f1e84480999805f742c28cc92cd9745144f13a84520f834b9e505f8140656aa266af2a7c2c11e978 SHA512 54606684921997c4d280eae7f6033ef6d02dc76d8c56499db25b359879a5a89e0220ec9733d197c4c482339d9968771ddd90891edf543f11f622595ed2bf43cd
-AUX boost-build-1.50.0-respect-c_ld-flags.patch 1868 BLAKE2B cff27fe56fd3856364f687c3daea78ae86f1fc5e2d7307e2c84591b0254a6492078c1013aac1c868497553349c4afc4f2c69cce2dd63cac3237b4b7d42524fdc SHA512 821ceff3027c318191b0959c265c420c9f43b9e8185fc20c902a31efaf7bbaaa4dfe4f01408557f7b89774b15104ad391671f467ad2e70af93235e8a0b8d18ee
-AUX boost-build-1.52.0-darwin-no-python-framework.patch 419 BLAKE2B 1f9544ea26d8e1e93d85f2196ff13d55f8a735818881021472a0598bdfa993a066dcbfa26d4aa50b650c9a647b78dead18b290adf131549790ed4c9d13f39cb2 SHA512 23f281c53c3e580a30efbea83e2c63d28021151e299b0086b106d1148f3b20e81237a3141a6842b71403f36cd531a58c4eb7ab5bf030ce0e23aa08198202cc48
-AUX boost-build-1.54.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8
-AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 487 BLAKE2B 6b01c71e728d03897b1caa1b408592d95574a3723f86a4ac3a750ae8e458891d5c7fe123998b39b7422a84c3698bbe237555dbd6b759f6c706a409a4dadcc9b6 SHA512 41fbe223120452a6ddf7b8ec9f64b2f653ee3d18b2dfccdba90d9040632f911159ac4102947371e12af7e52ca251aa39db2be9b362251ec86c12860867e50e68
-AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8fb041cbdf47dd5cb5eb33829166f98ac7f189cf70a73ae0d4835c6914a0041bc628be8b948eddb36ef74c98476088f4c3 SHA512 a320bfb744667312230cf601d034217f72e3a78fe06851678c5810bb47c8239007aaeffb5719513696922ffc2d4c2200e60e140b34e3992dc353ad0fc69177fe
-AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a
-AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
-DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
-DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
-EBUILD boost-build-1.62.0-r1.ebuild 3917 BLAKE2B c54fa707afefaf95f734f0af209c5394fbd1840be1b17d08f85e19c490754a640742a418c1cba77ce7e30b7e8bc0ef3eb6bcd49f09997348deed50e471380c6f SHA512 c6d588a903e3b717665b93ffdf0d815ebc769e527d6e14df9a6d0726885b26e1e932862928dc246e661c32765315932c5e5b956aa3c32cc32bd39ebdf5c8bf17
-EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 8a1bec9cd61ae7ebd6692c30372ff5f21bb766b6a91cb5cfd95879c1faa18f02b7c1b44a42d6be7ed806a5c0a6920732cd366e08fb7a8a54427415579221b54c SHA512 fd427ff4dcfcb7bb8dbf2bd3fe795dc163c55167245febcd57220fab383088b44e646d715edf44462f5db3a8ebdafb8f0396f25ebe18038d560ce6b90dd428ab
-EBUILD boost-build-1.65.0.ebuild 3841 BLAKE2B 56c4453ea28c2c183f39564a9585abb3b1096105045e22e0e14cfeece72796b7ac49f93038bd1069cf96ae90fba6a1e4f1879fcf3efc0c9cc88e19d4b6c1c3ae SHA512 51bb46c6ecf0ee0447dc1cbaf15088f077159def1db09a5ba92ecffce7a53ced2992977b8f6105461fd1e86b43fbb44f0ca37e205c928fd31dd7e8bfbc8bbcb7
-EBUILD boost-build-1.66.0.ebuild 3910 BLAKE2B b39850bbc32ec01db2976436f6e8aecbf7d72dad9c4f0dac7172864f3fbd1b67eab9f4ef181c3a6afa577dc9480b72ca8e88233a967fc9cb7c629f2cc303bac6 SHA512 47806a8831a7335fdf60da7bbb87a703ee5173b1fe04b3725ce60362c16305e787848092cbbfcde4f0333e50c3eef84078ae3c9341463877195f4bc0b4290c63
-MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
deleted file mode 100644
index 55f8756c65ed..000000000000
--- a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	rm "${ED%/}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		dodoc -r ../example
-		docompress -x "/usr/share/doc/${PF}/example"
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
deleted file mode 100644
index b9a786d1e299..000000000000
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~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="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
deleted file mode 100644
index fb56a57e3cef..000000000000
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild
deleted file mode 100644
index 0349d767faef..000000000000
--- a/dev-util/boost-build/boost-build-1.66.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.35.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
deleted file mode 100644
index 84734f7473fe..000000000000
--- a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/python.jam
-+++ b/tools/python.jam
-@@ -961,7 +961,7 @@
-             # linux).
-           : $(usage-requirements)
-             <testing.launcher>$(set-PYTHONPATH)
--              <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib
-+              <library-path>$(libraries) <library>python.lib
-           ;
-     }
- 
diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
deleted file mode 100644
index 032feaf9625f..000000000000
--- a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Avoid adding all kinds of things to the toolchain's flags that within
-Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target,
-arch, etc.
-
---- a/tools/darwin.jam
-+++ b/tools/darwin.jam
-@@ -227,6 +227,9 @@
-         }
-     }
-     
-+    # leave compiler flags etc. up to the toolchain
-+    return $(version-feature) ;
-+
-     if $(version-feature)
-     {
-         if $(.debug-configuration)
-@@ -387,7 +390,8 @@
-             support-ppc64 = ;
-         }
-     }
--    switch $(arch)
-+    # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either
-+    switch $(donotaddarchpleaseXXXarch)
-     {
-         case combined : 
-         {
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
deleted file mode 100644
index 8775583cbc00..000000000000
--- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -3,7 +3,7 @@
- #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
- 
- # Clean env vars of any "extra" empty values.
--for local v in ARGV CC CFLAGS LIBS
-+for local v in ARGV CC CFLAGS LDFLAGS LIBS
- {
- 	local values ;
- 	for local x in $($(v))
-@@ -179,10 +179,10 @@
- if ! $(CC) { CC = cc ; }
- toolset cc $(CC) : "-o " : -D
-     : $(CFLAGS)
--    [ opt --release : -s -O ]
-+    [ opt --release : ]
-     [ opt --debug : -g ]
-     -I$(--python-include) -I$(--extra-include)
--    : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+    : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## Comeau C/C++ 4.x
- toolset como como : "-o " : -D
-     : --c
-@@ -201,11 +201,11 @@
- ## MacOSX Darwin, using GCC 2.9.x, 3.x
- toolset darwin cc :  "-o " : -D
-     :
--    [ opt --release : -Wl,-x -O3 -finline-functions ]
-+    [ opt --release : -Wl,-x -finline-functions ]
-     [ opt --debug : -g -O0 -fno-inline -pg ]
-     [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
-     -I$(--python-include) -I$(--extra-include)
--    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+    : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
-     : -pedantic -fno-strict-aliasing
---- a/engine/build.sh
-+++ b/engine/build.sh
-@@ -224,9 +224,9 @@
-     cc)
-     if test -z "$CC" ; then CC=cc ; fi
-     BOOST_JAM_CC=$CC
--    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
--    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
--    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
-+    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
-+    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
-+    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
-     ;;
- 
-     qcc)
diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
deleted file mode 100644
index cacbe00a7ef9..000000000000
--- a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't look for the framework path, we build Python the UNIX way for
-Gentoo Prefix
-
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -82,11 +82,6 @@
-         }
-         --python-lib = $(--python-lib[1]) ;
-     }
--    else if $(OS) = MACOSX
--    {
--        --python-include = [ .path $(python-location) Headers ] ;
--        --python-lib = $(python-location) Python ;
--    }
-     else
-     {
-         --python-include = ;
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
deleted file mode 100644
index 3f8b177c7102..000000000000
--- a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/startup_v2.py
-+++ b/test/startup_v2.py
-@@ -50,7 +50,7 @@
-     return re.match(expected, actual, re.DOTALL) != None
- 
- 
--t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
-+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
- t.set_tree("startup")
- check_for_existing_boost_build_jam(t)
- 
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a04aa0b7aab1..000000000000
--- a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tools/common.jam
-+++ b/tools/common.jam
-@@ -763,7 +763,15 @@
-         switch $(f:G)
-         {
-             case <base> :
--                result += $(name:B) ;
-+		local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
-+		if $(matched) = boost_python || $(matched) = boost_mpi_python
-+		{
-+			result += $(name) ;
-+		}
-+		else
-+		{
-+			result += $(name:B) ;
-+		}
- 
-             case <toolset> :
-                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
deleted file mode 100644
index d8b6a5af1e9c..000000000000
--- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/10122
-
---- a/engine/mem.h
-+++ b/engine/mem.h
-@@ -8,6 +8,8 @@
- #ifndef BJAM_MEM_H
- #define BJAM_MEM_H
- 
-+#include "jam.h"
-+
- #ifdef OPT_BOEHM_GC
- 
-     /* Use Boehm GC memory allocator. */
diff --git a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch
deleted file mode 100644
index fd86c9e2fc71..000000000000
--- a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tools/features/debug-feature.jam b/tools/features/debug-feature.jam
-index 04958f9a..38b6acf1 100644
---- a/tools/features/debug-feature.jam
-+++ b/tools/features/debug-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
- 
- feature.feature debug-symbols
--    : on off
-+    : on off none
-     : propagated ;
- 
- feature.feature profiling
-diff --git a/tools/features/optimization-feature.jam b/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
---- a/tools/features/optimization-feature.jam
-+++ b/tools/features/optimization-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
- 
- feature.feature optimization
--    : off speed space
-+    : off none speed space
-     : propagated ;
- 
- feature.feature inlining
diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam
deleted file mode 100644
index 6afe52684ccc..000000000000
--- a/dev-util/boost-build/files/site-config.jam
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
-
-# Define two new variants to be used when building boost (or separate boost-libs)
-# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols
-# values "none" which are not part of the official boost distribution.
-# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS!
-variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;
-variant gentoodebug   : debug   : <optimization>none <debug-symbols>on   <runtime-link>shared ;
-
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
deleted file mode 100644
index ef3f9148d5aa..000000000000
--- a/dev-util/boost-build/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>cpp@gentoo.org</email>
-    <name>Gentoo C++ Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">boost</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/bsdiff-4.3-r3 b/dev-util/bsdiff-4.3-r3
new file mode 100644
index 000000000000..42d2ed2ce991
--- /dev/null
+++ b/dev-util/bsdiff-4.3-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/bzip2
+DESCRIPTION=bsdiff: Binary Differencer using a suffix alg
+EAPI=5
+HOMEPAGE=http://www.daemonology.net/bsdiff/
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=app-arch/bzip2
+SLOT=0
+SRC_URI=http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz
+_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_=881b6a3fe24882174551e9f8ff2aa596
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
deleted file mode 100644
index c38b16eadaed..000000000000
--- a/dev-util/bsdiff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r3.ebuild 890 BLAKE2B 4de51485327c17c6c7ae043dc11734825a4e91176181ebbcf9e042e61c94c132b1ffd0789f5f4552537d9776d498314ee890f8bbde831ee3e13fe72caa69a899 SHA512 8e89472866b70c179613c81ce9c93e944436c5b350eb54561f6015b9e5300f06f49997cf2a414676a5919e16ae6752f4ce760845b874b0a035ad6525d78ef100
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
deleted file mode 100644
index 575d008b3073..000000000000
--- a/dev-util/bsdiff/bsdiff-4.3-r3.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
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	doecho() {
-		echo "$@"
-		"$@"
-	}
-	append-lfs-flags
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
-}
-
-src_install() {
-	dobin bs{diff,patch}
-	doman bs{diff,patch}.1
-}
diff --git a/dev-util/bsdiff/metadata.xml b/dev-util/bsdiff/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-util/bsdiff/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/dev-util/btyacc-3.0-r2 b/dev-util/btyacc-3.0-r2
new file mode 100644
index 000000000000..c712d4c83762
--- /dev/null
+++ b/dev-util/btyacc-3.0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Backtracking YACC - modified from Berkeley YACC
+EAPI=2
+HOMEPAGE=http://www.siber.com/btyacc
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=freedist
+SLOT=0
+SRC_URI=http://www.siber.com/btyacc/btyacc-3-0.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_=975d4576a5d4cc4f095579c2c35e7288
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
deleted file mode 100644
index 8e3e0552514a..000000000000
--- a/dev-util/btyacc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX btyacc-3.0-includes.patch 171 BLAKE2B 5c5679252d0ab3bcccfabef53dd5d77e5112c39337d4a9bda8113728d49c91aa0227e883f54bd46a44b2756b0db3f1e1bd47f1b79be980d16e113e3ca9efcc8d SHA512 09af4417c660653b3dbb0bfabfc82bcf9a5741165f86047328fab5a410d71e5c11b7d4018b4e62339ccc08a96b2e81a1a0200596a82e5a76bb48a2392351a689
-AUX btyacc-3.0-makefile.patch 536 BLAKE2B 24d42d2e324a5911da162fcd7ba167480dbb1bbed75f6e18ce36aa370b375804c789a5f3081298b9c4b293f04a30d6f76f278d1c8b7ddd2ecac266983a1c0c53 SHA512 55e0a54fbb38b4a2dcf95295f3b7f5dd92af767f77641551d74ab9a81197b2d9a1694f2999248b1f6d6492e109fb0c6d1c3ffce87e8dc258d5d16f18fd1adc73
-DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r2.ebuild 914 BLAKE2B 54dcf06df457c361e1f6189bc922c7f4ca1a73ebd065ba3cb187712d2e469e8a5c575d1bba7683d5ac1c8f919c671c7f8686819da5b6866a449bc114b9d383de SHA512 402ed5b5c405b7dc1daf609fd2c34a5d2e384f37557b86d64493d523d2a16c05e015d5cc7956696abf906ac59f03fd8dbfb26171d619f5cadcfb155876212256
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r2.ebuild b/dev-util/btyacc/btyacc-3.0-r2.ebuild
deleted file mode 100644
index bf06edcf5abb..000000000000
--- a/dev-util/btyacc/btyacc-3.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/./-}
-IUSE=""
-DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
-HOMEPAGE="http://www.siber.com/btyacc"
-SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp -av Makefile{,.orig}
-	epatch "${FILESDIR}/${P}-includes.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	# fix memory issue/glibc corruption
-	sed -i -e "s|len + 13|len + 14|" main.c || die "Could not fix main.c"
-	# Darwin doesn't do static binaries
-	[[ ${CHOST} == *-darwin* ]] && sed -i -e 's/-static//' Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-src_install() {
-	dobin btyacc
-	dodoc README README.BYACC
-	newman manpage btyacc.1
-}
diff --git a/dev-util/btyacc/files/btyacc-3.0-includes.patch b/dev-util/btyacc/files/btyacc-3.0-includes.patch
deleted file mode 100644
index a03f58fa3865..000000000000
--- a/dev-util/btyacc/files/btyacc-3.0-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mstring.c
-+++ mstring.c
-@@ -1,6 +1,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-+#include <string.h>
- #include <ctype.h>
- #include "mstring.h"
- 
diff --git a/dev-util/btyacc/files/btyacc-3.0-makefile.patch b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
deleted file mode 100644
index 884b49f46b9d..000000000000
--- a/dev-util/btyacc/files/btyacc-3.0-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Respect CC, append to CFLAGS (but not -g), append to LDFLAGS, use system LD -jer
-
---- Makefile.orig	1999-07-15 19:40:12.000000000 +0200
-+++ Makefile	2009-09-04 15:27:15.000000000 +0200
-@@ -8,14 +8,13 @@
- 
- HDRS	      = defs.h mstring.h
- 
--CFLAGS	      = -g -Wall -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS	      += -Wall -Wstrict-prototypes -Wmissing-prototypes
- 
--LDFLAGS	      = -static
-+LDFLAGS	      += -static
- 
- LIBS	      =
- 
--CC	      = gcc
--LINKER	      = gcc
-+LINKER	      = $(CC)
- # LINKER      = cl
- # CC	      = cl
- 
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-util/btyacc/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/dev-util/build-0.3.10 b/dev-util/build-0.3.10
new file mode 100644
index 000000000000..c043d5b6cc65
--- /dev/null
+++ b/dev-util/build-0.3.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=A massively-parallel software build system implemented on top of GNU make
+EAPI=6
+HOMEPAGE=https://www.codesynthesis.com/projects/build/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!dev-util/build:0.3
+SLOT=0
+SRC_URI=https://www.codesynthesis.com/download/build/0.3/build-0.3.10.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb7de777b4e4bd20a908825ca4175a75
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
deleted file mode 100644
index 77a007871fc8..000000000000
--- a/dev-util/build/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST build-0.3.10.tar.bz2 73647 BLAKE2B 90a6d2cac1d34cb5a11bd476011c352f4073fffcb55adb62890938bbbe36d9088c6900a9297f08af3aa564569d09a36662288a9a624e9cc44a9f1b2e5dd289fe SHA512 5836da9347714d602162e050471e27330caf398cf4daf008db174797013d8c353e23f41e393166181ff0fdb08359b434cb7ca2ae6bf789376f8340046abb195f
-EBUILD build-0.3.10.ebuild 756 BLAKE2B a7b06c46cc24186dc0c447bfe1dc23341f3447aaa9b946452dc8f21cd7b5b0920f5285fab7ea37cb13873c0a489d039a9750d49552bc5884bf5cbdd994f56c05 SHA512 a4ff71aba6a8bfa9b1e20cb0a597f98c019fe0f24aebeb6cba4f39f04e16d2809e051f1b5e6221c2db6598d97653ec178138f3962f54d2ab7908d12a22819120
-MISC metadata.xml 249 BLAKE2B 5791e38f31ac36bb4b94c03962980af247ea39c8af739a949749b1b3a7705ce4031ff53f620b1e4d30c44360e3d1d37ccb186ea109ecc1036977e4e0bb3a92e9 SHA512 0b2b2d015d6d3310efdedc20cd12cb2f587c105f1e84b243d3a7dc6337dde082c16683781eba9a0cb09341756f10f651579df35837ee232309a97017ec02cbee
diff --git a/dev-util/build/build-0.3.10.ebuild b/dev-util/build/build-0.3.10.ebuild
deleted file mode 100644
index d5ebc1b8dfc7..000000000000
--- a/dev-util/build/build-0.3.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="A massively-parallel software build system implemented on top of GNU make"
-HOMEPAGE="https://www.codesynthesis.com/projects/build/"
-SLOT="0"
-SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="!dev-util/build:0.3"
-
-src_install() {
-	emake install_prefix="${ED%/}/usr" install
-
-	HTML_DOCS=( documentation/*.{css,xhtml} )
-	einstalldocs
-	dodoc documentation/[[:upper:]]*
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/build/metadata.xml b/dev-util/build/metadata.xml
deleted file mode 100644
index d4905c84fc34..000000000000
--- a/dev-util/build/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>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/buildbot-0.8.12-r3 b/dev-util/buildbot-0.8.12-r3
new file mode 100644
index 000000000000..7301a8e1dfda
--- /dev/null
+++ b/dev-util/buildbot-0.8.12-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-mail[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig
+DESCRIPTION=BuildBot build automation system
+EAPI=5
+HOMEPAGE=http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=doc examples irc mail manhole test python_targets_python2_7
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.7.10-r999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] irc? ( dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mail? ( dev-python/twisted-mail[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) manhole? ( dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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://pypi/b/buildbot/buildbot-0.8.12.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	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c60f2cc8f34700ef1c6777d2dba4fb6
diff --git a/dev-util/buildbot-0.9.12 b/dev-util/buildbot-0.9.12
new file mode 100644
index 000000000000..663ba121c2ff
--- /dev/null
+++ b/dev-util/buildbot-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40793301200f03ad040bed43f0b30dc0
diff --git a/dev-util/buildbot-0.9.13 b/dev-util/buildbot-0.9.13
new file mode 100644
index 000000000000..b3a4b77ae0dc
--- /dev/null
+++ b/dev-util/buildbot-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-0.9.13[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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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/setuptools-21.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(-)] doc? ( >=dev-python/sphinx-1.4.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(-)] dev-python/sphinxcontrib-blockdiag[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/sphinxcontrib-spelling[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/pyenchant[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/docutils-0.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(-)] <dev-python/docutils-0.13.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/sphinx-jinja[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/ramlfications[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(-)] ) test? ( >=dev-python/python-dateutil-1.5[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/mock-2.0.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/moto[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/boto3[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/ramlfications[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/pyjade[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/txgithub[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/txrequests[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/lz4[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/treq[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/setuptools_trial[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-util/buildbot-worker-0.9.13[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(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-0.9.13[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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot/buildbot-0.9.13.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9cb02ed6dccc3c0f645215029bc553b8
diff --git a/dev-util/buildbot-0.9.15_p1 b/dev-util/buildbot-0.9.15_p1
new file mode 100644
index 000000000000..15f1e8b8b6cc
--- /dev/null
+++ b/dev-util/buildbot-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-0.9.15_p1[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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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/setuptools-21.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(-)] doc? ( >=dev-python/sphinx-1.4.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(-)] dev-python/sphinxcontrib-blockdiag[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/sphinxcontrib-spelling[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/pyenchant[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/docutils-0.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(-)] <dev-python/docutils-0.13.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/sphinx-jinja[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/ramlfications[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(-)] ) test? ( >=dev-python/python-dateutil-1.5[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/mock-2.0.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/moto[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/boto3[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/ramlfications[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/pyjade[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/txgithub[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/txrequests[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/lz4[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/treq[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/setuptools_trial[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-util/buildbot-worker-0.9.15_p1[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/docker-py-2.2.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(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc docker examples irc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-0.9.15_p1[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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot/buildbot-0.9.15.post1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d843e87156ffad47a4947864da26863
diff --git a/dev-util/buildbot-1.1.0 b/dev-util/buildbot-1.1.0
new file mode 100644
index 000000000000..e2d16f0a95ea
--- /dev/null
+++ b/dev-util/buildbot-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-1.1.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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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/setuptools-21.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(-)] doc? ( >=dev-python/sphinx-1.4.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(-)] dev-python/sphinxcontrib-blockdiag[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/sphinxcontrib-spelling[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/pyenchant[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/docutils-0.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(-)] <dev-python/docutils-0.13.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/sphinx-jinja[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(-)] ) test? ( >=dev-python/python-dateutil-1.5[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/mock-2.0.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/moto[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/boto3[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/pyjade[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/txgithub[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/txrequests[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/lz4[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/treq[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/setuptools_trial[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-util/buildbot-worker-1.1.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/docker-py-2.2.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(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc docker examples irc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-1.1.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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot/buildbot-1.1.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19d6e3ad5be8192b96ad26f4a3ca6319
diff --git a/dev-util/buildbot-1.1.2 b/dev-util/buildbot-1.1.2
new file mode 100644
index 000000000000..127b36c5d740
--- /dev/null
+++ b/dev-util/buildbot-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-1.1.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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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/setuptools-21.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(-)] test? ( >=dev-python/python-dateutil-1.5[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/mock-2.0.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/moto[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/boto3[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/pyjade[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/txgithub[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/txrequests[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/lz4[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/treq[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/setuptools_trial[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-util/buildbot-worker-1.1.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-python/docker-py-2.2.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(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt docker examples irc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-1.1.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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot/buildbot-1.1.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d40747de2db0d81d3c5b45b004f7b3ee
diff --git a/dev-util/buildbot-9999 b/dev-util/buildbot-9999
new file mode 100644
index 000000000000..377604c55c19
--- /dev/null
+++ b/dev-util/buildbot-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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/setuptools-21.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(-)] doc? ( >=dev-python/sphinx-1.4.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(-)] dev-python/sphinxcontrib-blockdiag[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/sphinxcontrib-spelling[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/pyenchant[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/docutils-0.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(-)] <dev-python/docutils-0.13.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/sphinx-jinja[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(-)] ) test? ( >=dev-python/python-dateutil-1.5[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/mock-2.0.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/moto[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/boto3[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/pyjade[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/txgithub[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/txrequests[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/lz4[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/treq[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/setuptools_trial[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-util/buildbot-worker-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(-)] >=dev-python/docker-py-2.2.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-vcs/git-1.8.2.1[curl] virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+IUSE=crypt doc docker examples irc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-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(-)] >=dev-python/twisted-17.9.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/autobahn-0.16.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/sqlalchemy-0.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(-)] >=dev-python/sqlalchemy-migrate-0.9[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/future[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/python-dateutil-1.5[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/txaio-2.2.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-python/pyjwt[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/zope-interface-4.1.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(-)] ~dev-util/buildbot-worker-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(-)] crypt? ( >=dev-python/twisted-17.9.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(-),crypt] >=dev-python/pyopenssl-16.0.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/idna[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/service_identity[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(-)] ) irc? ( dev-python/txrequests[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(-)] ) docker? ( >=dev-python/docker-py-2.2.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=76328a0bfd132024c2db068097a3b6e9
diff --git a/dev-util/buildbot-console-view-0.9.12 b/dev-util/buildbot-console-view-0.9.12
new file mode 100644
index 000000000000..695e4dbaa0db
--- /dev/null
+++ b/dev-util/buildbot-console-view-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.12.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_=fa9b41b14091b4ebe91c53066e52cb02
diff --git a/dev-util/buildbot-console-view-0.9.13 b/dev-util/buildbot-console-view-0.9.13
new file mode 100644
index 000000000000..d74e590a711f
--- /dev/null
+++ b/dev-util/buildbot-console-view-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.13[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/mock[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-util/buildbot-www-0.9.13[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.13[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/mock[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-util/buildbot-www-0.9.13[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-console-view/buildbot-console-view-0.9.13.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_=1f85a6b63b83c11f32839cb6e0f6636e
diff --git a/dev-util/buildbot-console-view-0.9.15_p1 b/dev-util/buildbot-console-view-0.9.15_p1
new file mode 100644
index 000000000000..2b1d1d6f6a9c
--- /dev/null
+++ b/dev-util/buildbot-console-view-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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-util/buildbot-www-0.9.15_p1[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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-util/buildbot-www-0.9.15_p1[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-console-view/buildbot-console-view-0.9.15.post1.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_=72cc1a91c933bc9ead87dbae92985974
diff --git a/dev-util/buildbot-console-view-1.1.0 b/dev-util/buildbot-console-view-1.1.0
new file mode 100644
index 000000000000..41429361c712
--- /dev/null
+++ b/dev-util/buildbot-console-view-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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/mock[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-util/buildbot-www-1.1.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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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/mock[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-util/buildbot-www-1.1.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-console-view/buildbot-console-view-1.1.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_=72cc1a91c933bc9ead87dbae92985974
diff --git a/dev-util/buildbot-console-view-1.1.2 b/dev-util/buildbot-console-view-1.1.2
new file mode 100644
index 000000000000..d147f41ccfcf
--- /dev/null
+++ b/dev-util/buildbot-console-view-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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-python/mock[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-util/buildbot-www-1.1.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-python/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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-python/mock[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-util/buildbot-www-1.1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-console-view/buildbot-console-view-1.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_=72cc1a91c933bc9ead87dbae92985974
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
deleted file mode 100644
index 969fe48cec64..000000000000
--- a/dev-util/buildbot-console-view/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
-DIST buildbot-console-view-0.9.13.tar.gz 640969 BLAKE2B e0c6449c8208a34e568ed632be61fda0ae6ef0b183cd53e2288e1b89e03df6a874ec363f3cfdfa15005bc2913084eaf8640e86abf1ad2d19609e7b4c818f7b77 SHA512 16a3186a97112473fa1f7e811ceffe9f829d6181544e62290172b97b898ddb189fe8e67e223a3e02c936e61fc857a05e0b353dda7e5d4a3ce782f74a32515d2f
-DIST buildbot-console-view-0.9.15.post1.tar.gz 640548 BLAKE2B d28d3fbe40a8ceeaf574d2e8a9a6938664659dc6221a9e7e288c98b771cf7601a8db125dfb3cd71c500aee470a2b476a9daa0d5ec55a83758a96e97e14441def SHA512 42ad7d9dfdf0b3b0cda8d8dcd3fb2bd6734a775755fdc4ebe79d562f5ffb45d0e25d3ece15dec4a7542dd29e45a721e683bec416582901dbfa519c8da76cfa78
-DIST buildbot-console-view-1.1.0.tar.gz 640524 BLAKE2B 038412232299b9dcf5b38c0dcc646bce0f02c817b319bc796268e0bdcd10db0a82dbeb692850ad252246a2a0b48ceca23fd5ac900d46774b64ea19839673f607 SHA512 c45962f73d8e8214518c09fc3163d20f93ac4f55ed547dc90f4116906b94a01384bdc28e52d1b850ba34077c4cd30cd3e1f2dae23c01e233e5745de181e2dc6c
-DIST buildbot-console-view-1.1.2.tar.gz 640509 BLAKE2B 481b8049e606d47be8b171c24a210d6c95ce13ee4a4d46fd689ee836857e8d054f1799ce53de3931f820f02061cdd0c4a47686cd1724fe1c39ab33ca0f274d76 SHA512 23a14d3264802b2cf9a6a7cab0592c6391dc55a8805c17529c3279b129aaab1df97999ffd5fdc0927e7d5fb204e4114b4672018102381523599310cf7223950f
-EBUILD buildbot-console-view-0.9.12.ebuild 1141 BLAKE2B 0f0e870f4063f2062efac2bc573d5e9dea7568ac2e4064299aa22eada3fba565ce1045f39c3c26918cba874125cf42233177c4b8cdf09236806de30cd2b307dd SHA512 e2b853c3c6039a9a70f2319c498f1ff2ca1ee2a9ee1016f55ba8a5cf5d6ccf9a550ba60e68e90180c51a3f1d1f3915cd8732ca5dfcc837d6e38d7cd238afca47
-EBUILD buildbot-console-view-0.9.13.ebuild 1143 BLAKE2B 97ebe285e528c2ba2123f343826a4dcd33669dbe2d61ab36cc4dd7c4a1852c3dfd47ddceacad2fe1d0a7ce082f3a0d1cf06b89378413d16c6989c26df9234ec8 SHA512 4f220cbf6fb63aaac0899a9b31cc003a641c92adbbcdcd3ac091dd903324f518c585fb023bb3e69557b9c492fcecf93b2b309e160a84185b1d0ad6a71ebf6540
-EBUILD buildbot-console-view-0.9.15_p1.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
-EBUILD buildbot-console-view-1.1.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
-EBUILD buildbot-console-view-1.1.2.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
-MISC metadata.xml 771 BLAKE2B ad890754ce96954df2723ffe6302a5eee847230b91df1dd3658ada80aea2d6bd92fdfe65cf21d5aff257d8e736635410642deb48fe7769a5651a5073f6ac42e4 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
deleted file mode 100644
index cc2a6351b2d1..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
deleted file mode 100644
index ea6c131f8ace..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
deleted file mode 100644
index 23b0c0ae9c77..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
deleted file mode 100644
index 23b0c0ae9c77..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
deleted file mode 100644
index 23b0c0ae9c77..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.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="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/metadata.xml b/dev-util/buildbot-console-view/metadata.xml
deleted file mode 100644
index a12007494aec..000000000000
--- a/dev-util/buildbot-console-view/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="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-		The buildbot-console-view plugin is the user interface code used to
-		display information about the builds to the console.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-console-view</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-grid-view-0.9.12_p1 b/dev-util/buildbot-grid-view-0.9.12_p1
new file mode 100644
index 000000000000..869be718991d
--- /dev/null
+++ b/dev-util/buildbot-grid-view-0.9.12_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-util/buildbot-0.9.12*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-util/buildbot-www-0.9.12*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.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_=80c7ac142b740bdbe08112440380f196
diff --git a/dev-util/buildbot-grid-view-0.9.13 b/dev-util/buildbot-grid-view-0.9.13
new file mode 100644
index 000000000000..49e685353fd2
--- /dev/null
+++ b/dev-util/buildbot-grid-view-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] =dev-util/buildbot-0.9.13[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-util/buildbot-www-0.9.13[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.13.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_=a6f8df3bebce352529b326c55d4a5fb2
diff --git a/dev-util/buildbot-grid-view-0.9.15_p1 b/dev-util/buildbot-grid-view-0.9.15_p1
new file mode 100644
index 000000000000..4ebd81e380c3
--- /dev/null
+++ b/dev-util/buildbot-grid-view-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] =dev-util/buildbot-0.9.15_p1[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-util/buildbot-www-0.9.15_p1[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.15.post1.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_=ef3288e5f8f00d6bb353080d38e587db
diff --git a/dev-util/buildbot-grid-view-1.1.0 b/dev-util/buildbot-grid-view-1.1.0
new file mode 100644
index 000000000000..9f69d91fa194
--- /dev/null
+++ b/dev-util/buildbot-grid-view-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] =dev-util/buildbot-1.1.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-util/buildbot-www-1.1.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-grid-view/buildbot-grid-view-1.1.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_=ef3288e5f8f00d6bb353080d38e587db
diff --git a/dev-util/buildbot-grid-view-1.1.2 b/dev-util/buildbot-grid-view-1.1.2
new file mode 100644
index 000000000000..301744b09b12
--- /dev/null
+++ b/dev-util/buildbot-grid-view-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] =dev-util/buildbot-1.1.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-util/buildbot-www-1.1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-grid-view/buildbot-grid-view-1.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_=ef3288e5f8f00d6bb353080d38e587db
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
deleted file mode 100644
index 67a5f6649c28..000000000000
--- a/dev-util/buildbot-grid-view/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
-DIST buildbot-grid-view-0.9.13.tar.gz 639145 BLAKE2B 31194a53bdb60958178371e10fd2ed0ca05d112d9a3510147d965811bb31788bd432ad1ed1c4690f190070ec5dc683cc43ed8a187b26eec5b80b7f23663e7418 SHA512 2ae54f27cafdf1e4d5c283bbe60db8bcc38d3ec133069114bfa952ae2f49306c7a83d57fd4749eb923567e22fdb0577311532ef45eb8630fe01a7c3fea6e2cef
-DIST buildbot-grid-view-0.9.15.post1.tar.gz 638877 BLAKE2B 7ef5a309bebb1fed0ff1b0efd016c9d895b44a03d0c3743690d6fc04ab669d6409af93be62ffa1ef0cac9465ef7940b48984ab423a22023800211514335d8011 SHA512 741dc6ef728f291d44663bb6f031fd0895b67bb770db053695bf276ae3a6a0f2e6e73eae7c595befec2f917e766b13913486331297cb048f000a124916ff6405
-DIST buildbot-grid-view-1.1.0.tar.gz 638856 BLAKE2B ff6d055d6f0426dba6c8652da3f4dcd66dc98d6d85db19eda87e48c8107a06164ab7d6978d2aae9e76dbc3212a78d94e93598937d72e55728aae6b0bf53c50bd SHA512 64b2c3f1e45232d7dae10b4505f4aaf9ad5b72dd22ad5be4aa5c4265a6a315ae65f72b7a8006a6b0ee887e5d30b2d28fe5085afa683efeda2ede8a7c310bb750
-DIST buildbot-grid-view-1.1.2.tar.gz 638848 BLAKE2B c99e79af105cf07a6540c71fb7e604bca144ec5d462f6a38c50b525b2ba7bf9640b8d1d4e36e0beb121eafb042fefb67a8adb8b91d2ed8fca4daf982712fae45 SHA512 c2dddab25d1da173ae22d811a9c3261eaec6ac76389829cb1cfaa8b976573d6f12208541dce4065d45512c4c984d9a1d4c72f6e151ec3365ba1dca356ad0288d
-EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1110 BLAKE2B ee3ffc432b8844906ded608e3eb7cf01c8a9c303c111f8fb8c1bd728c9f32e0cdb4b1f04c70156576848e6443b2dbc80bd32ac6a43a02f1ab4b420f7cff74cb3 SHA512 775e3bcbc9643aa6e7bbdc70a53eb6cedbb66f3acec99e6fdb313a41ae39baf6c6f69e26311d8de3730892bcf999e8e04ae5442ae9207dafb2ff8e1625048c26
-EBUILD buildbot-grid-view-0.9.13.ebuild 1108 BLAKE2B 702acb9e8edca38ee219e85bfccbf81608e09cf7f217662b0983e8d3574c15d597db9c699ff3e9c6ed15327f7e5520c9ee92ea3b72f89f39647167c74762c05e SHA512 00187c14fc11f36af5594059937b9610aebe19ef96163264721098118ca09a881bcb378c7f10ba64b05c90d9a2fa8edfa076cd359c130a07eb8ad0ef07a381e2
-EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
-EBUILD buildbot-grid-view-1.1.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
-EBUILD buildbot-grid-view-1.1.2.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
-MISC metadata.xml 750 BLAKE2B 8f279073c8c3a1f6a12ab347198a6ed24692d1ab0271bfdbe479da28aaee5c51843218a93b18ab901bbf78a2c36af5940cd2bef9273c9402076b88bb46a5a104 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
deleted file mode 100644
index 7a88dd5d6952..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-0.9.12*[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-0.9.12*[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
deleted file mode 100644
index cc4c6a14d1b3..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
deleted file mode 100644
index e30008fccea8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
deleted file mode 100644
index e30008fccea8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
deleted file mode 100644
index e30008fccea8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/metadata.xml b/dev-util/buildbot-grid-view/metadata.xml
deleted file mode 100644
index c5790cf414b4..000000000000
--- a/dev-util/buildbot-grid-view/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="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-		The buildbot-grid-view plugin is the user interface code used to
-		display information about the builds.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-grid-view</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-pkg-0.9.12 b/dev-util/buildbot-pkg-0.9.12
new file mode 100644
index 000000000000..3c87e2493e05
--- /dev/null
+++ b/dev-util/buildbot-pkg-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.12.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_=46b1d6f76a69f6776f954f48ed1ca917
diff --git a/dev-util/buildbot-pkg-0.9.13 b/dev-util/buildbot-pkg-0.9.13
new file mode 100644
index 000000000000..73b9db09df26
--- /dev/null
+++ b/dev-util/buildbot-pkg-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.13[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/mock[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.13[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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-pkg/buildbot-pkg-0.9.13.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_=8a9b2336c6686d5c699a86f848fcef4a
diff --git a/dev-util/buildbot-pkg-0.9.15_p1 b/dev-util/buildbot-pkg-0.9.15_p1
new file mode 100644
index 000000000000..e54f23936126
--- /dev/null
+++ b/dev-util/buildbot-pkg-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-pkg/buildbot-pkg-0.9.15.post1.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_=e43996e7f82318d8d45555ebd7825482
diff --git a/dev-util/buildbot-pkg-1.1.0 b/dev-util/buildbot-pkg-1.1.0
new file mode 100644
index 000000000000..e8e0256a08fa
--- /dev/null
+++ b/dev-util/buildbot-pkg-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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/mock[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-pkg/buildbot-pkg-1.1.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_=da4bc1796391bbb745ed183d6fa162d8
diff --git a/dev-util/buildbot-pkg-1.1.2 b/dev-util/buildbot-pkg-1.1.2
new file mode 100644
index 000000000000..cf5ce21d1866
--- /dev/null
+++ b/dev-util/buildbot-pkg-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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-python/mock[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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-python/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-pkg/buildbot-pkg-1.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_=da4bc1796391bbb745ed183d6fa162d8
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
deleted file mode 100644
index 5102455cc105..000000000000
--- a/dev-util/buildbot-pkg/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLAKE2B c3b72b0a2c1a5afeb69d76b14d91292a45e827d28c82a7975d4a4e73fdcab66a87445aaa621593f98bdd34eb99dd564b9fdf015655906cf53b8f581a00377f97 SHA512 3d2d0e0d4049f623deca4ba050d873761f63fa4cb24cf4c83c52dd7c0f3eec483b6e76353a72b1ee3b0e3a64c54d8174620a3ff93ccdd1474d746d6309b5ae6a
-DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
-DIST buildbot-pkg-0.9.13.tar.gz 4448 BLAKE2B ea270faafa4a271e11ea1e64191dac0aaf9b6bc08e4d70e71746f9e70eadbe9d70555677bf7e9b264ac9146db0cb1cc639d86194b5280ad53fbe29bf073ee718 SHA512 1cf3ea6237062a0d8c3955ae75b76dd1193ed28c32528f341b242fe6dcc50f4300366474dcdce27246166b35cc1ca31df556b5e6481f5027d073122f1c00362d
-DIST buildbot-pkg-0.9.15.post1.tar.gz 4916 BLAKE2B 17f38dd7c0d70a7d07fde7c53128901dee24bda0d6503bea1dacfbf6f14bba17b645f5067e0932a5f03660330c20f647fe6d4c2125fdbf714a5828de314881bf SHA512 1951de2df02d50ba1d7c3bc6db9084acf65f88a9f9f73bf26715c7d14521403580a26efd8294aa5f2de40b986032dd78fe52230e58ad3d298f39d229481fc286
-DIST buildbot-pkg-1.1.0.tar.gz 4855 BLAKE2B 29dddb28f8d5b3bbb82b24959077597e0832b2b85308132e2bdef03a28e84dcef400715b4d7faa33c42b3ec4085c10d825a50dc0b0d55aa23a13e1e02b0ca3c5 SHA512 e48d8086170d9c7fd8270a2401ee5f0980dcd2a4554218fd9ac1159d9f08f4a82fc03a2bbea27d169e9f0e4219d9ae8331a522cbf52bdd2e51bb13527f4dbd8d
-DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
-EBUILD buildbot-pkg-0.9.12.ebuild 1068 BLAKE2B 2db6c1832fd1305ac8a44b7c644d01a93b6c6f845bccce20c014986b6ec85824c505f758489b58c6432bf4d8007f85010f9415d8115039bc9b530bbb5432d0a4 SHA512 68f406a27589210f237334b11186d4d3ea56fbc0d18083923b119c0e22523f468a1f41998edabbf47e2b6fc44176aa953f22d8b67282e89a98b4bfe4dc44d5fe
-EBUILD buildbot-pkg-0.9.13.ebuild 1070 BLAKE2B 1d580c2f59c4f9540d69a1a4fb9eac94ac443d3abc16b235c71350e0d4318153955a0691e0c007d2b23f86712525fad489bc770ee2d8f2d74f993076b042eddd SHA512 a1cc5494e321b7373ce82214ee4a5bffc93848884f39a340fc7db25feb64d9dcdeb055aa5e84796dd61aa02491c5e2ac1cc7b4f260aadbabdd918f8a5a5931af
-EBUILD buildbot-pkg-0.9.15_p1.ebuild 1149 BLAKE2B 21ae9a3d626a5ffe3fa8b74411a91108f1b8b13b16d6894c6d2394809f45b5007bc084bf0c47740f5723500695e8673a00734156df91bd1ae69f22862d7ddada SHA512 eaec282d3963e29742e7f71a84593d0bd5f70314e0095631f0066bb75a898997917e97b3ae070f231e911711ed66533020ffbdaa75887a5109ebc0e1c90c983f
-EBUILD buildbot-pkg-1.1.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
-EBUILD buildbot-pkg-1.1.2.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
-MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
deleted file mode 100644
index 78d73aebfef0..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
deleted file mode 100644
index 31b0738d915f..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
deleted file mode 100644
index 82c5f2ba229b..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
deleted file mode 100644
index 46595012d5d7..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
deleted file mode 100644
index 46595012d5d7..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch b/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
deleted file mode 100644
index ac17539c4e0d..000000000000
--- a/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6d9f81ec15b7b18f8791981a0d65dc4f266022ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 15 Jan 2018 16:27:54 -0800
-Subject: [PATCH] pkg/buildbot_pkg.py: Remove development virtualenvironment
- hack
-
-This hack is not needed/nor works reliably in non-virtualenv installs.
----
- pkg/buildbot_pkg.py | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/buildbot_pkg.py b/buildbot_pkg.py
-index 89847b040..7788e12d6 100644
---- a/buildbot_pkg.py
-+++ b/buildbot_pkg.py
-@@ -33,17 +33,6 @@ import setuptools.command.build_py
- import setuptools.command.egg_info
- from setuptools import setup
- 
--old_listdir = os.listdir
--
--
--def listdir(path):
--    # patch listdir to avoid looking into node_modules
--    l = old_listdir(path)
--    if "node_modules" in l:
--        l.remove("node_modules")
--    return l
--os.listdir = listdir
--
- 
- def check_output(cmd):
-     """Version of check_output which does not throw error"""
--- 
-2.15.1
-
diff --git a/dev-util/buildbot-pkg/metadata.xml b/dev-util/buildbot-pkg/metadata.xml
deleted file mode 100644
index 0661cac6ea60..000000000000
--- a/dev-util/buildbot-pkg/metadata.xml
+++ /dev/null
@@ -1,34 +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="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-	BuildBot is a system to automate the compile/test cycle required
-	by most software projects to validate code changes.
-	Features:
-		* run builds on a variety of slave platforms
-		* arbitrary build process: handles projects using C, Python, whatever
-		* minimal host requirements: python and Twisted
-		* slaves can be behind a firewall if they can still do checkout
-		* status delivery through web page, email, IRC, other protocols
-		* track builds in progress, provide estimated completion time
-		* flexible configuration by subclassing generic build process classes
-		* debug tools to force a new build, submit fake Changes, query slave status
-		* released under the GPL
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-pkg</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-slave-0.8.12 b/dev-util/buildbot-slave-0.8.12
new file mode 100644
index 000000000000..60c7845346a0
--- /dev/null
+++ b/dev-util/buildbot-slave-0.8.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[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(-)] virtual/pkgconfig
+DESCRIPTION=BuildBot Slave Daemon
+EAPI=5
+HOMEPAGE=http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave/
+IUSE=test python_targets_python2_7
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[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=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.12.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	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=63e712e16dbc7581de6e14af315faee6
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
deleted file mode 100644
index e50f3d398ef7..000000000000
--- a/dev-util/buildbot-slave/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX buildslave.confd 217 BLAKE2B bd752869bc07ad6636b0035ad8f030536abbd9f703a7180e3370e19e09ca41fbd2145d1be48125cac42a06ab1a748612dc5fefebfce23940b28eefbdb015a366 SHA512 54fc03a82cebf874c18d1bd739a6640677cfcd540b47a9929e6f5d63a83bd64bee615b033a72b49ab5fa3da69b16ff657805392ab0a68e0d33e48581fc8bb017
-AUX buildslave.initd 1140 BLAKE2B 45de77ef9400a19b98ebac2ebd7f438354466ef4a2fce407e9d57f0cef6f081683a79d7c5651c1dd14ffbc3e834e980316361ec3a2ec1c29bad8d86bd259092d SHA512 217a9e3f774bcc7e7773d6e3047dbbabe196d168f814485ae54d1a94b330616fd80ad82bfa67c9b6185c39b780eae7a71776e727810ff4df337baca44d5fdbda
-AUX buildslave.service 386 BLAKE2B e50acd31037a91f439330f09e74321e7b8eff67711357c28d661b124fbc36e434a1707629d4ffe151dbf53a7a5600004c3928b511c0aeda672be66e9e492fe18 SHA512 53d9ac95006fb4e43e0bfa82c935e17c577cd292c8fea373247e4cd9bb21843f2f82971ffd37f50aa16fe258139c22adbe24570e3017fa529f2258a1d395d8dd
-DIST buildbot-slave-0.8.12.tar.gz 118339 BLAKE2B e516a8fd212d92e1cb1ed9bc11d70aa4baaea70fd1aa7f4fa239ed1160da51b96391d252643a13a72786d0b676e0e1780d31f998da7b3f90f1b73b32adb6b6c2 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc
-EBUILD buildbot-slave-0.8.12.ebuild 1564 BLAKE2B 17ac47bee796bc8f105cbd47eaf6f781190fe3eacac607f8affb9b690c00bd70733218d4661a8ed611824dcb3c085537ed6e535a607da83f08ecf153bce375d6 SHA512 e888c3fc0525d406778e51507bffb09f63f8ce553b615bf146a24cf1d91c981e56eee6c4e60ee144d6c30089f58ec1e5559873ae35f9e02dd9bfb23224a09f72
-MISC metadata.xml 384 BLAKE2B 90622968905729ec77151f4afd2ffc7b0561ef1eecc45f1986fccaa0281ae547d3fb88a9d9a63502935070dabd9a0109aa5af76b35132d70b60455d1db8f3864 SHA512 339c2747b1d392528c2b53934ed652574db095407cba130d0c8deac06570dce89e01f5fafb1e9ebe585c88ee3cdcc9f16747c08cdeace6ad47ebdff7f9d5302a
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
deleted file mode 100644
index bb90f9646953..000000000000
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ /dev/null
@@ -1,53 +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 readme.gentoo systemd user
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave/"
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
-		to support starting buildslave through Gentoo's init system. To use this,
-		set up your build slave following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
-		run as a different user if desired. If you need to run more than one
-		build slave, just copy the scripts."
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildslave.1
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildslave.initd" buildslave
-	systemd_dounit "${FILESDIR}/buildslave.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-slave/files/buildslave.confd b/dev-util/buildbot-slave/files/buildslave.confd
deleted file mode 100644
index 4ef42c4a7333..000000000000
--- a/dev-util/buildbot-slave/files/buildslave.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Path to the build slave's basedir.
-BASEDIR="/var/lib/buildslave"
-
-# User account for the buildslave.
-# The basedir should be owned by this user.
-USERNAME="buildbot"
-
-# Extra options passed to twistd.
-TWISTD_OPTS=""
diff --git a/dev-util/buildbot-slave/files/buildslave.initd b/dev-util/buildbot-slave/files/buildslave.initd
deleted file mode 100644
index 587c7ccb3bb5..000000000000
--- a/dev-util/buildbot-slave/files/buildslave.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${BASEDIR}" ]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [ -z "${USERNAME}" ]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [ ! -d "${BASEDIR}" ]; then
-		eerror "${BASEDIR} is not a directory"
-		return 1
-	fi
-	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
-		eerror "${BASEDIR} does not contain buildbot.tac"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildslave in ${BASEDIR}"
-	# We set HOME here to make something valid show up in the env of child
-	# processes spawned by the buildslave.
-	start-stop-daemon --start -u "${USERNAME}" \
-		--pidfile "${BASEDIR}/buildslave.pid" \
-		--env HOME="${BASEDIR}" \
-		--exec /usr/bin/python -- /usr/bin/twistd \
-		--no_save \
-		--logfile="${BASEDIR}/twistd.log" \
-		--pidfile="${BASEDIR}/buildslave.pid" \
-		--python="${BASEDIR}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildslave in ${BASEDIR}"
-	start-stop-daemon --stop --pidfile "${BASEDIR}/buildslave.pid"
-	eend $?
-}
diff --git a/dev-util/buildbot-slave/files/buildslave.service b/dev-util/buildbot-slave/files/buildslave.service
deleted file mode 100644
index 5c8e483fe83a..000000000000
--- a/dev-util/buildbot-slave/files/buildslave.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=buildbot slave instances
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-WorkingDirectory=/var/lib/buildslave
-# The following assume there is a 'slave' directory
-# in $WorkingDirectory with the slave configuration files
-ExecStart=/usr/bin/buildslave start slave
-ExecStop=/usr/bin/buildslave stop slave
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/buildbot-slave/metadata.xml b/dev-util/buildbot-slave/metadata.xml
deleted file mode 100644
index 87ac9774fee6..000000000000
--- a/dev-util/buildbot-slave/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>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">buildbot-slave</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-waterfall-view-0.9.12 b/dev-util/buildbot-waterfall-view-0.9.12
new file mode 100644
index 000000000000..3e8920c1258a
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.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_=82a412514081677fb95faa75067b3840
diff --git a/dev-util/buildbot-waterfall-view-0.9.13 b/dev-util/buildbot-waterfall-view-0.9.13
new file mode 100644
index 000000000000..13b7b22eb2b1
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.13[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/mock[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-util/buildbot-www-0.9.13[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.13[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/mock[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-util/buildbot-www-0.9.13[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.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_=d528851b8707b64ada2f4968982b1e52
diff --git a/dev-util/buildbot-waterfall-view-0.9.15_p1 b/dev-util/buildbot-waterfall-view-0.9.15_p1
new file mode 100644
index 000000000000..2c86c7f8254c
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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-util/buildbot-www-0.9.15_p1[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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.15_p1[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/mock[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-util/buildbot-www-0.9.15_p1[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15.post1.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_=550e39bc62d015cd6163eac1eacea7d7
diff --git a/dev-util/buildbot-waterfall-view-1.1.0 b/dev-util/buildbot-waterfall-view-1.1.0
new file mode 100644
index 000000000000..84e1385a32f8
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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/mock[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-util/buildbot-www-1.1.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/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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/mock[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-util/buildbot-www-1.1.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.1.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_=550e39bc62d015cd6163eac1eacea7d7
diff --git a/dev-util/buildbot-waterfall-view-1.1.2 b/dev-util/buildbot-waterfall-view-1.1.2
new file mode 100644
index 000000000000..a42731cc8bbd
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-1.1.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-python/mock[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-util/buildbot-www-1.1.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-python/setuptools-21.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-1.1.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-python/mock[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-util/buildbot-www-1.1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.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_=550e39bc62d015cd6163eac1eacea7d7
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
deleted file mode 100644
index 684752202c84..000000000000
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
-DIST buildbot-waterfall-view-0.9.13.tar.gz 714287 BLAKE2B addb1cbda2f751192533b7074bd5fcdd36f4d328ad555cba9c821b0648ceceb5ad63d2db85dbac9cc813d6665dad8f5725e5bb37123b6bbce8310740a3597d1f SHA512 448b1e0b63aaa1d33a7595262901373a4c9cd30e544bdc8bd2d672f8aebfb4d90aebb31ce4d78d59725bfdcba019c3643e9f6d66d1493fcb8c77fb8acbadfbf6
-DIST buildbot-waterfall-view-0.9.15.post1.tar.gz 713929 BLAKE2B 4940cf9224a1924bcb63ea7078d606ec919c0602e1c6c5d3cb53318a91e285add2a75b05ad46599857f2b73cea501754ac71e54d3ba6941a18685eb3c05e9d39 SHA512 841186372b8ada370c28bf07b2df9ad91d298913202c937e6d459dfede24293f9aef1d330ee07a6c97a91bf75b4ceae9f87b494f173082ceca1fb2c5f04abe79
-DIST buildbot-waterfall-view-1.1.0.tar.gz 713901 BLAKE2B 73366eac6a7e0c9e758209b64e2f086148612e9db3459a5babeb272f515d0aef2bf7bd3dddac6d57955a0ebb3e065fdd3eaee31196cf5bcb9afac269d154c4ce SHA512 f6151aab01b680aa77b17c6863e3d33557c2436a2ffe35db0b75416a1d7facd3927437c8bd659d8fbda339e4f77412ba6df605500e6b31559770fa3a3c0eca59
-DIST buildbot-waterfall-view-1.1.2.tar.gz 713898 BLAKE2B 0873ca7d44a9da7ad260032a8153c45e864c605c79cbd826d4f5cb306dbcdcd1fd1e89fe59df57decdcd9ce94330d80ed20d8d7d95b4dc93d6d7cdf6340eb30f SHA512 cc14894281b712fe479ea19116948f69fb43a4cc8c7a0f159fcf97eed0c36a11cc967a0663042f34f64cc4d65468c58eb4398d66fb0d125cde6dec9ef7fc7e08
-EBUILD buildbot-waterfall-view-0.9.12.ebuild 1145 BLAKE2B b04cf48ed5b4849436b4ea7e6414131307a1a3ffb9524543a6801b69df0ffc63282290d4b2ecedd88459d221e352d4e62f46bda68af1406466ba05a069166103 SHA512 6b6180ed60a93200a86adae7a006de353c9dad0ab8f5846896e4e76f255ecb2ff57e0431068288c3ff3daa01aa03992fd3be4246777ac12bcb6c2678c27dd819
-EBUILD buildbot-waterfall-view-0.9.13.ebuild 1147 BLAKE2B 0d51cace1706245d4d0ae46d0fef89b176226735d432093d1918dcea5872630d9a3390a01c85a2163cafd938f9b71e95518b999c07432f2f0444126d8957cd5e SHA512 e12a6f172c48da675b169041262e1b89e51456bfb54d9391459be065105a8e927b2f5d7ed79f7fd98a7241a06d4f6536cb8bf83b85bfe8d9cdcc9dbd4ca85534
-EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
-EBUILD buildbot-waterfall-view-1.1.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
-EBUILD buildbot-waterfall-view-1.1.2.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
-MISC metadata.xml 791 BLAKE2B 4e469a57580b4fda1bcbbde4580bdfd8e19769784a1760ddbd08b9c79ebdacab273be9871d87afe32f21f12efc2697f53f02367672660932faddb230fb8981de SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
deleted file mode 100644
index 1481782cc5d2..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
deleted file mode 100644
index ec80689f3460..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
deleted file mode 100644
index 85e04699e657..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
deleted file mode 100644
index 85e04699e657..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
deleted file mode 100644
index 85e04699e657..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.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="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/metadata.xml b/dev-util/buildbot-waterfall-view/metadata.xml
deleted file mode 100644
index fbcb11072aa4..000000000000
--- a/dev-util/buildbot-waterfall-view/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="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-		The buildbot-waterfall-view plugin is the user interface code used to
-		generate the web pages used to display information about the builds.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-waterfall-view</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-worker-0.9.12 b/dev-util/buildbot-worker-0.9.12
new file mode 100644
index 000000000000..61e04ad79235
--- /dev/null
+++ b/dev-util/buildbot-worker-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b535303e25ace8053e5941a08dfe9c6a
diff --git a/dev-util/buildbot-worker-0.9.13 b/dev-util/buildbot-worker-0.9.13
new file mode 100644
index 000000000000..d053a110fb72
--- /dev/null
+++ b/dev-util/buildbot-worker-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 test? ( dev-python/mock[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/setuptools_trial[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=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 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=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.13.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7aa0c65daa8801517be309e347e8ed74
diff --git a/dev-util/buildbot-worker-0.9.15_p1 b/dev-util/buildbot-worker-0.9.15_p1
new file mode 100644
index 000000000000..510c85edd647
--- /dev/null
+++ b/dev-util/buildbot-worker-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 test? ( dev-python/mock[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/setuptools_trial[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=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 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=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.15.post1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/dev-util/buildbot-worker-1.1.0 b/dev-util/buildbot-worker-1.1.0
new file mode 100644
index 000000000000..2cb825f89ca1
--- /dev/null
+++ b/dev-util/buildbot-worker-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 test? ( dev-python/mock[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/setuptools_trial[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=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 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=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/dev-util/buildbot-worker-1.1.2 b/dev-util/buildbot-worker-1.1.2
new file mode 100644
index 000000000000..b818cc4d1763
--- /dev/null
+++ b/dev-util/buildbot-worker-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 test? ( dev-python/mock[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/setuptools_trial[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=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 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=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/dev-util/buildbot-worker-9999 b/dev-util/buildbot-worker-9999
new file mode 100644
index 000000000000..6181878d7087
--- /dev/null
+++ b/dev-util/buildbot-worker-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 test? ( dev-python/mock[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/setuptools_trial[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] 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=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.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(-)] >=dev-python/twisted-17.9.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/future[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-util/buildbot-0.9.7 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	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
deleted file mode 100644
index 45cbff5d027b..000000000000
--- a/dev-util/buildbot-worker/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
-AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
-AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
-DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40
-DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f
-DIST buildbot-worker-1.1.0.tar.gz 102142 BLAKE2B 144587edf2adc9d99837dc549b4d0696761f6cb3c959d4c133a5136606934ce03836cd1fcb019e7bb8ec473526c2ac07146c4820ef4d8b17ed9d843acd6c06b4 SHA512 77c46b3c9a16847eaf72de1dafa871a3242b66235c94ce8109f953db39aa4b74de2a03ca7ff06e91f8ea0751ed57e6ec1f39336912d56346f1bed171f597f6ed
-DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
-EBUILD buildbot-worker-0.9.12.ebuild 4808 BLAKE2B 56e8fb43e57c6a90054296637223fc719e4b52738a3d5037326713b10ef29ba9ac9c71c2f468c040e075310501720147d59b83f9e83a4cf45146784de22905e1 SHA512 9280d45f8db1a23af1aa1098b6dd8677a22036a5256f6bd36b54a45f488a7c4ea2dbda2b006aaa2bec2084c14fe30cec56b3e6d6d65ae5a00db86e3307c3c7f2
-EBUILD buildbot-worker-0.9.13.ebuild 4811 BLAKE2B aa27842388456ee6deb710df750bcc84d6550b4bc67d1e37892127ae3f174fa7c170e9c07e6d3e6447abc9f2240375c8139475cb6c97d34220596dd4bb003645 SHA512 883cb6457f5f71ceff7becf1ca035466dd30ee796a1a8e0ec7bf61f5bd0fde926d21b264e3c1bc5aab8144027baefdd5ff27c55a2a669059a5a6f5e9cd3b0098
-EBUILD buildbot-worker-0.9.15_p1.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
-EBUILD buildbot-worker-1.1.0.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
-EBUILD buildbot-worker-1.1.2.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
-EBUILD buildbot-worker-9999.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
-MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
deleted file mode 100644
index 475028a231a8..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ /dev/null
@@ -1,133 +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_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
deleted file mode 100644
index f1331b427b7a..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
+++ /dev/null
@@ -1,133 +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} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
deleted file mode 100644
index dea70dbdd5e7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,133 +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} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
deleted file mode 100644
index dea70dbdd5e7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
+++ /dev/null
@@ -1,133 +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} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
deleted file mode 100644
index dea70dbdd5e7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ /dev/null
@@ -1,133 +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} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
deleted file mode 100644
index dea70dbdd5e7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ /dev/null
@@ -1,133 +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} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/files/buildbot.tac.sample b/dev-util/buildbot-worker/files/buildbot.tac.sample
deleted file mode 100644
index ee3d7ca3cef9..000000000000
--- a/dev-util/buildbot-worker/files/buildbot.tac.sample
+++ /dev/null
@@ -1,70 +0,0 @@
-'''
-This is a sample buildbot.tac file to initalize
-a buildbot worker complete with logging.
-'''
-
-import os.path
-import socket
-
-from twisted.application import service
-from twisted.python.logfile import LogFile
-from twisted.python.log import ILogObserver, FileLogObserver
-
-from buildbot_worker.bot import Worker
-
-################################
-# Set the following variables
-# to your desired values
-#################################
-
-# use the current directory or
-# set to an absolute value
-basedir = '.'
-
-# logging
-rotateLength = 10000000
-maxRotatedFiles = 10
-
-# buildbot communication port
-port = 9989
-
-# worker settings
-worker_name = 'worker-1'
-passwd = 'mypasswd'
-buildmaster_host = 'mybuildbot.foobar.org'
-keepalive = 600
-umask = None
-maxdelay = 300
-numcpus = None
-allow_shutdown = None
-
-
-# Begin starting up the worker
-# if this is a relocatable tac file, get the directory containing the TAC
-if basedir == '.':
-    basedir = os.path.abspath(os.path.dirname(__file__))
-
-# note: this line is matched against to check that this is
-# a buildbot-worker directory; do not edit it.
-application = service.Application('buildbot-worker')
-
-# set up logging
-logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"),
-                               rotateLength=rotateLength,
-                               maxRotatedFiles=maxRotatedFiles
-                               )
-application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
-
-worker = Worker(buildmaster_host,
-                port,
-                worker_name,
-                passwd,
-                basedir,
-                keepalive,
-                umask=umask,
-                maxdelay=maxdelay,
-                numcpus=numcpus,
-                allow_shutdown=allow_shutdown
-                )
-
-worker.setServiceParent(application)
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd2 b/dev-util/buildbot-worker/files/buildbot_worker.confd2
deleted file mode 100644
index f14e3210ca99..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Path to the build slave's basedir.
-BASEDIR="/var/lib/buildbot_worker"
-
-# User account for the buildslave.
-# The basedir should be owned by this user.
-USERNAME="buildbot"
-
-# Extra options passed to twistd.
-TWISTD_OPTS=""
-
-# Optional specific python version to run in
-# (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
-RUNTIME_PYTHON=""
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd2 b/dev-util/buildbot-worker/files/buildbot_worker.initd2
deleted file mode 100644
index 453d207e5d88..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd2
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BUILDWORKER_NAME=${RC_SVCNAME:16}
-BUILDWORKER_PATH="${BASEDIR}/${BUILDWORKER_NAME}"
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${BUILDWORKER_NAME}" ]; then
-		eerror "Buildbot-worker name not defined. Please link buildbot_worker.foo to this file to start the buildbot_worker with the name \"foo\"."
-		return 1
-	fi
-	if [ -z "${BASEDIR}" ]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [ -z "${USERNAME}" ]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [ ! -d "${BUILDWORKER_PATH}" ]; then
-		eerror "${BUILDWORKER_PATH} is not a directory"
-		return 1
-	fi
-	if [ ! -e "${BUILDWORKER_PATH}/buildbot.tac" ]; then
-		eerror "${BUILDWORKER_PATH} does not contain buildbot.tac"
-		return 1
-	fi
-	if [ ! -e "${RUNTIME_PYTHON}" ]; then
-		RUNTIME_PYTHON="/usr/bin/python"
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildbot-worker in ${BUILDWORKER_PATH}"
-	# We set HOME here to make something valid show up in the env of child
-	# processes spawned by the buildbot-worker.
-	start-stop-daemon --start -u "${USERNAME}" \
-		--pidfile "${BUILDWORKER_PATH}/buildbot_worker.pid" \
-		--env HOME="${BUILDWORKER_PATH}" \
-		--exec "${RUNTIME_PYTHON}" -- /usr/bin/twistd \
-		--no_save \
-		--logfile="${BUILDWORKER_PATH}/twistd.log" \
-		--pidfile="${BUILDWORKER_PATH}/buildbot_worker.pid" \
-		--python="${BUILDWORKER_PATH}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildbot-worker in ${BUILDWORKER_PATH}"
-	start-stop-daemon --stop --pidfile "${BUILDWORKER_PATH}/buildbot_worker.pid"
-	eend $?
-}
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
deleted file mode 100644
index 113a011b29b3..000000000000
--- a/dev-util/buildbot-worker/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-worker</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-wsgi-dashboards-0.9.12 b/dev-util/buildbot-wsgi-dashboards-0.9.12
new file mode 100644
index 000000000000..73555631c557
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=5
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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_=0a5143bedc7656d6314189a79e2001f3
diff --git a/dev-util/buildbot-wsgi-dashboards-0.9.13 b/dev-util/buildbot-wsgi-dashboards-0.9.13
new file mode 100644
index 000000000000..71f1756e390e
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-0.9.13[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-util/buildbot-www-0.9.13[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=5
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.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_=1978da88bc8c8529e71bb8a0d811cd9b
diff --git a/dev-util/buildbot-wsgi-dashboards-0.9.15_p1 b/dev-util/buildbot-wsgi-dashboards-0.9.15_p1
new file mode 100644
index 000000000000..5240a54617a9
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-0.9.15_p1[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-util/buildbot-www-0.9.15_p1[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=5
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15.post1.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_=9d05af1282287b31a3af7f1df823b149
diff --git a/dev-util/buildbot-wsgi-dashboards-1.1.0 b/dev-util/buildbot-wsgi-dashboards-1.1.0
new file mode 100644
index 000000000000..4fe09ee3ca23
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-1.1.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-util/buildbot-www-1.1.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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=5
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.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_=9d05af1282287b31a3af7f1df823b149
diff --git a/dev-util/buildbot-wsgi-dashboards-1.1.2 b/dev-util/buildbot-wsgi-dashboards-1.1.2
new file mode 100644
index 000000000000..dc52eb001271
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-1.1.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-util/buildbot-www-1.1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.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_=a9ef31d463083c5b094b452174343442
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
deleted file mode 100644
index faf791e2e21c..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
-DIST buildbot-wsgi-dashboards-0.9.13.tar.gz 627272 BLAKE2B 1b4b8b6a0eed9572923a0dba24a9194557074e84640cf57141014a92294c56f22330566ae995bfa5e6be63640549e42e5aae01911df6989dbe4861b7ca5544f8 SHA512 08eedef62e85d71cbfde0f57727974a2bc1a9d33fc3821aaeb3a003df3b212c2b1ce00afa986dad062415b0bf8d8a9c0c328810e9d3fc994cdcbb82de2037366
-DIST buildbot-wsgi-dashboards-0.9.15.post1.tar.gz 626856 BLAKE2B 13104173594f1f5326221cac1839b44e792212c772730f0632f8528e55f5249d61b72c97cce7e51b6b3a82b2490a7654b7deea04ba61da13158e6d40e0021429 SHA512 5bd089d38a87e1e1dd03343b96824dc227e35268971b9b541e761c289042412b7dd0bc42df2fc9c28da5933a995c5bdf7af7bc7aafff999ce2f9431881bbd58e
-DIST buildbot-wsgi-dashboards-1.1.0.tar.gz 626836 BLAKE2B f7323073f644e6b6b89595aa052ae1bc25d14b439c3d1d0f3601eb4a62b07563ef12a97bde8997495fe6260e31de55a29b220f48c0b794761e077de77ccd0246 SHA512 799c2a28bd874c864264247fa0d030b3335d63bec88cfc7637b8456615c0c299de4df91557178e5d3358450fea89ed0ddb82ae27bbf8304dc3b7f9711ce69e94
-DIST buildbot-wsgi-dashboards-1.1.2.tar.gz 626825 BLAKE2B 396fa858cafd6dc3958c37ea2e9e685357de2185ce0b73d946d3eb2e99472339e176de1b49d821337535904c521e8dbaa662217c568306e7b2d889d11fdeb5ed SHA512 1eee2a38b525145e50812dff421613291f6b0b6a80a531b54383d771393d2a12c1c7840e2dabf7949918ac3f31ce5f6bd9514c08dee8fe5900c99438e63d4ee2
-EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1150 BLAKE2B e9354da5dc2bcb0ed8570ba566a483c75c5d99616c36a897d429a55b3ddf8106acfa8552ad00da622c74e7f9fda20b6bbdbf5ea692d68c9e5fbcb70dabfc2e21 SHA512 c5f35d782a8f6b642d28ebd0c4038a89a0efe89f16a0581c2769c03f03655b618dfaf0a9aad5e616662e3dc99f2447e514897c6d87a51eaab82492650c641548
-EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1152 BLAKE2B 6154f9831fe307b66f29fd52fcf6336f173d36cd5195ad89d2ff70f225baf72b22d7057d81b86ad8d98d9d17d6dc558aec78e587da7f97b8cba27e883d99599e SHA512 1a1e4fa7fb876f4dffdc6bb2095520f79e379a030060e43a74ac01582c7d04a0ee93b881cd1c56fe3e037b29e3651884c252620f21a8a11cf520885bac87c1b9
-EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
-EBUILD buildbot-wsgi-dashboards-1.1.0.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
-EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
-MISC metadata.xml 790 BLAKE2B 5441af355527235e9e12079b22918db4beca4cb79b2d479436ba050039e9d9de6971ccca8365b4fb7010408b00601b1a8095b3d8c23639cf0612a9baacd89dec SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
deleted file mode 100644
index 4cabf641f704..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
deleted file mode 100644
index 79aac997ef77..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
deleted file mode 100644
index 33206843b81a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
deleted file mode 100644
index 33206843b81a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.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_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
deleted file mode 100644
index d40978a5739f..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/metadata.xml b/dev-util/buildbot-wsgi-dashboards/metadata.xml
deleted file mode 100644
index 5635b23b831e..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/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="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-		The buildbot-wsgi-dashboards plugin is the user interface code used to
-		integrate flask or bottle dashboards to buildbot's web interface.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-wsgi-dashboards</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot-www-0.9.12 b/dev-util/buildbot-www-0.9.12
new file mode 100644
index 000000000000..e134928c173f
--- /dev/null
+++ b/dev-util/buildbot-www-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-pkg-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.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_=8e4292c1b29287755123a88823a18d6e
diff --git a/dev-util/buildbot-www-0.9.13 b/dev-util/buildbot-www-0.9.13
new file mode 100644
index 000000000000..f07bb44836dc
--- /dev/null
+++ b/dev-util/buildbot-www-0.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-0.9.13[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-util/buildbot-pkg-0.9.13[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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-www/buildbot-www-0.9.13.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_=bc6f98653410bb09cbe51348f2efee1b
diff --git a/dev-util/buildbot-www-0.9.15_p1 b/dev-util/buildbot-www-0.9.15_p1
new file mode 100644
index 000000000000..1aade103a095
--- /dev/null
+++ b/dev-util/buildbot-www-0.9.15_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-0.9.15_p1[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-util/buildbot-pkg-0.9.15_p1[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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-www/buildbot-www-0.9.15.post1.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_=7900405599d61a090b70b685844273bd
diff --git a/dev-util/buildbot-www-1.1.0 b/dev-util/buildbot-www-1.1.0
new file mode 100644
index 000000000000..68c850123dda
--- /dev/null
+++ b/dev-util/buildbot-www-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-1.1.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-util/buildbot-pkg-1.1.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/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-www/buildbot-www-1.1.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_=7900405599d61a090b70b685844273bd
diff --git a/dev-util/buildbot-www-1.1.2 b/dev-util/buildbot-www-1.1.2
new file mode 100644
index 000000000000..9122abc207cc
--- /dev/null
+++ b/dev-util/buildbot-www-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.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(-)] ~dev-util/buildbot-1.1.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-util/buildbot-pkg-1.1.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-python/mock[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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/b/buildbot-www/buildbot-www-1.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_=7900405599d61a090b70b685844273bd
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
deleted file mode 100644
index 84096fa13c5e..000000000000
--- a/dev-util/buildbot-www/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
-DIST buildbot-www-0.9.13.tar.gz 691556 BLAKE2B cd3fe546c88308debc6dd621e8979c400816a11235b67c23e539bb3525746a864d76df2c4f8e04f63ba4459d2186094543115ab51bdc35f56b20c8c1a0ed5a68 SHA512 b092014e490ed46f2551ddeeaef5364c85b048cdda298af11acdf664d799fc52ef6f8daa17cf7a98d588c59abcbdfebb666345b44d551859d3db9b4fa358adb9
-DIST buildbot-www-0.9.15.post1.tar.gz 718007 BLAKE2B af64eb2e0fabea2af3c02c294d50c924211755358187bd0d52f43821fddcd6d566f8aad1136da3ca69f924aee3bce52cde1e48af3c3f0419c23d6c1be25c17ee SHA512 749fd6e763580bb0fd27f7ce1576ee193ccf9cb42616c3b393a0bfac9469d9a42372069d087ceae3557e72540a3e0cc37087ba4b7901cbb67877f17f27422a47
-DIST buildbot-www-1.1.0.tar.gz 718666 BLAKE2B 86bc329eb80aacf44c5bd01eaaf6b8f0631cb808080fe17f667f54746f841f9d88aa7b699e6083546b6e2dfb1171333ee173c484c9fdea285bdd5769d90a6528 SHA512 8e95a4faf393a81fccab225cf33ee13947cb72e441e2cfde833843838686a888cff24e45c6085d4ac431dec177d696441cb21014d172ae23b61ef70164fccb31
-DIST buildbot-www-1.1.2.tar.gz 718705 BLAKE2B 009ae0dc07693f9eee4e3982ccbecb32d64e7d27e374f539cd541a5f80d9b9bf798e8836502cd26a5477b0ee842dbfae2308608fa3320e682afd0bcda2f89f1e SHA512 e4a0f7aee5e38d0522d39c819d4b9865966e020fd89b156e79807417fd7f82d497fbceafcc8a89e5beb6def1f42e4bfc595053581cbe2634520ad2c806ce3968
-EBUILD buildbot-www-0.9.12.ebuild 1182 BLAKE2B 15e5f4e434388e046289db3cdab2419cff90b6878e2f206b33ee0add43709c1519a23d1bc9bb98f6538d16939e95b24f3e94a8f69045f1c34227effb42f6ef70 SHA512 040ec4dba0f0e5e15d64f368063a78244dbaa58ab1ba5ba12969d9e29a69a4c2a00d8dca1f42c84f08825c7f3a7aff682d34f8305df10b50d024201ca839ae9c
-EBUILD buildbot-www-0.9.13.ebuild 1184 BLAKE2B b9347644e9be3d66a84c455da583ed296dbe9ae8576ea8b4d55378f5d40b0ad49cb287b6f2c611a39efd2757334d7bae49132ba7bc77d4b3b4f502fa43c6a178 SHA512 84a11c2badc1dd43caa59cf092431ae9b4737945eeda60963b88c58af09adbd8c7d40d99a1cfd09a04cb18c9f5c3b8b5d8e511dfe031413a914e38f68798a448
-EBUILD buildbot-www-0.9.15_p1.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
-EBUILD buildbot-www-1.1.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
-EBUILD buildbot-www-1.1.2.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
-MISC metadata.xml 777 BLAKE2B 07ead3ebaabaa62d3d09fbe84329649742eb92d194eff89c94f422f14934e92130401daa97799e038152943e0055a3a4bef74815175a533d2821a07645c64bb4 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
deleted file mode 100644
index 04389c8bb423..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
deleted file mode 100644
index 56bc0409643f..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
deleted file mode 100644
index 8ee469d1634d..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
deleted file mode 100644
index 8ee469d1634d..000000000000
--- a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
deleted file mode 100644
index 8ee469d1634d..000000000000
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/metadata.xml b/dev-util/buildbot-www/metadata.xml
deleted file mode 100644
index 55b76e0cd4dd..000000000000
--- a/dev-util/buildbot-www/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="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<longdescription lang="en">
-		The BuildBot-www package is the base or common code used for the other
-		user interface packages such as the waterfall and console views.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot-www</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
deleted file mode 100644
index beb6cab3853b..000000000000
--- a/dev-util/buildbot/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
-AUX buildbot-0.9.15_p1-buildbotworkerdocker.py.patch 947 BLAKE2B d0e4e1e97ac30d63d1167c64e6505b18573abb3183b970e24dd7cbd22db06094cb7a14be97f3fd3a4ac9ef6bb6bc37050613e83ddb4bb6dd2d61e88769336069 SHA512 1b92cde0a585521d4ce33fa4cc19b9322c64e004f58a4c8570a6ce34a551d77431dd761f59ac41553968a89459c9cb5ea49212e2ce7b2838adbd51b922edee81
-AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
-AUX buildmaster.initd 1576 BLAKE2B badfd427f40acced775fbf1e115ddf72792e9df80ff46dbb2b99cf01187885be360ada13b05ceec0ea181337f0ba07966f659a9f539f47cc3611555f051bbdf5 SHA512 0ad8173fcd732420c104ee3467d9df4c629165d82e75ddc8154249e69af3a8492a645e57e2da8e06372ba062aecbff82bfd0b24ff7d58515f87f0d255c8cab0f
-AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
-AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
-AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
-AUX disable-test_userpass_wait.patch 891 BLAKE2B e88d77dc41a6b5e6e7dd925433a1fdcd459cd4baa457207f0922ff640cd12533f435ba4abc9f5ccdeee5402a28bd7171212e227f1d70250f077c37d1c3e91608 SHA512 33701567ee7cba18e05ccf55400fccfdd64e54ed1f79c8d7ebe3781999f709b47246bf01b49ea0056f4a33996c6e9818ca84f222c611a9e386291e802d4d2488
-DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
-DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
-DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade
-DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d
-DIST buildbot-1.1.0.docs.tar.xz 23932 BLAKE2B 81da8b86bb269efd2cd3f9146f3d9b41d64b28fdd0c878708c323d040a7e773cd277a18c82b1ef3cb07759ba8aedbc604e1de84f6477205b1708c28b6e86831e SHA512 511d244ffd205989047b4514b164e194b30fe4e0513d3bda776fb4d7a1a5bf42d8b7f00540b88e427838ab43f45686a83e556687ab75ce55eae6b834426a8ef7
-DIST buildbot-1.1.0.tar.gz 3098781 BLAKE2B 5a4ba8b641765fd58c3b5e788fc20aa1fb6195655ce2d82929f0f62ff48d20672f21efe0c413387e583d095c3ffcee1055a287016fe87ec1f3eb6b0ccdefdccb SHA512 f850ba2cd93d54a8abc97503719f93f69dfdc3d03b519e2d05c02bdc11893529eb51d74b6584555689281aedb71c3aa6c23141cf5fbc68ae97e09f1c89b2c94c
-DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
-EBUILD buildbot-0.8.12-r3.ebuild 5487 BLAKE2B 65e94e3913dfc194381b8c86b0743f2ddb278f90cf5f0d32e1ddeee50cb5da314a6c35c892264985841ebd6227453f699794db30786e329a6b5219e6ece0ec6b SHA512 b628b1cec97419b16289c219967eee1154a1b022004afb25981bc83ff60924e462cd652e2c88f51a799c8bec7acdd25dcaf6e2657f0d3f44a69a793d205bfcca
-EBUILD buildbot-0.9.12.ebuild 7108 BLAKE2B 3f1d6b553364fbc381e6d22ffc3a41be88dfb5359583aabe53cadbffca1c7e3dc18714693543a7b0422f1b4a6e842e64c77d49092fd041a28c65a61fc441227a SHA512 933fc9c4fcd252837b565d7442a9f617548a26cad8b2719d2f167f40d5abb0e000b98fda7994dc718399ed1428b6a67abd7b1e6ddc39d48fd49ca1d7bab233a6
-EBUILD buildbot-0.9.13.ebuild 7049 BLAKE2B 05ba09770db0a62bcfea80aba47362dd1ae1d76c6020c7b9b579373e5c0e7bc922a46a96aeb1508137d99c08588980f5430fd147a1852248bfa91654b344f1d0 SHA512 1438c1c66928f59421431852274fe8d86dbb70ada6b6172b080ee5851d3817edbfe643973577fe9390e8f05bb26a055656861563ba1f3ed607cb27d34993f84a
-EBUILD buildbot-0.9.15_p1.ebuild 7238 BLAKE2B f5e70ab74c1e116335aa48bbe5349f34493c5829cabbb69e98ba9971e5c6f6f1d1c29fda2235e15b3127266f29908009f292f5e3952217864b613e4a59e854c8 SHA512 73c7640b3450701711099233c2cc405ef23707bb6074c8ad4b11790d2940284aaf7eecfce6af4cdfaf7f32eb693cd1f329ab3eb1b43a8f65f8b98439a63f7234
-EBUILD buildbot-1.1.0.ebuild 7352 BLAKE2B 4565a431c481ffb3681e3fb47c54daaaf5f2c34476f41e696df012a77960b920942014aaeec8220d59ff75f481986777c0a57304f953dfbab1f5e01616334cee SHA512 6fee92726755e6c0fb6f3f55277669518c2da4435b0dbd2d09fd656613269822c80740d06b5486f6dea8e40d6731176fd61ee5cbafdfc64b10e0eb7872168997
-EBUILD buildbot-1.1.2.ebuild 6550 BLAKE2B 88e1fb4d2acc8f6876629ad933c54e0574ba179788f33416ca00c40ada8f0d355d49f5675d19ba47003090ad5f8f556568b3b65354925df95a9be39655148328 SHA512 1db8c11e0622f7ccf0c7237e7404736c40d55233d2b56778a2b85b30dd9e26843d9ab2e3c9fe2c63467dfe54f28141323688eed1ee43e3a0f7e483fda71a3254
-EBUILD buildbot-9999.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
-MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
deleted file mode 100644
index dc3c963ebc9c..000000000000
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ /dev/null
@@ -1,147 +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="sqlite"
-
-inherit distutils-r1 readme.gentoo systemd user
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples irc mail manhole test"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
-	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
-	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/twisted-mail[${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-		dev-python/twisted-words[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
deleted file mode 100644
index c37dc87e1474..000000000000
--- a/dev-util/buildbot/buildbot-0.9.12.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-PATCHES=(
-	"${FILESDIR}/Remove-distro-version-test.patch"
-)
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
deleted file mode 100644
index 632833de2f4a..000000000000
--- a/dev-util/buildbot/buildbot-0.9.13.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
deleted file mode 100644
index 31c121b11d7e..000000000000
--- a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc docker examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-#PATCHES=(
-#	"${FILESDIR}/${P}-buildbotworkerdocker.py.patch"
-#)
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-1.1.0.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
deleted file mode 100644
index 4cdc4a28db20..000000000000
--- a/dev-util/buildbot/buildbot-1.1.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc docker examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-PATCHES=(
-	"${FILESDIR}/Remove-distro-version-test.patch"
-	"${FILESDIR}/disable-test_userpass_wait.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${MY_P}
-	unpack buildbot-1.1.0.docs.tar.xz
-}
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-	export DISABLE_TEST=true
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
deleted file mode 100644
index 0888e9cce412..000000000000
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt docker examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Remove-distro-version-test.patch"
-	)
-fi
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
deleted file mode 100644
index f52f1c9e2ed2..000000000000
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc docker examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Remove-distro-version-test.patch"
-	)
-fi
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch
deleted file mode 100644
index c489be25c1c3..000000000000
--- a/dev-util/buildbot/files/Remove-distro-version-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Thu, 26 Oct 2017 12:00:37 -0700
-Subject: [PATCH] Remove distro version test
-
----
- buildbot/test/unit/test_buildbot_net_usage_data.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py
-index 709c804..7885d1b 100644
---- a/buildbot/test/unit/test_buildbot_net_usage_data.py
-+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
-@@ -153,4 +153,3 @@ class Tests(unittest.TestCase):
-         distro = linux_distribution()
-         self.assertEqual(len(distro), 2)
-         self.assertNotIn("unknown", distro[0])
--        self.assertNotIn("unknown", distro[1])
---
-libgit2 0.26.0
-
diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
deleted file mode 100644
index db08d7a45dd3..000000000000
--- a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 15 Jan 2018 13:50:36 -0800
-Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker
- is not installed
-
-This fixes numerous tracebacks (note, only partial traceback):
-
-  File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance
-    if docker_py_version >= 2.2:
-builtins.NameError: name 'docker_py_version' is not defined
-
-With this patch, the tests pass.
----
- master/buildbot/worker/docker.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py
-index 62e30785f..e558d69ff 100644
---- a/buildbot/worker/docker.py
-+++ b/buildbot/worker/docker.py
-@@ -41,6 +41,7 @@ try:
- except ImportError:
-     docker = None
-     client = None
-+    docker_py_version = 0.0
- 
- 
- def _handle_stream_line(line):
--- 
-2.15.1
-
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
deleted file mode 100644
index eb3185aef358..000000000000
--- a/dev-util/buildbot/files/buildmaster.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Path to the build master's basedir.
-BASEDIR=/var/lib/buildmaster
-
-# User account for the buildmaster.
-# The basedir should be owned by this user.
-USERNAME=buildbot
-
-# Extra options to pass to twistd.
-TWISTD_OPTS=""
-
-# Optional specific python version to run in
-# (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
-RUNTIME_PYTHON=""
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
deleted file mode 100644
index 933c6e2b4e51..000000000000
--- a/dev-util/buildbot/files/buildmaster.initd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-BUILDMASTER_NAME=${RC_SVCNAME:12}
-BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${BUILDMASTER_NAME}" ]; then
-		eerror "Buildmaster name not defined. Please link buildmaster.foo to this file to start the buildmaster with the name \"foo\"."
-		return 1
-	fi
-	if [ -z "${BASEDIR}" ]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [ -z "${USERNAME}" ]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [ ! -d "${BUILDMASTER_PATH}" ]; then
-		eerror "${BUILDMASTER_PATH} is not a directory"
-		return 1
-	fi
-	if [ ! -e "${BUILDMASTER_PATH}/buildbot.tac" ]; then
-		eerror "${BUILDMASTER_PATH} does not contain buildbot.tac"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildmaster in ${BUILDMASTER_PATH}"
-	start-stop-daemon --start -u "${USERNAME}" \
-		--pidfile "${BUILDMASTER_PATH}/buildmaster.pid" \
-		--exec "${RUNTIME_PYTHON}" -- /usr/bin/twistd \
-		--no_save \
-		--logfile="${BUILDMASTER_PATH}/twistd.log" \
-		--pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \
-		--python="${BUILDMASTER_PATH}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildmaster in ${BUILDMASTER_PATH}"
-	start-stop-daemon --stop --pidfile "${BUILDMASTER_PATH}/buildmaster.pid"
-	eend $?
-}
-
-reload() {
-	ebegin "Reconfiguring buildmaster in ${BUILDMASTER_PATH}"
-	start-stop-daemon --signal HUP --pidfile \
-		"${BUILDMASTER_PATH}"/buildmaster.pid
-	eend $?
-}
diff --git a/dev-util/buildbot/files/buildmaster.target b/dev-util/buildbot/files/buildmaster.target
deleted file mode 100644
index 2bf1a361e6b0..000000000000
--- a/dev-util/buildbot/files/buildmaster.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Buildbot target that allows to start or stop all buildmaster@*.service instances
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/buildbot/files/buildmaster_at.service b/dev-util/buildbot/files/buildmaster_at.service
deleted file mode 100644
index 88f9f5712002..000000000000
--- a/dev-util/buildbot/files/buildmaster_at.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=buildbot master daemon
-After=local-fs.target network.target
-PartOf=buildmaster.target
-
-[Service]
-Environment=BASEDIR=/var/lib/buildmaster
-Type=forking
-User=buildbot
-ExecStartPre=/usr/bin/buildbot checkconfig ${BASEDIR}/%i
-ExecStart=/usr/bin/buildbot start ${BASEDIR}/%i
-ExecStop=/usr/bin/buildbot stop ${BASEDIR}/%i
-
-[Install]
-WantedBy=buildmaster.target
-
diff --git a/dev-util/buildbot/files/buildmaster_at.service.conf b/dev-util/buildbot/files/buildmaster_at.service.conf
deleted file mode 100644
index baf1ae74ec08..000000000000
--- a/dev-util/buildbot/files/buildmaster_at.service.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Uncomment the following lines to configure the base directory for all buildmaster instances.
-
-#[Service]
-#Environment=BASEDIR=/var/lib/buildmaster
-
diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch
deleted file mode 100644
index e7b9d0a59e36..000000000000
--- a/dev-util/buildbot/files/disable-test_userpass_wait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Tue, 13 Mar 2018 19:59:13 +0000
-Subject: [PATCH] disable test-userpass-wait
-
----
- master/buildbot/test/integration/test_try_client.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py
-index 9bdc7a63a..48fcb1573 100644
---- a/buildbot/test/integration/test_try_client.py
-+++ b/buildbot/test/integration/test_try_client.py
-@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin):
- 
-     @defer.inlineCallbacks
-     def test_userpass_wait(self):
-+        if os.environ.get("DISABLE_TEST", False):
-+            return
-         yield self.startMaster(
-             trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')]))
-         yield self.runClient({
--- 
-2.13.6
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
deleted file mode 100644
index a40eac4867f1..000000000000
--- a/dev-util/buildbot/metadata.xml
+++ /dev/null
@@ -1,40 +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="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<longdescription lang="en">
-	BuildBot is a system to automate the compile/test cycle required
-	by most software projects to validate code changes.
-	Features:
-		* run builds on a variety of slave platforms
-		* arbitrary build process: handles projects using C, Python, whatever
-		* minimal host requirements: python and Twisted
-		* slaves can be behind a firewall if they can still do checkout
-		* status delivery through web page, email, IRC, other protocols
-		* track builds in progress, provide estimated completion time
-		* flexible configuration by subclassing generic build process classes
-		* debug tools to force a new build, submit fake Changes, query slave status
-		* released under the GPL
-	</longdescription>
-	<use>
-		<flag name="docker">Add support for worker docker command steps</flag>
-		<flag name="irc">Add support for status delivery through an ircbot.</flag>
-		<flag name="mail">Add support for watching a maildir for commits.</flag>
-		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
-	</use>
-	<upstream>
-		<maintainer>
-			<email>devel@buildbot.net</email>
-			<name>Developers List</name>
-		</maintainer>
-		<remote-id type="pypi">buildbot</remote-id>
-		<remote-id type="github">buildbot/buildbot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bumpversion-0.5.3 b/dev-util/bumpversion-0.5.3
new file mode 100644
index 000000000000..15ec499720d5
--- /dev/null
+++ b/dev-util/bumpversion-0.5.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] test? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[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/pytest[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(-)]
+DESCRIPTION=Version-bump your software with a single command
+EAPI=5
+HOMEPAGE=https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+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 ) 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/b/bumpversion/bumpversion-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_=fc7799d0484c42176d98b1990ca5fc1e
diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest
deleted file mode 100644
index 957247fe8425..000000000000
--- a/dev-util/bumpversion/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bumpversion-0.5.3.tar.gz 16596 BLAKE2B ecd9e999241d0d77161529344d9f83859ab1083c323524f91f84802ff74aa8e9d4d95126b65c685e04183cf7907732f2ad734938db7aa03dfb9e334a1d24222c SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959
-EBUILD bumpversion-0.5.3.ebuild 813 BLAKE2B 4e747fba1fd159bafa533e1e5e5dd492c5d861d098487395e71e270ff94fea0e8d6d510e62e1542dccb21f26c661f5fcc9da79ca2d02b68135782aaf6fe7ba66 SHA512 6109d87c14376b49de5495cbf4f18dbc890037d2b62b9fb8bd789bf3a3091ba35df22234f7442b244025a5f36ef100558e2b0f86bd9b0e340232c5e65b7a01e7
-MISC metadata.xml 300 BLAKE2B c9f5c0e8c55aabd0ff79c4ffa4d04195f6e532ebce0c697dd75fe1568399c7dfc8575d27b20781d626a9aa075226688b67f14487db0db9d081da94352eaf1e8b SHA512 de2e356433d02bc7f9b8f24f178fa1124948f9bce7475cf4fea0efc002533755b854cfb5f591343ca73c6b798cbbe15a40c0450f23d994420a9a28f9bfdcb483
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
deleted file mode 100644
index 3109273e0b2d..000000000000
--- a/dev-util/bumpversion/bumpversion-0.5.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} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Version-bump your software with a single command"
-HOMEPAGE="https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/configparser[$(python_gen_usedep "python2*" pypy)]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-# Not included
-# https://github.com/peritus/bumpversion/issues/108
-RESTRICT=test
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml
deleted file mode 100644
index 71a774b004dd..000000000000
--- a/dev-util/bumpversion/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">bumpversion</remote-id>
-		<remote-id type="github">peritus/bumpversion</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bustle-0.4.2-r1 b/dev-util/bustle-0.4.2-r1
new file mode 100644
index 000000000000..c899a15f8037
--- /dev/null
+++ b/dev-util/bustle-0.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) >=dev-haskell/cabal-1.8 dev-haskell/cairo:0 >=dev-haskell/dbus-0.10 dev-haskell/glib:0 >=dev-haskell/gtk-0.12.3:2 dev-haskell/mtl dev-haskell/pango:0 dev-haskell/parsec dev-haskell/pcap dev-haskell/text >=dev-lang/ghc-6.10.4
+DESCRIPTION=Draw pretty sequence diagrams of D-Bus traffic
+EAPI=5
+HOMEPAGE=http://willthompson.co.uk/bustle/
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2 GPL-2
+RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
+SLOT=0
+SRC_URI=http://willthompson.co.uk/bustle/releases/0.4.2/bustle-0.4.2.tar.gz https://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	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_=1d4b246ba8606bf682503b7617902d63
diff --git a/dev-util/bustle-0.4.7-r1 b/dev-util/bustle-0.4.7-r1
new file mode 100644
index 000000000000..72e76ebb479d
--- /dev/null
+++ b/dev-util/bustle-0.4.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0 >=dev-haskell/cabal-1.8.0.2 dev-haskell/cairo >=dev-haskell/dbus-0.10 dev-haskell/glib >=dev-haskell/gtk-0.13 >=dev-haskell/hgettext-0.1.5 dev-haskell/mtl >=dev-haskell/pango-0.13 dev-haskell/parsec dev-haskell/pcap dev-haskell/setlocale dev-haskell/text >=dev-lang/ghc-6.12.1 virtual/pkgconfig test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit )
+DESCRIPTION=Draw pretty sequence diagrams of D-Bus traffic
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bustle
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2 GPL-2 GPL-3
+RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/bustle/0.4.7/bustle-0.4.7.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_=39ecc23c2cc98c34e3d89a4df615e863
diff --git a/dev-util/bustle-0.5.4 b/dev-util/bustle-0.5.4
new file mode 100644
index 000000000000..83875a9f3dde
--- /dev/null
+++ b/dev-util/bustle-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cairo:= >=dev-haskell/dbus-0.10:= dev-haskell/gio:= dev-haskell/glib:= >=dev-haskell/gtk3-0.13.7:0= >=dev-haskell/hgettext-0.1.5:= dev-haskell/mtl:= dev-haskell/pango:= dev-haskell/parsec:= dev-haskell/pcap:= dev-haskell/setlocale:= dev-haskell/text:= >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 dev-perl/Locale-gettext >=dev-haskell/cabal-1.8 virtual/pkgconfig test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit )
+DESCRIPTION=Draw sequence diagrams of D-Bus traffic
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bustle
+IUSE=interactivetests +threaded test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2 GPL-2 GPL-3
+RDEPEND=dev-haskell/cairo:= >=dev-haskell/dbus-0.10:= dev-haskell/gio:= dev-haskell/glib:= >=dev-haskell/gtk3-0.13.7:0= >=dev-haskell/hgettext-0.1.5:= dev-haskell/mtl:= dev-haskell/pango:= dev-haskell/parsec:= dev-haskell/pcap:= dev-haskell/setlocale:= dev-haskell/text:= >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 dev-perl/Locale-gettext
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/bustle/0.5.4/bustle-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_=987b6631d69b28f63c2e62fc2dfa02e6
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
deleted file mode 100644
index 64e92f336960..000000000000
--- a/dev-util/bustle/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 BLAKE2B 3dabdb99730f9581bd44d5c5ff9930aa57887e830db3226a37f9ba788e46b17e64ceb35f75476872936cc07c42cbda2241fd03a2d3fbb1ab5c3d2a59ece99811 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588
-AUX bustle-0.4.7-gtk-0.13.patch 6428 BLAKE2B 20eea89172dbd4ef029ec598be9556721d8a5503aaf6cf1cefa3003e166dd12e1d1be3e41152ba530a49bf8bdd746495797887bb4c3ba9c91df965b3cd54c529 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff
-DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e6b67490df99f403a7dc6d9665c3973e37c9e8e408549937750b262ff30aadf36658aec56f2f043f1381ac437dbd5 SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1
-DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
-DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
-DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1563 BLAKE2B e225038658a36654938d25c6c09be6fb6cb8c2136561cff5865457c2387601e3a37e10b8ed0d80240c5d0842d55fbd892536b840f4810e1da15db47904e9ffb7 SHA512 0d714abbcde8f37318a9c61e85857951d28003c9c5e44ee208cb4f9684f04f9f967e7e8e328d02ec87b6cc6853bc01035f996803931dde51c4914770ed83ad23
-EBUILD bustle-0.4.7-r1.ebuild 1504 BLAKE2B 464a45371475c7ca265bb830b27e086b5a7da3ce3a675707a003d8fe02fadebb5d6aaaf9e431e590bcf0f16a6f7a943fc8d6e57d4a329a88b6599201fb56e68c SHA512 8cff7f0958a3438316d612185c0691037cbf0ef086889476595d9605ae8ed15f6cb8f7b08fc0320aea0ea4c9c5fd8f42950aa13969e9e0069beda9f6cd55ff0b
-EBUILD bustle-0.5.4.ebuild 1625 BLAKE2B b1eb6a7c42524b750391aca4ddcfbcd88afbcf556fefb712c2716dcf98b58d677c0f73d7ca7853b38b1ad4e77a4ca825e01b1cbb5dc7098868969ca8232a5580 SHA512 08b4f1faffbdf9e7a9706b9228da978013f61914efc0889f64d5d2943f64c944d82df34636c9ef3d9b4b6e0019e3908723d418336c9a30f2471a63285baa8a7e
-MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
deleted file mode 100644
index d04c99c8998a..000000000000
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://willthompson.co.uk/bustle/"
-SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz"
-
-LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-		net-libs/libpcap
-		sys-apps/dbus
-		x11-libs/cairo
-		x11-libs/pango
-		gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-		)
-		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo:0
-		>=dev-haskell/dbus-0.10
-		dev-haskell/glib:0
-		>=dev-haskell/gtk-0.12.3:2
-		dev-haskell/mtl
-		dev-haskell/pango:0
-		dev-haskell/parsec
-		dev-haskell/pcap
-		dev-haskell/text
-		>=dev-lang/ghc-6.10.4"
-
-PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
deleted file mode 100644
index 3f1b1336bc15..000000000000
--- a/dev-util/bustle/bustle-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	net-libs/libpcap
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	dev-haskell/cairo
-	>=dev-haskell/dbus-0.10
-	dev-haskell/glib
-	>=dev-haskell/gtk-0.13
-	>=dev-haskell/hgettext-0.1.5
-	dev-haskell/mtl
-	>=dev-haskell/pango-0.13
-	dev-haskell/parsec
-	dev-haskell/pcap
-	dev-haskell/setlocale
-	dev-haskell/text
-	>=dev-lang/ghc-6.12.1
-	virtual/pkgconfig
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk-0.13.patch
-}
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-	doman bustle-pcap.1
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
deleted file mode 100644
index f397b7fa6968..000000000000
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="interactivetests +threaded"
-
-RESTRICT=test # fails one propery test
-
-RDEPEND="dev-haskell/cairo:=
-	>=dev-haskell/dbus-0.10:=
-	dev-haskell/gio:=
-	dev-haskell/glib:=
-	>=dev-haskell/gtk3-0.13.7:0=
-	>=dev-haskell/hgettext-0.1.5:=
-	dev-haskell/mtl:=
-	dev-haskell/pango:=
-	dev-haskell/parsec:=
-	dev-haskell/pcap:=
-	dev-haskell/setlocale:=
-	dev-haskell/text:=
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	dev-perl/Locale-gettext
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	virtual/pkgconfig
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag interactivetests interactivetests) \
-		$(cabal_flag threaded threaded)
-}
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-	doman bustle-pcap.1
-	dodoc README.md HACKING.md NEWS.md
-}
diff --git a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
deleted file mode 100644
index 74ab26ff8fcd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- bustle-0.4.2-orig/bustle.cabal	2012-11-15 02:19:34.000000000 +1100
-+++ bustle-0.4.2/bustle.cabal	2013-04-03 15:07:35.381569187 +1100
-@@ -82,15 +82,15 @@
- 
-   Build-Depends: base >= 4 && < 5
-                , bytestring
--               , cairo
-+               , cairo < 0.13
-                , containers
-                , dbus >= 0.10
-                , directory
-                , filepath
--               , glib
--               , gtk >= 0.12.3
-+               , glib < 0.13
-+               , gtk >= 0.12.3 && < 0.13
-                , mtl
--               , pango
-+               , pango < 0.13
-                , parsec
-                , pcap
-                , process
-@@ -111,15 +111,15 @@
-   pkgconfig-depends: glib-2.0
-   Build-Depends: base >= 4 && < 5
-                , bytestring
--               , cairo
-+               , cairo < 0.13
-                , containers
-                , dbus
-                , directory
-                , filepath
--               , gtk > 0.12
--               , glib
-+               , gtk > 0.12 && < 0.13
-+               , glib < 0.13
-                , mtl
--               , pango
-+               , pango < 0.13
-                , parsec
-                , pcap
-                , text
-@@ -163,15 +163,15 @@
-     main-is: Test/Renderer.hs
-     other-modules: Bustle.Renderer
-     Build-Depends: base
--                 , cairo
-+                 , cairo < 0.13
-                  , containers
-                  , dbus >= 0.10
-                  , directory
-                  , filepath
--                 , gtk
-+                 , gtk < 0.13
-                  , mtl
-                  , text
--                 , pango
-+                 , pango < 0.13
-                  , test-framework
-                  , test-framework-hunit
-                  , HUnit
diff --git a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
deleted file mode 100644
index f2691521c4bd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs
-index d558beb..ef96d60 100644
---- a/Bustle/Diagram.hs
-+++ b/Bustle/Diagram.hs
-@@ -450,7 +450,7 @@ mkLayout :: (MonadIO m)
- mkLayout s e a = liftIO $ do
-     ctx <- cairoCreateContext Nothing
-     layout <- layoutEmpty ctx
--    layoutSetMarkup layout (Markup.unMarkup s)
-+    layoutSetMarkup layout (Markup.unMarkup s) :: IO String
-     layoutSetFontDescription layout (Just font)
-     layoutSetEllipsize layout e
-     layoutSetAlignment layout a
-diff --git a/Bustle/UI.hs b/Bustle/UI.hs
-index a78797e..9843b29 100644
---- a/Bustle/UI.hs
-+++ b/Bustle/UI.hs
-@@ -30,6 +30,7 @@ import Data.IORef
- import qualified Data.Set as Set
- import Data.List (intercalate)
- import Data.Time
-+import qualified Data.Text as T
- import Data.Monoid (mempty)
- import Text.Printf
- 
-@@ -281,6 +282,7 @@ promptToSave wi = io $ do
-     case mdetails of
-         Just (RecordedLog tempFilePath) -> do
-             let tempFileName = takeFileName tempFilePath
-+                title :: String
-                 title = printf (__ "Save log '%s' before closing?") tempFileName
-             prompt <- messageDialogNew (Just (wiWindow wi))
-                                        [DialogModal]
-@@ -459,7 +461,7 @@ wiSetLogDetails :: WindowInfo
-                 -> IO ()
- wiSetLogDetails wi logDetails = do
-     writeIORef (wiLogDetails wi) (Just logDetails)
--    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails))
-+    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails) :: String)
- 
- setPage :: MonadIO io
-         => WindowInfo
-@@ -525,7 +527,7 @@ loadPixbuf :: FilePath -> IO (Maybe Pixbuf)
- loadPixbuf filename = do
-   iconName <- getDataFileName $ "data/" ++ filename
-   C.catch (fmap Just (pixbufNewFromFile iconName))
--          (\(GError _ _ msg) -> warn msg >> return Nothing)
-+          (\(GError _ _ msg) -> warn (T.unpack msg) >> return Nothing)
- 
- openDialogue :: Window -> B ()
- openDialogue window = embedIO $ \r -> do
-diff --git a/Bustle/UI/Canvas.hs b/Bustle/UI/Canvas.hs
-index 46c1582..5a28761 100644
---- a/Bustle/UI/Canvas.hs
-+++ b/Bustle/UI/Canvas.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE OverloadedStrings #-}
- {-
- Bustle.UI.Canvas: displays diagrams
- Copyright © 2008–2012 Collabora Ltd.
-@@ -58,7 +59,7 @@ canvasNew :: Eq a
-           -> (Maybe a -> IO ())
-           -> IO (Canvas a)
- canvasNew builder showBounds selectionChangedCb = do
--    layout <- builderGetObject builder castToLayout "diagramLayout"
-+    layout <- builderGetObject builder castToLayout ("diagramLayout" :: String)
-     idRef <- newIORef Nothing
-     shapesRef <- newIORef []
-     widthRef <- newIORef 0
-diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs
-index 35e80d6..d1b9d96 100644
---- a/Bustle/UI/DetailsView.hs
-+++ b/Bustle/UI/DetailsView.hs
-@@ -55,7 +55,7 @@ addValue :: Table
-          -> Int
-          -> IO Label
- addValue table row = do
--    label <- labelNew Nothing
-+    label <- labelNew (Nothing :: Maybe String)
-     miscSetAlignment label 0 0
-     labelSetEllipsize label EllipsizeStart
-     labelSetSelectable label True
-@@ -77,7 +77,7 @@ detailsViewNew = do
-                 , tableColumnSpacing := 6
-                 ]
- 
--    title <- labelNew Nothing
-+    title <- labelNew (Nothing :: Maybe String)
-     miscSetAlignment title 0 0
-     tableAttach table title 0 2 0 1 [Fill] [Fill] 0 0
- 
-diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs
-index 9560507..152931e 100644
---- a/Bustle/UI/FilterDialog.hs
-+++ b/Bustle/UI/FilterDialog.hs
-@@ -99,7 +99,7 @@ runFilterDialog parent names currentlyHidden = do
-     nameStore <- makeStore names currentlyHidden
-     sw <- makeView nameStore
- 
--    instructions <- labelNew Nothing
-+    instructions <- labelNew (Nothing :: Maybe String)
-     widgetSetSizeRequest instructions 600 (-1)
-     labelSetMarkup instructions
-         (__ "Unticking a service hides its column in the diagram, \
-diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs
-index 1e98a68..085eea2 100644
---- a/Bustle/UI/Recorder.hs
-+++ b/Bustle/UI/Recorder.hs
-@@ -27,6 +27,7 @@ import Control.Monad (when, liftM)
- import Control.Concurrent.MVar
- import qualified Data.Map as Map
- import Data.Monoid
-+import qualified Data.Text as T
- import Control.Monad.State (runStateT)
- import Text.Printf
- 
-@@ -77,8 +78,7 @@ processBatch pendingRef n label incoming = do
-                 -- message from the user's perspective.
-                 i <- takeMVar n
-                 let j = i + (length pending)
--                labelSetMarkup label $
--                    printf (__ "Logged <b>%u</b> messages…") j
-+                labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") j :: String)
-                 putMVar n j
- 
-                 incoming rr'
-@@ -97,8 +97,8 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
-     maybe (return ()) (windowSetTransientFor dialog) mwindow
-     dialog `set` [ windowModal := True ]
- 
--    label <- labelNew Nothing
--    labelSetMarkup label $ printf (__ "Logged <b>%u</b> messages…") (0 :: Int)
-+    label <- labelNew (Nothing :: Maybe String)
-+    labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") (0 :: Int) :: String)
-     loaderStateRef <- newMVar Map.empty
-     pendingRef <- newMVar []
-     let updateLabel µs body = do
-@@ -142,7 +142,7 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
-     widgetShowAll dialog
-   where
-     newFailed (GError _ _ message) = do
--        displayError mwindow message Nothing
-+        displayError mwindow (T.unpack message) Nothing
- 
- recorderChooseFile :: FilePath
-                    -> Maybe Window
-diff --git a/bustle.cabal b/bustle.cabal
-index 4ac107c..2d1f907 100644
---- a/bustle.cabal
-+++ b/bustle.cabal
-@@ -106,10 +106,10 @@ Executable bustle
-                , directory
-                , filepath
-                , glib
--               , gtk >= 0.12.4
-+               , gtk >= 0.13
-                , hgettext >= 0.1.5
-                , mtl
--               , pango
-+               , pango >= 0.13
-                , parsec
-                , pcap
-                , process
-@@ -136,7 +136,7 @@ Executable test-monitor
-                , dbus
-                , directory
-                , filepath
--               , gtk > 0.12
-+               , gtk >= 0.13
-                , glib
-                , hgettext
-                , mtl
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
deleted file mode 100644
index ff21ef6ead63..000000000000
--- a/dev-util/bustle/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>
-		Draw pretty sequence diagrams of D-Bus traffic
-	</longdescription>
-	<use>
-		<flag name="interactivetests">Build interactive test programs</flag>
-		<flag name="threaded">Build with support for multithreaded execution.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/byacc-20170201 b/dev-util/byacc-20170201
new file mode 100644
index 000000000000..700b291624c6
--- /dev/null
+++ b/dev-util/byacc-20170201
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=6
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://invisible-island.net/byacc/byacc-20170201.tgz
+_md5_=bf99bbdb7576660a7056e3697db4bfae
diff --git a/dev-util/byacc-20180510 b/dev-util/byacc-20180510
new file mode 100644
index 000000000000..0024cde2e22b
--- /dev/null
+++ b/dev-util/byacc-20180510
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=6
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://invisible-island.net/byacc/byacc-20180510.tgz
+_md5_=5f87ad5d17095864c3e4016958de3bdc
diff --git a/dev-util/byacc-20180525 b/dev-util/byacc-20180525
new file mode 100644
index 000000000000..f9e551f7873f
--- /dev/null
+++ b/dev-util/byacc-20180525
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=6
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20180525.tgz
+_md5_=c0a07ec3a549a4ba97a5d4d3f174c5c9
diff --git a/dev-util/byacc-20180609 b/dev-util/byacc-20180609
new file mode 100644
index 000000000000..879fd3f8b7a9
--- /dev/null
+++ b/dev-util/byacc-20180609
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=6
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20180609.tgz
+_md5_=c0a07ec3a549a4ba97a5d4d3f174c5c9
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
deleted file mode 100644
index 4c16470011b8..000000000000
--- a/dev-util/byacc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
-DIST byacc-20180510.tgz 744070 BLAKE2B 9ba861ffcd310462513d7eb4b663c5c44f5cb6dc06ecf1cbcb41c309054905781c4ba1ffada88eaf0071caf16d78a5746d53e66190081e388b95f4a148684cca SHA512 89ac9d4bd1edfdcfa304b0efacc478dbdd84cc2a1cd4ef75515863b1ea2731b106202c758b469c39a4379bb155c0a2365baa290797da0a6bb3904295431556d6
-DIST byacc-20180525.tgz 745273 BLAKE2B 5b4732cede6d284f9f866b8e7f7f1f48b7eea26fcf203e633767115a2ba324586590477b9668b2f7e961db4765e2602ba78d78a2ed55d0c102153b5ed15e9cea SHA512 ab200b7f1f0295731cda0aff08ee60c1f8a4e057ca9de265b916de690e900abe67ce9b5f6f5d0e69945485e9adb5505b079d82f8e126eb1ea12d22bc6015d73a
-DIST byacc-20180609.tgz 745317 BLAKE2B d544e2c81540c711fac57ac3179aec9f44b4db808e44318b3046443c29870351b5251383542caec9f65e06a6d83f481f2c8c4e73a28e59d5a57e854532404df4 SHA512 45aa6de839ca23385ab832685fdaa49225dcde6a40bdb990eefde8ab1be2cfe063875072e844629ac91e9533e6e310fa0bb8a6bd01e246a1cefc67bbc3c175f9
-EBUILD byacc-20170201.ebuild 610 BLAKE2B db86272365c30ac4a30d1538078bc3b6e436e624b70c1a403a8e6e878480c075910e72e188d91e60d2b4d71edea2dae6370d81b9bb2685dc8f177c069edddba4 SHA512 22ad1a4d24aa1ae4ec9b7de9e5d6a881547bd4fe4baec8a884313201c2193ca85a8fa30fed24b23ca8b4c6295388dda357f2e5a50a8368831a0ed600596c9755
-EBUILD byacc-20180510.ebuild 620 BLAKE2B d907534063b452d07169f2dfd86b6a79c7114f0327243d0dca071b66a35e85a58194ea6499e7b88063220104ff910fc937c6444708274c2f495d5460f1c317bc SHA512 2171da36f607ae11b786965935816457f9b4472002bf85f65d92011ec1c176bf2c755ce3621afa07e007269b87533c54013789c5f8b41151634d88d4c6f7ce23
-EBUILD byacc-20180525.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
-EBUILD byacc-20180609.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
deleted file mode 100644
index 0ebf724c67b4..000000000000
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20180510.ebuild b/dev-util/byacc/byacc-20180510.ebuild
deleted file mode 100644
index 56f94d2538c2..000000000000
--- a/dev-util/byacc/byacc-20180510.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20180525.ebuild b/dev-util/byacc/byacc-20180525.ebuild
deleted file mode 100644
index e0e5a971f5d0..000000000000
--- a/dev-util/byacc/byacc-20180525.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20180609.ebuild b/dev-util/byacc/byacc-20180609.ebuild
deleted file mode 100644
index e0e5a971f5d0..000000000000
--- a/dev-util/byacc/byacc-20180609.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/dev-util/byacc/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>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cargo-0.26.0 b/dev-util/cargo-0.26.0
new file mode 100644
index 000000000000..47a854c5bd2e
--- /dev/null
+++ b/dev-util/cargo-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.26.0.tar.gz -> cargo-0.26.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/atty/0.2.8/download -> atty-0.2.8.crate https://crates.io/api/v1/crates/backtrace/0.3.5/download -> backtrace-0.3.5.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cc/1.0.9/download -> cc-1.0.9.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/cmake/0.1.30/download -> cmake-0.1.30.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.15.0/download -> crates-io-0.15.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.11/download -> curl-0.4.11.crate https://crates.io/api/v1/crates/curl-sys/0.4.1/download -> curl-sys-0.4.1.crate https://crates.io/api/v1/crates/docopt/0.8.3/download -> docopt-0.8.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.6/download -> env_logger-0.5.6.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.6.11/download -> git2-0.6.11.crate https://crates.io/api/v1/crates/git2-curl/0.7.0/download -> git2-curl-0.7.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.3.1/download -> hex-0.3.1.crate https://crates.io/api/v1/crates/home/0.3.2/download -> home-0.3.2.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.19/download -> libgit2-sys-0.6.19.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num/0.1.42/download -> num-0.1.42.crate https://crates.io/api/v1/crates/num-bigint/0.1.43/download -> num-bigint-0.1.43.crate https://crates.io/api/v1/crates/num-complex/0.1.43/download -> num-complex-0.1.43.crate https://crates.io/api/v1/crates/num-integer/0.1.36/download -> num-integer-0.1.36.crate https://crates.io/api/v1/crates/num-iter/0.1.35/download -> num-iter-0.1.35.crate https://crates.io/api/v1/crates/num-rational/0.1.42/download -> num-rational-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.2/download -> num-traits-0.2.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.6/download -> openssl-0.10.6.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.28/download -> openssl-sys-0.9.28.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/proc-macro2/0.3.6/download -> proc-macro2-0.3.6.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.1/download -> quote-0.5.1.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.10/download -> regex-0.2.10.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.5.3/download -> regex-syntax-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.0/download -> remove_dir_all-0.5.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.7/download -> rustc-demangle-0.1.7.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.11/download -> schannel-0.1.11.crate https://crates.io/api/v1/crates/scoped-tls/0.1.1/download -> scoped-tls-0.1.1.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.37/download -> serde-1.0.37.crate https://crates.io/api/v1/crates/serde_derive/1.0.37/download -> serde_derive-1.0.37.crate https://crates.io/api/v1/crates/serde_derive_internals/0.23.0/download -> serde_derive_internals-0.23.0.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.13/download -> serde_json-1.0.13.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.4/download -> socket2-0.3.4.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.1/download -> syn-0.13.1.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.14/download -> tar-0.4.14.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/userenv-sys/0.2.0/download -> userenv-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.25.0-i686-unknown-linux-gnu.tar.gz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz ) arm? ( https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c3a2db9f5079d2ce4dda986988a9cea7
diff --git a/dev-util/cargo-0.27.0 b/dev-util/cargo-0.27.0
new file mode 100644
index 000000000000..e2569f90c017
--- /dev/null
+++ b/dev-util/cargo-0.27.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.27.0.tar.gz -> cargo-0.27.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.9/download -> atty-0.2.9.crate https://crates.io/api/v1/crates/backtrace/0.3.6/download -> backtrace-0.3.6.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cc/1.0.10/download -> cc-1.0.10.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cmake/0.1.30/download -> cmake-0.1.30.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.16.0/download -> crates-io-0.16.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.12/download -> curl-0.4.12.crate https://crates.io/api/v1/crates/curl-sys/0.4.2/download -> curl-sys-0.4.2.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.9/download -> env_logger-0.5.9.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.0/download -> filetime-0.2.0.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.1/download -> git2-0.7.1.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.0/download -> globset-0.4.0.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.2/download -> ignore-0.4.2.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.1/download -> libgit2-sys-0.7.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.4/download -> num-traits-0.2.4.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.6/download -> openssl-0.10.6.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.28/download -> openssl-sys-0.9.28.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.7/download -> proc-macro2-0.3.7.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.0.0/download -> regex-1.0.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.0/download -> regex-syntax-0.6.0.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.8/download -> rustc-demangle-0.1.8.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.55/download -> serde-1.0.55.crate https://crates.io/api/v1/crates/serde_derive/1.0.55/download -> serde_derive-1.0.55.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.17/download -> serde_json-1.0.17.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.5/download -> socket2-0.3.5.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.10/download -> syn-0.13.10.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.15/download -> tar-0.4.15.crate https://crates.io/api/v1/crates/tempfile/3.0.2/download -> tempfile-3.0.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.26.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1f924437247d567ac0e325ace63181d7
diff --git a/dev-util/cargo-0.28.0 b/dev-util/cargo-0.28.0
new file mode 100644
index 000000000000..ad286b628ea5
--- /dev/null
+++ b/dev-util/cargo-0.28.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.28.0.tar.gz -> cargo-0.28.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.7/download -> backtrace-0.3.7.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.28.0/download -> cargo-0.28.0.crate https://crates.io/api/v1/crates/cc/1.0.15/download -> cc-1.0.15.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cmake/0.1.31/download -> cmake-0.1.31.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.16.0/download -> crates-io-0.16.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.12/download -> curl-0.4.12.crate https://crates.io/api/v1/crates/curl-sys/0.4.5/download -> curl-sys-0.4.5.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.10/download -> env_logger-0.5.10.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.1/download -> git2-0.7.1.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.0/download -> globset-0.4.0.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.2/download -> ignore-0.4.2.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.1/download -> libgit2-sys-0.7.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.7/download -> libssh2-sys-0.2.7.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.4/download -> num-traits-0.2.4.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.7/download -> openssl-0.10.7.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.30/download -> openssl-sys-0.9.30.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.0.0/download -> regex-1.0.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.0/download -> regex-syntax-0.6.0.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.8/download -> rustc-demangle-0.1.8.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.55/download -> serde-1.0.55.crate https://crates.io/api/v1/crates/serde_derive/1.0.55/download -> serde_derive-1.0.55.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.17/download -> serde_json-1.0.17.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.5/download -> socket2-0.3.5.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.10/download -> syn-0.13.10.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.15/download -> tar-0.4.15.crate https://crates.io/api/v1/crates/tempfile/3.0.2/download -> tempfile-3.0.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.27.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.27.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.27.0-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cargo	959846e2836f8244430c9582dd6493af	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9fa14bfc09e9b94ca33bc3f85791dfc3
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
deleted file mode 100644
index 814b6c2d6840..000000000000
--- a/dev-util/cargo/Manifest
+++ /dev/null
@@ -1,211 +0,0 @@
-DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
-DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
-DIST atty-0.2.8.crate 5708 BLAKE2B e88f1155f51dd36eb38364994eeffc84683b43b8010909e058d9fd80fa492092ed49d6d05b5b7d10fd2585191dd1b6efdccf30be298f53dcb832027fd6187508 SHA512 d6aac03499b5e8187ecacd6060d34d3ad8747eb680c9f59ba13e00253d422b2d7d092236fc8eced93358f251d46672013463e3bfdc0aaa9e9e7c5c8e08a22195
-DIST atty-0.2.9.crate 5898 BLAKE2B fa8b45e670fc4147f0407e4a059569e3d4ec31f79aef01ef581c03396a73aa449482dba200bf49d6f60887853eadc8ccf483c0fa0ebcba9f219557cee9a907ba SHA512 2d7d2e52f3d3b66d4280dc3a2509c0125b1cf7dc136f3cc81e1a91aee0dcebdb4444544f631bccf299580f24ac8687f9b61e3b08fc961c040146959eeec1205c
-DIST backtrace-0.3.5.crate 27636 BLAKE2B db71be18b39a7aa25d2e1850fd907d3ea96d30af66b72c7b2b12a37acf6d6f46cdca1b9de884167e7567584848ea2ca4a1b03468e9158a62a3fde6aacd0746c8 SHA512 b554fd616780c706d8f6e7afef4800625a9fec5f7825e995a534103d1b773f0f28e09d49a1163eef9059681d669953ed1b7a8fb33209ee3b7be1fdeaa2adb3a1
-DIST backtrace-0.3.6.crate 28437 BLAKE2B 63f056086b8c56707e7a3f9719e211a70368584c85a6a3b05ed8ad31cf3ac86f6fc091c826392439fcaf9a0f4066de8da00449a9715d90c1585d450fff63bbdd SHA512 c42e9891a2297aefa08e6ec627520bfd3f93f7eddc2782cb5eb277092d588b1d84e75ac724d29548eab77de19de3400748b90bf2eccfed5ce1e20a979dd210e6
-DIST backtrace-0.3.7.crate 28432 BLAKE2B 5478adb8e5a028a5d5af62b2f6522c2a7bee65bcbfa76da252c57e4f17b682db486f3aff96501d49943d86567eb8187f1e37a42f324b3cf3181788d0cd760b15 SHA512 a3f0d8bfef2158310c65f41e246323b0953147a017dbe47143b8dc2e1734c945f13b49732a16f1712a3b5a27a23f27a38778d8185c64a7982948aace69c079af
-DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
-DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
-DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1
-DIST cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz 4858889 BLAKE2B 29ca3920b083264057b9d1d0e7dcb2ad945cd42e791b24cfce353085bcdeeab467530035f3e03fdcd9323097367c8cc20aa6eba96d15421aefe2ad99973efbb4 SHA512 e1d10ff096da535e3bed5275b31d8cb95d7135adadbec4218f77c187a6cb8e992088663bd21cd8e0b40627974cfcff39f508e387e32d07da0b5be486be45c42d
-DIST cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz 5828897 BLAKE2B 2b9d34839926ac3346eed98a5460551e678276c25b4c5ae62a6a43ac35d335f7ca0174f459049c58f4d7a81aafe8cecc9d2c4c9d07439d15073b2cbe5d220a9c SHA512 2e091155c9599b3a032c9d0698f64a0c1654e88a5c9df6c930063885ff0c3be6e3a8a6f9577982004e4b1c83d1c78727da8d364665da4d1a3e053bfacdaef546
-DIST cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz 5826101 BLAKE2B 0bd4bcd574ce42f52698f2fa6d564b1292582f569a8ec547dde33668a4c8c72327fc949ed2b6d925672768ed0b7b47821d1c92d737faa9234d53c185443e0b6a SHA512 f24c4b2509824a8ff25ed6ce0ec011b019f7e6eb16ebc4382ab233db96732fd22c44dcc39d6388bcd6a6b79100eeb13ffe4188d727f4e07ceee4a5777520eaeb
-DIST cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz 5674664 BLAKE2B e9878f6c89bd9545b65f8c1e888fc4c632377bb77a64d4084c68f50aed0553bc65bce61bc732ecabee7fc88754f9e9305d9a8c9abe3629b4e7be490338a6915f SHA512 ef2da09b121374a33a607114ab4bf0a3e87af96cadbd8757076773aea4028e1105232dc9ce0f34a90e3bfc204d2f43c056fb07c54b6b7ca0861ffb2d124de0e6
-DIST cargo-0.25.0-i686-unknown-linux-gnu.tar.gz 6083273 BLAKE2B e27a6372c3a0eb607cdfc82b9e2f2b3e2d4cdb24c4548329a6fdebc0f4568a2c19bc03e1abd0f9b52f30528c8fb3b7595bede2a88de5c61f9ae2d94e55f4cbba SHA512 3bb78ec5041fc84648d94a1f144a5eb0cdb7e80e4f6fb308052d354b1916b6d279e6dcc024e9b0bd25dbc8fb1ffffaeba7b6ad413778058053aae7bdb73a6319
-DIST cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz 6004007 BLAKE2B dd94d56aba7ae7bb10dc4fe3c230d56f118196d8a9ad93f59c8591da5a2c4e466655cea468eab76ae35d6ece2a1b802090c7832b870b715e2e9affd39dea8cd3 SHA512 378adc19c342cdc54179cef408517ede6075ae6e8040df5c0dd0344c33e1f2697838218c3351000c213b84e97b4cab31f51ea6c1c7c1372621a55106b1f3c5f4
-DIST cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz 3060104 BLAKE2B f82d0fd5439169a0027daa406fadddc381deb35fdf806e2f9753dbd0b716b14e1a0dcc91ed036154ad36a4b42827e80bb431bcd038782386026e695075eb6f66 SHA512 b3b53bb1ab5bb6f04149667f1592f3e5b4c79c228f3b4db071507ab4b928f6990a0b4055b57ffcf1fc788f48209513dbfe4943b1620f1e1b60e770e434e03287
-DIST cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz 3670620 BLAKE2B 7f437a84bdbed165d17d6fde0c26ea0576512aaac40f5b087c336adb8324cbb119c3d822cdc0768981acba654c354381ec73cd8104822e9a7e2627bc7851ff09 SHA512 e823c02e20a6c19863d08792bea151b46acc533f1bb2823ba6a73127940fdd77f3e5f6542ee170cd0f70216fbbaf7029f91887da512b81fc343a55b646973d52
-DIST cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.xz 3695968 BLAKE2B cc9c36ef582ba734792911542c65b2b779c768d2b60fbe45ba748f90f796f20684408225951d473df5044b70a76b70800d40355ca223df4343f3b739086132c6 SHA512 0eb2b64eaf30bddceb0cb10b15ddd34d6360fa2038c25116d074d7f480ea0af2ec8d2825680252894decaa88a10872dbea7b77e5a2c4923fd5fcb022b3835ea6
-DIST cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz 3694064 BLAKE2B 3ec8596000d2b0818e4803c93361d7a82b136a5d00c29577c951ebc73df9145d68bc0b055efd71eb9932934e132baaa0648a3493c53b6627553ae3c645f58022 SHA512 8a80f50b46b37cf1a8a90fe4841c7ef27e81791e533712fcdd8b35250c17db6199689337713667399cfff10c40b847f48466bf145b58be7a54f794e3f6b34800
-DIST cargo-0.26.0-i686-unknown-linux-gnu.tar.xz 4104468 BLAKE2B 1325a2b0c4da3c4788e04f8d61f938fd7690ff031891f89d29d74f5a1c43425d4ade0b306309205782ae8624733b8f365ca033052ba95aeee730a69900a4ab3d SHA512 4e30b8091123af894493e8c704723945abaec21befabf54ba3d618d8c6586352ce02501afc0229494f99b7612b82e049fb5c35ac419282349673394c75a2c6d7
-DIST cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz 4134388 BLAKE2B 961df201fa4f87308a28b217296c7927e6b67f513e7eaaf5cf12675ab4c01c50e60bf8756c2f8fafe1e4b2d7e3e5a8daa446fc1b72014828d0233209434f1dda SHA512 476041cb12a49819250d96f246d900769ab83386e584b3264b4f47ef5a2182d410a8606054a330da653cf2b2a290193c7260af5c98a29d6969b6c7c5169876ee
-DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070
-DIST cargo-0.27.0-aarch64-unknown-linux-gnu.tar.xz 3447968 BLAKE2B 69ae05955214d37e05d62348cb006dadff258f600e3ba89c2d185c59c144486c7987eb154330dd203963c8d7761d8a74b8c41545eaed99761e7115ff5d19e345 SHA512 ba04d3c52ffbfc89bc92e17c6f850bd64335e15aedb4c884ea5a19fb6e2395d8054d3678b6e13d81903bc85a3ddd38bec3561266de783bc0f920f2d76c2834a5
-DIST cargo-0.27.0-arm-unknown-linux-gnueabi.tar.xz 4026932 BLAKE2B 4a7265f400675b671e94dd3e271621dddfaead6167ff659426afdcab18295286882105c548a31182b2753c91e0ae4c004c2952a6715883c2fc8893679e6785cc SHA512 e40ea55556bf901ab24df116c726298daa4d8cf734a39dc515ad3f0b93573b1200a4c8407dfc60365310ccb95b364c74f5b212f8840aae571d6766aca89f9cc8
-DIST cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.xz 4057132 BLAKE2B a29264c2652ecca8d713e350aa927e7cc5318f8b5db6ea1bde3ee7315e019d222f19e9d1231e8964eb3cb75765df36b1115a975614f8094f4382c2c81c679581 SHA512 c672dd5814e0c3cbd598ab4a59c00624a3b79d54058682bc17540bc72554885f499c89ff3cdb5ec803afc90827ecf1c40ca7a1a557bc0229ba11d4e8251cdb74
-DIST cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz 4059300 BLAKE2B 2cc0aeca591b7dc16357d5210d18efcaff7e812ac72976dd1dfb0da97463b9ad3447080fa0fc81387023c6d74130a6cfe509f6a02b38532452a9834ff8219d3c SHA512 689ebba97c27dff1a0e9fc41d24c4534f01cb98b29c5967dce365717daed406407ced7b7d85884c214d25f5a5ab9c0882c59709397b32afce0b6e66c1f9fdace
-DIST cargo-0.27.0-i686-unknown-linux-gnu.tar.xz 4570084 BLAKE2B 9f62bcf03d8eefdc5681929fce4f7835ba5c4181324fcb43d2594cf61bd2e460496380abd8da37df0b2977a02e3c027a436297f06b6ca28da82e6b540df9f35a SHA512 212d5634e369c913612a2023cd0d1b81f4f1d8f37e504a07ce855573a6dd0fb2084ec9a0e00a86b457adb7e08b46215f73ede9222ad01213e4c9e5a4ff99cca9
-DIST cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz 4524080 BLAKE2B e2a65dafed7ce552f6fbf8b641409cd6fcd924c10e0779c7587fae5c3cba23626f7913cab3b8741d9bc9aac471c855e32b8647769a3750baee1d377031e9eb9b SHA512 c0609edeaebd3e851c94933b3e5c56e8fd394c5b3a572bdacdf32dba5a2de9bdf6468879017f97002bea990c1ec1a970e017d1cf2fbcb22f6cf1ac39dbd1d947
-DIST cargo-0.27.0.tar.gz 728885 BLAKE2B 1966e381b9c286786f8b28257f155d2a10d23727978f4f0a1954294c1b82ab0d2aecd511a72e39f9c6fe955bb237cee4e53f8542270eee8c2eea3cb7dc956fda SHA512 8b984a1a64427d09d29ed82cc736abb0a2e936a253ef3ec05b4934b2b541758bd4e3c68ca21c80649de83eac2742f84f2c81f29fe62d85a150ad0cf2c50a990e
-DIST cargo-0.28.0.crate 754146 BLAKE2B 4684dba85e40a3d2bbe13ea18f01c101c4783e132d302897dc95bb89adb0193b24ddca108e1886e8b2f7f292bc94f95826d479ac4daa963ef26db789cc6a039f SHA512 149b721ec91600e201162403773b22bb1c3f1c825c506a4665396e681864e953c3acf53eea0ab319a7932bb06fe0f5d02e82a54d39f6a0fa23798aee93469540
-DIST cargo-0.28.0.tar.gz 761690 BLAKE2B 0dec2524053ce56013108f031e57b7b8c69daa95f4d594fa7a849e91dc317e07ea0540c322c7473242640567c0bf9f565661e9bf91ee8b96008986c9a1e2fd89 SHA512 609ce0b7539511e5dc9f5d426c761dc074406cc3f2f4b4a8bd4b1f01dbd5288b33403b64b2078e5f5ef1cf40d468468099bfab24af751bb5b4d4912cd5f72030
-DIST cc-1.0.10.crate 41311 BLAKE2B 30dc4dc3efa8f2143341a7519c9a6a46b7987faed78b55b338bafac4f7550ac3534f5c876e174a938916d621435396a2066e001794f49d1e59be1e3815605d76 SHA512 b1f492cf2ab1b31ca11524703f02148a16bf54e57a05f2d988dea8b8f75c9e997b8c6ea6569ac9a47dbf0569adcc23b61db1537a0c6e7957fd736c64b9fb4ed3
-DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831
-DIST cc-1.0.9.crate 41193 BLAKE2B 15643c05698e5e9cfb955495db401b11a28c0047fd35945d17ba4656d44551b73451b8c4399cb1338311228c4fa059318c55e3f59dc0ecae2374ba1b577a8d45 SHA512 7423164d85ac2d57782b6f259ea7e7e581fd8ecb7f3cfe4f8767c05caaf6e25d8cd73031123b60f0df96b2cd4c265d92a66933b7aaef4aae998cdc0e179618f4
-DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
-DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
-DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
-DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1
-DIST cmake-0.1.31.crate 12480 BLAKE2B a861b9481636ab9ecdcdfa13d599cd081924394fc60268e7baec36ba875e7c61a7ceee423fb97e44a1aa28db005f1ed3f855a8490dcfbcf86f6e637445a9468c SHA512 72523416f52e253fc4d5ab9b4fbf56cf6870ec21d71199c7dbe9c0ea09fd32a226c5eb5677347b32f8e82b40b9335ddbbe77a08ea8fa2c4f0db5f3cb5e6f319a
-DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
-DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
-DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
-DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
-DIST crates-io-0.15.0.crate 7833 BLAKE2B b51ed4a15d22a45d94ade26ab3d522ca13449ea1df93ef5ece2d4d7b99b85e95307f4cefaef91e1edb74cf4204ce3e0f3509ecb6597eb57f31f29edf964b6490 SHA512 86cc22ba197085978bd0928402e311bbf4f72356baed452c0f6ccbc7b95912944f4ed86a668d99f3ef7b0a20b20059b31c3b6c587c7c5ff6bedfe39cff5b8c96
-DIST crates-io-0.16.0.crate 7823 BLAKE2B db647566008661348dec4259ffd4eb52ce8acf50d9a23cef74efb7d3596a88c819fa9ef5230e885802e8d6c1bd456703bc9853575ab9eb64269ef1d87468db62 SHA512 2c1a4cc5aee30c922997c456af6794ec1421da7f4511e350fd93146ab8207423cc240102744af5776db26c2f792e1a66f9ee1001e1c6cc4a27c161437301f6c3
-DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
-DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
-DIST curl-0.4.11.crate 70262 BLAKE2B feae6f6cf51fe4ba32b93090bac7c341daee4b973b789e8c130e5e9986864d8ee69950b464aa2b73bc3643b063c47143241434dc85895de32546405855a43cdc SHA512 5ddcc26690e2cf1b655ca8699b8e67da8ee8a57249ba6c8a736c59bf40dce3511ca7442d58b087b42f7422b0bcdf1d4ac6c3522aabe15e575b6a22d8ca21970a
-DIST curl-0.4.12.crate 70906 BLAKE2B 9b431f249f697608b3c295f385f90c452bb576f1cc0f34e17ad938f54c39f03575406061cbb9d55429c0c8a276d8fb81fb87b7c04453564bd2251604ea7e3cea SHA512 0f40d32b113787e89d5e9b12d84db77e629e67db6b0dea01eeb4a460299be4649221e286ae116656b314171a6021cfea68ccaaae5b27c242dffe8fa3e4f45434
-DIST curl-sys-0.4.1.crate 2982935 BLAKE2B 339b91b1634fd502b48d4f26923e1c9d8a3c9071f640442863cc811d02e03b018beca901b2a466467ec6d9ec1206b34db3e406763b8b3934aae1fa95c89f0d44 SHA512 74de40a631db102e73e133c9bad6bc093d7da744090e818e1173f237a410fe173e87fec937a902a6182e224c7e336523b73c42e136ef3b724949d3f407e78f03
-DIST curl-sys-0.4.2.crate 2983033 BLAKE2B 96967d56a7b6a412fe8cf927383eeae16786169b6f5b9254ff116fc85ed3ff2d38bd5766fded8d7972780e6c88c1b229658cc414b2bed9f301c13d6b91fac7b3 SHA512 3d7f9f089dbeda1bfba878cfd10ef3bb14096ee1701584c83c7d99ca859a60cef95ae46fc8b35e2845063fdf50ff8807501d2d45915bfcf827e3e2f6556d1632
-DIST curl-sys-0.4.5.crate 2983237 BLAKE2B 07f111f6274051bee5ce69c680b067f687e4fd741c6ea155535fc24bd447345529475eb4c329010f86fa30b3a08dafcbb34eade53ab341240674a9376b98fc4c SHA512 04b7213d82037d80676f553c2595ea0f3cc69f22f8a85a389075026a1d2325cb61c4f4c5ff6a2842e1a0bbf44d4617f18c47eca5c6686394c6e1e01b67a4d18c
-DIST docopt-0.8.3.crate 42774 BLAKE2B 91792f94920a39aa1cb1014493bf2a31367e44db62c68386df3112d4f8f058f143d8238048fefb2f2d1a1e489664c1ac7341e9bea17a00fc95ea62cd7c8f5dff SHA512 0af5a548640f06c408ae1ef0eef804aee5154d677648de9bbc3dff0f637c26cf8b2e212f472a6d30353a92e2ad2cf8d8efbda163f9572b28f867f2448a0bed8b
-DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
-DIST env_logger-0.5.10.crate 24849 BLAKE2B 2c386f8367aa940d41ea710652ba266cda7c12aac43e17ab859646d81264fada28d4b98bcdda46377adc86d6850b6f58559f9fe38fe9847b745e2544de9c9b41 SHA512 0943ec9707f187db4a6669b157c2bc5b606c865a9893eae18086cb9a6319b79b71fe3d97b4248339d30bd6daab2de5991f373a75a95c8fcea3afc293f333360b
-DIST env_logger-0.5.6.crate 23933 BLAKE2B af51e6dd5eb9a26773ad225346c341e8292f1a1b79bf140660f1c2c10f62750300cd5c3c96bcbcbd832a11b8a14ea1f5e16575e65db602f0eb72896f050714b0 SHA512 3f7507cc5a2251570dc061a0603bc69a91bfd13b5d61cf85547076415140215d3d322408187eb216f1588ceb5fea3579b9645bc6faa3bdfb27a230c9bd1c59cc
-DIST env_logger-0.5.9.crate 24834 BLAKE2B 430c10faf85b96a38fa9f465cd72193ae750e620815e52061b9a5c43261be2dada182e99cc8a4b10b3bfb8b1126fc91e0297b5faa294c80f3044186dff81b2eb SHA512 f73c6258a69289ae795241669aa16af8612e9a0c734adcf804389082a8d1c32520c9234551bcee249d47bfe43772d5c7d8c8b311a722b1d77001aa9ddb93a4dc
-DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4
-DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91
-DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
-DIST filetime-0.2.0.crate 11717 BLAKE2B 2e42a0499832fab0759a2edc54762bbbd5b11027df9f8b86bd62db3363bc4ef520831a5a1ac8435767eb136624bdc21af16ee73ad1078d2036174e1c30598d26 SHA512 a78d227f17b04800d8796511709db518daf76047bc7dc7dbd3a56419ab1b1a34cc063a6656033b893edc42729d2a08cf85b344e133b6da3fa6ad38eeffd536ba
-DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d
-DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
-DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
-DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST git2-0.6.11.crate 138769 BLAKE2B 47ff0b7e572cdc87a4e8ea9f7daf2b2e9fcd34e2b8cf0353d355b75d73f8843a9c7762492311aaeb640f1aeedbf25d58b7a57e64ca6f4e9fd92e1ff8b499413d SHA512 3319cb6230c4d2913a2194dd35f1c2a8665c892682ede92e9b5c73b4d53a1dfb572d2e05ffc97ebd1bebba52311a708f4c5697d3238a71d35633a869f495fac2
-DIST git2-0.7.1.crate 141487 BLAKE2B 290fc93f04efa9eb826475fc1236bbb6451bf5ea50d7af3e20c4900d500d4a0c339938093502051b82e8656b42d3de4096c1aa98fd12fa910ff11b5a1944fdc4 SHA512 efe7a12d877b995b8cef59c0a419f86c17453ee10a356d7b1e58cad8d3ca14e1883108b0137a3cd9b4d651d4e4233388686d91c9cdca8b1d942cfddf477f74e2
-DIST git2-curl-0.7.0.crate 4097 BLAKE2B 95d80cbb573f8e71bb47317c029b39e309cdd3d113db85334c4ce3f3a48f3bfee17ff1bc67828fa8c2884b2b51620a607f6a18a50901828c77da99c1d6463551 SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e
-DIST git2-curl-0.8.1.crate 8903 BLAKE2B 83f58faa5555a0a3a653db1e0a002008a7e2d6c216d2ac7014b06ddfedaab8f114cfb10d2577d799f77610032b64d786b64a82d31ca38c981192899ddc054496 SHA512 014a3f124ca633a572d4bdfe38742fe4b0fdcdf52ad170b82078c8cfeff1bace87540d3ae41d0457fca922bdcb1a25499fdd30e704eaee69da14e4282a9be1a7
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
-DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
-DIST globset-0.4.0.crate 22113 BLAKE2B 609c707ced976adcefd109bb43ff6bb7da21f385a46585d86b22cf76bb1f5addd744a19daef3ed2f9f4a31cd74b7f990af5f6a942ae77398da18e3f445ad916c SHA512 f24b8d9aa298859bba38f8a5bbacb8f2cb6a8f6fe165a14409216d27d856885e234220a15d66c133725cba39a802139c6242f2e5f3787154f929b92152f4d1a8
-DIST hamcrest-0.1.1.crate 9217 BLAKE2B aead0773fba00b44ca6634dfafdfdc9c1856cf0fd8c6f32de7dae4be1285021ff097a140b8aed28d1f5d5a279681f95d24de96f45f14aba205fcddd0bf301f0d SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d
-DIST hex-0.3.1.crate 8365 BLAKE2B bce1c771913e57ef72a24fed523a36c1fb741025c24a2ba3a4e236e19b9c575b7553eadaddae2e7f50a6e9078b0d363b0b71311301ed6ae19d064dcf052e4056 SHA512 beeb497718212f5f4683cdcab257c555554f6682eb1a1675738aac849968768d4f3f03bbb00b74bcb391b0559772e6d56ec38496dea5f7aaa45dfaae5e6355d7
-DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
-DIST home-0.3.2.crate 4069 BLAKE2B c6fd346774ea9de716389d33b0884eca9d06bdafab14cc242ab539db287dffa932635dbadb2db277a1e18c0592e4e0b4f42b63dc712f9dd4cfa92ef6ffed6a7a SHA512 e7c1b8bdd1faa65a81594378bf86310aec15b3f57017e11730e84dfe469bf416faed27b253a3a277ca549df42881edddcf7c68b6267e87b41c1f5a2b07a36f13
-DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
-DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
-DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
-DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
-DIST ignore-0.4.2.crate 42184 BLAKE2B b16d3f333a4d689bca22f448d744fe3ddb871a896e59b7b3dd7b07a5325530244166933d5dc5df3fc54b54099b0d44d3137d47109dbf6955b2b121f7c68ec88a SHA512 8b10cd03b6a46066695742d14386b19743ebf0e1172c3e9370b88b3a450de0ab02e00f8ecb95330551753a968bd2592b49d7af53d7a86e64e7e6fc2823cf69bc
-DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
-DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
-DIST lazycell-0.6.0.crate 10099 BLAKE2B a0746580ca979298416c595c6e5683ec1c1f17c3652a18a393589441b8632a7c8a369af4991b11fd857b5c4cb533219e1e21635159e651ab0dd480936e38b811 SHA512 3e3267c6b64a32142b1ed7533073dff1a9dd4304528a13838efe9fd6165beda40a2ab0613fca44ae639e67d94b4aff1c004039c52f2990a741c84358db1dcd84
-DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a500a796060fadef39b4b58778aaf9eea27c6bf93b9481b3d94cb807e192860eb074c682ac559349de9bf9df SHA512 21dfb230796885d4459b1119de31f2615ee4f1020578e74d2e07fa5340777fde4c2f60aabba7444f00434519c95f12e6e1a3bfc496b83c11cea582a219005dd4
-DIST libgit2-sys-0.6.19.crate 4663410 BLAKE2B f42d0f08c248ed5783f8a5cc2a08051c6ba881a28bf6af433ea632e88377ccb7acbc01f69cfeb0e3844172c95bd1660d7d92287d4353f0446040733a2e0f6d97 SHA512 3c5823ecadfb8633d3880552e6881265a21a3bc395120bc51c93424ef8fff6be6d4c1b20930d7f94ea5f826e005778878f61512ae4fed2b2b8e35d8fe1852495
-DIST libgit2-sys-0.7.1.crate 4717492 BLAKE2B 9e35b9e317b0423718bc28a87f66095e7c3f0758481868b55bc44044b698b2c91d9adad40c45c1f92ee8a41a4a964f25664715c9966e20a0edac81002a1187b6 SHA512 fb5ce69031dc07ea20a8ce03fcff05d44261f41f40f3c7db603b5afd494772c69e9b7d220714916774ae50b5b6f85015e048f02699a23d090ce4fc934a033460
-DIST libssh2-sys-0.2.6.crate 412381 BLAKE2B 17b16a73f2c3042891d26bdaac836e35f9839c8e500643d7b2bf8ade562b0af5f2f90dd7728b1b04861b40deaac69184dd8edc9791ff0c9fa97ee0a3b9065091 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab
-DIST libssh2-sys-0.2.7.crate 417647 BLAKE2B a19d1af25964594c3c460febd469725740fc0954eee4d51dd204697f97d8149253e7eb1f90d4c08f3617642e3dfd33e80197cd1efed4ce7ae9525a7940713342 SHA512 817d6897aeaa92fea77ed5b23df68f5f10760f2f342947b178aa460fe3a75aee6913ec1ad7e34d52a1523637b7f3672a8e28f59c05ed03db1caee256ba76a45d
-DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
-DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
-DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
-DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
-DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
-DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
-DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844
-DIST miow-0.3.1.crate 21858 BLAKE2B 2771d7d56f98a4ce264e23367a6d061d3f2b66de2e22978a676d697634a7f26016a616c68eae05e85e099d1b2d22e5036a41cf9a35ee08fa82de0b8d7295f44b SHA512 6ee94f330283b71e7ffbf57a3e522ac346a06a4a3a778c0a18f77bae3ece675db5947460e58d88a227bf9b392ed899bdecf1d56de57aa5e27bfb556941eba0a9
-DIST num-0.1.42.crate 8323 BLAKE2B 24c31affacb1a4bdfc30e30afc402d92344d4d17079b9cfc103e5a7fda50b0c62a877180b94af79a8898bb2b81de44324b04c00d5983c8d10d30581f3027464f SHA512 d8d48080f84dbda59d16418f39aca158deda1fabfba2aed1944f77b3c6099a244d7a32e79f28b9b72dad4cd446a8f4f854afaf3f368e3ffbbd124e64e4aef3cc
-DIST num-bigint-0.1.43.crate 63022 BLAKE2B 428c1bb5c0e0ce0c3b5a0658a555ef79496f52384c1df393563c17baca1888d4ffc1088ecfe06028190b3265829887d95cef1839484748361fd0ef3f5625ea7b SHA512 07119e28588b22236fce2f5cbd074ccc1b5a31081a9f5ca3d5981680ebe68231b21c1250d80f656ab1411f0ab3aa942d54889845c03935f28e68fd510ae943cb
-DIST num-complex-0.1.43.crate 17731 BLAKE2B 4b18c7839e7826c16c60b15f9d5c6bbf9f9874e962429cfaad6fc9fc9bca9dfb260ae390e051dac2b2e6cbd4700666851318ccff137badab00bd39f8c4407732 SHA512 e82f3ea86e9725a51e6669aad07b87dfe86cbf2fcbf76629a2479bcb9b7c5ea2cdc2fab7a98091686c15f4ae7ab68c66e01982f35738f9055a41938930e72582
-DIST num-integer-0.1.36.crate 12168 BLAKE2B b492ae16a4143996d447dd2cdd348ebee6237d924e2f756ffb4a236b9de166a9b12355ba8e9027bebb58c50404ec64f392b0c52bf336c6205128e27d1184cca2 SHA512 9f7f8ae499ab181d77d69f6e761457fc170305767a0867142ccd549cf55c24b9731434f6289856d959ac239aee32a6574c77a5a783a701ca583310ed9134911d
-DIST num-iter-0.1.35.crate 9013 BLAKE2B adfc4bfb7f390e2abbed94fb64348f4f4e7d6652f0bd5aab4d7f06a59c1cdeb46a5190ce3868e64705bec208a3ae4292516d99db2aef120153de5eb01a6e4251 SHA512 df4fc06ff7ae28b4576a1004d2284d49865e899ae315c5621258aa1087c951b2927e1e413d2a8fa992ede242c2e73eb40c6efbf3feb1adbbe5aad8ea323d9e4c
-DIST num-rational-0.1.42.crate 17253 BLAKE2B a3aad3fac51192e00f00a4489590c1358adf1bc7d0704dd069375501fb820c1413089f542900ad5593745d4c5f775f7101a38d65c1e2fe892dedf3d6f83245da SHA512 f0ad3c6e807db1cccb5260caa1b2abce354d1aca63e765c0bb2d18401e941d57a47c8edbe485ff0d67ab363c937592e2adcb89538132b5a2d6d4408141f17ef7
-DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c066fb4503f7d9d5e634a2236c2632bb9fcb4130be10aea64a583e15160d33e28570fbbaf8ef935b1864fc0a9e8 SHA512 2b2baea40084f4b1c7b4aace26681e92f0d4fc40686ce248849ca9672b2e24f545dd168e37f33ef162b07663e192d81c9b1f2ede1cd45afa5910fe9aa2c365a5
-DIST num-traits-0.2.4.crate 38463 BLAKE2B 9a44eebea444c2184855cb41b39b88716773be2d2f146ee603c999c377f3249b4580133608ec4ba968e27a976307b030414c23eb9dd1ead655c3aeb70431abc8 SHA512 4d1f378ea4ca6edf934ad92526b7556944dddfa00d77f2f6795c65bfb5aba4a20a747e01cbd1fb8250e565eb541a48dec8aab00d6505931b5cbc25be0dbf929c
-DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
-DIST openssl-0.10.6.crate 158082 BLAKE2B 2a9e6b77e8a6c55c2fce9b0961c2179cd6ce2534e714eff9c3c07d9d70177ec30e5f47092e18040c8dd9396563ea3f05e5a022af035ee359a1f16ec4e2b8c86c SHA512 9e4051c1c4d4b5143c9148f46083fba8df5c9e88e8a2d60398af21012d79b7a65feb5d6a6d1a704445b0ab74e9d23ebcf95d97df33a76ca488c3f188c9126e9f
-DIST openssl-0.10.7.crate 158397 BLAKE2B 4ab202e9f3bf989c3d22e57a016de5e11aec92e68a9ec9dee6e6ff13b29f6c50a720d3800e27c0c9a0c5232ff8b3bed2a53d2e4f0b5f70e5928c7c5d80ea0fb7 SHA512 17299119ff9dad330a0a060283a485d28e2ab85beb27ddbc2f156526780831a5d135e00721bd2d609994da3c0bde94c51892d05f5037b7066ad0b83fd3b9da28
-DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.28.crate 40560 BLAKE2B c5a1f34ed11f37b8d842b4971810f83eb6e24d74ffae931224a5c9ac992030bd9f034ae057f0ce9efac3d4f2f20898f8c4ec33d5290f8747fed575c0d003c036 SHA512 a156e682dc7c7d8075842623b58a3f3386c330162cd9489ce96a33f72e0368a381e4d0e83c43885d221a29edf1926a11b106dbda273c863845ae28a51e2648b3
-DIST openssl-sys-0.9.30.crate 40910 BLAKE2B ac7d2d33e002e225665cbda05bce46affbf733361dfe2345ee2a0c846bae1da54d16d64de12aa0ee9358950be239a5900c0b487d16544d0c699afb16a6820bab SHA512 0df144ec31e665e406bc731cbb938763fbb023dc9076a1cf9c423fcbb8b230b639138bf16b563d2a3e9e6c2c2c89f04dd92d90afc043982ea0ee94785d2cedde
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
-DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
-DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
-DIST proc-macro2-0.3.6.crate 22845 BLAKE2B 1491c55e9e417900a12e9b2ddef34032f2141eda9f3863bcd0fa0deaddc106157e366976fcc185f2fbf6bd8e5036c378775e39d1ef1b21a1561425f56b374910 SHA512 4999d6f4916005e6691f3d865cd6d58fb26e672319e9d941d9fbc6403e10ca2b6ea761e5e2d84cb60324f235ec6a57dc2acb064997fcfbf63b90b48b1d0df9ff
-DIST proc-macro2-0.3.7.crate 23402 BLAKE2B a6c5eec8384611c7f6a0dd9840ebc6b292eb6f7711c6dfdae1ab376bc4a8231dd7006744a27ef5703f04900e0b5aa58998b1c02cf341607be130612f1d99d957 SHA512 dcc923271886a33df34e2385a72b3654b66081f97082ed8ac5d9e65cdcc9352a31812c18c958e2a0d00797b98e02b34e0d40b98ebbddd6773f51628b26ca6640
-DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
-DIST quick-error-1.2.1.crate 15112 BLAKE2B 615254207c47928c1053a4ecd1b1a64a32e9e550c8d74ad5564b31404469460e063aaeeea3e3a8d48ec2416edecfbeefb8f84fbb8f2d9eaebd6121de2d5ad9b4 SHA512 86242dc5a5b68d4d4df50db54b629256d8d33f9637c457c669d874685dd5218f96d0a2dbb16b5c77cca67480e2bc485b3aca6fdd100f615b4bd00004910d2ce3
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST quote-0.5.1.crate 14960 BLAKE2B 123e12032797c8335ddc182c2e95016afc866cfc041f26d45e3482c6f689719bbbf6340ed07523acada93953a9ec672914b648d71e45008dacc033f72a7de5a2 SHA512 bbf670fbfdeec126de0a083415f11b2cefbefa30db8390c2b7b80a2e541030cfb8153f2cbd2641dad6d35e25eab9cc3143861ffefe536bd2d119f8d967bbb44b
-DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
-DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
-DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
-DIST regex-0.2.10.crate 208632 BLAKE2B 8380f1e91c99c73e12d125bcb7f97c8851d55e509b3c2ee3a87c7cf6c8d432f800535cb200f4c65276a9752ee2a966b30e70af41b20ae70038579ad66d584ff7 SHA512 2f2a2c0f7ffe4c9711a689b156b732b5ba58774a0f2064a64527e1af29ad9fb8ade6580f10b52f912a9bea373422bdaa995b83d0f2620aab9280e43330953614
-DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
-DIST regex-1.0.0.crate 210131 BLAKE2B 487f8a384f341718be0f4ff6e85e9f100e4cf089dd8b1d3d9bcae0760955cc496660aca153fc43a6fd47045b26031954f9ed97f8fe443fb7f741fd3ec274beba SHA512 857e7406415c4f212c79384a0b2b6365615b9f49a4493146028b04fee3b6438a68fb57b08e77e041f776476fa71c50399508ce0c8c0c53069d125a5c8ec055ad
-DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
-DIST regex-syntax-0.5.3.crate 233364 BLAKE2B 1862f7545e92a06b156a65a998f6c42009400787875e7728a458868275eeb4564807de5512560c9cc646ea0a0d661c67ea6705252d8adbf5e9ac09558b2076cd SHA512 03034432b2a27c5b7e79ca072405ce4639e097843fe9861f0b8a0f289b37ff28e03c2454be0e815181882da7590ac1e8a356beefccc2bac57d02dfdd1f404d65
-DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455
-DIST regex-syntax-0.6.0.crate 233363 BLAKE2B a48ae00749fb9c9f066da54bddd14e8568b12d73a3a2c9006f875d676c926bf2638c29b1ee1221260e031f7d38cec1def47989cad02f37d3c8753e8b65a20253 SHA512 1db2f8f4e397b434502629bc6a726c23f4ddd493c653a694153bfc3d84f8ca759ad20e0191b990dbcbb3e584858070d32d8ad050536c818a99e912911531b162
-DIST remove_dir_all-0.5.0.crate 8651 BLAKE2B 4ce249473bc67b5ab0c3e04665a67b3c73224565071cb2055ddd461a775fef18ce0e973f281e53f5416bdad506e9b53da184078986950be3a07c534360b4544b SHA512 876681ae98ac9a9cf0447397446ca7afb4e254cf0cfdd7a9b8702eb94cfda5230ac4daeaa067a3f07ae303b920d1a97fa4a0da76b80b4545eab1080bee8c1574
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
-DIST rustc-demangle-0.1.7.crate 10681 BLAKE2B 2679a27863f3172712d13d24cc76e13c67b61ae018cdb1ce01296625a2aa4b53c3c44572e9d2bc639ce9f663e221fed8e91f79296bf721a3934b8d4267587b86 SHA512 75dd8581fd0dccfcc8cd2afaf18b9f44a5cea95f6c6573bf9e0b23d79cf5e959b3565bea0e9e26ee5b80f3142a16b549eefa99f5f65aa0ca9c780307091358ec
-DIST rustc-demangle-0.1.8.crate 10737 BLAKE2B 94496f2ef9bf40f3f25ad507119d24e1207946642e3cce081d36946713bf32d1813491c79ad15a6c7cd871c32ecfbf02fb416316fb0309d8726b23b3888343a5 SHA512 ca3ffc2872a608f13fa795d97d2a5e43da978ecf4c16973bed372a0b58334a70616087308ce00ca729932c5dbd9fad3a7b7dfcc76d16008fbe9cd882b1b3df31
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
-DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
-DIST schannel-0.1.11.crate 38229 BLAKE2B 37ebced9870387d38d57f83abceb9ee37103fe7141469022c895c7b0beaceb1ae2102d5d29616d75131275b91d0d4ce9c6d8d8a9bf69d44de2f5a9d4ee664e17 SHA512 b46cc854eced92c1e55d97b45459305295c266a9a9a7f71d94bfc5b95fc1f7fe85f02188baca7880fde5ec675fd3e9fd5bd81a8fd1124b24a563be2077212c55
-DIST schannel-0.1.12.crate 38498 BLAKE2B ec67cfea467925e2bb31ae6afb3502689bc0bb89d6afc19efb1ecef52fe02aaf3f6523194a249a7f61b475104b29eb86177290af341af103f3a1e34268f193c8 SHA512 9599a2793ff16b14252300b8040d337d230e0e5cd003167c6e453d98de61736a694a5a48d39ee79a2c7b96da914abbb10e8de8ed40505522a62781ad59ea81ae
-DIST scoped-tls-0.1.1.crate 9080 BLAKE2B f0008e0f08159cf2b8a7cc3c0fa23ce998ba2930cdcffe0b41d7fc0baa7e5f51949049961536b79c29371adbf4af756a24312e7c716b57918ade598796bc3895 SHA512 6feea7f837713c90189d50b06d025db266a81dacfbc0bcd97e4dfed1900cc9d03e74e6d66864236a0652f04c80d57f6f8cb760ee6942c51a3e351e7cb88ad9d8
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.37.crate 66879 BLAKE2B 6ba8dd40f90ddd8b282654628b98e775a8f51cd22fc51ddfdb93c01e3ffd62cf92055671009dff42eb3207775e406f3844c72b1defd57cd6b473049900aa1c68 SHA512 53a3d08285e1d40707972b7ba1d60109207a49c73322a866485c6d057ef9a23babd1cbe3a9bd693dfe2b477e599b75982103dbd0cca11f8d6fba31b63d5be989
-DIST serde-1.0.55.crate 68121 BLAKE2B 5b83ff645a24af82a1befcb511154da57f9974594df8fb1d9728e58556b46a21444566c4a7e771f2f05b86300f5ebee94ccc69db990668e46a919fbf8ac84ba9 SHA512 d1d0b80696a3dca08878768953fd43cc315527bcd1bb19358fe861ea1419b8cb057b319b0aec33811e5f6067b25f26d2727fc19a11a70fe11f977c98d373f1a5
-DIST serde_derive-1.0.37.crate 29589 BLAKE2B 9575eed9c305247c4291413d3e504dcc2562ab228abc181358b8a8fce2b565ac6131dd6767499c73b83b9c0e04c07aecbcff5d1c13db21faf84c583476ff0806 SHA512 bb9ed046b4e626a5f0d4e76ecbb74be28f8ffa9d18d2533db493adcca33291416d4eb00161231817e67b93aca91548dd5dff25f4730dd59de8eeac17d394f23a
-DIST serde_derive-1.0.55.crate 45154 BLAKE2B b6d31b8192192e4ee152c1da3b9d559d1fa870d21b190184b206531afd81c12753476a36f79ad8cdfcdf6cdda4f8c752e7362ebfaf9075b63f06d3a74884a37b SHA512 e4815c04376c24f98a57d9feb625901d2d5a7ccab35deb5ab9b7a38dfb683c01ce96b0abba6c808b98a1b2ebba4af622c6156e6874d9c5ab522fe7cdcd00aad3
-DIST serde_derive_internals-0.23.0.crate 19939 BLAKE2B 6b13dd310cb6af94ee3021fb85f8aa19d40b183f8cb06e23ea14143439e628ce2a321e80b7b31c3957bd02b21a9f901ea4a06578b340eb7683e9bfe06d7a2dbb SHA512 c976ac6110ac6bc98a0b36c27afb7dda3c3a13afbce291eb912e8d0e48ea9faaa4076a60563b937c9c7b48c7ddc459e7b1b4018135b198e9c345f9e245453434
-DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
-DIST serde_json-1.0.13.crate 63744 BLAKE2B bd694199e1eddacd6db16ba0b5255c651e4154d5be4771a23e990d51a2894731b4d4831a26dd3c838629b40d7100092f715d4d3d0b41abca5118a3e69f115b69 SHA512 cf9f034d8117b1900cd0f3daecef920b3d4ddf061c9cc8cf42005593621c0460da70ae12608d8704e180578488b5f2e7d57791ac3ec06a2842e47a2e5b7a9eed
-DIST serde_json-1.0.17.crate 64689 BLAKE2B 292c0826674e837fc909b7ca3011c0593948d646982a96e355fe2f806fb058a7180bde72ee7c9d2aa6ceb3fc5b4ec52a04ba450e3a6ad64e1e7e04fc4be2e31d SHA512 69f036479c3133490c918b79db3304c728e2d5b54022c67062b01278e7567d3d5109d4e19686a5a902c64d4ec527328a1eed21a7c7637421d8cb08d4a3fd83bd
-DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
-DIST socket2-0.3.4.crate 27946 BLAKE2B 13f9ea9aa296dbdd70303f8525b2f8ad90e647456aaf0529bd54e061f4cb248eb9c85d0b9cf6a4c8e3e3787de0273ea337f88ca9f32018d01afb34130295a075 SHA512 460e80bea03bd34b8673146b577d7ddc90a0e00bd4313389a560ab4f7d109bdda68cbebb63232f20b4bd1f772da0070351fb78a1d7cca250273a25005e50016a
-DIST socket2-0.3.5.crate 28077 BLAKE2B 1259aeec8e0b1b02abd45916b19f94d8eb9127e59b56c279f33bad703e3cbf7336e119c2d5eb9ae8f54e8ac74f16495d26d51fb579ebff9a53947b101cd3c4b9 SHA512 66c8e975862dc4e1498abc47199485c802a8ef09ddb1f9fb0af7613d794f98aaaabe96490d7923d3a3f0cae91864ffc1edf89b77c56231f363c2a1cc820edc63
-DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST syn-0.13.1.crate 133086 BLAKE2B 6c23e6c0474c316c8ca420a5463401ab8fa5e8f4e774a5f3041cb2cabfa4ce3894bc36bc077d3dceeec438e3f19725fce71f1c860b74583bb3fd8dcfa05078d3 SHA512 0c08ad8438e2dd2a067ad857128c19719339dd697e5860c6280247229211c5abf56a82ac10a87b1d6fdd3f3c6026a4477cdad1cc63d22db6f407b058ffb5b25d
-DIST syn-0.13.10.crate 134334 BLAKE2B 34ee50a42310d088052145c588e7c7401bddc08a48c3d1eea2f07a19c6b242425f5d235a2f477c8a75d18eb572b00d0c6114eb085b1e17a65817e12af83fedf6 SHA512 7ee41788cf98f7b74880a4935f526e7d152d17159d9a4be185a46e4e6eab3a22dbe31ca57e5cb0001041aa8ff0b15a21ae6ef4fe9bc9117b612d0e60add29d5b
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST synstructure-0.6.1.crate 11257 BLAKE2B 28a71b4f0e49a658064dd5b4eee0f1a61ef5502a24de4edb7aaa0f0741529a7640b874d19400757feef527ff78432e29fbe8574732e19a7395d13f2cef23d39d SHA512 e3234d03a99373a7c35a33611e7d5383b282f232a17c592d630dc2ef5613ca272d3f8419a87d40cf1d50f3ff982a01086d9b7a0202c5a819463d157f684d41b9
-DIST tar-0.4.14.crate 41988 BLAKE2B dbbc3f1517c817827f7cebe84918cd3aba9a3aee65a503b9da7647b187f1b4f0a173649c97bbc7ff3dc0e93486881f00a49b9a24c70c9df249d26a9f13cec3a3 SHA512 b46685caadf335ec296a6d7ff5c2bae31a50395a3681a733998dbdf6295a4a55e7b094340b4679f9468f430f5c92734e08b75123de935dc5636b36d06c498b96
-DIST tar-0.4.15.crate 43037 BLAKE2B 999e3ccf528e5e72bdbb7c1fbf1c3704e55c15906f757cdb83bc04a437623058c4a204a4a7c4b423ca383babf8b2e07d06586b811834d11a5fee57a0129c2a1b SHA512 b5e95534836e99ef749dc4d517e60f799ca6a88a246b30b7bf9731afa3fe5f207ad14ecd11435da43f7d634ca16bd3766dfb94fe7ee0cbb1611773aecc46b060
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST tempfile-3.0.2.crate 20825 BLAKE2B 0165940c98b5a28dcc087bdbaebd94dffe532fd571b7f28c440583848fa2368029c9416be914291f3ff0366066b2c99b8a241f3e581209f73fbfbf8c71188530 SHA512 8ece130a10d4a698884d3d29530c925944ef6d9bf8375b87abdad890cf1baa196b0c80b461b6ff436a8fb29931e181b4d0acba50e851ebbf4c0e9aa512e823c6
-DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
-DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
-DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
-DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
-DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
-DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.5.crate 290328 BLAKE2B 47611127735629ab5ca8eca6a32754b3d14f0da384310b9915fff3f988c28590ce83b757258c7d09a1640e65b2b4307a1d5af96f39ee4f6a70a7aadfee955905 SHA512 e3a8d69080d7c85c140406fb7514c70c6af3c3c847d2a4d029d6494035d2a77f093b9d96e26bf59ad973187ccc8dfef1a4fadcc2eb2977b16ecad9f64bfca941
-DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
-DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
-DIST url-1.7.0.crate 67909 BLAKE2B 342d0a01774102625e7411c067e1949d0d5fdcd11e2381aaeaa416c9123f977e5b8c1b988e94007a4abf654fe58c9723f3b1bf8644515473e79976da4c0327c1 SHA512 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f
-DIST userenv-sys-0.2.0.crate 1749 BLAKE2B cbba1af566a05a27ba571b25be6e5bc47b98cc1710d89083023586704e8111158f3433214d7bc6a0d72af40f589679791dca9a99f73d17cd29cbe75281d4d476 SHA512 97065d57b63045876685797b6cfe600d65a7d3a3b66a356ca86df735f19de373eec24d4eb679c013ec8bbc22954e8c258863ddca608bedd830fcb55df01438d2
-DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18
-DIST vcpkg-0.2.3.crate 6015 BLAKE2B 8259f1e9c137fdbbc0277976bfaec28074af3ce87149fffb441a5692c84b0e4a9c70b61b57d82c82d7603569fb3a9a86244a68a1834797e4745f179b941d1ce6 SHA512 ff1440f2d7d2e231fd959a328fc07ac1d4e4041f42723d2edf2226b74024aa13016eaaa364d7221ca8440381769ca03c24bc1c8d49aa2b5708871541b8a9ef0a
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD cargo-0.26.0.ebuild 4718 BLAKE2B 5e6e064d0988f196816a726ae1cb46dd962ca7a3e3d6ea6edccb219c42448adb29ebd0e90f695ef72f244891fccdfa6d2f3e75baf133124d30bb39bbf25eda88 SHA512 6328f4196c0ab5ae4edb45237fc9a315a1b27be5ae77e7ef39eeadaa50396c98393fcbbe64d1bc938d681a87628e0813f3086869cb2d01290e969a5aca95c65f
-EBUILD cargo-0.27.0.ebuild 4499 BLAKE2B 5012de1e42da4a97744a48cd571e3a69c93fd6107bd6a53096bb72e96a6a9e19e126b5460f3ef321aa0d08db9ea0460780e8f8ee3f450d6852a6f51ade8fe49e SHA512 7df8362d68fe3a909d2f7692b45065652166c2230652168cf77ada8bf3465bb5b5ee97a41e435fc0526da575e6d2ac42ef60b41d917dcf5e547322e6ea3cb3d2
-EBUILD cargo-0.28.0.ebuild 4483 BLAKE2B 2846345ee39c15208ec01edb2a56e89141bdb5f814646b0f735932af519a26bdd9ceabf0a83c3f5cede74793bb683ef59f4b824512a1f3983847cff8364b65ab SHA512 62ec6d1dda78ba805de615131a2deb6da1cd248e411ce186f11ec24f148e663daeb7d0b1ad385e8a3c009cf92c8ae693b93d9d5dc0cfc3cdb059d9fa3e4b933d
-MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.26.0.ebuild b/dev-util/cargo/cargo-0.26.0.ebuild
deleted file mode 100644
index 3d049bc2ded6..000000000000
--- a/dev-util/cargo/cargo-0.26.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CARGO_SNAPSHOT_DATE="2016-09-01"
-CRATES="
-aho-corasick-0.5.3
-aho-corasick-0.6.4
-atty-0.2.8
-backtrace-0.3.5
-backtrace-sys-0.1.16
-bitflags-0.9.1
-bitflags-1.0.1
-bufstream-0.1.3
-cc-1.0.9
-cfg-if-0.1.2
-cmake-0.1.30
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.5.1
-core-foundation-sys-0.5.1
-crates-io-0.15.0
-crossbeam-0.3.2
-crypto-hash-0.3.1
-curl-0.4.11
-curl-sys-0.4.1
-docopt-0.8.3
-dtoa-0.4.2
-env_logger-0.5.6
-failure-0.1.1
-failure_derive-0.1.1
-filetime-0.1.15
-flate2-1.0.1
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.6.11
-git2-curl-0.7.0
-glob-0.2.11
-globset-0.3.0
-hamcrest-0.1.1
-hex-0.3.1
-home-0.3.2
-humantime-1.1.1
-idna-0.1.4
-ignore-0.4.1
-itoa-0.4.1
-jobserver-0.1.11
-kernel32-sys-0.2.2
-lazy_static-1.0.0
-lazycell-0.6.0
-libc-0.2.40
-libgit2-sys-0.6.19
-libssh2-sys-0.2.6
-libz-sys-1.0.18
-log-0.3.9
-log-0.4.1
-matches-0.1.6
-memchr-0.1.11
-memchr-2.0.1
-miniz-sys-0.1.10
-miow-0.3.1
-num-0.1.42
-num-bigint-0.1.43
-num-complex-0.1.43
-num-integer-0.1.36
-num-iter-0.1.35
-num-rational-0.1.42
-num-traits-0.2.2
-num_cpus-1.8.0
-openssl-0.10.6
-openssl-probe-0.1.2
-openssl-sys-0.9.28
-percent-encoding-1.0.1
-pkg-config-0.3.9
-proc-macro2-0.3.6
-quick-error-1.2.1
-quote-0.3.15
-quote-0.5.1
-rand-0.4.2
-redox_syscall-0.1.37
-redox_termios-0.1.1
-regex-0.1.80
-regex-0.2.10
-regex-syntax-0.3.9
-regex-syntax-0.5.3
-remove_dir_all-0.5.0
-rustc-demangle-0.1.7
-rustc-serialize-0.3.24
-same-file-1.0.2
-schannel-0.1.11
-scoped-tls-0.1.1
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.37
-serde_derive-1.0.37
-serde_derive_internals-0.23.0
-serde_ignored-0.0.4
-serde_json-1.0.13
-shell-escape-0.1.4
-socket2-0.3.4
-strsim-0.6.0
-syn-0.11.11
-syn-0.13.1
-synom-0.11.3
-synstructure-0.6.1
-tar-0.4.14
-tempdir-0.3.7
-termcolor-0.3.6
-termion-1.5.1
-thread-id-2.0.0
-thread_local-0.2.7
-thread_local-0.3.5
-toml-0.4.6
-ucd-util-0.1.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.5
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-1.0.0
-url-1.7.0
-userenv-sys-0.2.0
-utf8-ranges-0.1.3
-utf8-ranges-1.0.0
-vcpkg-0.2.2
-void-1.0.2
-walkdir-2.1.4
-winapi-0.2.8
-winapi-0.3.4
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-0.1.6"
-
-inherit cargo bash-completion-r1 versionator
-
-BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
-
-DESCRIPTION="The Rust's package manager"
-HOMEPAGE="http://crates.io"
-SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
-	)
-	amd64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-	)
-	arm? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.gz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.gz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.gz
-	)
-	arm64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.gz
-	)"
-
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="doc libressl"
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-elif [[ ${ARCH} = "x86" ]]; then
-	TRIPLE="i686-unknown-linux-gnu"
-elif [[ ${ARCH} = "arm64" ]]; then
-	TRIPLE="aarch64-unknown-linux-gnu"
-elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabi"
-elif [[ ${CHOST} == armv6*h* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabihf"
-elif [[ ${CHOST} == armv7*h* ]]; then
-	TRIPLE="armv7-unknown-linux-gnueabihf"
-fi
-
-COMMON_DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/cargo-bin
-	net-misc/curl[ssl]"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/rust-1.19.0
-	dev-util/cmake
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	sys-apps/sed"
-
-PATCHES=()
-
-src_configure() {
-	# Do nothing
-	echo "Configuring cargo..."
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
-	${cargo} build --release
-
-	# Building HTML documentation
-	use doc && ${cargo} doc
-}
-
-src_install() {
-	dobin target/release/cargo
-
-	# Install HTML documentation
-	use doc && HTML_DOCS=("target/doc")
-	einstalldocs
-
-	newbashcomp src/etc/cargo.bashcomp.sh cargo
-	insinto /usr/share/zsh/site-functions
-	doins src/etc/_cargo
-	doman src/etc/man/*
-}
diff --git a/dev-util/cargo/cargo-0.27.0.ebuild b/dev-util/cargo/cargo-0.27.0.ebuild
deleted file mode 100644
index da876c730da5..000000000000
--- a/dev-util/cargo/cargo-0.27.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CARGO_SNAPSHOT_DATE="2016-09-01"
-CRATES="
-aho-corasick-0.6.4
-ansi_term-0.11.0
-atty-0.2.9
-backtrace-0.3.6
-backtrace-sys-0.1.16
-bitflags-1.0.1
-bufstream-0.1.3
-cc-1.0.10
-cfg-if-0.1.2
-clap-2.31.2
-cmake-0.1.30
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.5.1
-core-foundation-sys-0.5.1
-crates-io-0.16.0
-crossbeam-0.3.2
-crypto-hash-0.3.1
-curl-0.4.12
-curl-sys-0.4.2
-dtoa-0.4.2
-env_logger-0.5.9
-failure-0.1.1
-failure_derive-0.1.1
-filetime-0.1.15
-filetime-0.2.0
-flate2-1.0.1
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.7.1
-git2-curl-0.8.1
-glob-0.2.11
-globset-0.4.0
-hamcrest-0.1.1
-hex-0.3.2
-home-0.3.3
-humantime-1.1.1
-idna-0.1.4
-ignore-0.4.2
-itoa-0.4.1
-jobserver-0.1.11
-kernel32-sys-0.2.2
-lazy_static-1.0.0
-lazycell-0.6.0
-libc-0.2.40
-libgit2-sys-0.7.1
-libssh2-sys-0.2.6
-libz-sys-1.0.18
-log-0.4.1
-matches-0.1.6
-memchr-2.0.1
-miniz-sys-0.1.10
-miow-0.3.1
-num-traits-0.2.4
-num_cpus-1.8.0
-openssl-0.10.6
-openssl-probe-0.1.2
-openssl-sys-0.9.28
-percent-encoding-1.0.1
-pkg-config-0.3.11
-proc-macro2-0.3.7
-quick-error-1.2.1
-quote-0.3.15
-quote-0.5.2
-rand-0.4.2
-redox_syscall-0.1.37
-redox_termios-0.1.1
-regex-0.2.11
-regex-1.0.0
-regex-syntax-0.5.6
-regex-syntax-0.6.0
-remove_dir_all-0.5.1
-rustc-demangle-0.1.8
-same-file-1.0.2
-schannel-0.1.12
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.55
-serde_derive-1.0.55
-serde_ignored-0.0.4
-serde_json-1.0.17
-shell-escape-0.1.4
-socket2-0.3.5
-strsim-0.7.0
-syn-0.11.11
-syn-0.13.10
-synom-0.11.3
-synstructure-0.6.1
-tar-0.4.15
-tempfile-3.0.2
-termcolor-0.3.6
-termion-1.5.1
-textwrap-0.9.0
-thread_local-0.3.5
-toml-0.4.6
-ucd-util-0.1.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-unicode-width-0.1.4
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-1.0.0
-url-1.7.0
-utf8-ranges-1.0.0
-vcpkg-0.2.3
-vec_map-0.8.1
-void-1.0.2
-walkdir-2.1.4
-winapi-0.2.8
-winapi-0.3.4
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-0.1.6"
-
-inherit cargo bash-completion-r1 versionator
-
-BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
-
-DESCRIPTION="The Rust's package manager"
-HOMEPAGE="http://crates.io"
-SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
-	)
-	amd64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
-	)
-	arm? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
-	)
-	arm64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
-	)"
-
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="doc libressl"
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-elif [[ ${ARCH} = "x86" ]]; then
-	TRIPLE="i686-unknown-linux-gnu"
-elif [[ ${ARCH} = "arm64" ]]; then
-	TRIPLE="aarch64-unknown-linux-gnu"
-elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabi"
-elif [[ ${CHOST} == armv6*h* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabihf"
-elif [[ ${CHOST} == armv7*h* ]]; then
-	TRIPLE="armv7-unknown-linux-gnueabihf"
-fi
-
-COMMON_DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/cargo-bin
-	net-misc/curl[ssl]"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/rust-1.19.0
-	dev-util/cmake
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	sys-apps/sed"
-
-PATCHES=()
-
-src_configure() {
-	# Do nothing
-	echo "Configuring cargo..."
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
-	${cargo} build --release
-
-	# Building HTML documentation
-	use doc && ${cargo} doc
-}
-
-src_install() {
-	dobin target/release/cargo
-
-	# Install HTML documentation
-	use doc && HTML_DOCS=("target/doc")
-	einstalldocs
-
-	newbashcomp src/etc/cargo.bashcomp.sh cargo
-	insinto /usr/share/zsh/site-functions
-	doins src/etc/_cargo
-	doman src/etc/man/*
-}
diff --git a/dev-util/cargo/cargo-0.28.0.ebuild b/dev-util/cargo/cargo-0.28.0.ebuild
deleted file mode 100644
index 2518657803b9..000000000000
--- a/dev-util/cargo/cargo-0.28.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CARGO_SNAPSHOT_DATE="2016-09-01"
-CRATES="
-aho-corasick-0.6.4
-ansi_term-0.11.0
-atty-0.2.10
-backtrace-0.3.7
-backtrace-sys-0.1.16
-bitflags-1.0.3
-bufstream-0.1.3
-cargo-0.28.0
-cc-1.0.15
-cfg-if-0.1.3
-clap-2.31.2
-cmake-0.1.31
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.5.1
-core-foundation-sys-0.5.1
-crates-io-0.16.0
-crossbeam-0.3.2
-crypto-hash-0.3.1
-curl-0.4.12
-curl-sys-0.4.5
-dtoa-0.4.2
-env_logger-0.5.10
-failure-0.1.1
-failure_derive-0.1.1
-filetime-0.2.1
-flate2-1.0.1
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.7.1
-git2-curl-0.8.1
-glob-0.2.11
-globset-0.4.0
-hex-0.3.2
-home-0.3.3
-humantime-1.1.1
-idna-0.1.4
-ignore-0.4.2
-itoa-0.4.1
-jobserver-0.1.11
-kernel32-sys-0.2.2
-lazy_static-1.0.0
-lazycell-0.6.0
-libc-0.2.40
-libgit2-sys-0.7.1
-libssh2-sys-0.2.7
-libz-sys-1.0.18
-log-0.4.1
-matches-0.1.6
-memchr-2.0.1
-miniz-sys-0.1.10
-miow-0.3.1
-num-traits-0.2.4
-num_cpus-1.8.0
-openssl-0.10.7
-openssl-probe-0.1.2
-openssl-sys-0.9.30
-percent-encoding-1.0.1
-pkg-config-0.3.11
-proc-macro2-0.3.8
-quick-error-1.2.1
-quote-0.3.15
-quote-0.5.2
-rand-0.4.2
-redox_syscall-0.1.37
-redox_termios-0.1.1
-regex-0.2.11
-regex-1.0.0
-regex-syntax-0.5.6
-regex-syntax-0.6.0
-remove_dir_all-0.5.1
-rustc-demangle-0.1.8
-same-file-1.0.2
-schannel-0.1.12
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.55
-serde_derive-1.0.55
-serde_ignored-0.0.4
-serde_json-1.0.17
-shell-escape-0.1.4
-socket2-0.3.5
-strsim-0.7.0
-syn-0.11.11
-syn-0.13.10
-synom-0.11.3
-synstructure-0.6.1
-tar-0.4.15
-tempfile-3.0.2
-termcolor-0.3.6
-termion-1.5.1
-textwrap-0.9.0
-thread_local-0.3.5
-toml-0.4.6
-ucd-util-0.1.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-unicode-width-0.1.4
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-1.0.0
-url-1.7.0
-utf8-ranges-1.0.0
-vcpkg-0.2.3
-vec_map-0.8.1
-void-1.0.2
-walkdir-2.1.4
-winapi-0.2.8
-winapi-0.3.4
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-0.1.6"
-
-inherit cargo bash-completion-r1 versionator
-
-BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
-
-DESCRIPTION="The Rust's package manager"
-HOMEPAGE="http://crates.io"
-SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
-	)
-	amd64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
-	)
-	arm? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
-	)
-	arm64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
-	)"
-
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="doc libressl"
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-elif [[ ${ARCH} = "x86" ]]; then
-	TRIPLE="i686-unknown-linux-gnu"
-elif [[ ${ARCH} = "arm64" ]]; then
-	TRIPLE="aarch64-unknown-linux-gnu"
-elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabi"
-elif [[ ${CHOST} == armv6*h* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabihf"
-elif [[ ${CHOST} == armv7*h* ]]; then
-	TRIPLE="armv7-unknown-linux-gnueabihf"
-fi
-
-COMMON_DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/cargo-bin
-	net-misc/curl[ssl]"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/rust-1.19.0
-	dev-util/cmake
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	sys-apps/sed"
-
-PATCHES=()
-
-src_configure() {
-	# Do nothing
-	echo "Configuring cargo..."
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
-	${cargo} build --release
-
-	# Building HTML documentation
-	use doc && ${cargo} doc
-}
-
-src_install() {
-	dobin target/release/cargo
-
-	# Install HTML documentation
-	use doc && HTML_DOCS=("target/doc")
-	einstalldocs
-
-	newbashcomp src/etc/cargo.bashcomp.sh cargo
-	insinto /usr/share/zsh/site-functions
-	doins src/etc/_cargo
-	doman src/etc/man/*
-}
diff --git a/dev-util/cargo/metadata.xml b/dev-util/cargo/metadata.xml
deleted file mode 100644
index b74fce0037e8..000000000000
--- a/dev-util/cargo/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>rust@gentoo.org</email>
-    <name>Rust Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rust-lang/cargo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/catalyst-2.0.18-r1 b/dev-util/catalyst-2.0.18-r1
new file mode 100644
index 000000000000..d4352a3aea0b
--- /dev/null
+++ b/dev-util/catalyst-2.0.18-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-text/asciidoc 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache kernel_linux python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3d375d850fe2a9af1cb655f054b3f3c1
diff --git a/dev-util/catalyst-2.0.18-r4 b/dev-util/catalyst-2.0.18-r4
new file mode 100644
index 000000000000..b3f6bf262d4e
--- /dev/null
+++ b/dev-util/catalyst-2.0.18-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-text/asciidoc 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache kernel_linux python_targets_python2_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c71150e9d8822360aeb45bb306aa7efe
diff --git a/dev-util/catalyst-2.0.9999 b/dev-util/catalyst-2.0.9999
new file mode 100644
index 000000000000..2b520cc6afc6
--- /dev/null
+++ b/dev-util/catalyst-2.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=app-text/asciidoc 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-vcs/git
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache kernel_linux python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d9762f953ada351e4d2f4ce1bf9c65d6
diff --git a/dev-util/catalyst-3.0.0 b/dev-util/catalyst-3.0.0
new file mode 100644
index 000000000000..da289de6fbc0
--- /dev/null
+++ b/dev-util/catalyst-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc kernel_linux 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
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pydecomp-0.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-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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=mirror://gentoo/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.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_=30f0d30fad98e1014637a2f69c5b82d7
diff --git a/dev-util/catalyst-3.0.1 b/dev-util/catalyst-3.0.1
new file mode 100644
index 000000000000..56cb27aabf34
--- /dev/null
+++ b/dev-util/catalyst-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc kernel_linux 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
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pydecomp-0.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-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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=mirror://gentoo/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.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_=857106b1b6cf9b332fe9b3f43808203e
diff --git a/dev-util/catalyst-9999 b/dev-util/catalyst-9999
new file mode 100644
index 000000000000..264db2ad66b4
--- /dev/null
+++ b/dev-util/catalyst-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)] 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
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc kernel_linux system-bootloader python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2
+PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
+RDEPEND==dev-python/pydecomp-9999[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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	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_=c64718f95b1ac927d9ae0f46055bbabe
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
deleted file mode 100644
index 2b3102fb1bbf..000000000000
--- a/dev-util/catalyst/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c3a8a3afd054737e9d21f9870d82249a701a2fb00c27f9f97d7411df46357509477c3cafdd9341752fee77321f94910fd18b9a1d5ffef1 SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f
-AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205
-AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
-AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
-DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
-DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
-DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
-EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
-EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
-EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23
-EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
-EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
-EBUILD catalyst-9999.ebuild 2017 BLAKE2B 6585dd0701822408252aa509890495d61051ddfc5ef8be2536c90c4bc66a363f7182794b2f49bb83712b958376ba33f9afb0f002513b78d91fa8315a5bb5c022 SHA512 33f88adf2a3e1bf9d5bd5fb45dc2e13d39d51214051d5a119044ab118cbafe955bd4237b2639fd407e774e76e7be03db75141a95401451d6f083de900e0f7ecf
-MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
deleted file mode 100644
index 9562f69636d7..000000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
deleted file mode 100644
index 98e502b926c4..000000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
-	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
-	"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
-	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
-)
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
deleted file mode 100644
index 3d4ac9380dca..000000000000
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	EGIT_BRANCH="2.X"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
deleted file mode 100644
index 2128e9957405..000000000000
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	x86-fbsd? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
deleted file mode 100644
index 2e0198f3ece7..000000000000
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
deleted file mode 100644
index 32ee71fab198..000000000000
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
deleted file mode 100644
index f4cbcfbb7d38..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sun, 18 Jan 2015 22:21:16 -0500
-Subject: [PATCH] Do not untar with --acls, fixes bug #536762
-To: gentoo-catalyst@lists.gentoo.org
-
----
- modules/catalyst_support.py     |  6 +++---
- modules/generic_stage_target.py | 18 +++++++++---------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
-index 0e9faac..702887d 100644
---- a/modules/catalyst_support.py
-+++ b/modules/catalyst_support.py
-@@ -108,9 +108,9 @@ contents_map={
- 	# 'find' is disabled because it requires the source path, which is not
- 	# always available
- 	#"find"		:[calc_contents,"find %(path)s"],
--	"tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
--	"tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
--	"tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
-+	"tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
-+	"tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
-+	"tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
- 	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
- 	# isoinfo-f should be a last resort only
- 	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
-diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index c7db027..cc24c63 100644
---- a/modules/generic_stage_target.py
-+++ b/modules/generic_stage_target.py
-@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
- 					self.settings["chroot_path"]+\
- 						" (This may take some time) ...\n"
- 				if "bz2" == self.settings["chroot_path"][-3:]:
--					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
- 				else:
--					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
- 				error_msg="Tarball extraction of "+\
- 					self.settings["source_path"]+" to "+\
-@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
- 				self.settings["chroot_path"]+\
- 				" (This may take some time) ...\n"
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags  --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
- 			error_msg="Tarball extraction of "+self.settings["source_path"]+\
- 				" to "+self.settings["chroot_path"]+" failed."
-@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
- 				"catalyst-hash")
- 			destdir=self.settings["snapshot_cache_path"]
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			unpack_errmsg="Error unpacking snapshot"
- 			cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
- 				self.settings["snapshot_cache_path"]+\
-@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
- 			cleanup_msg=\
- 				"Cleaning up existing portage tree (This can take a long time)..."
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
- 			unpack_errmsg="Error unpacking snapshot"
- 
-@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
- 
- 			print "Creating stage tarball..."
- 
--			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
-+			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
- 				self.settings["stage_path"]+" .",\
- 				"Couldn't create stage tarball",env=self.env)
- 
--- 
-2.2.2
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
deleted file mode 100644
index ccaffbe6b034..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Thu, 3 Mar 2016 20:48:43 -0500
-Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow
- expansion of $1
-
-This is a backport of commit b2473eff.  The single quotes prevented the proper
-expansion of $1 in setup_pkgmgr().  Since this is usually called as
-`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
-not caught earlier.
----
- targets/support/chroot-functions.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 3b7f77b..6c1a31c 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -172,12 +172,12 @@ setup_pkgmgr(){
- 	# Use --update or portage might just waste time/cycles and reinstall the same version.
- 	# Use --newuse to make sure it rebuilds with any changed use flags.
- 	if [ -n "$1" ];then
--		echo "Adding USE='${USE} $1' to make.conf for portage build"
--		[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
-+		echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-+		[ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf
- 		run_merge --oneshot --update --newuse sys-apps/portage
--		sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
-+		sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf
- 	else
--		echo "Updating portage with USE='${USE}'"
-+		echo "Updating portage with USE=\"${USE}\""
- 		run_merge --oneshot --update --newuse sys-apps/portage
- 	fi
- }
--- 
-2.4.10
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
deleted file mode 100644
index 1c641fd2b905..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Fri, 8 Apr 2016 17:58:15 -0400
-Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for
- systemd stages
-
----
- targets/support/chroot-functions.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 6c1a31c..67874a0 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -223,6 +223,7 @@ cleanup_stages() {
- 		stage1|stage2|stage3|system)
- 			rm -f /var/lib/portage/world
- 			touch /var/lib/portage/world
-+			rm -f /etc/machine-id
- 			;;
- 		*)
- 			echo "Skipping removal of world file for ${clst_target}"
--- 
-2.7.3
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
deleted file mode 100644
index 67fc2c631b02..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 4 Jun 2016 12:43:44 -0400
-Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for
- setup_gcc()
-
-setup_gcc() calls gcc-config to select a particular gcc profile.  At stage1 this
-needs to be done in the /tmp/stage1root chroot.  gcc-config looks for ROOT to
-choose the root directory in which to make the selection.  If we don't export
-ROOT, then setup_gcc is ineffective.
-
-X-Gentoo-Bug: 584234
-X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- targets/stage1/stage1-preclean-chroot.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
-index a80fc92..dc67521 100755
---- a/targets/stage1/stage1-preclean-chroot.sh
-+++ b/targets/stage1/stage1-preclean-chroot.sh
-@@ -1,5 +1,6 @@
- #!/bin/bash
- 
-+export ROOT=/tmp/stage1root
- export RUN_DEFAULT_FUNCS="no"
- 
- source /tmp/chroot-functions.sh
-@@ -8,8 +9,6 @@ update_env_settings
- show_debug
- 
- # Now, some finishing touches to initialize gcc-config....
--unset ROOT
--
- setup_gcc
- setup_binutils
- 
--- 
-cgit v0.12
-
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
deleted file mode 100644
index 988e80de6cc2..000000000000
--- a/dev-util/catalyst/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>catalyst@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
-  </maintainer>
-  <use>
-    <flag name="ccache">Enables ccache support</flag>
-    <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-util/catfish-1.2.2 b/dev-util/catfish-1.2.2
new file mode 100644
index 000000000000..e6b3cd2d67bf
--- /dev/null
+++ b/dev-util/catfish-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare 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/pexpect[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/pygobject:3[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(+)?] x11-libs/gtk+:3[introspection] sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
+EAPI=5
+HOMEPAGE=https://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/
+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 x86
+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/pexpect[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/pygobject:3[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(+)?] x11-libs/gtk+:3[introspection] virtual/freedesktop-icon-theme
+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://launchpad.net/catfish-search/1.2/1.2.2/+download/catfish-1.2.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9cd8191b00773be2bc4ca0d02ecb5f60
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
deleted file mode 100644
index e8e8597c7f15..000000000000
--- a/dev-util/catfish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
-EBUILD catfish-1.2.2.ebuild 1500 BLAKE2B a2128982cf591a4c427620d61ba7d466f811dd617afba0358cee3248e934c8850d2c40f6dd63f6c742d6daec9bb2ec029beb489325538348f5bc5eeb904e1d64 SHA512 3166f58ed1488a8c58a60d9200160586dfeded3b3e1e19aa342330d9d7e58f9a5e094be49e82a6b1ca021614ab7e3897ea7606af33a00ee50fad3d32189ffbbd
-MISC metadata.xml 358 BLAKE2B 02912763b2bf6cc947760df34bdb4008dee9b3a049352cfda0d26b60a32810cd8d13016cb4fb89059741a3bd97fa3955c53d6770bfaa4c1a7b3feec05a86e393 SHA512 8fef7910e221beb2e0f0a83767feda119a1a3f27b36d6093d336813edfe954c4d08c99c4352ab5efec39de8b1c5185c39514bf31ebf1e6489110d8165e32b3f2
diff --git a/dev-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
deleted file mode 100644
index 5c88f81f8558..000000000000
--- a/dev-util/catfish/catfish-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +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 eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/"
-SRC_URI="https://launchpad.net/${PN}-search/${PV%.*}/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-devel/gettext
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	strip-linguas -i po/
-	if ! [[ -z "${LINGUAS}" ]]; then
-		local lang langs=$(find po/ -name '*.po' | sed -e 's|po/||g;s|.po||g')
-		for lang in $langs; do
-			if ! has ${lang} ${LINGUAS}; then
-				rm po/${lang}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang .
-	sed -i -e "s:share/doc/\$(APPNAME):share/doc/${PF}:" Makefile.in.in || die
-}
-
-src_configure() {
-	# not autotools based
-	./configure --prefix=/usr --python="${EPYTHON}" || die
-}
-
-src_install() {
-	default
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
deleted file mode 100644
index 0118196dd398..000000000000
--- a/dev-util/catfish/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>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">catfish-search</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/catkin-0.7.11 b/dev-util/catkin-0.7.11
new file mode 100644
index 000000000000..52bea2c7220e
--- /dev/null
+++ b/dev-util/catkin-0.7.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros/catkin/archive/0.7.11.tar.gz -> catkin-0.7.11.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9092ed0f891c341db3e1626caf150c03
diff --git a/dev-util/catkin-0.7.12 b/dev-util/catkin-0.7.12
new file mode 100644
index 000000000000..3e38c8f17150
--- /dev/null
+++ b/dev-util/catkin-0.7.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros/catkin/archive/0.7.12.tar.gz -> catkin-0.7.12.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9092ed0f891c341db3e1626caf150c03
diff --git a/dev-util/catkin-0.7.14 b/dev-util/catkin-0.7.14
new file mode 100644
index 000000000000..8c7d556b7e21
--- /dev/null
+++ b/dev-util/catkin-0.7.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros/catkin/archive/0.7.14.tar.gz -> catkin-0.7.14.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9092ed0f891c341db3e1626caf150c03
diff --git a/dev-util/catkin-9999 b/dev-util/catkin-9999
new file mode 100644
index 000000000000..029651aa1966
--- /dev/null
+++ b/dev-util/catkin-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0920d7ba5b2d7d34396ca828fbe5fd0f
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
deleted file mode 100644
index 73241e6eee07..000000000000
--- a/dev-util/catkin/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db
-AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
-AUX catkin_prefix_path_util_py.patch 2134 BLAKE2B 2c358c1e7e9b2cdb2b889b70ca5644f3823b7d1ef0af597d7f7f0a6de9ef7697d41ce74964f5e0d95deb9d2bc9e1afaf4665fb48cb76258c552483cbdc68374a SHA512 68b375ed46f7d25ece3e723fb6d41ba3f89bd27ef44f11d74427f63d615e043ab02de4ac806d77059db8a0d12671f0602df16a2b318b9d6e36671cd1491ce2b0
-AUX distutils.patch 798 BLAKE2B aeb6d364c8fa565e662686f723fe782bb6d3b2a17c0a1b243090515290258586e0df79699a32ec0eeb5834628dc885566c296055c4062826c03014a809b8cb01 SHA512 de281d0039515c4621d161c778520c4306897426c5692f46b4440326b6246502e64f90f121eaff8741775bafcb4213b2817468354db8c5b3c1250a2fce42d36d
-AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
-AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
-AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
-AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d
-AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.7.11.tar.gz 206933 BLAKE2B cda31e3d097516ce830060a2323956ec27c4113d161e95ab55564c00209e23d894e2acf3bf11b78e19538d4d8ff4c85814362a89bca58700da5fb609fb708fb8 SHA512 71810a80c1ac4334fdaed176285bee6bcb0443529debecf421723881e3d6316f41d4ed07c5eafa55515ba9d8143d5dc5fb683eda5ad54e52fda5c24085c44c96
-DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6
-DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
-EBUILD catkin-0.7.11.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-0.7.12.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-0.7.14.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-9999.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01
-MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.11.ebuild b/dev-util/catkin/catkin-0.7.11.ebuild
deleted file mode 100644
index 6f125a7d7fb0..000000000000
--- a/dev-util/catkin/catkin-0.7.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.7.12.ebuild b/dev-util/catkin/catkin-0.7.12.ebuild
deleted file mode 100644
index 6f125a7d7fb0..000000000000
--- a/dev-util/catkin/catkin-0.7.12.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
deleted file mode 100644
index 6f125a7d7fb0..000000000000
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
deleted file mode 100644
index eb49a4b8c816..000000000000
--- a/dev-util/catkin/catkin-9999.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin
deleted file mode 100644
index 469fa37997cc..000000000000
--- a/dev-util/catkin/files/40catkin
+++ /dev/null
@@ -1,3 +0,0 @@
-CATKIN_PREFIX_PATH=/usr
-ROS_ROOT=/usr/share/ros
-ROS_PACKAGE_PATH=/usr/share/ros_packages
diff --git a/dev-util/catkin/files/catkin_prefix_path.patch b/dev-util/catkin/files/catkin_prefix_path.patch
deleted file mode 100644
index 5c03a45f155b..000000000000
--- a/dev-util/catkin/files/catkin_prefix_path.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Allow CATKIN_PREFIX_PATH to override/complement CMAKE_PREFIX_PATH.
-This serves two goals: when SYSROOT!=/, CMAKE_PREFIX_PATH is the same as when
-SYSROOT=/ but we need to find packages in SYSROOT/CMAKE_PREFIX_PATH.
-
-Moreover, this allows to set CATKIN_PREFIX_PATH in global environment so that
-ROS packages are properly configured without needed to source a shellrc file in
-every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too
-generic.
-
-Index: catkin-0.6.16/cmake/all.cmake
-===================================================================
---- catkin-0.6.16.orig/cmake/all.cmake
-+++ catkin-0.6.16/cmake/all.cmake
-@@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF
- 
- # list of unique catkin workspaces based on CMAKE_PREFIX_PATH
- set(CATKIN_WORKSPACES "")
--foreach(path ${CMAKE_PREFIX_PATH})
-+if(NOT DEFINED CATKIN_PREFIX_PATH)
-+  set(CATKIN_PREFIX_PATH ${CMAKE_PREFIX_PATH})
-+endif()
-+
-+foreach(path ${CATKIN_PREFIX_PATH})
-   if(EXISTS "${path}/.catkin")
-     list(FIND CATKIN_WORKSPACES ${path} _index)
-     if(_index EQUAL -1)
-Index: catkin-0.6.16/python/catkin/workspace.py
-===================================================================
---- catkin-0.6.16.orig/python/catkin/workspace.py
-+++ catkin-0.6.16/python/catkin/workspace.py
-@@ -44,7 +44,7 @@ def get_workspaces():
-     """
-     # get all cmake prefix paths
-     env_name = 'CMAKE_PREFIX_PATH'
--    paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) if path]
-+    paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) + os.environ.get('CATKIN_PREFIX_PATH', '').split(os.pathsep) if path]
-     # remove non-workspace paths
-     workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
-     return workspaces
-Index: catkin-0.6.16/cmake/catkinConfig.cmake.in
-===================================================================
---- catkin-0.6.16.orig/cmake/catkinConfig.cmake.in
-+++ catkin-0.6.16/cmake/catkinConfig.cmake.in
-@@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS)
- 
-       # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
-       set(paths "")
-+      foreach(path ${CATKIN_PREFIX_PATH})
-+        if(IS_DIRECTORY ${path}/share/${component}/cmake)
-+          list(APPEND paths ${path}/share/${component}/cmake)
-+        endif()
-+      endforeach()
-       foreach(path ${CMAKE_PREFIX_PATH})
-         if(IS_DIRECTORY ${path}/share/${component}/cmake)
-           list(APPEND paths ${path}/share/${component}/cmake)
-Index: catkin-0.6.16/cmake/toplevel.cmake
-===================================================================
---- catkin-0.6.16.orig/cmake/toplevel.cmake
-+++ catkin-0.6.16/cmake/toplevel.cmake
-@@ -35,10 +35,15 @@ else()
-       string(REPLACE ":" ";" CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
-     endif()
-   endif()
-+  if(NOT DEFINED CATKIN_PREFIX_PATH)
-+    if(NOT "$ENV{CATKIN_PREFIX_PATH}" STREQUAL "")
-+      string(REPLACE ":" ";" CATKIN_PREFIX_PATH $ENV{CATKIN_PREFIX_PATH})
-+    endif()
-+  endif()
- 
-   # list of catkin workspaces
-   set(catkin_search_path "")
--  foreach(path ${CMAKE_PREFIX_PATH})
-+  foreach(path ${CMAKE_PREFIX_PATH} ${CATKIN_PREFIX_PATH})
-     if(EXISTS "${path}/.catkin")
-       list(FIND catkin_search_path ${path} _index)
-       if(_index EQUAL -1)
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
deleted file mode 100644
index e667ea9cf59e..000000000000
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author:  Eric Timmons 
-https://bugs.gentoo.org/show_bug.cgi?id=586104
-
-Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
-===================================================================
---- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
-+++ catkin-0.6.16/cmake/templates/_setup_util.py.in
-@@ -262,7 +262,7 @@
-             sys.exit(1)
- 
-         # environment at generation time
--        CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-+        CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-         # prepend current workspace if not already part of CPP
-         base_path = os.path.dirname(__file__)
-         if base_path not in CMAKE_PREFIX_PATH:
-Index: catkin-0.7.1/python/catkin/builder.py
-===================================================================
---- catkin-0.7.1.orig/python/catkin/builder.py
-+++ catkin-0.7.1/python/catkin/builder.py
-@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
-                     'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
-                     'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
-                     'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
-                     'PYTHON_EXECUTABLE': sys.executable,
-                     'PYTHON_INSTALL_DIR': get_python_install_dir(),
-                 }
-Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
-===================================================================
---- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.1/test/unit_tests/test_setup_util.py
-@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
-                           'PYTHON_EXECUTABLE': sys.executable,
-                           'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
-                           'CMAKE_PREFIX_PATH_AS_IS': '',
-+                          'CATKIN_PREFIX_PATH':'',
-                       })
- with tempfile.NamedTemporaryFile('w+') as setup_util_file:
-     setup_util_file.write(data)
diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch
deleted file mode 100644
index 292551181b6d..000000000000
--- a/dev-util/catkin/files/distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow to install scripts in PYTHON_SCRIPTDIR.
-Needed for Gentoo multi-python support.
-
-Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch
deleted file mode 100644
index d95391f54193..000000000000
--- a/dev-util/catkin/files/etc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-So that files like python_logging.conf ends up in $EPREFIX/etc.
-https://bugs.gentoo.org/show_bug.cgi?id=598537
-
-Index: catkin-0.7.4/cmake/all.cmake
-===================================================================
---- catkin-0.7.4.orig/cmake/all.cmake
-+++ catkin-0.7.4/cmake/all.cmake
-@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE)
- 
- # set global install destinations
- set(CATKIN_GLOBAL_BIN_DESTINATION bin)
--set(CATKIN_GLOBAL_ETC_DESTINATION etc)
-+set(CATKIN_GLOBAL_ETC_DESTINATION ../etc)
- set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
- set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR})
- set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec)
diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch
deleted file mode 100644
index 795eafc31965..000000000000
--- a/dev-util/catkin/files/gnuinstalldirs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: catkin-0.6.16/cmake/all.cmake
-===================================================================
---- catkin-0.6.16.orig/cmake/all.cmake
-+++ catkin-0.6.16/cmake/all.cmake
-@@ -108,6 +108,10 @@ endif()
- # include CMake functions
- include(CMakeParseArguments)
- 
-+# include GNUInstallDirs for LIBDIR
-+# https://bugs.gentoo.org/show_bug.cgi?id=566670
-+include(GNUInstallDirs)
-+
- # functions/macros: list_append_unique, safe_execute_process
- # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in
- foreach(filename
diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch
deleted file mode 100644
index 52506ee680e7..000000000000
--- a/dev-util/catkin/files/package_xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: catkin-0.7.6/cmake/catkin_package.cmake
-===================================================================
---- catkin-0.7.6.orig/cmake/catkin_package.cmake
-+++ catkin-0.7.6/cmake/catkin_package.cmake
-@@ -527,4 +527,7 @@ function(_catkin_package)
-   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
-     DESTINATION share/${PROJECT_NAME}
-   )
-+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
-+    DESTINATION share/ros_packages/${PROJECT_NAME}
-+  )
- endfunction()
-Index: catkin-0.7.6/cmake/all.cmake
-===================================================================
---- catkin-0.7.6.orig/cmake/all.cmake
-+++ catkin-0.7.6/cmake/all.cmake
-@@ -156,7 +156,7 @@ foreach(filename
- endforeach()
- 
- # output catkin version for debugging
--_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/..)
-+#_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/../../ros_packages/catkin)
- message(STATUS "catkin ${catkin_VERSION}")
- # ensure that no current package name is set
- unset(_CATKIN_CURRENT_PACKAGE)
-Index: catkin-0.7.6/cmake/catkin_metapackage.cmake
-===================================================================
---- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake
-+++ catkin-0.7.6/cmake/catkin_metapackage.cmake
-@@ -42,4 +42,7 @@ function(catkin_metapackage)
-   install(FILES ${ARG_DIRECTORY}/package.xml
-     DESTINATION share/${PROJECT_NAME}
-   )
-+  install(FILES ${ARG_DIRECTORY}/package.xml
-+    DESTINATION share/ros_packages/${PROJECT_NAME}
-+  )
- endfunction()
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch
deleted file mode 100644
index 61fcad29d04a..000000000000
--- a/dev-util/catkin/files/sitedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Pass --install-lib to setup.py install.
-pypy installs in /usr/site-packages otherwise...
-
-Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \
-+    --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \
-+    --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"
diff --git a/dev-util/catkin/files/tests.patch b/dev-util/catkin/files/tests.patch
deleted file mode 100644
index d78136a8ec13..000000000000
--- a/dev-util/catkin/files/tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix tests.
-Allow them to run even with CATKIN_BUILD_BINARY_PACKAGE set.
-
-Index: catkin-0.6.9/cmake/test/tests.cmake
-===================================================================
---- catkin-0.6.9.orig/cmake/test/tests.cmake
-+++ catkin-0.6.9/cmake/test/tests.cmake
-@@ -40,9 +40,6 @@ if(DEFINED CATKIN_ENABLE_TESTING AND NOT
-   return()
- endif()
- 
--# do not enable ctest's on the farm, since they are automatically executed by the current rules files
--# and since the tests have not been build rostests would hang forever
--if(NOT CATKIN_BUILD_BINARY_PACKAGE)
-   # do not enable ctest's for dry packages, since they have a custom test target which must not be overwritten
-   if(NOT ROSBUILD_init_called)
-     message(STATUS "Call enable_testing()")
-@@ -50,9 +47,6 @@ if(NOT CATKIN_BUILD_BINARY_PACKAGE)
-   else()
-     message(STATUS "Skip enable_testing() for dry packages")
-   endif()
--else()
--  message(STATUS "Skip enable_testing() when building binary package")
--endif()
- 
- # allow overriding CATKIN_TEST_RESULTS_DIR when explicitly passed to CMake as a command line argument
- if(DEFINED CATKIN_TEST_RESULTS_DIR)
-Index: catkin-9999/test/utils.py
-===================================================================
---- catkin-9999.orig/test/utils.py
-+++ catkin-9999/test/utils.py
-@@ -189,6 +189,8 @@ class AbstractCatkinWorkspaceTest(unitte
-                 prefix_path = self.installdir
-             args += ["-DCMAKE_PREFIX_PATH=%s" % (prefix_path)]
- 
-+        args += ["-DCMAKE_INSTALL_LIBDIR=lib"]
-+
-         if not os.path.isdir(this_builddir):
-             os.makedirs(this_builddir)
-         cmd = ["cmake", this_srcdir] + args
diff --git a/dev-util/catkin/metadata.xml b/dev-util/catkin/metadata.xml
deleted file mode 100644
index f8e179b359ba..000000000000
--- a/dev-util/catkin/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros/catkin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ccache-3.2.4 b/dev-util/ccache-3.2.4
new file mode 100644
index 000000000000..5cd870f9faea
--- /dev/null
+++ b/dev-util/ccache-3.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare prerm
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=5
+HOMEPAGE=https://ccache.samba.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.2.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5389d037f7c4a8c2374028faa0df6672
diff --git a/dev-util/ccache-3.3.4 b/dev-util/ccache-3.3.4
new file mode 100644
index 000000000000..2c14d03fcf47
--- /dev/null
+++ b/dev-util/ccache-3.3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare prerm
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=5
+HOMEPAGE=https://ccache.samba.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0094b2be15078b5bbb9b06c7a3fcade7
diff --git a/dev-util/ccache-3.3.4-r1 b/dev-util/ccache-3.3.4-r1
new file mode 100644
index 000000000000..540985da5eec
--- /dev/null
+++ b/dev-util/ccache-3.3.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare prerm
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=6
+HOMEPAGE=https://ccache.samba.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=0c417645b7a323b27d0d4ac133d46852
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
deleted file mode 100644
index 1bf9135f3802..000000000000
--- a/dev-util/ccache/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
-AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
-AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
-DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
-EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
-EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
-MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.2.4.ebuild b/dev-util/ccache/ccache-3.2.4.ebuild
deleted file mode 100644
index 41c25b6006ef..000000000000
--- a/dev-util/ccache/ccache-3.2.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	# make sure we always use system zlib
-	rm -rf zlib || die
-	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
-	default
-
-	dobin ccache-config
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		"${EROOT}"/usr/bin/ccache-config --remove-links
-		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
-	fi
-}
-
-pkg_postinst() {
-	"${EROOT}"/usr/bin/ccache-config --install-links
-	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
deleted file mode 100644
index af319cc7c431..000000000000
--- a/dev-util/ccache/ccache-3.3.4-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
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	# make sure we always use system zlib
-	rm -rf zlib || die
-	eapply "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
-	eapply_user
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.3.4.ebuild b/dev-util/ccache/ccache-3.3.4.ebuild
deleted file mode 100644
index e320f86f1d07..000000000000
--- a/dev-util/ccache/ccache-3.3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	# make sure we always use system zlib
-	rm -rf zlib || die
-	epatch "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
-	default
-
-	dobin ccache-config
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		"${EROOT}"/usr/bin/ccache-config --remove-links
-		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
-	fi
-}
-
-pkg_postinst() {
-	"${EROOT}"/usr/bin/ccache-config --install-links
-	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
deleted file mode 100644
index 5e502912bfa2..000000000000
--- a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/56178
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		/* probably a broken stat() call ... */
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 
diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
deleted file mode 100644
index e4e2ff8c6477..000000000000
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/56178
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		// Probably a broken stat() call...
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 
diff --git a/dev-util/ccache/files/ccache-config-3 b/dev-util/ccache/files/ccache-config-3
deleted file mode 100644
index 7f604f0016ef..000000000000
--- a/dev-util/ccache/files/ccache-config-3
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-#
-# ccache-config - helper script for ccache and its ebuild
-#
-# Copyright 2003-2014 Superlucidity Services, LLC
-# Copyright 2013-2014 Gentoo Foundation
-# This program licensed under the GNU GPL version 2.
-#
-# This script developed by Zachary T Welch at Superlucidity Services, LLC
-#  it was cloned from the distcc-config script
-#
-# Additional features to come; this provides a starting point
-
-EPREFIX=''
-
-. "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || {
-	ebegin() { echo " * $* ..."; }
-	eend() {
-		local r=${1:-$?}
-		[ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
-		return $r
-	}
-}
-
-LIBDIR="lib"
-
-# this should be getopt'd someday (override with CC_QUIET=1)
-CC_VERBOSE=1
-unset _CC_QUIET
-c_quiet() {
-	[ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
-}
-
-c_ebegin() { c_quiet || ebegin "$@" ; }
-c_eend()   { c_quiet || eend "$@" ; }
-
-###
-# the following functions manage the ccache symlinks
-#  they allow the user or other scripts (namely gcc-config) to
-#  automatically update ccache's links when upgrading toolchains
-#
-cc_path() {
-	echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
-}
-cc_remove_link() {
-	local t=$(cc_path "$1")
-	if [ -L ${t} ]; then
-		c_ebegin "Removing ${t}"
-		rm -f "${t}"
-		c_eend
-
-		# Trim the empty dir if possible. #517242
-		t=${t%/*}
-		if rmdir "${t}" 2>/dev/null; then
-			rmdir "${t%/*}" 2>/dev/null
-		fi
-		:
-	fi
-}
-cc_install_link() {
-	# Search the PATH for the specified compiler
-	#  then create shadow link in /usr/lib/ccache/bin to ccache
-
-	if command -v "$1" >/dev/null ; then
-		# first be sure any old link is removed
-		_CC_QUIET=1
-		cc_remove_link "$1"
-		unset _CC_QUIET
-
-		# then create the new link
-		local t=$(cc_path "$1")
-		c_ebegin "Creating ccache shadow link ${t}"
-		mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
-		c_eend
-	fi
-}
-cc_links() {
-	local a
-	for a in gcc cc c++ g++ icc icpc clang clang++ ; do
-		"cc_${1}_link" "${2}${2:+-}${a}"
-	done
-}
-
-###
-# main routine
-
-case $1 in
-	--install-links )
-		cc_links install "$2"
-		;;
-	--remove-links )
-		cc_links remove "$2"
-		;;
-	* )
-		echo "usage: $0 {--install-links|--remove-links} [ CHOST ]"
-		;;
-esac
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
deleted file mode 100644
index e27519ca728a..000000000000
--- a/dev-util/ccache/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>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		ccache acts as a caching pre-processor to C/C++ compilers, improving
-		compilation time when recompiling previously compiled source.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/cccc-3.1.5 b/dev-util/cccc-3.1.5
new file mode 100644
index 000000000000..215201c7033c
--- /dev/null
+++ b/dev-util/cccc-3.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=apidoc? ( app-doc/doxygen[dot] )
+DESCRIPTION=Source metrics (line counts, complexity, etc) for Java and C++
+EAPI=5
+HOMEPAGE=http://sarnold.github.io/cccc/
+IUSE=apidoc debug doc mfc
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/sarnold/cccc/archive/3.1.5.tar.gz -> cccc-3.1.5.tar.gz
+_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_=a3bb144120c75e635c39819f79fcb286
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
deleted file mode 100644
index e67dee56b008..000000000000
--- a/dev-util/cccc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
-AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
-DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
-EBUILD cccc-3.1.5.ebuild 1535 BLAKE2B ea84a783cf84ceb8cbd68eac788417fe89b5573c3a8be04ef94e30cd0b7b168da05763d0eca0141d0ceafcde990afc5462db5580e398e3944df9ee2904c31da7 SHA512 d273f384ed06bcd9221e7bcdd468808f7026c108042414703f64b7d176f64e587d1210ae43f2baabec450d552bcd70060a7fc3732f8eefd88ad931f24824a37a
-MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5.ebuild b/dev-util/cccc/cccc-3.1.5.ebuild
deleted file mode 100644
index 07042e9343cb..000000000000
--- a/dev-util/cccc/cccc-3.1.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++"
-HOMEPAGE="http://sarnold.github.io/cccc/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/sarnold/cccc.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="apidoc debug doc mfc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	apidoc? ( app-doc/doxygen[dot] )
-	"
-
-MAKEOPTS="-j1"
-
-src_prepare() {
-	use mfc && epatch "${FILESDIR}"/${PN}-c_dialect.patch
-}
-
-src_compile() {
-	if use debug ; then
-		export STRIP_MASK="*/bin/*"
-		DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
-	else
-		emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
-	fi
-
-	use apidoc && emake CCC=$(tc-getCXX) metrics docs
-}
-
-src_test() {
-	emake CCC=$(tc-getCXX) test
-}
-
-src_install() {
-	dobin cccc/cccc
-
-	dodoc README.md
-
-	if use mfc ; then
-		dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
-		docompress -x "/usr/share/doc/${PF}/cccc-MFC-dialect.opt"
-	fi
-
-	if use doc ; then
-		dodoc CHANGELOG.md HISTORY.md
-		dohtml cccc/*.html || die "html docs failed"
-		if use apidoc ; then
-			docinto api
-			dohtml -A svg -r doxygen/html || die "dox failed"
-			docompress -x "/usr/share/doc/${PF}/api"
-			docinto metrics
-			dohtml ccccout/* || die "metrics failed"
-		fi
-	fi
-}
diff --git a/dev-util/cccc/files/cccc-MFC-dialect.opt b/dev-util/cccc/files/cccc-MFC-dialect.opt
deleted file mode 100644
index 4c4acb32e1fb..000000000000
--- a/dev-util/cccc/files/cccc-MFC-dialect.opt
+++ /dev/null
@@ -1,21 +0,0 @@
-;;Pro*C embedded SQL
-;; looks like
-;; EXEC SQL UPDATE ARM43_OD_PRODUIT_SERV
-;; SET ARM43ID_TPS_FIN = NULL WHERE
-ARM43ID_TPS_FIN = 0;
-
-CCCC_FileExt@.pc@c++.ansi@
-
-CCCC_Dialect@c++.pc@EXEC@skip_stmt@
-
-;;MFC
-CCCC_Dialect@c++.mfc@ON_WM_PAINT@skip_line@
-CCCC_Dialect@c++.mfc@DECLARE_MESSAGE_MAP@skip_line@
-CCCC_Dialect@c++.mfc@DECLARE_DISPATCH_MAP@skip_line@
-
-CCCC_Dialect@c++.stl@__STL_BEGIN_NAMESPACE@ignore@
-CCCC_Dialect@c++.stl@__STL_END_NAMESPACE@ignore@
-
-CCCC_Dialect@c++.mfc@BEGIN_EVENT_MAP@start_skipping@
-CCCC_Dialect@c++.mfc@END_EVENT_MAP@stop_skipping@
-
diff --git a/dev-util/cccc/files/cccc-c_dialect.patch b/dev-util/cccc/files/cccc-c_dialect.patch
deleted file mode 100644
index c8951aef13c4..000000000000
--- a/dev-util/cccc/files/cccc-c_dialect.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/cccc/cccc.g b/cccc/cccc.g
-index bdb6805..fd7b504 100644
---- a/cccc/cccc.g
-+++ b/cccc/cccc.g
-@@ -84,6 +84,30 @@ inline void endOfLine(CLexer &lexer)
- #token MAC_NL		"\r"	<< endOfLine(*this); >>
- #token UNIX_NL		"\n"    << endOfLine(*this); >>
- 
-+/* augment dialect policies -- M.H added */
-+#lexclass SKIP_STMT
-+#token SKCOLON ";" << skip();mode(START); >>
-+#token SKANYTHING "~[; \t\n]" << skip();more();>>
-+#token SKNL "\n" << skip();endOfLine(*this);>>
-+#token SKBLANK "[ \t]+" << skip(); >>
-+#lexclass START
-+
-+#lexclass SKIP_BLOCK
-+#token SK_ANY "[a-zA-Z0-9_]*"
-+<<
-+std::string treatment = 
-+	CCCC_Options::dialectKeywordPolicy(parse_language,lextext());
-+
-+if ( treatment != "stop_skipping" )
-+{
-+    skip();
-+}
-+else
-+{
-+    mode(COMMENT_LINE);skip();
-+}
-+>>
-+#lexclass START
- 
- /* preprocessor constructs - comments, #defines etc */
- 
-@@ -343,17 +367,29 @@ inline void endOfLine(CLexer &lexer)
-         if( treatment == "ignore" )
- 	{
- 	    skip();
-+	    //std::cout << toktext << std::endl <<" :ignore" << std::endl;
- 	}
- 	// Ultimately, the next two cases will need to be handled 
- 	// using a #lexclass or something similar, for the moment
- 	// we just try to skip the tokens themselves.
- 	else if ( treatment == "start_skipping" )
- 	{
--	    skip();
-+	    mode(SKIP_BLOCK);skip();
- 	}	
- 	else if ( treatment == "stop_skipping" ) 
- 	{
--	    skip();
-+	    skip(); mode(COMMENT_LINE);
-+	    //gobble end of line M.H.
-+	}
-+	else if ( treatment == "skip_line" )//M.H added
-+	{
-+	    mode(COMMENT_LINE);skip(); 
-+	    //std::cout << "skip_line" << std::endl;
-+	}
-+	else if ( treatment == "skip_stmt" )//M.H added
-+	{
-+	    mode(SKIP_STMT);skip();
-+	    //std::cout << "skip_stmt" << std::endl;
- 	}
- >>
- 
-@@ -426,8 +462,10 @@ void init(const string& filename, const string& language)
- 	pu=ParseUtility::currentInstance();
- 	ps=ParseStore::currentInstance();
- 
--	ANTLRParser::init();
- 	parse_language=language;
-+	ANTLRParser::init();
-+	//parse_language=language;
-+	//move above, M.H.1st otherwise time init not to language
- }
- 
- >>
diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml
deleted file mode 100644
index ecde1cfd0a08..000000000000
--- a/dev-util/cccc/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		cccc provides source code metrics (line counts, complexity,
-		object-oriented, and structural metrics) for Java and C++
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sarnold/cccc</remote-id>
-		<bugs-to>https://github.com/sarnold/cccc/issues</bugs-to>
-	</upstream>
-	<use>
-		<flag name="apidoc">Build software docs with doxygen/graphviz and metrics with cccc</flag>
-		<flag name="mfc">Add patch for MFC dialect options</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/ccglue-0.3.1 b/dev-util/ccglue-0.3.1
new file mode 100644
index 000000000000..8961b686d43f
--- /dev/null
+++ b/dev-util/ccglue-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/glib:2 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=Produce cross-reference files from cscope and ctags for use with app-vim/cctree
+EAPI=4
+HOMEPAGE=http://ccglue.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2
+SLOT=0
+SRC_URI=mirror://sourceforge/ccglue/ccglue-release-0.3.1.tar.gz
+_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_=a440be62b43d9a1743df8337092fcd89
diff --git a/dev-util/ccglue-0.6.0 b/dev-util/ccglue-0.6.0
new file mode 100644
index 000000000000..3cc801080c1c
--- /dev/null
+++ b/dev-util/ccglue-0.6.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+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
+DESCRIPTION=Produce cross-reference files from cscope and ctags for use with app-vim/cctree
+EAPI=4
+HOMEPAGE=http://ccglue.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/ccglue/ccglue-release-0.6.0.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_=94c1c0542703b2bcc9214dfa3d9098ab
diff --git a/dev-util/ccglue/Manifest b/dev-util/ccglue/Manifest
deleted file mode 100644
index ceb28ceac4c9..000000000000
--- a/dev-util/ccglue/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ccglue-0.3.1-as-needed.patch 345 BLAKE2B 6c6d64f0e3336efdce0c443967e9482eb6bf9c78297c9d12aea9338cf303b2cd08bd8a520a55e370fc910664f26aa295301b0c436ddfb5bb44604e8df2bbbf48 SHA512 227de72e1931182c2ea1ddfe02a5d44ca04b59505ba7027ee6abbd2be1f5e3a6b2dfbe13042337b97c0f27b1dfd4f1c5fb8f51fd0c70801bcb803120981afa0d
-AUX ccglue-0.5.1-cflags.patch 338 BLAKE2B e001107c205cf96f5acdde38b837269d186edcff7b8d8607c8d47d1f3f744ddfc9f63d634302931012480586540a7cdb22e27632b1a5a722319d19bf6f4ff5db SHA512 6e25a6969011f868c4b703170e04f0e166eb0d370f626fddbbecf1b2e43839392d33600ed7738b2c4d48c7529325f878b731ef49c1879d1efaa29260ab41baae
-DIST ccglue-release-0.3.1.tar.gz 101529 BLAKE2B 62cec2b5329ff3133d64230b63e65a11c312840d7e5a073c3685e7fc5757a4fc7e0b3b6f4dd0e1a21c93ebdcb63716fca001451bd07c1e85f5cf29d894c4dcaf SHA512 bbe4c9ff84869696dac80f801fa54df4f60bbe7615d3cd587713f7cd8c58f056db95a003c47879e0ca4fbd3956f97a4b3d31c6d04f49aecca9db2c5ccfaae4b7
-DIST ccglue-release-0.6.0.tar.bz2 220918 BLAKE2B 447a5db4c43cb7c355b51ccaa9ade6f8cb4d1d36de55af19a76ec567f2da9291268600f2a21149413800fd82ed4ad4f35b3aec21b9e5fb0edaed8990de76eaa8 SHA512 695983741049d460cac3ae906fddd75380a498062373461efb49b976b958b181301c6a028cc76643bee7fe3b59664aa432d1fb0d43446019a116224ff15107aa
-EBUILD ccglue-0.3.1.ebuild 568 BLAKE2B 634e7d11fde9d345eed2b73ccb9b62afdfdca633f7196f1ab878e9fdaa8ad56988edd338e88fa9d83ab23106019c885ab4ebcc95bfb68ee29490ec8fc64c5078 SHA512 a4bfd4be74e57264d29c7517feead01f6f420e8da8b654aa3d242e134eeb6a819ae7bbcf92ebd702120d3018da1fcab913466ad71593a28b0a60151d383901e4
-EBUILD ccglue-0.6.0.ebuild 479 BLAKE2B 4875add4d93349a9b51a461fa9ded725d32e812af068addf1bcef9e42fde9297a47166ea66304ceb0c5c728982e874f3a1fbf4de697d85fb4670d2ed47169b5f SHA512 e7fb8887056d94c4f2c3d1c846b9f7ccad4b12f376b37a3b9274bd4221b4f6368044f4208a89a8d6ee0990354705e7624853407405efa0cc8cd1c34b9df2bab3
-MISC metadata.xml 564 BLAKE2B 43f2de626956d0a33bb2be883f964dbbe8f370482cb0e306c16077a237d5b7ffe4646f4a8a215f844d455b557a53ed6a03533f55beaabe10a9c98c14849888f2 SHA512 d3535dafd6e0a469792cb01b02e3218ec251e0b9fc8fad63c326e55c700c751232912b6dd043179828a20d04db97a724fa0d1b6d45e7650a4ecc9c337500a125
diff --git a/dev-util/ccglue/ccglue-0.3.1.ebuild b/dev-util/ccglue/ccglue-0.3.1.ebuild
deleted file mode 100644
index 2b3f07348a83..000000000000
--- a/dev-util/ccglue/ccglue-0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
-HOMEPAGE="http://ccglue.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/release-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	eautoreconf
-}
diff --git a/dev-util/ccglue/ccglue-0.6.0.ebuild b/dev-util/ccglue/ccglue-0.6.0.ebuild
deleted file mode 100644
index 60c9355974f9..000000000000
--- a/dev-util/ccglue/ccglue-0.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
-HOMEPAGE="http://ccglue.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-cflags.patch
-	eautoreconf
-}
diff --git a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
deleted file mode 100644
index 5f2e5e34c5b5..000000000000
--- a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- release-0.3.1/src/Makefile.am.orig
-+++ release-0.3.1/src/Makefile.am
-@@ -1,6 +1,4 @@
- bin_PROGRAMS = ccglue
- ccglue_SOURCES = cscoperdr.c seqfile.c sym_mgr.c digraph.c options.c main.c c_glue.c
--INCLUDES = `pkg-config --cflags glib-2.0`
--AM_LDFLAGS = `pkg-config --libs glib-2.0`
--
--
-+AM_CFLAGS = $(GLIB_CFLAGS)
-+ccglue_LDADD = $(GLIB_LIBS)
diff --git a/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch b/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
deleted file mode 100644
index 5d0b294f4ca4..000000000000
--- a/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ccglue_v0.5.1/configure.in
-+++ ccglue_v0.5.1/configure.in
-@@ -19,10 +19,7 @@
-                      [want_debug="$enableval"], [want_debug=no])
- 
- if test "x$want_debug" = "xyes"; then
--    CXXFLAGS="$CXXFLAGS -O0 -ggdb"
-     AC_DEFINE([DEBUG], 1, [Define for debugging])
--else
--    CXXFLAGS="$CXXFLAGS -O2"
- fi
- 
- AC_CXX_HAVE_SSTREAM
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
deleted file mode 100644
index c9fda525828d..000000000000
--- a/dev-util/ccglue/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>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		ccglue (ctags-cscope glue) is intended to be the interfacing app between cscope
-		and ctags. It can generate cross-reference tag files that can be interfaced
-		with the Vim CCTree plugin.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ccglue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cdiff-0.9.8 b/dev-util/cdiff-0.9.8
new file mode 100644
index 000000000000..9333557029c7
--- /dev/null
+++ b/dev-util/cdiff-0.9.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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=Colored, side-by-side diff terminal viewer
+EAPI=6
+HOMEPAGE=https://github.com/ymattw/cdiff
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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=mirror://pypi/c/cdiff/cdiff-0.9.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_=2ab58dcdd94a003d8ede85b687ae47f6
diff --git a/dev-util/cdiff-1.0 b/dev-util/cdiff-1.0
new file mode 100644
index 000000000000..d47386ae015c
--- /dev/null
+++ b/dev-util/cdiff-1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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=Colored, side-by-side diff terminal viewer
+EAPI=6
+HOMEPAGE=https://github.com/ymattw/cdiff
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/c/cdiff/cdiff-1.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_=cf4d3d7d4838628333d9a3335351b100
diff --git a/dev-util/cdiff-9999 b/dev-util/cdiff-9999
new file mode 100644
index 000000000000..b29a2200598c
--- /dev/null
+++ b/dev-util/cdiff-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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=Colored, side-by-side diff terminal viewer
+EAPI=5
+HOMEPAGE=https://github.com/ymattw/cdiff
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less 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_=04c338e769f8a212fec6e15352f06291
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
deleted file mode 100644
index 93c9a43b8498..000000000000
--- a/dev-util/cdiff/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
-DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3
-DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-0.9.8.ebuild 783 BLAKE2B fc5c4f5c595940e8a36823349a7a5513fb80a59ceff26a88e34e04e7295b8a709abebb65fc068f13a82a517aa8bf0391e66791efb28457f827aceaecd6aa1c90 SHA512 ac5a69cd3dd6804219f77720d045945ed866d43815445581e39adf0d05ca294600000df3e7aadf887203b555749e3fdf6cc1bf4c6fb599049ff5db745f774a13
-EBUILD cdiff-1.0.ebuild 716 BLAKE2B 3a128a2dc5e35a40238e1e73e5085f90a211808f25041fdedc041647ae5f5940605ea47716705957637ad8774f4bf021c2a5dc1b8b5806ffac61c775ad3872ef SHA512 f4c225982bf50ed5af0011c8277f7dfd03d7d1da150bd7bb0a8995d1cceeb7b59363f1c5cc2c52faecd427b6a216ad6becec1fb211c4ff4b2d8c2958ca102695
-EBUILD cdiff-9999.ebuild 752 BLAKE2B dab28fae8a7d15a2b630ab794b3c388fbe6caf5fc011c8f3dea1451f5f388bd19ce5692e01699dee07df1c3c2c86e31ba392c4df2d3eca95ecf8b05a881c949c SHA512 68046d783fd8421ae93bb2094a6b46728b60955ac2d1e74c89657ef7e7740785db7eb8f5ded27fe99ca229545de49ecce09dbdc62e624a5f63f66d28545ae4b2
-MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
deleted file mode 100644
index a38fa1a360dd..000000000000
--- a/dev-util/cdiff/cdiff-0.9.8.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
deleted file mode 100644
index 010b3b89ab78..000000000000
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES.rst README.rst )
-
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
deleted file mode 100644
index 9d071be628c7..000000000000
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ /dev/null
@@ -1,33 +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 git-r3
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
deleted file mode 100644
index 50b00cc5a46e..000000000000
--- a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/test_cdiff.py	2013-03-24 15:08:00.000000000 +0100
-+++ b/tests/test_cdiff.py	2013-06-23 01:17:20.560520188 +0200
-@@ -737,7 +737,7 @@
-         os.chdir(self._non_ws)
-         ret = cdiff.main()
-         os.chdir(self._cwd)
--        self.assertNotEqual(ret, 0)
-+#        self.assertNotEqual(ret, 0)
- 
-     def test_read_log(self):
-         sys.argv = [sys.argv[0], '--log']
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
deleted file mode 100644
index 8298304ad283..000000000000
--- a/dev-util/cdiff/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-needed -->
-  <longdescription>
-    Colored, side-by-side diff terminal viewer.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">cdiff</remote-id>
-    <remote-id type="github">ymattw/cdiff</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/cflow-1.4 b/dev-util/cflow-1.4
new file mode 100644
index 000000000000..3267e57d8adb
--- /dev/null
+++ b/dev-util/cflow-1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl virtual/libiconv ) nls? ( sys-devel/gettext )
+DESCRIPTION=C function call hierarchy analyzer
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/cflow/
+IUSE=debug emacs nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl virtual/libiconv )
+SLOT=0
+SRC_URI=ftp://download.gnu.org.ua/pub/release/cflow/cflow-1.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5acc2fa7fdac227b69dd898ff6b0ee55
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
deleted file mode 100644
index 5c0a1aadb7ec..000000000000
--- a/dev-util/cflow/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
-AUX cflow-1.4-info-direntry.patch 356 BLAKE2B 5edd13456dc90461927c0b2ecbb7c66987ef935e54d7d89010bdddac6193a9eee852fde601543149a3aeef1fc5e3447d43d2e076673e9ebd3b6e5bb978477008 SHA512 6bcfd0ec801b3c487d817d2fd1a0f030a1e3fccffb03f5343eb335c807fd763a8c00d8f98654ce3f8574e756a9c1d5769da71b9fb70acee0ecdace6395a3a624
-DIST cflow-1.4.tar.bz2 634862 BLAKE2B ac8d31b2af7c11bc09f440f0f044f67a538a2a2d574146216b11239097553c41d4982594cc919fc6cc3b861a9b1bf1bd200a0c1f14ee8ab437b724bf6d84c6c7 SHA512 b8f8bd0e75e9ad0ba112313c576766b7cf72ef1e29ad0b0a2ce233f43b4196e311077be2134ff6e0fa0bb18375469ca6a969307fa7565a63ab60dec20400ee03
-EBUILD cflow-1.4.ebuild 1062 BLAKE2B 7859e1bf77201114ebc9731efc12c0b406252f27bda699419f9d6569e08710d64eab4510e66d574ac5a741c929a867333579a841c6fe149ff014a00f40fdca34 SHA512 98d316fb2cef72bcf601a744604bda6bbc3bf28673d4879264993f79cb0c4468bee5ca65317d05924459f609ccb116e1745c10aa324608b7df02a2af4705de8d
-MISC metadata.xml 588 BLAKE2B a5466656ce4c3a761b64b1ade2fef0363065450ddc10d590a0f52f5b8fd4df057cdc99a84c056925bdfcbabbb63ed2eb4e646d04b0adde4378adac56c290757f SHA512 cc702fd85f1e907a364f9e79e4b183bd4ff2317750bf917acbef7d326abded9c1adbd66bd21a46df7b394e9d4990c8c056c7173a4fa758217519f3def7c789a2
diff --git a/dev-util/cflow/cflow-1.4.ebuild b/dev-util/cflow/cflow-1.4.ebuild
deleted file mode 100644
index d34006c749eb..000000000000
--- a/dev-util/cflow/cflow-1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit elisp-common eutils
-
-DESCRIPTION="C function call hierarchy analyzer"
-HOMEPAGE="https://www.gnu.org/software/cflow/"
-SRC_URI="ftp://download.gnu.org.ua/pub/release/cflow/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-	nls? ( virtual/libintl virtual/libiconv )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-info-direntry.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		EMACS=no
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		elisp-compile elisp/cflow-mode.el
-	fi
-}
-
-src_install() {
-	default
-	doinfo doc/cflow.info
-
-	if use emacs; then
-		elisp-install ${PN} elisp/cflow-mode.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cflow/files/50cflow-gentoo.el b/dev-util/cflow/files/50cflow-gentoo.el
deleted file mode 100644
index 56a2c8c5d775..000000000000
--- a/dev-util/cflow/files/50cflow-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; cflow site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'cflow-mode "cflow-mode" nil t)
-(add-to-list 'auto-mode-alist '("\\.cflow\\'" . cflow-mode))
diff --git a/dev-util/cflow/files/cflow-1.4-info-direntry.patch b/dev-util/cflow/files/cflow-1.4-info-direntry.patch
deleted file mode 100644
index ab7e4956425f..000000000000
--- a/dev-util/cflow/files/cflow-1.4-info-direntry.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/cflow.texi b/doc/cflow.texi
-index dfb1fdf..5dc1d48 100644
---- a/doc/cflow.texi
-+++ b/doc/cflow.texi
-@@ -21,7 +21,7 @@
- @end direntry
- @dircategory Emacs
- @direntry
--* cflow mode: (cflow)cflow mode.  Major mode for visiting cflow charts.
-+* cflow mode: (cflow)Emacs.      Major mode for visiting cflow charts.
- @end direntry
- @end ifinfo
- 
diff --git a/dev-util/cflow/metadata.xml b/dev-util/cflow/metadata.xml
deleted file mode 100644
index 8e343daf6159..000000000000
--- a/dev-util/cflow/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>dev-zero@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		GNU cflow analyzes a collection of C source files and prints a graph,
-		charting control flow within the program.
-
-		GNU cflow is able to produce both direct and inverted flowgraphs for C
-		sources. Optionally a cross-reference listing can be generated. Two
-		output formats are implemented: POSIX and GNU (extended).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/cgdb-0.6.6 b/dev-util/cgdb-0.6.6
new file mode 100644
index 000000000000..95c1d236418a
--- /dev/null
+++ b/dev-util/cgdb-0.6.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses >=sys-libs/readline-5.1-r2
+DESCRIPTION=A curses front-end for GDB, the GNU debugger
+EAPI=4
+HOMEPAGE=http://cgdb.sourceforge.net/
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses >=sys-libs/readline-5.1-r2 sys-devel/gdb
+SLOT=0
+SRC_URI=mirror://sourceforge/cgdb/cgdb-0.6.6.tar.gz
+_md5_=17f666d5e9a7ca1b5003e8eb926dedf6
diff --git a/dev-util/cgdb-0.6.7 b/dev-util/cgdb-0.6.7
new file mode 100644
index 000000000000..65876fcb569b
--- /dev/null
+++ b/dev-util/cgdb-0.6.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses >=sys-libs/readline-5.1-r2
+DESCRIPTION=A curses front-end for GDB, the GNU debugger
+EAPI=4
+HOMEPAGE=http://cgdb.github.io/
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses >=sys-libs/readline-5.1-r2 sys-devel/gdb
+SLOT=0
+SRC_URI=http://cgdb.me/files/cgdb-0.6.7.tar.gz
+_md5_=d1cdd2e0e578716b6ae30ab61b8b98e1
diff --git a/dev-util/cgdb-0.6.8 b/dev-util/cgdb-0.6.8
new file mode 100644
index 000000000000..5bb6beb60b1b
--- /dev/null
+++ b/dev-util/cgdb-0.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= test? ( dev-util/dejagnu )
+DESCRIPTION=A curses front-end for GDB, the GNU debugger
+EAPI=6
+HOMEPAGE=http://cgdb.github.io/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+SLOT=0
+SRC_URI=https://github.com/cgdb/cgdb/archive/v0.6.8.tar.gz -> cgdb-0.6.8.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=975895ed623cf02144666c969260e92b
diff --git a/dev-util/cgdb-0.7.0 b/dev-util/cgdb-0.7.0
new file mode 100644
index 000000000000..9db3f11fd414
--- /dev/null
+++ b/dev-util/cgdb-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= test? ( dev-util/dejagnu )
+DESCRIPTION=A curses front-end for GDB, the GNU debugger
+EAPI=6
+HOMEPAGE=http://cgdb.github.io/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+SLOT=0
+SRC_URI=https://github.com/cgdb/cgdb/archive/v0.7.0.tar.gz -> cgdb-0.7.0.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5537acb36c24b1bdf949bef5797c6927
diff --git a/dev-util/cgdb-9999 b/dev-util/cgdb-9999
new file mode 100644
index 000000000000..1be79b50cc94
--- /dev/null
+++ b/dev-util/cgdb-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= test? ( dev-util/dejagnu ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A curses front-end for GDB, the GNU debugger
+EAPI=6
+HOMEPAGE=http://cgdb.github.io/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8c9adb9db99b919afb638d1ee82afa73
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
deleted file mode 100644
index 4f15d73f1c1d..000000000000
--- a/dev-util/cgdb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST cgdb-0.6.6.tar.gz 954789 BLAKE2B 71a095ce0237dc00e8387349818a9af5d5afd6d3ba72f0835eab80e674bb3c2934dca361b58fe70115db3b0315cf2cd34e60640f0d10fee75c261a8cbc3d231b SHA512 9efd4e60f07f6e189fe3c91ef52c1b3c8d70623b11d08bac6d78c36e8f8f549071448212db973974b9604f84aafc73697d9d1305c3d9691fb5f19346d2e04e8f
-DIST cgdb-0.6.7.tar.gz 674132 BLAKE2B 5378bffd3bed99934b83c1db82baea86d24f83c4e586d0695193bd5ee864ca0c76ea493187ffb307d16610b2e5a8bcdd9c4b2949c1e00299eb20ceab7dd609a0 SHA512 0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e
-DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
-DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.6.ebuild 446 BLAKE2B 6916fd61e26daf6d29f59ae01772cfc7144ba34e9f056cc132e95cdd3879b51a15ae897528e0fd4e1e77a69e6ae8b159665edcc4e8ca81440faba1c8325cb556 SHA512 8b42cf87241b9ea21930d581e23792d8f8fdbfded7b32e00d2c49d52fdc48c9cb0fa4e30638467c66b3baffaaa4c40e221f1b5cfb5a6bba0e46b7ba70285cb2c
-EBUILD cgdb-0.6.7.ebuild 448 BLAKE2B e5d0ffc9397a430d76d3b67567ffe0a512bca902bc975193bc8ba01f570dd7b1e4de68cb26ee94efe528811fd15442f74af6e6188d56b5ae69306f5d21b28535 SHA512 00ad998f1b28cf7a99e78841943a973ee5f5a3e2888c4c749e68f36d082f20a2d518dfad0ac4dc493dc77d1549fe97c4f45fbd3782fe5e4b776ebf076b17ac8e
-EBUILD cgdb-0.6.8.ebuild 878 BLAKE2B 3f645a5f31c9a450a2426c4060d1cfa6041f5a3249565bf1baf0490f8e3894a17317c8ba0c88d0754c795f6ab072a667ab606a046a56b9449f5c01a6f660d026 SHA512 ef2ec446e1a58ebdc3e66d2097af59d8afbc573fdb8ca98da9a0bab71d6ad755ab0832f1d1028bc4d3148f68326a4d054242d7293ce73f54f128d80bb0f955ed
-EBUILD cgdb-0.7.0.ebuild 881 BLAKE2B 778de1aa175ab0ac9db729fab025ae1e1781e612b9a238a57dd7687c0458440bd468f940171dabf7e11de7d9ab76eef8a01df6f55941a2171eed220e205b5a75 SHA512 4fbb20d6d8e82979b5b81763dcf635f24a589ea12a1c00ecde694901a5747a90dc5a7ccb186f20329aa7d717aeb6d7d01469921b5a292c0446bd3d1d2f00cf9a
-EBUILD cgdb-9999.ebuild 881 BLAKE2B 5a3c6dc5bf761930537591428bc8f33df50ed1c93f1267eacb487d8e0ad8328606d7d8f5c7adb8c6e2cf945a328b2cd6fe3190dba7ae7e242fc4997e8941863a SHA512 ee777392e48feed140699b68c956da91dd38fca82d03facc6c45061ca1f1b11432af9667da84462dbf09c03cf40abcc9933611458d07e6333dc562958b68b106
-MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
diff --git a/dev-util/cgdb/cgdb-0.6.6.ebuild b/dev-util/cgdb/cgdb-0.6.6.ebuild
deleted file mode 100644
index 5778250bac4c..000000000000
--- a/dev-util/cgdb/cgdb-0.6.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cgdb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
deleted file mode 100644
index fd2095ed0c6f..000000000000
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-SRC_URI="http://cgdb.me/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
deleted file mode 100644
index a34ddbb21ba7..000000000000
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
-else
-	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-inherit multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
-
-RDEPEND="
-	${COMMONDEPEND}
-	sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cgdb/cgdb-0.7.0.ebuild b/dev-util/cgdb/cgdb-0.7.0.ebuild
deleted file mode 100644
index f1e40470f225..000000000000
--- a/dev-util/cgdb/cgdb-0.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
-else
-	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-inherit multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
-
-RDEPEND="
-	${COMMONDEPEND}
-	sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
deleted file mode 100644
index 5a5dd25473fd..000000000000
--- a/dev-util/cgdb/cgdb-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=6
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
-else
-	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-inherit multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-COMMONDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
-
-RDEPEND="
-	${COMMONDEPEND}
-	sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md FAQ )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
deleted file mode 100644
index bf712b486f42..000000000000
--- a/dev-util/cgdb/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>nado@troglodyte.be</email>
-		<name>Corentin Pazdera</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cgdb/cgdb</remote-id>
-		<remote-id type="sourceforge">cgdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cgvg-1.6.2 b/dev-util/cgvg-1.6.2
new file mode 100644
index 000000000000..e4ca15ce77de
--- /dev/null
+++ b/dev-util/cgvg-1.6.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=A tiny version of cscope that is much more useful in certian instances
+EAPI=0
+HOMEPAGE=http://uzix.org/cgvg.html
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://uzix.org/cgvg/cgvg-1.6.2.tar.gz
+_md5_=7c22db542db0c851498db0b0a11cf3cb
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
deleted file mode 100644
index d7800524bba7..000000000000
--- a/dev-util/cgvg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cgvg-1.6.2.tar.gz 41790 BLAKE2B 7d3313172862c6b1cd41b3ab824b5c164b498012b8c3a9017804569757aaee0f4e20f7dd14c458eafed6629480e6a0e5c450ed16a06f627735f74c57b1156ad2 SHA512 b2b4ec973515a4282c7b5d4ac1009682ac64f632509717fda88c3fa91ee59c21c950b085b86c551d8f2fd75539a319eec0c8837655ad025042cbf6e101c92173
-EBUILD cgvg-1.6.2.ebuild 534 BLAKE2B d47e1a4dcacbcd5ea5680463df91bb5c8e630139808e8b573716cb7a0ac04d796bbf88ed75747c71af761e48849188414f0ee6b99ecb35635b4e11df937434bc SHA512 e84627deecc6d68e07356bf7de43ee0dc5d99f3646b7f66454db575cab235daf4c820d78194ef4de2c0897e1b6111a6cf1292b593ba4a1e18c5dcad5d2cce63d
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/cgvg/cgvg-1.6.2.ebuild b/dev-util/cgvg/cgvg-1.6.2.ebuild
deleted file mode 100644
index cc5658993b5b..000000000000
--- a/dev-util/cgvg/cgvg-1.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A tiny version of cscope that is much more useful in certian instances"
-HOMEPAGE="http://uzix.org/cgvg.html"
-SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/dev-util/cgvg/metadata.xml b/dev-util/cgvg/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/cgvg/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/checkbashisms-2.18.2 b/dev-util/checkbashisms-2.18.2
new file mode 100644
index 000000000000..18877afc5c3f
--- /dev/null
+++ b/dev-util/checkbashisms-2.18.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=6
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.2.tar.xz
+_md5_=5bded2685f1b949f89ed8467f23a6137
diff --git a/dev-util/checkbashisms-2.18.3 b/dev-util/checkbashisms-2.18.3
new file mode 100644
index 000000000000..fd807a479803
--- /dev/null
+++ b/dev-util/checkbashisms-2.18.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=6
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.3.tar.xz
+_md5_=e699215e3a300f6440f6a125c805af82
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
deleted file mode 100644
index d6855f83afa2..000000000000
--- a/dev-util/checkbashisms/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
-DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
-EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.3.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
-MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
deleted file mode 100644
index bc30ea8cdf00..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.18.2.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
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
deleted file mode 100644
index be58ae776f20..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.18.3.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
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
deleted file mode 100644
index 662ccdfd2bea..000000000000
--- a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 10 Nov 2015 19:39:19 -0500
-Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
-
-POSIX permits the -v/-V options:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-command [-p][-v|-V] command_name
----
- scripts/checkbashisms.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
-index 045328c..fe64a6b 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -644,7 +644,7 @@ sub init_hashes {
- 	qr';;?&' =>  q<;;& and ;& special case operators>,
- 	$LEADIN . qr'jobs\s' =>  q<jobs>,
- #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
--	$LEADIN . qr'command\s+-[^p]\s' =>  q<'command' with option other than -p>,
-+	$LEADIN . qr'command\s+-[^pvV]\s' =>  q<'command' with option other than -p/-v/-V>,
- 	$LEADIN . qr'setvar\s' =>  q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
- 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
- 	$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
--- 
-2.6.2
-
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
deleted file mode 100644
index 8491585905ca..000000000000
--- a/dev-util/checkbashisms/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>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">checkbaskisms</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/checkstyle-7.2 b/dev-util/checkstyle-7.2
new file mode 100644
index 000000000000..d0953c2397a9
--- /dev/null
+++ b/dev-util/checkstyle-7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:4 dev-java/commons-beanutils:1.7 >=dev-java/commons-cli-1.3:1 dev-java/commons-logging:0 dev-java/guava:20 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Development tool to help write Java code that adheres to a coding standard
+EAPI=6
+HOMEPAGE=https://github.com/checkstyle/checkstyle
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:4 dev-java/commons-beanutils:1.7 >=dev-java/commons-cli-1.3:1 dev-java/commons-logging:0 dev-java/guava:20 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/checkstyle/checkstyle/archive/checkstyle-7.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28c7b785edbf26e4a12adac074cad6f2
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
deleted file mode 100644
index 11f0daed07bf..000000000000
--- a/dev-util/checkstyle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST checkstyle-7.2.tar.gz 3359817 BLAKE2B 45cb74f6d2ff49cc218537cb9b5f95764a61a506f3aad8e265c809a0fecf9da47e8902ccc3afc312cddf3260d763b9d98a7e148c9382ed4107931cd189841170 SHA512 ee99d96d99a3f75097297cfda46e3647e57213bcb8b78098251a21c3fe0b4bb774393848d444f721d4bea83173581c89377a9d250157d6e6a225239da81d955f
-EBUILD checkstyle-7.2.ebuild 1600 BLAKE2B d61930952f75fa6b13c127d7aaca67093425cc906641561eab2a935da8802c271a05c3c9aaae79717b12a00383afb94955665553cb18174f6ba929f186b41078 SHA512 07c364b86aa8c6d4f0b6b228c777a8d1d62b3adb684b1dae0d78741d6729161493f1700c853bbc7e4546e31a1ec4bc97c0731a5d92b8b3258e7085df4ee2b8de
-MISC metadata.xml 377 BLAKE2B babe8dd16a427da17ad7255b39076b80d2a12e8b9b8eaeaea1b3d9633135b0cb262ca6e935a69f2895d06e48bbcf2df007f434b6db83f6039bd255dc9a790e34 SHA512 1a335de522055af5d8ec2ecd498528a66802b1fbb34e6b4be5e333c77b4b096ec38d0b7a8e5af7162315b4e8c3a99242c9246255fdd153566e258b808d50492a
diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild b/dev-util/checkstyle/checkstyle-7.2.ebuild
deleted file mode 100644
index 0036872cb55c..000000000000
--- a/dev-util/checkstyle/checkstyle-7.2.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
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Development tool to help write Java code that adheres to a coding standard"
-HOMEPAGE="https://github.com/checkstyle/checkstyle"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/antlr:4
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-cli-1.3:1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="${S}/src/main/java"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
-}
-
-src_compile() {
-	local PKG
-
-	PKG=com/puppycrawl/tools/checkstyle/grammars
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
-
-	PKG+=/javadoc
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocLexer.g4 || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocParser.g4 || die
-
-	cd "${S}" || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-
-	java-pkg_dolauncher ${PN} \
-		--main com.puppycrawl.tools.checkstyle.Main
-
-	java-pkg_dolauncher ${PN}-gui \
-		--main com.puppycrawl.tools.checkstyle.gui.Main
-}
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
deleted file mode 100644
index 6c0addb7ff01..000000000000
--- a/dev-util/checkstyle/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">checkstyle</remote-id>
-		<remote-id type="github">checkstyle/checkstyle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/clair-2.0.3 b/dev-util/clair-2.0.3
new file mode 100644
index 000000000000..a14dfceb233f
--- /dev/null
+++ b/dev-util/clair-2.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Vulnerability Static Analysis for Containers
+EAPI=6
+HOMEPAGE=https://github.com/coreos/clair
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/bzr dev-vcs/git !!sci-visualization/xd3d
+SLOT=0
+SRC_URI=https://github.com/coreos/clair/archive/v2.0.3.tar.gz -> clair-2.0.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=632fd048bdf51a4504473a64499dbaa3
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
deleted file mode 100644
index 08ca65b78523..000000000000
--- a/dev-util/clair/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
-AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
-EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
-MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.3.ebuild b/dev-util/clair/clair-2.0.3.ebuild
deleted file mode 100644
index 8c92e5db7e56..000000000000
--- a/dev-util/clair/clair-2.0.3.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
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/files/clair.confd b/dev-util/clair/files/clair.confd
deleted file mode 100644
index e66675311de3..000000000000
--- a/dev-util/clair/files/clair.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for clair config
-command_args="-config=/etc/clair/config.yaml"
diff --git a/dev-util/clair/files/clair.initd b/dev-util/clair/files/clair.initd
deleted file mode 100644
index 53518fea6320..000000000000
--- a/dev-util/clair/files/clair.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Clair Vulnerability Static Analysis for Containers"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/clair"
-command_args="${command_args:--config=/etc/clair/config.yaml}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/dev-util/clair/metadata.xml b/dev-util/clair/metadata.xml
deleted file mode 100644
index 01abcbc89e22..000000000000
--- a/dev-util/clair/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">coreos/clair</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/clazy-1.3 b/dev-util/clazy-1.3
new file mode 100644
index 000000000000..a89a1f532e13
--- /dev/null
+++ b/dev-util/clazy-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:= app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=6
+HOMEPAGE=https://github.com/KDE/clazy/blob/master/README.md
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:=
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.3/src/clazy-1.3.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_=9f5f4e52ebb6a1aae4ce938ad08198da
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
deleted file mode 100644
index d6d32abdf05e..000000000000
--- a/dev-util/clazy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clazy-1.3.tar.xz 159860 BLAKE2B 3860a7f0e2e518fda210e7a4c0de7ea21d52ed5f0e280e1f12dedea2b639dde994621e55b55766e65b9575c275e8ca55c8f6556d1223aee0d642fff2814810bc SHA512 71b69fd28e507f44c5ddc5be8e79fa1511398691cbd8aae920c77171720c6e3e2f308db478e604285a2686aaca0026ff0472547eff98d77c0d4f83c72727563e
-EBUILD clazy-1.3.ebuild 727 BLAKE2B 512415365340f12308adbfa37d0da415edf97fa15b341b543db49213267994fde338b1d7e681b91276ae8492dc9f87adb2d62922f515cdf480b777dc482171c2 SHA512 4b766b1f101f30297fef7f873066734f436edd6892e9bc9ec13beac5847bfb05044f7f97295cffa46e5feecbb47873b3ce982bfc69eabc6d29d29de089681add
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.3.ebuild b/dev-util/clazy/clazy-1.3.ebuild
deleted file mode 100644
index fc60842b73c9..000000000000
--- a/dev-util/clazy/clazy-1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://github.com/KDE/clazy/blob/master/README.md"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt DESTINATION/d' \
-		-i CMakeLists.txt || die
-
-	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
-		-i docs/man/CMakeLists.txt || die
-}
diff --git a/dev-util/clazy/metadata.xml b/dev-util/clazy/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/clazy/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cligh-0.1_p20120630 b/dev-util/cligh-0.1_p20120630
new file mode 100644
index 000000000000..6df50578f6d5
--- /dev/null
+++ b/dev-util/cligh-0.1_p20120630
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[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=Command-line interface to GitHub
+EAPI=5
+HOMEPAGE=http://the-brannons.com/software/cligh.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[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://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> cligh-0.1_p20120630.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	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=812d4bcacc2fb19d15223737a09ee469
diff --git a/dev-util/cligh-0.2 b/dev-util/cligh-0.2
new file mode 100644
index 000000000000..bc7f5e282c97
--- /dev/null
+++ b/dev-util/cligh-0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[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=Command-line interface to GitHub
+EAPI=5
+HOMEPAGE=http://the-brannons.com/software/cligh.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[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=http://the-brannons.com/software/cligh-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_=3387997b9334b669b8b7eba61e8fc1f8
diff --git a/dev-util/cligh-9999 b/dev-util/cligh-9999
new file mode 100644
index 000000000000..e39eefe6ee05
--- /dev/null
+++ b/dev-util/cligh-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/PyGithub[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-python/pyxdg[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(-)] 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
+DESCRIPTION=Command-line interface to GitHub
+EAPI=5
+HOMEPAGE=http://the-brannons.com/software/cligh.html
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=dev-python/PyGithub[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-python/pyxdg[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(-)] 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
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	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_=b908aed02329fefa05a8c6fb07f0b5ff
diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
deleted file mode 100644
index f37ceb07d48d..000000000000
--- a/dev-util/cligh/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST cligh-0.1_p20120630.tar.gz 7848 BLAKE2B 4690330e4b353244bc1e7065759637fa9d1de0b412357f00ebbc432e88b6fb00718ba1177900e3bad77c0a0ce8bb3b0defe3de1004137c3ebe73d9d255739291 SHA512 1be944a18cad117ddceb5461f0f53c083f34afe32c79d5ce9494c587fa5d8b8f7c7acc3f7447e18677b7fce2fa96ed7bb34a228b5528f19fe4933a24fefa933d
-DIST cligh-0.2.tar.gz 7844 BLAKE2B 001e597ee60fd8b9e378c96f1ad4ab9dcf42de049bc2a914f8dece12048beebe0ec04b095cad64508af611b2fe52ca43fcf62b5bded74b3336359be85fef1235 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c
-EBUILD cligh-0.1_p20120630.ebuild 545 BLAKE2B 9480e10e97945bcdf10623417fc745ddd7f6a3751d3255d5b23e4ccd99cb5c3ce818268050a33090547df764cd90e839c4641fc45316ccb44b23022428a847e1 SHA512 fd32a8b47b20d93fc89888c1120f34bf2dde9698550e1b6eeea3bfd155cace25cf6109787dc0ce95f9829bc8e7d0efc3d6f5ad2c6fc317e240163f1c7d115217
-EBUILD cligh-0.2.ebuild 482 BLAKE2B fc1a2f481f693f513b3baacbe283408b26f4681a16f96be98435546bc66ab084ec9f10709bb7ea23d364ab980c1c06542bb78c1142479de868159dd7205abc2d SHA512 e26bd6b4af345ff67c145a55e27dfa37fdc12765a1437d17972c7ae9d7e418785c7649bcd127be9e72575a6de8a6ea032b0ac6fd9f3a545b235a07a203fe6746
-EBUILD cligh-9999.ebuild 477 BLAKE2B e5f728ee5049496241080019e31e2e9493cc4cb47a93f5d487345cd5e3b3265f7841da4d3f97010590e011625095d9172640e5cd341f707a028a8843605b459b SHA512 28b2b445ccd19c91141d26d4d71c0de3f013159c1c9ef0311c9bc9d637a02087bf9fc4c4cb4bfa53787d0cdfcbb45056f35992896cd1f62f49f6ddb40b3a3f64
-MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-0.1_p20120630.ebuild b/dev-util/cligh/cligh-0.1_p20120630.ebuild
deleted file mode 100644
index 2727bd726c2f..000000000000
--- a/dev-util/cligh/cligh-0.1_p20120630.ebuild
+++ /dev/null
@@ -1,20 +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 vcs-snapshot
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="https://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.2.ebuild b/dev-util/cligh/cligh-0.2.ebuild
deleted file mode 100644
index 88c4d2017c48..000000000000
--- a/dev-util/cligh/cligh-0.2.ebuild
+++ /dev/null
@@ -1,20 +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="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="http://the-brannons.com/software/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
deleted file mode 100644
index 94342369cec8..000000000000
--- a/dev-util/cligh/cligh-9999.ebuild
+++ /dev/null
@@ -1,20 +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 git-2
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-EGIT_REPO_URI="https://github.com/CMB/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
deleted file mode 100644
index d0604a5cc9a0..000000000000
--- a/dev-util/cligh/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>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">CMB/cligh</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/clinfo-2.2.18.03.26 b/dev-util/clinfo-2.2.18.03.26
new file mode 100644
index 000000000000..34c0cd8e25a1
--- /dev/null
+++ b/dev-util/clinfo-2.2.18.03.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+KEYWORDS=~amd64
+LICENSE=CC0-1.0
+RDEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+SLOT=0
+SRC_URI=https://github.com/Oblomov/clinfo/archive/2.2.18.03.26.tar.gz -> clinfo-2.2.18.03.26.tar.gz
+_md5_=5c7f85382c06fc156aed219cc3948351
diff --git a/dev-util/clinfo-2.2.18.04.06 b/dev-util/clinfo-2.2.18.04.06
new file mode 100644
index 000000000000..5f33d204700b
--- /dev/null
+++ b/dev-util/clinfo-2.2.18.04.06
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+KEYWORDS=~amd64
+LICENSE=CC0-1.0
+RDEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+SLOT=0
+SRC_URI=https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz -> clinfo-2.2.18.04.06.tar.gz
+_md5_=5c7f85382c06fc156aed219cc3948351
diff --git a/dev-util/clinfo-9999 b/dev-util/clinfo-9999
new file mode 100644
index 000000000000..baef7a2a0af9
--- /dev/null
+++ b/dev-util/clinfo-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+LICENSE=CC0-1.0
+RDEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=5c7f85382c06fc156aed219cc3948351
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
deleted file mode 100644
index 7f775b0d56ed..000000000000
--- a/dev-util/clinfo/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST clinfo-2.2.18.03.26.tar.gz 38519 BLAKE2B 736036f4f84c170876b9b550bfe837c67a273cef9032af8734035edf5070d17d876d10f7d5c81889966df0a9ad4192c43c1501326188782cc674611ea57130ef SHA512 dec90a314e6c52e5501339dbe594cb57cfc8cae6855db7bb88b36984fd661e55f2cc8eb29fa546998862c806ec752bfc2b6a9e0d9d962370f84b0091605c1bcb
-DIST clinfo-2.2.18.04.06.tar.gz 41459 BLAKE2B e90a515fd9318aeced510cd97cc477e1925b37e2c389ffee0ec484563acc9f0f9a8880cb38575b299c4f63e1b4a6959064d7d0d45487f67d6fcf32ce91962a47 SHA512 4aa1623bd08602e2104b4ba3150f36a9e8e8fb25728d4a1792a9cc81a2a5952a4a78ccad0928f098ce4e8bc05f30d09267e01ccd81d541fdfb0bc7de46908faf
-EBUILD clinfo-2.2.18.03.26.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
-EBUILD clinfo-2.2.18.04.06.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
-EBUILD clinfo-9999.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
-MISC metadata.xml 327 BLAKE2B 92f019eb0500214ac6f345ee38aeb8df84ebf69a503fcb9dc3284e23d9badc20fbd985aa9f60df6b4d9f515027a4e973b2439c568b0a63f5acac2be97de04dfc SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21
diff --git a/dev-util/clinfo/clinfo-2.2.18.03.26.ebuild b/dev-util/clinfo/clinfo-2.2.18.03.26.ebuild
deleted file mode 100644
index 3d01e885bdad..000000000000
--- a/dev-util/clinfo/clinfo-2.2.18.03.26.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
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
-HOMEPAGE="https://github.com/Oblomov/clinfo"
-LICENSE="CC0-1.0"
-SLOT="0"
-
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
-}
diff --git a/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild b/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild
deleted file mode 100644
index 3d01e885bdad..000000000000
--- a/dev-util/clinfo/clinfo-2.2.18.04.06.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
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
-HOMEPAGE="https://github.com/Oblomov/clinfo"
-LICENSE="CC0-1.0"
-SLOT="0"
-
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
-}
diff --git a/dev-util/clinfo/clinfo-9999.ebuild b/dev-util/clinfo/clinfo-9999.ebuild
deleted file mode 100644
index 3d01e885bdad..000000000000
--- a/dev-util/clinfo/clinfo-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
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
-HOMEPAGE="https://github.com/Oblomov/clinfo"
-LICENSE="CC0-1.0"
-SLOT="0"
-
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
-}
diff --git a/dev-util/clinfo/metadata.xml b/dev-util/clinfo/metadata.xml
deleted file mode 100644
index 7682807ac4fc..000000000000
--- a/dev-util/clinfo/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>candrews@gentoo.org</email>
-		<name>Craig Andrews</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Oblomov/clinfo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/clion-2017.3.4 b/dev-util/clion-2017.3.4
new file mode 100644
index 000000000000..55de2210f2cb
--- /dev/null
+++ b/dev-util/clion-2017.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A complete toolset for C and C++ development
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/clion
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=sys-devel/gdb dev-util/cmake
+SLOT=0
+SRC_URI=http://download.jetbrains.com/cpp/CLion-2017.3.4.tar.gz -> clion-2017.3.4.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_=9d6aad82957b1fa26df263cdf0ec2f6c
diff --git a/dev-util/clion-2018.1 b/dev-util/clion-2018.1
new file mode 100644
index 000000000000..e437d40d163d
--- /dev/null
+++ b/dev-util/clion-2018.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A complete toolset for C and C++ development
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/clion
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=sys-devel/gdb dev-util/cmake
+SLOT=0
+SRC_URI=http://download.jetbrains.com/cpp/CLion-2018.1.tar.gz -> clion-2018.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
+_md5_=9d6aad82957b1fa26df263cdf0ec2f6c
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
deleted file mode 100644
index 044314cdf4b9..000000000000
--- a/dev-util/clion/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST clion-2017.3.4.tar.gz 331195446 BLAKE2B 5d868de5b1d97a80dd2d63977dfda8d3ab56840c95e4cdba5b8e55cf626dbd68e1015fd8dae664dbdf8161853a96a492ce43a78e0e6bd13138144d28e1146f78 SHA512 044e713e2ab3724b891b48a1d75936dce1580be0fded174101f768f6976f76f2557768128fd596cc8855c15f27dbd9a1e9d4299b947ad00ca458c537d81fd0b8
-DIST clion-2018.1.tar.gz 333789580 BLAKE2B 026ebe63049f3b80c2924079092707379d07fa838b532b7e191ee5fbc66dfa50dbc97ad78cbafd6794f99bc29ce66f4d54882d0bbc1339e08a2f35bd5f195bc5 SHA512 ac95b5d346f077ab26882ff4c0f71420c6fcd0a929aa33c60b427d0a10839bec3a2e5363d8cd18d9e2d6988da17dd0deacd9fd3b3c5f0619c9925acf263f56bd
-EBUILD clion-2017.3.4.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
-EBUILD clion-2018.1.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
-MISC metadata.xml 470 BLAKE2B 839c416b941a14b2025a68ad5bf7cb1ea2d1be8b5f7cff2cd87cb5eff6ef73d37a462b868ee56ec70d9270d9ed15fc01533fb3a217fd1273de9b839c6dc8af82 SHA512 9aa5a4724a19a45cbd03c4d71005265509546d8e3134dbf634ed19ae4d7d3d56f2cf17edd9d7e3d2882e57c2f07a1229f0b76af11f2c95a3cfd56dd0db3b6757
diff --git a/dev-util/clion/clion-2017.3.4.ebuild b/dev-util/clion/clion-2017.3.4.ebuild
deleted file mode 100644
index 376319ea602b..000000000000
--- a/dev-util/clion/clion-2017.3.4.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
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	sys-devel/gdb
-	dev-util/cmake"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/bin
-		bin/gdb/lib
-		bin/gdb/share
-		bin/cmake
-		license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
-	)
-
-	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
-	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
-	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
-	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2018.1.ebuild b/dev-util/clion/clion-2018.1.ebuild
deleted file mode 100644
index 376319ea602b..000000000000
--- a/dev-util/clion/clion-2018.1.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
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	sys-devel/gdb
-	dev-util/cmake"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/bin
-		bin/gdb/lib
-		bin/gdb/share
-		bin/cmake
-		license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
-	)
-
-	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
-	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
-	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
-	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
deleted file mode 100644
index 4f7225e07bb7..000000000000
--- a/dev-util/clion/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>c.a.strahl@gmail.com</email>
-		<name>Christian Strahl</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>		
-	<longdescription lang="en">
-		Fully Integrated C/C++ Development Environment.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/cloc-1.72 b/dev-util/cloc-1.72
new file mode 100644
index 000000000000..6cb950dcd238
--- /dev/null
+++ b/dev-util/cloc-1.72
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Count Lines of Code
+EAPI=6
+HOMEPAGE=https://github.com/AlDanial/cloc
+KEYWORDS=amd64 ~arm ppc ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-File-Spec virtual/perl-File-Temp
+SLOT=0
+SRC_URI=https://github.com/AlDanial/cloc/releases/download/v1.72/cloc-1.72.tar.gz
+_md5_=e2ce2f13a430df1e504f1a8d27eec889
diff --git a/dev-util/cloc-1.74 b/dev-util/cloc-1.74
new file mode 100644
index 000000000000..0074057202e8
--- /dev/null
+++ b/dev-util/cloc-1.74
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Count Lines of Code
+EAPI=6
+HOMEPAGE=https://github.com/AlDanial/cloc
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-File-Spec virtual/perl-File-Temp
+SLOT=0
+SRC_URI=https://github.com/AlDanial/cloc/releases/download/1.74/cloc-1.74.tar.gz
+_md5_=42f738dd7b6e5363465cbb1292957dee
diff --git a/dev-util/cloc-1.76-r1 b/dev-util/cloc-1.76-r1
new file mode 100644
index 000000000000..82011866eb50
--- /dev/null
+++ b/dev-util/cloc-1.76-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Count Lines of Code
+EAPI=6
+HOMEPAGE=https://github.com/AlDanial/cloc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Parallel-ForkManager dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=https://github.com/AlDanial/cloc/releases/download/v1.76/cloc-1.76.tar.gz
+_md5_=b3d395ee20d4cb680b187c13ed9c959f
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
deleted file mode 100644
index b03820a2a784..000000000000
--- a/dev-util/cloc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
-DIST cloc-1.74.tar.gz 396192 BLAKE2B 632d2e4764a7bec9b6bb45edaac80da65f5ea23ec682c3246beb2add011fa5ac6860671b45981e9eec374872c691e66467bc0d4709b725fa53ec88efc7ce3a05 SHA512 456ff10c50673326e0b80d2e0b5965fba19c5c868e880108647d5182e048e62bdd734ce485386a561163d8dab81551101cbc5dcc13088400fe0a14ad500e1cbf
-DIST cloc-1.76.tar.gz 419678 BLAKE2B bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360 SHA512 3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd
-EBUILD cloc-1.72.ebuild 652 BLAKE2B 0247613d5209f906c9848d8874d18662cdb103992ece7462434fa2e19a5f12a8bde97b873093eac75ef21132dfe04f5a7fd2f6c22f5893dfa1bd187c2ea85412 SHA512 804fdbb749ec15ff4e68bf4841c8888b8466fedcf88a82d8b82d8968eecde91ccc83582100a4261f9c4731fb01737e828ce3b80a707b6d9410593ea17cd03a00
-EBUILD cloc-1.74.ebuild 655 BLAKE2B b85899b7f270abe0cf86868425e038b47b91ef168d022ab2147a8ccc3b3deb87c93940cc7f0b4a7f184996b2c3651505e37a843b7193f594b780d9d8c38cf09a SHA512 23d7b861f2feecd2e9ae4dbeb7592d039787ec7fb8cb89ca22922275b1e0c46e1fa5d347a91b7d7ebfd47b1023968d593027d26d11569a39e6cbf33a6d827ea9
-EBUILD cloc-1.76-r1.ebuild 675 BLAKE2B a09be83f8551a02a7dfd802b24369b7639f26fa0e4d004a586e8402b37e2e352b3faef463ef328e37979ef0232012f2fd2e4b9057589f4984043898e36fc1aa3 SHA512 c1308b6e3c7e9469e38c10a80848f95eb7f9c802c6751e143202a82b1ae5d543fd403f82126f2bd72f7df5f45e1e5307f4a59bedd1a4587b8af20f982c3514ba
-MISC metadata.xml 435 BLAKE2B 5658cf3e41d5dac9b2acab8075357492429742f12fee07bedec393e3a068d9c57464d7434e044eeacff38bc7a043ecb4b3b6d42d57c0441d27a8f645c599fe0d SHA512 c747ba0f0014099be6572197e6aa9aa520cdfd6bae63fc3e0f92b723554a56180d52e1cb40422a063f56a4003d07b3cd09337b4413471668e62d51a6deace02a
diff --git a/dev-util/cloc/cloc-1.72.ebuild b/dev-util/cloc/cloc-1.72.ebuild
deleted file mode 100644
index 8935ab1749b8..000000000000
--- a/dev-util/cloc/cloc-1.72.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-
-src_compile() {
-	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
-	doman "${PN}.1"
-	dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.74.ebuild b/dev-util/cloc/cloc-1.74.ebuild
deleted file mode 100644
index d227ea30905b..000000000000
--- a/dev-util/cloc/cloc-1.74.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
-
-src_compile() {
-	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
-	doman "${PN}.1"
-	dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.76-r1.ebuild b/dev-util/cloc/cloc-1.76-r1.ebuild
deleted file mode 100644
index 70dda680961e..000000000000
--- a/dev-util/cloc/cloc-1.76-r1.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
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Parallel-ForkManager
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long"
-
-src_compile() {
-	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
-	doman "${PN}.1"
-	dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
deleted file mode 100644
index 273f73f2439a..000000000000
--- a/dev-util/cloc/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>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">AlDanial/cloc</remote-id>
-		<bugs-to>https://github.com/AlDanial/cloc/issues</bugs-to>
-		<remote-id type="sourceforge">cloc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cmake-3.10.3 b/dev-util/cmake-3.10.3
new file mode 100644
index 000000000000..9a0e8bb8f538
--- /dev/null
+++ b/dev-util/cmake-3.10.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b0204f9bdfa02fe4d32aafc5e5f36a55
diff --git a/dev-util/cmake-3.11.3 b/dev-util/cmake-3.11.3
new file mode 100644
index 000000000000..c05d9b289b78
--- /dev/null
+++ b/dev-util/cmake-3.11.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7fbb566ed1528503fdb7a29cb18bb527
diff --git a/dev-util/cmake-3.11.4 b/dev-util/cmake-3.11.4
new file mode 100644
index 000000000000..240a98cf33d1
--- /dev/null
+++ b/dev-util/cmake-3.11.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9241078c3fb9160d55613c1be98f8811
diff --git a/dev-util/cmake-3.12.0_rc3 b/dev-util/cmake-3.12.0_rc3
new file mode 100644
index 000000000000..b9821a8192c2
--- /dev/null
+++ b/dev-util/cmake-3.12.0_rc3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.12/cmake-3.12.0-rc3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7fbb566ed1528503fdb7a29cb18bb527
diff --git a/dev-util/cmake-3.9.6 b/dev-util/cmake-3.9.6
new file mode 100644
index 000000000000..918dde76b1e8
--- /dev/null
+++ b/dev-util/cmake-3.9.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DESCRIPTION=Cross platform Make
+EAPI=6
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs server system-jsoncpp ncurses qt5 test
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69bd47bbbdf8c75aac51b8e76b8ca42f
diff --git a/dev-util/cmake-fedora-2.7.1 b/dev-util/cmake-fedora-2.7.1
new file mode 100644
index 000000000000..d4f7491406ee
--- /dev/null
+++ b/dev-util/cmake-fedora-2.7.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Provides cmake helper macros and targets for linux, especially fedora developers
+EAPI=6
+HOMEPAGE=https://pagure.io/cmake-fedora
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.pagure.org/cmake-fedora/cmake-fedora-2.7.1-Source.tar.gz
+_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_=9a6ccfc0ed95429209c25d179e410a37
diff --git a/dev-util/cmake-fedora/Manifest b/dev-util/cmake-fedora/Manifest
deleted file mode 100644
index 5d36b62ddb29..000000000000
--- a/dev-util/cmake-fedora/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cmake-fedora-2.7.1-Source.tar.gz 127053 BLAKE2B cc5578104d63b4d1e445897c4fe73fe464c3bb294209bb3fd6a58c9274f0f802626ee467d0ec5493ef76f64ffad130858ba8302ab1cfdc7a38a7c3d0a993ceb2 SHA512 1f264a3527c4938916de91d2b8ce10c58fa222c992820d6ea5c5e850a190476900a4cdb18f7efc0680222d220efb5e56c8102a9f034385e15b5f88f9a25601cf
-EBUILD cmake-fedora-2.7.1.ebuild 523 BLAKE2B ae0994bee1b18ec02e4cf2e6f8edb981402ef09323b921a71ce1a4e3635a999c77953621ea1aaaa25e9690c83bfc04073dc646da1872d3790387f61a6563e5d2 SHA512 b1ba08106f3b19b95cde395d55b4901a7fdb96d23f266ecd748224b2658302188065cbaed0603105589d0bc8986f6546bb64869b735a5d6edfa677d4695a7961
-MISC metadata.xml 216 BLAKE2B 05fd9b6b8952981aa2213eea891b84f76192ee19cfc993bb9ae8b6840c1519826a9f4aa32cdbac20d390b0c1008fadeb1a100e25afdc98476d0abe6293331741 SHA512 25aafbf1f6b774c2a0e86ce4940cf30f89393021cdc5ff80b1bdd69902ab3c2a4ec62cb5b902487b3f2c12e4cf37c077131ac58463f1d72d95a4cf0caa930038
diff --git a/dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild b/dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild
deleted file mode 100644
index b06aff27275d..000000000000
--- a/dev-util/cmake-fedora/cmake-fedora-2.7.1.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
-
-MY_P="${P}-Source"
-inherit cmake-utils
-
-DESCRIPTION="Provides cmake helper macros and targets for linux, especially fedora developers"
-HOMEPAGE="https://pagure.io/cmake-fedora"
-SRC_URI="https://releases.pagure.org/cmake-fedora/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-CMAKE_IN_SOURCE_BUILD=1
-
-# fails 1 of 7
-RESTRICT="test"
diff --git a/dev-util/cmake-fedora/metadata.xml b/dev-util/cmake-fedora/metadata.xml
deleted file mode 100644
index 7166aba8a22d..000000000000
--- a/dev-util/cmake-fedora/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>naota@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
deleted file mode 100644
index e931436e979d..000000000000
--- a/dev-util/cmake/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-AUX 50cmake-gentoo.el 244 BLAKE2B 1a6c7919b020b3e590a67a9a37f5afd7a56e9970274987cc785f5d5ca78e702a4387684441a68d111a2836eaa76be8ab111b03d81784acbc701b8ccc726f9a2a SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb
-AUX cmake-2.8.10.2-FindPythonLibs.patch 990 BLAKE2B af80335e802c198287315da4ebce193d81ceec00a1e13ec084b80bc3f3df5fb9158765c3bc02d4ed9f6972b77e66c712dd8292c12aa4aca78d178e96943639ee SHA512 c2027439ef5f53991f99db4c60f62e0164641ffce58bfbe0dd9a0b4f93f8b96f6f6e30715a3ab57a47ea7a85d7d784ad602ca74ce88b5bca1a08c538dcc9676f
-AUX cmake-3.0.0-FindBLAS.patch 1581 BLAKE2B 62493ac0ed23748be1913a919d88937c929e29a587a880335caa895c3e9046577f7978c6d85d3ed37762932b812aca407339679c4b917cceb85323130d07e79c SHA512 c73533071df93975a2dc9ba1e17fb16bd396ec816ec9b2b4b714923ea6db606baea82c378bb50d7bb9d918e54c661489265e1032b24d03b2ba924489d01510f7
-AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577
-AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad
-AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
-AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba040703958db0bc57cfc3a5359b2aa71beb8600b2d4232225612036d00bcb9b9cbbdbb5f357f4fae492b6ed960c1a2a59bac SHA512 ea9ec5fcebd5a5988f5588b20cbf7e547065db6616476500c1d2d89c8585cf2276f7ba4fb06e85aa85ed435f81ca276c44518ce8f9f0efb6fc363f82f3b1aba4
-AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
-AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
-AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163
-AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 BLAKE2B e9390cac784eef6d3b83b88f995637098bf8ae35f53a0b2fa316081320f3901afe5eb965d011e2b944e1b1c6a59fb269b9daf28e35e94ffde9ade8576ef84788 SHA512 305cbdba81b23524403ef8eda93d494a0c3f3069e6434f0dbbd2f4e7bb2f64d503241bf5c3774631751dd26cb798472961c5565d5792e1028ca274054d2e77f1
-AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
-AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
-AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
-DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
-DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-DIST cmake-3.12.0-rc3.tar.gz 8089991 BLAKE2B 306faa1f3ef03fe4e9c35f9f131ad0de9c47cae12fa918647fb52dd3a9b80346b199ce0cb432beb5a79c1789214a0573c4bd6a0a7844c5797c82635c087a2586 SHA512 ef106fd3afaa118bca4d0cd62e348d02eafa17ba0ac04360572123e1e4e65c8ba7a83e0be0e56c8b600b693f4f0dd9aaa8a1ce9311a58fe65f10a2a599895591
-DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
-EBUILD cmake-3.11.4.ebuild 5974 BLAKE2B 833e3a47fcdad582c6d46eea9c3bea63ef4542f7ec7e5a75eb9ad62f340ce17a80e00e4375541da2a014746aeeef238999e9073dbe21edfa5915bafc91997073 SHA512 e1b1feb91dc95811783600e3a571b028ece865ee0f91f6b82b3e6fd190d350bff646292bb7b1082a65e769a8faa03d430271806102dd6d0731369cdfc8fcfd2c
-EBUILD cmake-3.12.0_rc3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
-EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
-MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.3.ebuild b/dev-util/cmake/cmake-3.10.3.ebuild
deleted file mode 100644
index 843a7d270713..000000000000
--- a/dev-util/cmake/cmake-3.10.3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.11.3.ebuild b/dev-util/cmake/cmake-3.11.3.ebuild
deleted file mode 100644
index 050883851f5e..000000000000
--- a/dev-util/cmake/cmake-3.11.3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.11.4.ebuild b/dev-util/cmake/cmake-3.11.4.ebuild
deleted file mode 100644
index b9e25d107095..000000000000
--- a/dev-util/cmake/cmake-3.11.4.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-libuv-1.21.patch
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.12.0_rc3.ebuild b/dev-util/cmake/cmake-3.12.0_rc3.ebuild
deleted file mode 100644
index 050883851f5e..000000000000
--- a/dev-util/cmake/cmake-3.12.0_rc3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
deleted file mode 100644
index 3b09404e21f0..000000000000
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( >=dev-libs/libuv-1.0.0:= )
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
-		-DCMAKE_USE_LIBUV="$(usex server)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d47cbc..000000000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
-(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
-(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
deleted file mode 100644
index 5f9c26658f31..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index bffa9fb..8fc90ee 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -74,6 +74,19 @@ set(_Python_VERSIONS
-   ${_PYTHON_FIND_OTHER_VERSIONS}
-   )
- 
-+# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)
-+    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
-+    if (_Gentoo_Python_INDEX EQUAL -1)
-+       # the current Gentoo python version is not compatible with what is requested
-+       set(_Python_VERSIONS)
-+    else ()
-+       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
-+    endif ()
-+endif()
-+
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
deleted file mode 100644
index 342a4319798d..000000000000
--- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,23 @@
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
- 
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_BLAS blas)
-+if(PC_BLAS_FOUND)
-+  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
-+  mark_as_advanced(BLAS_LIBRARIES)
-+else(PC_BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- 
-@@ -688,3 +709,5 @@
- endif()
- 
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
deleted file mode 100644
index 321f05302aa1..000000000000
--- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -4,6 +4,10 @@
- #
- # Find LAPACK library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- #
-@@ -140,6 +144,23 @@
- 
- endmacro()
- 
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+  mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
- 
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -348,3 +369,5 @@
- endif()
- 
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
deleted file mode 100644
index 1f3599bcc828..000000000000
--- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Do not detect Xcode and set -isysroot for its SDK, since that messes up
-our toolchain, and hence makes any compilation fail, bug #445308
-
---- a/Modules/Platform/Darwin-Initialize.cmake
-+++ b/Modules/Platform/Darwin-Initialize.cmake
-@@ -1,16 +1,16 @@
- # Ask xcode-select where to find /Developer or fall back to ancient location.
--execute_process(COMMAND xcode-select -print-path
--  OUTPUT_VARIABLE _stdout
--  OUTPUT_STRIP_TRAILING_WHITESPACE
--  ERROR_VARIABLE _stderr
--  RESULT_VARIABLE _failed)
--if(NOT _failed AND IS_DIRECTORY ${_stdout})
--  set(OSX_DEVELOPER_ROOT ${_stdout})
--elseif(IS_DIRECTORY "/Developer")
--  set(OSX_DEVELOPER_ROOT "/Developer")
--else()
-+#execute_process(COMMAND xcode-select -print-path
-+#  OUTPUT_VARIABLE _stdout
-+#  OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  ERROR_VARIABLE _stderr
-+#  RESULT_VARIABLE _failed)
-+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
-+#  set(OSX_DEVELOPER_ROOT ${_stdout})
-+#elseif(IS_DIRECTORY "/Developer")
-+#  set(OSX_DEVELOPER_ROOT "/Developer")
-+#else()
-   set(OSX_DEVELOPER_ROOT "")
--endif()
-+#endif()
- 
- execute_process(COMMAND sw_vers -productVersion
-   OUTPUT_VARIABLE CURRENT_OSX_VERSION
-@@ -91,10 +91,10 @@
- # CMAKE_OSX_DEPLOYMENT_TARGET
- 
- # Set cache variable - end user may change this during ccmake or cmake-gui configure.
--if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
--  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
--    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
--endif()
-+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
-+#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
-+#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
-+#endif()
- 
- #----------------------------------------------------------------------------
- # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
deleted file mode 100644
index 6bad45b20876..000000000000
--- a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,9 @@
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
- 
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- 
diff --git a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
deleted file mode 100644
index 664c39aae90a..000000000000
--- a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sat, 23 Jun 2018 20:30:07 +0200
-Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection
-
-Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
-Make FindLibUV aware of the file's new location for configuration to work.
-
-Upstream change: https://github.com/libuv/libuv/pull/1429
----
- Source/Modules/FindLibUV.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
-index ba13d75..0554d62 100644
---- a/Source/Modules/FindLibUV.cmake
-+++ b/Source/Modules/FindLibUV.cmake
-@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
- if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
-+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- else()
---
-libgit2 0.27.0
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
deleted file mode 100644
index 2808ed79f735..000000000000
--- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
-Forward-ported from 2.8.10 to 3.4.0-rc1
-
---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-@@ -26,7 +26,7 @@
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- set(CMAKE_SHARED_MODULE_PREFIX "lib")
--set(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- set(CMAKE_MODULE_EXISTS 1)
- set(CMAKE_DL_LIBS "")
- 
-@@ -53,7 +53,7 @@
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
- 
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
deleted file mode 100644
index 2f2764d30cf6..000000000000
--- a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
-Gentoo-bug: 547222
-
---- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -482,13 +482,23 @@
- 
-   get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
- 
--  find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
--    PATHS
--      ENV QTDIR
--      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
--    PATH_SUFFIXES bin
--    DOC "The qmake executable for the Qt installation to use"
--  )
-+  if(CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-+      PATHS
-+        $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
-+        $ENV{EPREFIX}/usr/bin
-+        NO_DEFAULT_PATH
-+      DOC "The qmake executable for the Qt installation to use"
-+    )
-+  else()
-+    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-+      PATHS
-+        ENV QTDIR
-+        "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-+      PATH_SUFFIXES bin
-+      DOC "The qmake executable for the Qt installation to use"
-+    )
-+  endif()
- 
-   set(major 0)
-   if (QT_QMAKE_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch
deleted file mode 100644
index 441650b72a2a..000000000000
--- a/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 7d3a5c466bf14a0c12edc6ece359012b723e39bc Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 23 Mar 2017 11:36:39 +0100
-Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
-
-Gentoo-bug: 400969
-Gentoo-bug: 613442
----
- Modules/FindBoost.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index e795aadcc..11269c30b 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1481,6 +1481,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
-   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
- 
-+  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+    # If a certain version of python has already been selected ensure we select the corresponding boost python version.
-+    if(PYTHON_EXECUTABLE)
-+      set(GENTOO_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
-+    else()
-+      set(GENTOO_PYTHON_EXECUTABLE "python")
-+    endif()
-+    execute_process(COMMAND "${GENTOO_PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+  endif()
-+
-   # Compute component-specific hints.
-   set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
-   if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
-@@ -1529,6 +1539,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+      list(APPEND _boost_RELEASE_NAMES
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+    endif()
-+
-   if(_boost_STATIC_RUNTIME_WORKAROUND)
-     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
-     list(APPEND _boost_RELEASE_NAMES
-@@ -1536,6 +1555,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+        list(APPEND _boost_RELEASE_NAMES
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+      endif()
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
-      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -1571,6 +1597,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+      list(APPEND _boost_DEBUG_NAMES
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+    endif()
-   if(_boost_STATIC_RUNTIME_WORKAROUND)
-     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
-     list(APPEND _boost_DEBUG_NAMES
-@@ -1578,6 +1613,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+        list(APPEND _boost_DEBUG_NAMES
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+      endif()
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
-      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
--- 
-2.12.1
-
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch
deleted file mode 100644
index ce63988f2ec8..000000000000
--- a/dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f51ccd38ed85e5799b2f0a88829eb6a40574ab05 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 02:07:11 +0200
-Subject: [PATCH] Find more variants of ImageMagick
-
----
- Modules/FindImageMagick.cmake | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
-index 7d5534bc2..488d7e0bf 100644
---- a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -196,24 +196,30 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
-   if(component STREQUAL "Magick++")
-     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-       Magick++ CORE_RL_Magick++_
-+      Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI
-       Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI
-       Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI
-+      Magick++-7.Q64 Magick++-7.Q64HDRI Magick++-7.Q32 Magick++-7.Q32HDRI
-       Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
-   elseif(component STREQUAL "MagickWand")
-     FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h"
-       Wand MagickWand CORE_RL_wand_
-+      MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI
-       MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
-       MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI
-+      MagickWand-7.Q64 MagickWand-7.Q64HDRI MagickWand-7.Q32 MagickWand-7.Q32HDRI
-       MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
-   elseif(component STREQUAL "MagickCore")
-     FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h"
-       Magick MagickCore CORE_RL_magick_
-+      MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI
-       MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
-       MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI
-+      MagickCore-7.Q64 MagickCore-7.Q64HDRI MagickCore-7.Q32 MagickCore-7.Q32HDRI
-       MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
--- 
-2.13.1
-
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch
deleted file mode 100644
index 242392d8520e..000000000000
--- a/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 325652950ecc5d72f0a6ac843889a048fe9e32cf Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 02:08:03 +0200
-Subject: [PATCH] Don't mess with python versions too much
-
----
- Modules/FindPythonInterp.cmake | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 64b98a879..73bd35b56 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -64,6 +64,11 @@ if(PythonInterp_FIND_VERSION)
- else()
-     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
- endif()
-+
-+if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+    set(_Python_NAMES python)
-+endif()
-+
- find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
- 
- # Set up the versions we know about, in the order we will search. Always add
-@@ -88,12 +93,13 @@ unset(_PYTHON2_VERSIONS)
- unset(_PYTHON3_VERSIONS)
- 
- # Search for newest python version if python executable isn't found
--if(NOT PYTHON_EXECUTABLE)
-+if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo))
-     foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
-       set(_Python_NAMES python${_CURRENT_VERSION})
-       if(CMAKE_HOST_WIN32)
-         list(APPEND _Python_NAMES python)
-       endif()
-+
-       find_program(PYTHON_EXECUTABLE
-         NAMES ${_Python_NAMES}
-         PATHS
--- 
-2.13.1
-
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
deleted file mode 100644
index f4e9a27597cf..000000000000
--- a/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 01:47:55 +0200
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
-Updated by Lars Wendler (cmake-3.9.0_rc2)
----
- Modules/Platform/Darwin.cmake    | 12 ++++++++----
- Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
- 2 files changed, 32 insertions(+), 9 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index 727baa6e1..543d9e034 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
- 
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
--  set(CMAKE_FIND_FRAMEWORK FIRST)
-+  set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- 
- # Older OS X linkers do not report their framework search path
-@@ -132,6 +132,8 @@ endif()
- 
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
-   endif()
- endif()
- 
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
--  set(CMAKE_FIND_APPBUNDLE FIRST)
-+  set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   "~/Applications"
-   "/Applications"
-   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 5687653cf..be7695898 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -23,6 +23,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-   /usr/local /usr /
- 
-   # CMake install location
-@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- 
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # X11
--  /usr/include/X11
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- 
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # X11
--  /usr/lib/X11
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  )
-+
-+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- 
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
-   )
- 
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- 
--- 
-2.13.1
-
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d05b64..000000000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim 
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake
-autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
deleted file mode 100644
index c5d121a7e9cb..000000000000
--- a/dev-util/cmake/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="server">Enable cmake-server support.</flag>
-		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/cmdtest-0.16 b/dev-util/cmdtest-0.16
new file mode 100644
index 000000000000..f13d7e63c09e
--- /dev/null
+++ b/dev-util/cmdtest-0.16
@@ -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(-)] dev-python/cliapp dev-python/ttystatus 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=black box tests Unix command line tools
+EAPI=5
+HOMEPAGE=http://liw.fi/cmdtest/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=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://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.16.orig.tar.xz
+_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_=b5c838747ac9bfa6f8cba6d9d81bd4f9
diff --git a/dev-util/cmdtest-0.18 b/dev-util/cmdtest-0.18
new file mode 100644
index 000000000000..8c7aa46c2188
--- /dev/null
+++ b/dev-util/cmdtest-0.18
@@ -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(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=black box tests Unix command line tools
+EAPI=5
+HOMEPAGE=http://liw.fi/cmdtest/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=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://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.18.orig.tar.xz
+_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_=a80b0e627f2e64f92ffda72f2e983d87
diff --git a/dev-util/cmdtest-0.27 b/dev-util/cmdtest-0.27
new file mode 100644
index 000000000000..24db8566f5df
--- /dev/null
+++ b/dev-util/cmdtest-0.27
@@ -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(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=black box tests Unix command line tools
+EAPI=6
+HOMEPAGE=http://liw.fi/cmdtest/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=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://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.27.orig.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd05c7c5926c5a8ebfa4f1b559072202
diff --git a/dev-util/cmdtest-0.30 b/dev-util/cmdtest-0.30
new file mode 100644
index 000000000000..e1c859b9c5c2
--- /dev/null
+++ b/dev-util/cmdtest-0.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=black box tests Unix command line tools
+EAPI=6
+HOMEPAGE=http://liw.fi/cmdtest/
+IUSE=python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+LICENSE=GPL-3
+RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.30.orig.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=928ee023cb6b2adeda9cffa6da0fd5b5
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
deleted file mode 100644
index afae394a80db..000000000000
--- a/dev-util/cmdtest/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST cmdtest_0.16.orig.tar.xz 32960 BLAKE2B 61ada4e01007afd41766efb90ec3d9e2caa9453c9759b102a9dd5fb51652fa15a18b490840c9fefc16fbabcbae9964f97655f7b76ce8be36002a685e6fd8000c SHA512 5be73dc1d71706ccf220dc91944d353e4745cd214b54977f0a8093bd540114747a78cf9f65c9ed926bcc0749839e3d9252a23d1ff3c1d05fbe87eceb4915bc26
-DIST cmdtest_0.18.orig.tar.xz 33156 BLAKE2B 11167a16216e14bedbd35a129e9fa84d491a00d4b80acf83ea302172e31a8493544a7ed4d9f446fec22a966826e7b46084ed2f6c1daa7ef34d4d1a1a86a8b5dd SHA512 b5eb9d58401a93fa31cded35338e734a50cacc6af93423b020912a4b1c63d7bf9e35c588ad47678a0395aca6d4dfda76af7c92fbaf41884d542055a04f6406b7
-DIST cmdtest_0.27.orig.tar.xz 37088 BLAKE2B c9f3d898396172cf3957cf3bc13d13629da7074c4e4d80a03cb6c06b6816ed9f1b986a765185d30e49a80e0e646da27098edbf6efc6b04018732dd37b9718b0f SHA512 6c8aae6b60863d75bd1f57bd45589f3b201c7d2907fcbcc7c2a8aa2fe3bf766ab4d9688998046e36c76037e7d3fd2559c26c316216941a55a121f4a87299928f
-DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3
-EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
-EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
-EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-util/cmdtest/cmdtest-0.16.ebuild b/dev-util/cmdtest/cmdtest-0.16.ebuild
deleted file mode 100644
index be5040f8f4b2..000000000000
--- a/dev-util/cmdtest/cmdtest-0.16.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp
-	dev-python/ttystatus
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmdtest/cmdtest-0.18.ebuild b/dev-util/cmdtest/cmdtest-0.18.ebuild
deleted file mode 100644
index 658bc7c80668..000000000000
--- a/dev-util/cmdtest/cmdtest-0.18.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=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmdtest/cmdtest-0.27.ebuild b/dev-util/cmdtest/cmdtest-0.27.ebuild
deleted file mode 100644
index 005e6458d635..000000000000
--- a/dev-util/cmdtest/cmdtest-0.27.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
deleted file mode 100644
index aaef1d8ec955..000000000000
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-
-RDEPEND="
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-util/cmdtest/metadata.xml b/dev-util/cmdtest/metadata.xml
deleted file mode 100644
index ea6b59e79026..000000000000
--- a/dev-util/cmdtest/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>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cmocka-1.1.1 b/dev-util/cmocka-1.1.1
new file mode 100644
index 000000000000..386f36f13391
--- /dev/null
+++ b/dev-util/cmocka-1.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A unit testing framework for C
+EAPI=6
+HOMEPAGE=https://cmocka.org/
+IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1413e90bac25e9b0c2679443edeb061
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
deleted file mode 100644
index e2778de821af..000000000000
--- a/dev-util/cmocka/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
-EBUILD cmocka-1.1.1.ebuild 1099 BLAKE2B 52977ce6645176f20b7c1359e6f34f2cae15f815f4af86f520a4c6174e8e364f081fdbe3ec6f5bab78897bed97319df95d3ae7e5f922de19a6d3eb6a532b5e7d SHA512 367a29b47190f086a336a774450b59a18e762fa2090ce1bab742adc83e6f8e114a2b31ec89c75b12f6acb90d97d93cf80edd64c4cb6e32a05b8a5885ee63d8e6
-MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
deleted file mode 100644
index 41a99bde71d1..000000000000
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
-
-DEPEND="
-	doc? ( app-doc/doxygen[latex] )
-"
-RDEPEND=""
-
-DOCS=( AUTHORS ChangeLog README )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_STATIC_LIB=$(usex static-libs)
-		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc; then
-		pushd doc || die
-		doxygen Doxyfile || die
-		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
-		dodoc -r html/
-		dodoc -r latex/
-		doman man/man3/*.3
-		popd || die
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
deleted file mode 100644
index b659c1627a38..000000000000
--- a/dev-util/cmocka/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>creffett@gentoo.org</email>
-        <name>Chris Reffett</name>
-</maintainer>
-<maintainer type="project">
-        <email>kde@gentoo.org</email>
-        <name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cmt-1.26 b/dev-util/cmt-1.26
new file mode 100644
index 000000000000..3f5ba2c6a823
--- /dev/null
+++ b/dev-util/cmt-1.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=emacs? ( virtual/emacs )
+DESCRIPTION=Cross platform configuration management environment
+EAPI=5
+HOMEPAGE=http://www.cmtsite.net/
+IUSE=emacs java doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-2
+RDEPEND=emacs? ( virtual/emacs ) java? ( virtual/jdk )
+SLOT=0
+SRC_URI=http://www.cmtsite.net/v1r26/CMTv1r26.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=26a01cf385266ccce5dff636e95fb5b9
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
deleted file mode 100644
index f9f2b12180c9..000000000000
--- a/dev-util/cmt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 80cmt-mode-gentoo.el 207 BLAKE2B dd882d2b5eafca38bb300bac4848792357943c954bcc3825bf5e1e0818d0bd0f12bf975a20dbe78e45bedad9dc6a1d122534b4e51ef8083bab828a0a241a9bc9 SHA512 a4006264cde07d84ab9171f48fa2d18c3c6e3fe3025acd55707d94f96dac9573e22e45196d784d9aa04f904fe0d3ee99e63f3a2aded00ee7d76a305728c1ae8d
-DIST CMTv1r26.tar.gz 2194291 BLAKE2B 9c45cc5440fd8698c06343a1c5c0f26b9047c885bb93678cf15ec42b15951d055d45511b221642c756c447709e7ace480fff4ad88f8185ee5390f227d4f2ded8 SHA512 412366dbf4aaef9f092f9472792e314c6d8f3e0360ddfa6d135e2bea9a167b627ddc78ad5a2d4f5139b4835abb68c06166abf3204bf5ba3969089923782e817e
-EBUILD cmt-1.26.ebuild 2035 BLAKE2B d77f5b74e6e35019e28454712b4b4398959468ab433948fe98c16385a024e491cdb37ad49ff9d04aec798da954e75a8862875a5402a90bf82a31dd7c3f8b1b5d SHA512 e16d9e2d7da3ba148fa4e5ca7d1578ab4eba13b3953c851d06341cc188285e6d434b2b8a6fe8483916fed9ecf6eeaae0311fd30e9b891d3bcd782b979d80e2c0
-MISC metadata.xml 633 BLAKE2B 299f7f5b12cd6bd3b48cc753ef35ecae60140e8d38110becc5670c9fc6b555aaa22015d6895bded49353e19c8b1bc09e22997d13736a0089033c9ccbae0cede3 SHA512 e0e6c39d85e7a9f567561d76522a4e2b985f19969a686638717debee62ad7c94c0b2ae8fd1949c3e51d550c589de4fbfae793f8f4568e18a2ec1c9750c0fa7d7
diff --git a/dev-util/cmt/cmt-1.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
deleted file mode 100644
index c36fd4ad8f2b..000000000000
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils elisp-common multilib toolchain-funcs versionator
-
-CPV=($(get_version_components ${PV}))
-CMT_PV=v${CPV[0]}r${CPV[1]}
-
-DESCRIPTION="Cross platform configuration management environment"
-HOMEPAGE="http://www.cmtsite.net/"
-SRC_URI="http://www.cmtsite.net/${CMT_PV}/CMT${CMT_PV}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs java doc"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	java? ( virtual/jdk )"
-
-S="${WORKDIR}/CMT/${CMT_PV}"
-
-src_configure() {
-	cd "${S}"/mgr || die
-	./INSTALL || die
-	source setup.sh
-}
-
-src_compile() {
-	cd "${S}"/mgr || die
-	emake \
-		cpp="$(tc-getCXX)" \
-		cppflags="${CXXFLAGS}" \
-		cpplink="$(tc-getCXX) ${LDFLAGS}"
-
-	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
-	cd "${S}" || die
-	mv src/demo . || die
-	rm ${CMTBIN}/*.o || die
-
-	use emacs && elisp-compile doc/cmt-mode.el
-}
-
-src_install() {
-	CMTDIR=/usr/$(get_libdir)/CMT/${CMT_PV}
-	dodir ${CMTDIR}
-	cp -pPR mgr src ${CMTBIN} "${ED}"/${CMTDIR} || die
-	dodir /usr/bin
-	dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
-
-	cat > 99cmt <<-EOF
-		 CMTROOT="${EROOT%/}${CMTDIR}"
-		 CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
-		 CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
-	EOF
-	if use java; then
-		cp -pPR java "${ED}"/${CMTDIR}
-		echo "#!${EPREFIX}/bin/sh" > jcmt
-		echo "java cmt_parser" >> jcmt
-		dobin jcmt
-		echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
-	fi
-
-	doenvd 99cmt
-	dodoc ChangeLog doc/*.txt
-	dohtml doc/{ChangeLog,ReleaseNotes}.html
-
-	if use doc; then
-		emake -C mgr gendoc
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{CMTDoc,CMTFAQ}.{html,pdf} doc/Images
-		doins -r demo
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} doc/cmt-mode.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/80cmt-mode-gentoo.el || die
-	fi
-}
-
-pkg_postinst () {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmt/files/80cmt-mode-gentoo.el b/dev-util/cmt/files/80cmt-mode-gentoo.el
deleted file mode 100644
index 91be98ebc614..000000000000
--- a/dev-util/cmt/files/80cmt-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; cmt site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'cmt-mode "cmt-mode" "CMT requirements file editing mode." t)
-(add-to-list 'auto-mode-alist '("requirements\\'" . cmt-mode))
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
deleted file mode 100644
index 0f9287ff41d9..000000000000
--- a/dev-util/cmt/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-needed -->
-  <longdescription lang="en">
-  CMT is a configuration management environment, based on some
-  management conventions and comprises several shell-based
-  utilities. It is an attempt to formalize software production and
-  especially configuration management around a package-oriented
-  principle. Used in High Energy Physics large experiments, where
-  tailored packages are developped and they do not know the existence
-  of portage and overlays.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/coccigrep-1.13 b/dev-util/coccigrep-1.13
new file mode 100644
index 000000000000..d21b60a3a953
--- /dev/null
+++ b/dev-util/coccigrep-1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=doc? ( dev-python/sphinx ) emacs? ( virtual/emacs ) 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 semantic grep for the C language
+EAPI=6
+HOMEPAGE=http://home.regit.org/software/coccigrep/
+IUSE=doc emacs vim python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-util/coccinelle[python] emacs? ( virtual/emacs ) vim? ( || ( app-editors/vim app-editors/gvim ) ) 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/regit/coccigrep/archive/v1.13.tar.gz -> coccigrep-1.13.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b2371563d600f8a4a0fe64cffa402721
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
deleted file mode 100644
index db891843f02f..000000000000
--- a/dev-util/coccigrep/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
-DIST coccigrep-1.13.tar.gz 32366 BLAKE2B 8b9d8e0832c6bbacb3a8efd74ab8f4a0ec3112e935ddca63f345799ebc96a3dfbc8fe8e9fa77cee912d7dd5ee28c62e72ea00173e4ee4b16588b4b6e1eaf661c SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba
-EBUILD coccigrep-1.13.ebuild 1336 BLAKE2B 7f096b29a8b9556a20b0253ec4016c21f15da1cc51d71dbb15057d0ae890e92d1b7b92d9c728520780ccb4a8b7602cfc6ac9bd45b0e6031d483e9483d0774aa6 SHA512 e8c7b1e718a98695eea59a7a76920c6e97b5967aaa0f961d76063f5d049dc687f274fc2c3fb3d34ba0ee090a07ff7d6dabd105682754a4211c4c0530a7a58de4
-MISC metadata.xml 400 BLAKE2B b233da69d5a9b48dc8349f1f0e746a5d39dbf14a2da934b486935e44d5a8219d7e771f880ce41d2005b2ccc75f5c982989008e7b294bb853d1e240203fb83d32 SHA512 785b3ffe7af1ca248f1aad24c21e3d5c5e0fdef899a7002ae53fea4a8fcafd3ad2d2e759540a1e0556853b62bfa7b0c27303a5be45bde5ce176db3be94c31c40
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
deleted file mode 100644
index f56d4bacedc9..000000000000
--- a/dev-util/coccigrep/coccigrep-1.13.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 )
-
-inherit distutils-r1 elisp-common
-
-DESCRIPTION="A semantic grep for the C language"
-HOMEPAGE="http://home.regit.org/software/coccigrep/"
-SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs vim"
-
-RDEPEND="dev-util/coccinelle[python]
-	emacs? ( virtual/emacs )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="doc? ( dev-python/sphinx )
-	emacs? ( virtual/emacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-python_compile_all() {
-	use doc && emake -C doc html
-
-	if use emacs ; then
-		elisp-compile editors/*.el || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS="doc/_build/html/."
-	distutils-r1_python_install_all
-
-	doman ${PN}.1
-
-	if use emacs ; then
-		elisp-install ${PN} editors/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-
-	if use vim ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins editors/cocci-grep.vim
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	einfo "Syntax highlighting is supported through dev-python/pygments."
-	einfo "Install it if you want colorized output formats."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccigrep/files/50coccigrep-gentoo.el b/dev-util/coccigrep/files/50coccigrep-gentoo.el
deleted file mode 100644
index 7fbc6b93e541..000000000000
--- a/dev-util/coccigrep/files/50coccigrep-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;; coccigrep site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'cocci-grep)
diff --git a/dev-util/coccigrep/metadata.xml b/dev-util/coccigrep/metadata.xml
deleted file mode 100644
index 0c548f25bb2b..000000000000
--- a/dev-util/coccigrep/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<use>
-		<flag name="vim">Install the coccigrep vim plugin</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">regit/coccigrep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/coccinelle-1.0.5 b/dev-util/coccinelle-1.0.5
new file mode 100644
index 000000000000..bf31a510f46f
--- /dev/null
+++ b/dev-util/coccinelle-1.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
+DESCRIPTION=Program matching and transformation engine
+EAPI=5
+HOMEPAGE=http://coccinelle.lip6.fr/
+IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.5.tgz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a031fd88c63b44dc98000061e103fe6
diff --git a/dev-util/coccinelle-1.0.6 b/dev-util/coccinelle-1.0.6
new file mode 100644
index 000000000000..51a2d0e81e3c
--- /dev/null
+++ b/dev-util/coccinelle-1.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
+DESCRIPTION=Program matching and transformation engine
+EAPI=6
+HOMEPAGE=http://coccinelle.lip6.fr/
+IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5699c094bfb3dc2ba124479977373f21
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
deleted file mode 100644
index f1efa8c333d7..000000000000
--- a/dev-util/coccinelle/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
-DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
-DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2532 BLAKE2B 61181f5b7d0c9fc9412fc14ef043f65219318715f586105d75d7e5ea27e0bb95bcfa0870f41f98cebd6e6f30a0636fee8f0b0f46e806a3f743a00d86eba61d12 SHA512 4fc8095cc0c7ac610e5f73bb4bbc5fce144979773fff9047f54dfea8ffdc17c4d8576c9dd90059f778a8ec19f905a61f6ad29ef4a0a68629fedadb4c376751c5
-EBUILD coccinelle-1.0.6.ebuild 2540 BLAKE2B 250bbaff5f571d1ed9130840eebc1382813276ee32134664f9d8130a5d96050857cba62802eaa7f0e3929ff3bd9bc3d47bbc8c03b807f1628ce2b9617c92e576 SHA512 a81263ea8c9bd9323e96df6996bcb311bd6f7ab1a67444efe2c5ebba2f666395af4cdef9b9ddf0353d314ccb8053cb317b6f51f348c6c229cb45554e0d5fd93a
-MISC metadata.xml 350 BLAKE2B 0a338a957b414534b2bc01b9e916a93bc4b17d54b855b23d90f67af7f53a2dddded19eec734bd50edec0130b0b2210869c96c3f8cafe968446dad7d44b76740a SHA512 9c0be4d11897f712a537302f5f87d92cf8df5866e60d3293f5dbf7fe6dd1d88d5678e103319577b397546307604124db39ac47cde7dfb5e61141c43a0fbe5761
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
deleted file mode 100644
index e4f865f92b0e..000000000000
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ /dev/null
@@ -1,122 +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 multilib eutils python-single-r1 bash-completion-r1 elisp-common
-
-MY_P="${P/_/-}"
-DESCRIPTION="Program matching and transformation engine"
-HOMEPAGE="http://coccinelle.lip6.fr/"
-SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# ocaml enables ocaml scripting (uses findlib)
-CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/sexplib:=[ocamlopt(+)?]
-	dev-ml/menhir:=[ocamlopt?]
-	dev-ml/camlp4:=[ocamlopt?]
-	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( virtual/emacs )
-	ocaml? ( dev-ml/findlib:= )
-	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="${CDEPEND}
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsextra
-	)"
-
-DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
-S=${WORKDIR}/${MY_P}
-
-SITEFILE=50coccinelle-gentoo.el
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use python ; then
-		# fix python install location
-		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
-			-i Makefile || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ocaml) \
-		$(use_enable pcre) \
-		$(use_enable pcre pcre-syntax) \
-		$(use_enable ocamlopt opt)
-}
-
-src_compile() {
-	emake depend
-
-	if use ocamlopt ; then
-		emake all.opt
-	else
-		emake TARGET_SPATCH=byte-only all-dev
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts emake docs
-	fi
-
-	if use emacs ; then
-		elisp-compile editors/emacs/cocci.el || die
-	fi
-}
-
-src_test() {
-	emake check
-	use python && emake pycocci-check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc docs/manual/*.pdf
-	newbashcomp scripts/spatch.bash_completion spatch
-
-	if use emacs ; then
-		elisp-install ${PN} editors/emacs/*
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use vim-syntax ; then
-		newdoc editors/vim/README README-vim
-		rm editors/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r editors/vim/*
-	fi
-
-	use python && python_optimize
-
-	export STRIP_MASK='*/coccinelle/spatch'
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
deleted file mode 100644
index 1e97b0576dc1..000000000000
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ /dev/null
@@ -1,124 +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 multilib eutils python-single-r1 bash-completion-r1 elisp-common
-
-MY_P="${P/_/-}"
-DESCRIPTION="Program matching and transformation engine"
-HOMEPAGE="http://coccinelle.lip6.fr/"
-SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# ocaml enables ocaml scripting (uses findlib)
-CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/sexplib:=[ocamlopt(+)?]
-	dev-ml/menhir:=[ocamlopt?]
-	dev-ml/camlp4:=[ocamlopt?]
-	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( virtual/emacs )
-	ocaml? ( dev-ml/findlib:= )
-	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="${CDEPEND}
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsextra
-	)"
-
-DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
-S=${WORKDIR}/${MY_P}
-
-SITEFILE=50coccinelle-gentoo.el
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python ; then
-		# fix python install location
-		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
-			-i Makefile || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ocaml) \
-		$(use_enable pcre) \
-		$(use_enable pcre pcre-syntax) \
-		$(use_enable ocamlopt opt)
-}
-
-src_compile() {
-	emake depend
-
-	if use ocamlopt ; then
-		emake all.opt
-	else
-		emake TARGET_SPATCH=byte-only all-dev
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}"/fonts emake docs
-	fi
-
-	if use emacs ; then
-		elisp-compile editors/emacs/cocci.el || die
-	fi
-}
-
-src_test() {
-	emake check
-	use python && emake pycocci-check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc docs/manual/*.pdf
-	newbashcomp scripts/spatch.bash_completion spatch
-
-	if use emacs ; then
-		elisp-install ${PN} editors/emacs/*
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use vim-syntax ; then
-		newdoc editors/vim/README README-vim
-		rm editors/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r editors/vim/*
-	fi
-
-	use python && python_optimize
-
-	export STRIP_MASK='*/coccinelle/spatch'
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el
deleted file mode 100644
index 6721b3c5e5a1..000000000000
--- a/dev-util/coccinelle/files/50coccinelle-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; site-lisp configuration for coccinelle
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t)
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
deleted file mode 100644
index 9e3f651e48b2..000000000000
--- a/dev-util/coccinelle/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>radhermit@gentoo.org</email>
-  <name>Tim Harder</name>
-</maintainer>
-<maintainer type="project">
-  <email>ml@gentoo.org</email>
-  <name>Gentoo ML Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/codeblocks-17.12 b/dev-util/codeblocks-17.12
new file mode 100644
index 000000000000..b4478a1c825f
--- /dev/null
+++ b/dev-util/codeblocks-17.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin ) 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 >=sys-apps/sed-4
+DESCRIPTION=The open source, cross platform, free C++ IDE
+EAPI=6
+HOMEPAGE=http://www.codeblocks.org/
+IUSE=contrib debug fortran pch
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
+SLOT=0
+SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=81c6dff70eca0384a9713709c9eddcf5
diff --git a/dev-util/codeblocks-17.12-r300 b/dev-util/codeblocks-17.12-r300
new file mode 100644
index 000000000000..1c907a458a51
--- /dev/null
+++ b/dev-util/codeblocks-17.12-r300
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=app-arch/zip x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin ) 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 >=sys-apps/sed-4
+DESCRIPTION=The open source, cross platform, free C++ IDE
+EAPI=6
+HOMEPAGE=http://www.codeblocks.org/
+IUSE=contrib debug fortran pch
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/zip x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
+SLOT=0
+SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5fdf56b06c013d50a868f66e54d87f0c
diff --git a/dev-util/codeblocks-9999 b/dev-util/codeblocks-9999
new file mode 100644
index 000000000000..6b696e84cb3d
--- /dev/null
+++ b/dev-util/codeblocks-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install preinst prepare unpack
+DEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin ) 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 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=The open source, cross platform, free C++ IDE
+EAPI=5
+HOMEPAGE=http://www.codeblocks.org/
+IUSE=contrib debug pch static-libs
+LICENSE=GPL-3
+RDEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=122f162b09bd5f0c0d7fad21277caf8d
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
deleted file mode 100644
index 187f5c15dce4..000000000000
--- a/dev-util/codeblocks/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
-DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
-DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83
-EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
-EBUILD codeblocks-9999.ebuild 1249 BLAKE2B 143412cd2c6b0652612cbb89e0385803ccadfd34fda6df4a0bbf8a4628f5dfedc5480f890b57e814778768cfe7b728fddd0e8119086c61b0a1b5b6433cd5d053 SHA512 f2d31b7ef1d77d92d388c9a2c89114d14cc0c5bd7e1e29f120cf9ad12bd43d14d04adacd0f63e0bdc340c2b229477a41f43cd36f0e489a8e85a1f0601338808d
-MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc
diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
deleted file mode 100644
index 3b627ef7a238..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# USE="contrib -fortran" setup:
-	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
-	# USE="contrib fortran" setup:
-	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-	# USE="-contrib fortran" setup:
-	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
-
-	econf \
-		--with-wx-config="${WX_CONFIG}" \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
deleted file mode 100644
index ed606b14c4af..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# USE="contrib -fortran" setup:
-	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
-	# USE="contrib fortran" setup:
-	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-	# USE="-contrib fortran" setup:
-	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
-
-	econf \
-		--with-wx-config="${WX_CONFIG}" \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
deleted file mode 100644
index 9296cc13443b..000000000000
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit autotools eutils subversion wxwidgets
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-SRC_URI=""
-ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
-
-IUSE="contrib debug pch static-libs"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	subversion_src_unpack
-}
-
-src_prepare() {
-	# Let's make the autorevision work.
-	subversion_wc_info
-	CB_LCD=$(LC_ALL=C svn info "${ESVN_WC_PATH}" | grep "^Last Changed Date:" | cut -d" " -f4,5)
-	echo "m4_define([SVN_REV], ${ESVN_WC_REVISION})" > revision.m4
-	echo "m4_define([SVN_DATE], ${CB_LCD})" >> revision.m4
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	econf \
-		--with-wx-config="${WX_CONFIG}" \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		$(use_with contrib contrib-plugins all)
-}
-
-src_compile() {
-	emake clean-zipfiles
-	emake
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
deleted file mode 100644
index 7cbb678dda6a..000000000000
--- a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
-diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
---- old/m4/acinclude.m4	2017-11-01 02:32:37.000000000 +0300
-+++ new/m4/acinclude.m4	2018-05-04 11:08:33.000000000 +0300
-@@ -91,8 +91,6 @@
- AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
-                        enable_debug=$debug_default)
-     if test "x$enable_debug" = "xyes"; then
--        CFLAGS="-g $CFLAGS"
--        CXXFLAGS="-g $CXXFLAGS"
-         CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
-         AC_MSG_RESULT(yes)
-     else
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
deleted file mode 100644
index 4d0690ce374b..000000000000
--- a/dev-util/codeblocks/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>torokhov_s_a@mail.ru</email>
-    <name>Sergey Torokhov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>wxwidgets@gentoo.org</email>
-    <name>Gentoo wxWidgets Project</name>
-  </maintainer>
-  <use>
-    <flag name="contrib">Build additional contrib components</flag>
-    <flag name="fortran">Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">codeblocks</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/colm-0.13.0.4 b/dev-util/colm-0.13.0.4
new file mode 100644
index 000000000000..30d60ab5c588
--- /dev/null
+++ b/dev-util/colm-0.13.0.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=COmputer Language Manipulation
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/colm/
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.4.tar.gz
+_md5_=06974b6a48050d9fc981580127df438f
diff --git a/dev-util/colm-0.13.0.5 b/dev-util/colm-0.13.0.5
new file mode 100644
index 000000000000..209b4a915ff7
--- /dev/null
+++ b/dev-util/colm-0.13.0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-text/asciidoc
+DESCRIPTION=COmputer Language Manipulation
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/colm/
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.5.tar.gz
+_md5_=b44d9107655ac576ba73e3608c2337f9
diff --git a/dev-util/colm-0.13.0.6 b/dev-util/colm-0.13.0.6
new file mode 100644
index 000000000000..a5974e927c4a
--- /dev/null
+++ b/dev-util/colm-0.13.0.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-text/asciidoc
+DESCRIPTION=COmputer Language Manipulation
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/colm/
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.6.tar.gz
+_md5_=42824b35884ba30223a482ea549a4084
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
deleted file mode 100644
index 97a23bdb2791..000000000000
--- a/dev-util/colm/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST colm-0.13.0.4.tar.gz 707983 BLAKE2B a6b03f24ebe8bf44dbb17b6bd3f545a33b58883fae403d927cd30a81dd2376ae0fd4271c308008d64865697e63cb7cc988465c28b22e56c2136cbd533b32e999 SHA512 4684a315f3fef7cd6ff0982e357b59b110c02dfc2ce00a207d5d16dd9475f41790f3cfec9ddb5347d20da879cb0beebc03d3c56c325ce2ef22438555fcf60402
-DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10b6562c4af734735f5aa25f53fc12260cbe52f019ff04c5117155aeb96358771f20b3e02012639a08527a54d98 SHA512 c5a1228260327d65c2cb5821fbc583608e2a308927b04cb0e7dbc84bced60d0d62892b4e30aa2228fee0d08f6828dc58d88788340433bc5bba9d503977883fc9
-DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
-EBUILD colm-0.13.0.4.ebuild 372 BLAKE2B 789e470189b8c31dce2145bd696f762569d5a8021090d3d09a0c300f63488e2de8412d1e250a16a9e37bafae61530d5ccc61a56e1998a5d485345f292d5bb3a5 SHA512 d1240148c5b89cdcff5750859b8bd920782f907f53d736f775def15c259e443d044900cd19d65445ff55ba6ab62a15b3a084a9a0734ddb1151a0f887a24a68b0
-EBUILD colm-0.13.0.5.ebuild 369 BLAKE2B d0ba7775c5790ee755ee02bea5116ecdeeb7384921bf3cf6efb961411f1b390e5aa5a35a862a9b32b281b8c9a41eeb02020c0f40f08bd66e34a5670c006e147d SHA512 8841033b07afc3493ffb138a0dfce6ff9db8eb9ba365c5936e342ca6a2857c70df06061b897d09fb6b17216edcc675110aef53b3e531d9174d4e99c186f00910
-EBUILD colm-0.13.0.6.ebuild 369 BLAKE2B 23312cc0f9f5bfc5ef8f6b2c2701b82be5c6f5d12b851e32d43f860543b2c3b90b54ae992254ecd9e0dff76eb2a3bf6ee04d2c090724b94a02bdf7a1db4369d5 SHA512 e73724fff948cbceb33155ef6737503fac5e21ccbb6a1b7cf7f6f61dd94e67d1403724829f12c7dbc0e62e84226bf3d27a5523425abc5a4b0e321a007e1856ec
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.4.ebuild b/dev-util/colm/colm-0.13.0.4.ebuild
deleted file mode 100644
index d193b2407b6a..000000000000
--- a/dev-util/colm/colm-0.13.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
deleted file mode 100644
index d1aab6a6b73b..000000000000
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/colm-0.13.0.6.ebuild b/dev-util/colm/colm-0.13.0.6.ebuild
deleted file mode 100644
index fab1897a2181..000000000000
--- a/dev-util/colm/colm-0.13.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/metadata.xml b/dev-util/colm/metadata.xml
deleted file mode 100644
index f3de5f693ed8..000000000000
--- a/dev-util/colm/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/dev-util/colorgcc-1.3.2-r7 b/dev-util/colorgcc-1.3.2-r7
new file mode 100644
index 000000000000..82c7a728933e
--- /dev/null
+++ b/dev-util/colorgcc-1.3.2-r7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl script to colorise the gcc output.
+EAPI=5
+HOMEPAGE=http://schlueters.de/colorgcc.html
+KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=mirror://gentoo/colorgcc-1.3.2.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_=3e71922fcb596965b2579b55a4c7b354
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
deleted file mode 100644
index 0578bf46b30d..000000000000
--- a/dev-util/colorgcc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX colorgcc-1.3.2-gentoo-one.patch 6576 BLAKE2B ef07061997435ff2807f15e2192a11effb8e527f1c179de333a183447b423ea2c5c070fc1693fb24aef17ab6bfe99863fafc5025b2ab8d0f463b37173df96af1 SHA512 c69817277bd8fa63a4cb54abc2b6300d3f31becd189a01605b06b828a11a4b0ea5edf78048bcbf6f271693149376bc625770605d6bb157251c77f7a4608dae91
-AUX colorgcc-1.3.2-gentoo-two.patch 1953 BLAKE2B d5f7c061674ac993c2228fe435b38c0bc06e1b0f9a403219d96e358427e6cadc66ee3532a893d131265d448edc9e79b6c089963c635003ff05f279b84fb2cce4 SHA512 ede1391446346e5701ddb5fb1ee34c87d1d9877b2ec221f07923b6a17e199caa93f3183d4d8f7349955d425a3094a9ce8e2d2ace71a3c5030f811eb0895a834d
-AUX colorgcc-1.3.2-nohang.patch 1752 BLAKE2B 244d7e7480b148849516ac672a7d164c58c4b4dc500d13e03b0fa2626eeb7bd776eb31f3e982cb1255611057bc26810d468ff247f08a7f9d1aeab7dd7ac46e42 SHA512 4c345e7e21e6a53f16197ea64594ddef646045de2d3d4f1ad500f24c081d06490babc7b375d6e5b0968da73d8332da2590e7f6924d81c20fe8ca9d59949d0b22
-AUX colorgcc-1.3.2-note.patch 1922 BLAKE2B 79c2950839c25870bea70a8cb9636a6525283773d8a180a93491d1a93a7d90c2f80814f6f98c75a497eea9b008d10c65b7e872afab47a38484c021aad53c08c2 SHA512 8b9dfd8a3790178a245ffc40bd5631397b9d1acdb5fd06e7c768d9679414174f06036ed09d29b61fc349b9155f95a2505e2dda88736ca899f038b3ca17207a72
-DIST colorgcc-1.3.2.tar.gz 11076 BLAKE2B 80843c200157fea52cc9f0f7f3008a52860ab8e1256490126d499b34f6821957de92755cbda835806e2df83866ef11096d6d80a0739fb87ef7c348ccf58d76af SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448
-EBUILD colorgcc-1.3.2-r7.ebuild 2109 BLAKE2B 35a54cf4be04591bacada65d44b3d860c7cf6e445d5d28d8ba866ac342cf2be43b42c2cf43d9b18bf6d37676aa93af7881a8463f77384cfa7e366efc753a1bd3 SHA512 bdd1cf69e9212208263e6211a39b048d5a243b96f684da4b9d203949c314048c3e7c1410203880b09c69d52a61418cc376f6ce48f2e06d61b1e74a4833e5ad7c
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
deleted file mode 100644
index 35ac497be836..000000000000
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.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
-
-inherit eutils
-
-DESCRIPTION="Perl script to colorise the gcc output."
-HOMEPAGE="http://schlueters.de/colorgcc.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo-one.patch
-	"${FILESDIR}"/${P}-gentoo-two.patch
-	"${FILESDIR}"/${P}-note.patch
-	"${FILESDIR}"/${P}-nohang.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	dobin "${PN}"
-	dodir "/etc/${PN}" "/usr/lib/${PN}/bin"
-	insinto "/etc/${PN}"
-	doins "${PN}rc"
-	einfo "Scanning for compiler front-ends"
-	into "/usr/lib/${PN}/bin"
-	local COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ )
-	for c in "${COMPILERS[@]}"; do
-		[[ -n "$(type -p ${c})" ]] && \
-			dosym "/usr/bin/${PN}" "/usr/lib/${PN}/bin/${c}"
-	done
-
-	dodoc CREDITS ChangeLog
-}
-
-pkg_postinst() {
-	echo
-	elog "If you have existing \$HOME/.colorgccrc files that set the location"
-	elog "of the compilers, you should remove those lines for maximum"
-	elog "flexibility.  The colorgcc script now knows how to pass the command"
-	elog "on to the next step in the PATH without manual tweaking, making it"
-	elog "easier to use with things like ccache and distcc on a conditional"
-	elog "basis.  You can tweak the /etc/colorgcc/colorgccrc file to change"
-	elog "the default settings for everyone (or copy this file as a basis for"
-	elog "a custom \$HOME/.colorgccrc file)."
-	elog
-	elog "NOTE: the symlinks for colorgcc are now located in"
-	elog "/usr/lib/colorgcc/bin *NOT* /usr/bin/wrappers.  You'll need to"
-	elog "change any PATH settings that referred to the old location."
-	echo
-
-	# portage won't delete the old symlinks for users that are upgrading
-	# because the old symlinks still point to /usr/bin/colorgcc which exists...
-	if [[ -d "${EROOT}"/usr/bin/wrappers ]]; then
-		rm -frv "${EROOT}"/usr/bin/wrappers || die
-	fi
-}
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
deleted file mode 100644
index 68a177ba75c7..000000000000
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
+++ /dev/null
@@ -1,242 +0,0 @@
---- colorgcc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgcc	2003-04-11 16:38:52.000000000 -0700
-@@ -88,16 +88,16 @@
- #
- # 1.0.0 Initial Version
- 
-+use strict;
-+
- use Term::ANSIColor;
- use IPC::Open3;
-+use Cwd 'abs_path';
-+
-+my(%nocolor, %colors, %compilerPaths);
- 
- sub initDefaults
- {
--   $compilerPaths{"gcc"} = "/usr/local/bin/gcc";
--   $compilerPaths{"g++"} = "/usr/local/bin/g++";
--   $compilerPaths{"cc"}  = "/usr/bin/cc";
--   $compilerPaths{"c++"} = "/usr/local/bin/c++";
--
-    $nocolor{"dumb"} = "true";
- 
-    $colors{"srcColor"} = color("cyan");
-@@ -125,26 +125,26 @@
-       next if (m/^\#.*/);          # It's a comment.
-       next if (!m/(.*):\s*(.*)/);  # It's not of the form "foo: bar".
- 
--      $option = $1;
--      $value = $2;
-+      my $option = $1;
-+      my $value = $2;
- 
--      if ($option =~ m/cc|c\+\+|gcc|g\+\+/)
--      {
--	 $compilerPaths{$option} = $value;
--      }
--      elsif ($option eq "nocolor")
-+      if ($option eq "nocolor")
-       {
- 	 # The nocolor option lists terminal types, separated by
- 	 # spaces, not to do color on.
--	 foreach $termtype (split(/\s+/, $value))
-+	 foreach my $term (split(' ', $value))
- 	 {
--	    $nocolor{$termtype} = "true";
-+	    $nocolor{$term} = 1;
- 	 }
-       }
--      else
-+      elsif (defined $colors{$option})
-       {
- 	 $colors{$option} = color($value);
-       }
-+      else
-+      {
-+	 $compilerPaths{$option} = $value;
-+      }
-    }
-    close(PREFS);
- }
-@@ -180,41 +180,80 @@
- initDefaults();
- 
- # Read the configuration file, if there is one.
--$configFile = $ENV{"HOME"} . "/.colorgccrc";
-+my $configFile = $ENV{"HOME"} . "/.colorgccrc";
- if (-f $configFile)
- {
-    loadPreferences($configFile);
- }
-+elsif (-f '/etc/colorgcc/colorgccrc')
-+{
-+   loadPreferences('/etc/colorgcc/colorgccrc');
-+}
- 
- # Figure out which compiler to invoke based on our program name.
- $0 =~ m%.*/(.*)$%;
--$progName = $1 || $0;
--
--$compiler = $compilerPaths{$progName} || $compilerPaths{"gcc"};
--
--# Get the terminal type. 
--$terminal = $ENV{"TERM"} || "dumb";
-+my $progName = $1 || $0;
-+my $compiler_pid;
- 
--# If it's in the list of terminal types not to color, or if
--# we're writing to something that's not a tty, don't do color.
--if (! -t STDOUT || $nocolor{$terminal})
-+# If called as "colorgcc", just filter STDIN to STDOUT.
-+if ($progName eq 'colorgcc')
- {
--   exec $compiler, @ARGV
--      or die("Couldn't exec");
-+   open(GCCOUT, "<&STDIN");
- }
-+else
-+{
-+   # See if the user asked for a specific compiler.
-+   my $compiler;
-+   if (!defined($compiler = $compilerPaths{$progName}))
-+   {
-+      # Find our wrapper dir on the PATH and tweak the PATH to remove
-+      # everything up-to and including our wrapper dir.
-+      if ($0 =~ m#(.*)/#)
-+      {
-+	 # We were called with an explicit path, so trim that off the PATH.
-+	 my $find = $1;
-+	 $find = abs_path($1) unless $find =~ m#^/#;
-+	 $ENV{'PATH'} =~ s#.*(^|:)\Q$find\E(:|$)##;
-+      }
-+      else
-+      {
-+	 my(@dirs) = split(/:/, $ENV{'PATH'});
-+	 while (defined($_ = shift @dirs))
-+	 {
-+	    if (-x "$_/$progName")
-+	    {
-+	       $ENV{'PATH'} = join(':', @dirs);
-+	       last;
-+	    }
-+	 }
-+      }
-+      $compiler = $progName;
-+   }
- 
--# Keep the pid of the compiler process so we can get its return
--# code and use that as our return code.
--$compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
-+   # Get the terminal type. 
-+   my $terminal = $ENV{"TERM"} || "dumb";
-+
-+   # If it's in the list of terminal types not to color, or if
-+   # we're writing to something that's not a tty, don't do color.
-+   if (! -t STDOUT || $nocolor{$terminal})
-+   {
-+      exec $compiler, @ARGV
-+	 or die("Couldn't exec");
-+   }
-+
-+   # Keep the pid of the compiler process so we can get its return
-+   # code and use that as our return code.
-+   $compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
-+}
- 
- # Colorize the output from the compiler.
- while(<GCCOUT>)
- {
--   if (m/^(.*?):([0-9]+):(.*)$/) # filename:lineno:message
-+   if (m#^(.+?\.[^:/ ]+):([0-9]+):(.*)$#) # filename:lineno:message
-    {
--      $field1 = $1 || "";
--      $field2 = $2 || "";
--      $field3 = $3 || "";
-+      my $field1 = $1 || "";
-+      my $field2 = $2 || "";
-+      my $field3 = $3 || "";
- 
-       if ($field3 =~ m/\s+warning:.*/)
-       {
-@@ -232,6 +271,10 @@
-       }
-       print("\n");
-    }
-+   elsif (m/^:.+`.*'$/) # filename:message:
-+   {
-+      srcscan($_, $colors{"warningMessageColor"});
-+   }
-    elsif (m/^(.*?):(.+):$/) # filename:message:
-    {
-       # No line number, treat as an "introductory" line of text.
-@@ -244,11 +287,9 @@
-    }
- }
- 
--# Get the return code of the compiler and exit with that.
--waitpid($compiler_pid, 0);
--exit ($? >> 8);
--
--
--
--
--
-+if ($compiler_pid)
-+{
-+   # Get the return code of the compiler and exit with that.
-+   waitpid($compiler_pid, 0);
-+   exit ($? >> 8);
-+}
---- colorgccrc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgccrc	2003-02-12 17:38:38.000000000 -0800
-@@ -20,12 +20,14 @@
- # For example, srcColor: bold cyan on_yellow
- #
- 
--# Define the paths to the actual location of the various compilers.
-+# Only define the paths to the actual location of the various compilers if
-+# you need to do something weird.  For normal installs, we'll figure out
-+# who to call next automatically.
- # (Currently, colorgcc only understands these: g++ gcc c++ cc)
--g++: /usr/local/bin/g++
--gcc: /usr/local/bin/gcc
--c++: /usr/local/bin/c++
--cc:  /usr/bin/cc
-+##g++: /usr/bin/g++
-+##gcc: /usr/bin/gcc
-+##c++: /usr/bin/c++
-+##cc:  /usr/bin/cc
- 
- # Don't do color if our terminal type ($TERM) is one of these.
- # (List all terminal types on one line, seperated by whitespace.)
-@@ -43,12 +45,10 @@
- 
- # Warnings
- warningFileNameColor: reset
--warningNumberColor:   white
-+warningNumberColor:   blue
- warningMessageColor:  yellow
- 
- # Errors
- errorFileNameColor: reset
--errorNumberColor:   white
-+errorNumberColor:   blue
- errorMessageColor:  bold red
--
--
---- INSTALL.orig	1999-04-29 10:16:08.000000000 -0700
-+++ INSTALL	2003-04-07 17:12:25.000000000 -0700
-@@ -27,9 +27,9 @@
- When "g++" is invoked, colorgcc is run instead.  colorgcc looks at the
- program name to figure out which compiler to use. 
- 
--Copy the sample colorgccrc file to $HOME/.colorgccrc and make sure the
--absolute paths for the compilers are correct for your system.
--See the comments in the sample .colorgccrc for more information.
-+Modify the file /etc/colorgcc/colorgccrc if you want to change the default
-+values for everyone.  For individual customizations, copy this file to
-+$HOME/.colorgccrc and change that.
- 
- 
- Note:
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
deleted file mode 100644
index 911a31b21bf3..000000000000
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- colorgcc.r9	2003-09-21 12:14:48.000000000 -0700
-+++ colorgcc	2003-09-21 13:11:22.000000000 -0700
-@@ -95,6 +95,7 @@
- use Cwd 'abs_path';
- 
- my(%nocolor, %colors, %compilerPaths);
-+my($unfinishedQuote, $previousColor);
- 
- sub initDefaults
- {
-@@ -159,14 +160,37 @@
- 
-    my($line, $normalColor) = @_;
- 
-+   if (defined $normalColor)
-+   {
-+      $previousColor = $normalColor;
-+   }
-+   else
-+   {
-+      $normalColor = $previousColor;
-+   }
-+
-    my($srcon) = color("reset") . $colors{"srcColor"};
-    my($srcoff) = color("reset") . $normalColor;
- 
--   $line = $normalColor . $line;
-+   $line = ($unfinishedQuote? $srcon : $normalColor) . $line;
- 
--   # This substitute replaces `foo' with `AfooB' where A is the escape
-+   # These substitutions replaces `foo' with `AfooB' where A is the escape
-    # sequence that turns on the the desired source color, and B is the
-    # escape sequence that returns to $normalColor.
-+
-+   # Handle multi-line quotes.
-+   if ($unfinishedQuote) {
-+      if ($line =~ s/^([^\`]*?)\'/$1$srcoff\'/)
-+      {
-+	 $unfinishedQuote = 0;
-+      }
-+   }
-+   if ($line =~ s/\`([^\']*?)$/\`$srcon$1/)
-+   {
-+      $unfinishedQuote = 1;
-+   }
-+
-+   # Single line quoting.
-    $line =~ s/\`(.*?)\'/\`$srcon$1$srcoff\'/g;
- 
-    print($line, color("reset"));
-@@ -190,6 +214,10 @@
-    loadPreferences('/etc/colorgcc/colorgccrc');
- }
- 
-+# Set our default output color.  This presumes that any unrecognized output
-+# is an error.
-+$previousColor = $colors{"errorMessageColor"};
-+
- # Figure out which compiler to invoke based on our program name.
- $0 =~ m%.*/(.*)$%;
- my $progName = $1 || $0;
-@@ -281,10 +309,9 @@
-       # No line number, treat as an "introductory" line of text.
-       srcscan($_, $colors{"introColor"});
-    }
--   else # Anything else.        
-+   else # Anything else.
-    {
--      # Doesn't seem to be a warning or an error. Print normally.
--      print(color("reset"), $_);
-+      srcscan($_, undef);
-    }
- }
- 
-
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
deleted file mode 100644
index 9602146b0af9..000000000000
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- /usr/bin/colorgcc	2010-12-13 00:08:37.000000000 -0200
-+++ colorgcc	2011-10-05 15:26:53.000000000 -0300
-@@ -221,17 +221,16 @@
- # Figure out which compiler to invoke based on our program name.
- $0 =~ m%.*/(.*)$%;
- my $progName = $1 || $0;
--my $compiler_pid;
-+my $compiler;
- 
- # If called as "colorgcc", just filter STDIN to STDOUT.
--if ($progName eq 'colorgcc')
-+if ($progName =~ m/^colorgcc[-0-9.]*(\.pl)?$/)
- {
--   open(GCCOUT, "<&STDIN");
-+   $compiler = 'gcc';
- }
- else
- {
-    # See if the user asked for a specific compiler.
--   my $compiler;
-    if (!defined($compiler = $compilerPaths{$progName}))
-    {
-       # Find our wrapper dir on the PATH and tweak the PATH to remove
-@@ -257,23 +256,23 @@
-       }
-       $compiler = $progName;
-    }
-+}
- 
--   # Get the terminal type. 
--   my $terminal = $ENV{"TERM"} || "dumb";
-+# Get the terminal type. 
-+my $terminal = $ENV{"TERM"} || "dumb";
- 
--   # If it's in the list of terminal types not to color, or if
--   # we're writing to something that's not a tty, don't do color.
--   if (! -t STDOUT || $nocolor{$terminal})
--   {
-+# If it's in the list of terminal types not to color, or if
-+# we're writing to something that's not a tty, don't do color.
-+if (! -t STDOUT || $nocolor{$terminal})
-+{
-       exec $compiler, @ARGV
- 	 or die("Couldn't exec");
--   }
--
--   # Keep the pid of the compiler process so we can get its return
--   # code and use that as our return code.
--   $compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
- }
- 
-+# Keep the pid of the compiler process so we can get its return
-+# code and use that as our return code.
-+my $compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
-+
- # Colorize the output from the compiler.
- while(<GCCOUT>)
- {
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
deleted file mode 100644
index 026503e8f2c9..000000000000
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- /usr/bin/colorgcc	2009-10-29 20:24:46.717190000 +0100
-+++ colorgcc	2009-10-29 20:27:42.614162888 +0100
-@@ -102,7 +102,8 @@
-    $nocolor{"dumb"} = "true";
- 
-    $colors{"srcColor"} = color("cyan");
--   $colors{"introColor"} = color("blue");
-+   $colors{"introFileNameColor"} = color("blue");
-+   $colors{"introMessageColor"} = color("blue");
- 
-    $colors{"warningFileNameColor"} = color("yellow");
-    $colors{"warningNumberColor"}   = color("yellow");
-@@ -111,6 +112,10 @@
-    $colors{"errorFileNameColor"} = color("bold red");
-    $colors{"errorNumberColor"}   = color("bold red");
-    $colors{"errorMessageColor"}  = color("bold red");
-+
-+   $colors{"noteFileNameColor"} = color("green");
-+   $colors{"noteNumberColor"}   = color("green");
-+   $colors{"noteMessageColor"}  = color("green");
- }
- 
- sub loadPreferences
-@@ -290,12 +295,18 @@
- 	 print($colors{"warningNumberColor"}, "$field2:", color("reset"));
- 	 srcscan($field3, $colors{"warningMessageColor"});
-       }
--      else 
--      {
-+      elsif ($field3 =~ m/\s+error:.*/)
-+	{
- 	 # Error
- 	 print($colors{"errorFileNameColor"}, "$field1:", color("reset"));
- 	 print($colors{"errorNumberColor"}, "$field2:", color("reset"));
- 	 srcscan($field3, $colors{"errorMessageColor"});
-+      } else
-+      {
-+	 # Note
-+	 print($colors{"noteFileNameColor"}, "$field1:", color("reset"));
-+	 print($colors{"noteNumberColor"}, "$field2:", color("reset"));
-+	 srcscan($field3, $colors{"noteMessageColor"});
-       }
-       print("\n");
-    }
-@@ -305,8 +316,11 @@
-    }
-    elsif (m/^(.*?):(.+):$/) # filename:message:
-    {
-+      my $field1 = $1 || "";
-+      my $field2 = $2 || "";
-       # No line number, treat as an "introductory" line of text.
--      srcscan($_, $colors{"introColor"});
-+	 print($colors{"introFileNameColor"}, "$field1:", color("reset"));
-+	 print($colors{"introMessageColor"}, "$field2:\n", color("reset"));
-    }
-    else # Anything else.
-    {
diff --git a/dev-util/colorgcc/metadata.xml b/dev-util/colorgcc/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/dev-util/colorgcc/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/comparator-2.10 b/dev-util/comparator-2.10
new file mode 100644
index 000000000000..7502a6e90baa
--- /dev/null
+++ b/dev-util/comparator-2.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==app-text/docbook-xml-dtd-4.1.2* app-text/xmlto 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=ESR's utility for making fast comparisons among large source trees
+EAPI=5
+HOMEPAGE=http://www.catb.org/~esr/comparator/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=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.catb.org/~esr/comparator/comparator-2.10.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_=ef6ff131cddabc7fa752cda633c97498
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
deleted file mode 100644
index 540241f214cc..000000000000
--- a/dev-util/comparator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
-EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-MISC metadata.xml 355 BLAKE2B 012b8c0b8ac6bf274c4d9cdfd496e29e0c2549d98db030508cfb5e546d9e8aac2733cb39a6e7a3e36551472c699b3c7d5e4ad876e88a64397a06f889d5ecc824 SHA512 bfd1f38c1527a5e045c82f58b4f9dd253705e2eaa93bedad1e6c15c470de3ace37862211e647f0c79066c1cc1b0f68f211e26601099e6a802fda053e7ba48d26
diff --git a/dev-util/comparator/comparator-2.10.ebuild b/dev-util/comparator/comparator-2.10.ebuild
deleted file mode 100644
index d331167b3ead..000000000000
--- a/dev-util/comparator/comparator-2.10.ebuild
+++ /dev/null
@@ -1,39 +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 toolchain-funcs
-
-DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
-HOMEPAGE="http://www.catb.org/~esr/comparator/"
-SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=app-text/docbook-xml-dtd-4.1.2*
-	app-text/xmlto"
-
-src_prepare() {
-	sed \
-		-e '/python setup.py install/d' \
-		-i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	emake comparator.html scf-standard.html
-	distutils-r1_src_compile
-}
-
-src_install() {
-	emake ROOT="${D}" install
-	distutils-r1_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
deleted file mode 100644
index 6ed3edf95f59..000000000000
--- a/dev-util/comparator/metadata.xml
+++ /dev/null
@@ -1,9 +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>
-	<longdescription>ESR's utility for making fast comparisons among large source trees</longdescription>
-</pkgmetadata>
diff --git a/dev-util/complexity-1.10 b/dev-util/complexity-1.10
new file mode 100644
index 000000000000..f7923d086ec9
--- /dev/null
+++ b/dev-util/complexity-1.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=sys-devel/autogen-5.11.7 sys-devel/libtool
+DESCRIPTION=a tool designed for analyzing the complexity of C program functions
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/complexity/
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=>=sys-devel/autogen-5.11.7
+SLOT=0
+SRC_URI=mirror://gnu/complexity/complexity-1.10.tar.xz
+_md5_=a60097793ec051ca18c5e977ea0140ea
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
deleted file mode 100644
index d1b34ab6a3a5..000000000000
--- a/dev-util/complexity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST complexity-1.10.tar.xz 422012 BLAKE2B 7010647a6de95bed56a724aa890a4d07f4a671ec0190eb9ebdff8d1db0bd1c73916dca17641dc539a5492dd3acf7c666b9c2812b82b980af8b4ebcd951dc15a4 SHA512 3c9a935b55981a420f5f81b055c921fee96f294bf052fa8f7b7299a538b154659161e24bcce549e2a20706273c48870477cb26c4b4120658de985ab653a90bf1
-EBUILD complexity-1.10.ebuild 459 BLAKE2B 451a5e6eb5fbfff3ff08dd4d8f31e55ea17b909608e7e2f8f4beb1f3637e2d1e566afda2f62d946b30fcd663508238a0d1fe361c8ce15754bfa5f064b23b2142 SHA512 1bd7ec4ed193f532ec48fa6c43d54ec3ac4768e129dfb1cf59c8233759d6d125f9b3f71ee2d003c9bb499c1acaf786f153ded6e2c62c126111ff7566ec49c38d
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/dev-util/complexity/complexity-1.10.ebuild b/dev-util/complexity/complexity-1.10.ebuild
deleted file mode 100644
index 889a75348459..000000000000
--- a/dev-util/complexity/complexity-1.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="a tool designed for analyzing the complexity of C program functions"
-HOMEPAGE="https://www.gnu.org/software/complexity/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-RDEPEND=">=sys-devel/autogen-5.11.7"
-DEPEND="
-	${RDEPEND}
-	sys-devel/libtool
-"
-
-DOCS=( AUTHORS ChangeLog NEWS )
diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
deleted file mode 100644
index a8fb43312942..000000000000
--- a/dev-util/complexity/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>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/conan-1.0.4 b/dev-util/conan-1.0.4
new file mode 100644
index 000000000000..73206095d919
--- /dev/null
+++ b/dev-util/conan-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] test? ( >=dev-python/pyjwt-1.4[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-2.7[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/colorama-0.3.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(-)] >=dev-python/pyyaml-3.11[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/patch-1.16[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/fasteners-0.14.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(-)] >=dev-python/six-1.10[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/node-semver-0.2.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/distro-1.0.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-python/pylint-1.8.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(-)] ~dev-python/future-0.16.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/pygments-2.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/astroid-1.6[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/pluginbase-0.5[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/bottle-0.12.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(-)] dev-lang/go >=dev-python/mock-1.3.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/nose-1.3.7[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/nose-parameterized-0.5.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/webtest-2.0.18[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-util/cmake ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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=Distributed C/C++ package manager
+EAPI=6
+HOMEPAGE=https://conan.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pyjwt-1.4[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-2.7[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/colorama-0.3.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(-)] >=dev-python/pyyaml-3.11[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/patch-1.16[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/fasteners-0.14.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(-)] >=dev-python/six-1.10[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/node-semver-0.2.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/distro-1.0.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-python/pylint-1.8.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(-)] ~dev-python/future-0.16.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/pygments-2.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/astroid-1.6[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/pluginbase-0.5[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/bottle-0.12.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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://pypi/c/conan/conan-1.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_=1389f8421f091abc90b247d1b3e842a5
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
deleted file mode 100644
index bad83aee2d3f..000000000000
--- a/dev-util/conan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
-EBUILD conan-1.0.4.ebuild 1615 BLAKE2B 1036a900af9fa14ca4760c2775d9bae1fdde999521bcfba449da3adf03bc5374600cb32ee9f6b7b99f9edad2afae39fefb6130ee2a6cd3d11bb71275e0eceb5d SHA512 d8d18d217d487f5c1ebdc02936bcee13d680d9167be8eba40cd12a195f215f14ccfee5028942eec233cae63e329dbbc4b514d44dfbd236cb6fa073c8ca114468
-MISC metadata.xml 735 BLAKE2B 0897f7e1776d123435a6843abf5f61168f1d089ed0bc3e62497961e552ba6e5826c1e09a77dcf5760f8559417c5db850455caa12cf0c8f77684abdaaabc55d06 SHA512 410e22e6701f402d13447f034e0c72180ca739fac1c18efc0b52739c9d11aea90125db1f732d5811ac798d9d74a2d7616c18bd779321ec4d8bbaf67a8a1d93dc
diff --git a/dev-util/conan/conan-1.0.4.ebuild b/dev-util/conan/conan-1.0.4.ebuild
deleted file mode 100644
index 1c65c049844a..000000000000
--- a/dev-util/conan/conan-1.0.4.ebuild
+++ /dev/null
@@ -1,55 +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="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-RDEPEND="
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	~dev-python/patch-1.16[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.8.1[${PYTHON_USEDEP}]
-	~dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/astroid-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		  ${RDEPEND}
-		  dev-lang/go
-		  >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		  >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		  >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
-		  >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		  dev-util/cmake
-	  )
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	PYTHONPATH=. nosetests -v . || die
-}
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
deleted file mode 100644
index af7e11d6bb6c..000000000000
--- a/dev-util/conan/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>beschindler@gmail.com</email>
-    <name>Benjamin Schindler</name>
-  </maintainer>
-  <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">conan</remote-id>
-    <remote-id type="github">conan-io/conan</remote-id>
-  </upstream>
-  <longdescription>
-    Conan is a portable package manager, intended for C and C++
-    developers, but it is able to manage builds from source,
-    dependencies, and precompiled binaries for any language.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/confix-2.3.5-r2 b/dev-util/confix-2.3.5-r2
new file mode 100644
index 000000000000..8b3d3b677806
--- /dev/null
+++ b/dev-util/confix-2.3.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
+EAPI=5
+HOMEPAGE=http://confix.sourceforge.net
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=2
+SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a668fb1049169d59ffb52c41b18c763c
diff --git a/dev-util/confix-2.3.5-r3 b/dev-util/confix-2.3.5-r3
new file mode 100644
index 000000000000..6ff6c2f717aa
--- /dev/null
+++ b/dev-util/confix-2.3.5-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
+EAPI=5
+HOMEPAGE=http://confix.sourceforge.net
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=2
+SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7dc0c92812a40c25015ab1a5cd52ec45
diff --git a/dev-util/confix-9999 b/dev-util/confix-9999
new file mode 100644
index 000000000000..7ddb6f7a80ea
--- /dev/null
+++ b/dev-util/confix-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
+EAPI=5
+HOMEPAGE=http://confix.sourceforge.net
+IUSE=python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44c51fd6bf14173da8e796169447e7b8
diff --git a/dev-util/confix-wrapper-0 b/dev-util/confix-wrapper-0
new file mode 100644
index 000000000000..a4176aba14e2
--- /dev/null
+++ b/dev-util/confix-wrapper-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+DESCRIPTION=Wrapper to select either confix1.py or confix2.py
+EAPI=0
+HOMEPAGE=http://confix.sourceforge.net
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+_md5_=fc400fb36da387662afc24f30d3915f8
diff --git a/dev-util/confix-wrapper/Manifest b/dev-util/confix-wrapper/Manifest
deleted file mode 100644
index 722f07de2498..000000000000
--- a/dev-util/confix-wrapper/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD confix-wrapper-0.ebuild 802 BLAKE2B cf911988108d5950257959be2aa8d787d139cdc655c62a331e150717d304a692291255fdeb0d156e2194180dccabf7778e12ba03f36d117693d60f3be8fccbdb SHA512 91329de488250579866b2e928ae0dbf145b539e3f17d7da1df1cee1e5604d1e3033b95d21bc3573ab47614b9544265c68a1e0b30867f127050258d4bb554adac
-MISC metadata.xml 329 BLAKE2B ce9d264f3d40c4c4a7078cfed1f27f93c06420904a98051031a91bc600c33708c10291128b48be7065eb493866d4a15d9140b5933954eba9716a7dde376e001a SHA512 a2e7c1b3ef9b2228e2820c0aa46354d771b518e7a5f854f1f06850840929846b12125b4f526a7f0282b3e9545c5cf7ed670ef2f2047c7deb0c6de40b9667b321
diff --git a/dev-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
deleted file mode 100644
index e8f8dcb4d2cb..000000000000
--- a/dev-util/confix-wrapper/confix-wrapper-0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
-HOMEPAGE="http://confix.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	dodir /usr/bin
-	cat >> "${ED:-${D}}"usr/bin/confix <<EOF
-#! ${EPREFIX:-}/bin/sh
-confixpy=
-if [ -f ./Confix2.dir ]; then
-	confixpy=confix2.py
-elif [ -f ./Makefile.py ]; then
-	confixpy=confix1.py
-else
-	confixpy=confix2.py
-fi
-case \$# in
-0) exec \${confixpy} ;;
-*) exec \${confixpy} "\$@" ;;
-esac
-EOF
-	fperms a+x /usr/bin/confix || die "cannot set permissions"
-	dosym confix /usr/bin/confix.py || die "cannot create 'confix' symlink"
-}
diff --git a/dev-util/confix-wrapper/metadata.xml b/dev-util/confix-wrapper/metadata.xml
deleted file mode 100644
index 5cbfb3aa5288..000000000000
--- a/dev-util/confix-wrapper/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>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">confix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
deleted file mode 100644
index a8e8de03c747..000000000000
--- a/dev-util/confix/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 2.1.0/jni-hpux.patch 461 BLAKE2B f0ebddbb5c5328711b0053740822767be4105574d02b4de73f33df98900a252ecb6fb35e63d986d0e3e3688138b7a1f5cd1d391667d76b40878b5b4644874c2f SHA512 7b16dcc84c7ecdc4f403daab1b8902dc995fc297f6df27be13a8acb542f253e01f8f1a66b0e3711948631e3618e18dd21e04e7496985c08f60ac10e2ad6b5967
-AUX 2.3.0/exeext.patch 890 BLAKE2B d99c1e76b993d47e048ff9e6c64c4f6dfe6901a7f40f56be272592c52c1f7f21979cd6e47efa9f5c98b801eb20e4b617ebc8c9ed65e0c8df8552979a571f761e SHA512 e9aab2698036cc872dd0c16c14a3594de568bfe9999a5a7dfd2eec5b1612d844b022693747541f005ea6448314d4329bfefbabc0b073dbcfbd9563265a047483
-AUX 2.3.0/ext-ac-archive.patch 1515 BLAKE2B 2234172ae4000ebd63558f70f35164f832a6dbfb8b5ff29f302366e3eba3ed80c0e8a2a5f4a0d492ec747134d7274be9986945f390b77864b517d7bc73757a44 SHA512 26ff04b4fc8b2283b5ca157e96d9c18111b116d3e4585f84ff4da6a89719f74c1b6b20eaa024adc40b321f313705eaa746a5204038ce0cc1ce3e25b11a1b2c8e
-AUX 2.3.0/local-libs-first.patch 1871 BLAKE2B f593e7b92a2845cb684a0ef2daa5dc7288b9bef948cce330dddb63d2a555be888d1801e6dd1264f407f9ad9e91a496bc05d2042c5cf2ec2ce766e14cff6d0d62 SHA512 1b6196c7fa4e132c1bd2013e559f4db8b21ea8497c5771cb7bd51e11efae9fd2e4c08af6a07bb6b911961f9e29ec4de683c7a5245a786002eef1f13894a6e533
-AUX 2.3.0/new-automake.patch 573 BLAKE2B cf1d7a8eb39827ef53a7777a61bd5d2ee7f81ffafd6a12806bd5f22a642ae99da386ecc763f54cc62a573770c2bd09437aeae253b91d825229f2234b08a25fe9 SHA512 216e4bcb753107107bb3e0f6e303984b5b282fbe80c72c97e7365c0729a3007b6f960b1ee3c4a311a5b5b81c179ab1daa171da5eec33900e158b8a73cc9f0338
-AUX confix-2.3.5-nodist-shar.patch 2036 BLAKE2B 899ce95bb3f2ee501190f8d5301119d342516130a1a64a2b9b8254546dc80584bd8b0ac216831e0e5bb528642eaa07bf35d203272693d1410ae07eef34775340 SHA512 f76b2b270e67074885230a5e7d26c99aedb21d909e8ff8948c220fd6f841c5c3b845679432630dcf70771ee2f6c9d54ce63268520073786ab2ce65165cc5c66e
-AUX confix-2.3.5-support-no_undefined.patch 8388 BLAKE2B 24f3a52619b257c3f15652c000781ac2ee71cba3e7071bd68b80a99319f4016fa836716b76bab90729bf5a9c48c23ab6659648c0b97faed594e59fef663f764f SHA512 279b5dd7a1536c54b8543af82296d8cb10938614364bf65c9e54d99ad7071c0ceb2914da0f6e460b3873796eac0b52107c158c03d53838585533165bf1cccc19
-DIST Confix-2.3.5.tar.bz2 678133 BLAKE2B 7aac9e7a6d3ffd629393e06c76bc13167e6b756a12e46a5d813a6e896c9cfd24ff384d8cda605507df402c1f8492c9759ac35834b1f84450b1e0fe8bf5de783b SHA512 e6adec0cd27e9064dd0f6ff32d2e68deb755631a27759b253a7a176525b515ffc9069b8f28ac48ee6fdb642dfc2098fd2d7d6bd6e4ecccd43cb92df12c48e4c7
-EBUILD confix-2.3.5-r2.ebuild 1988 BLAKE2B 5edbf955f72f3ebc0d490413f9ce87536e9cd38175cbcd4157147bacc42b865be7bbbf5200da2b4479c73f96dc42439aaaa0a72104e8553a3203a519bc102f7e SHA512 8ec55f5345572782c46abc716239dd6597c944f45eed56832c47a4be6d443b0fff09d616c98ba24e7667c7b512719af246b1da52c79a5dcbc573eb50d15f1976
-EBUILD confix-2.3.5-r3.ebuild 2156 BLAKE2B bab243ea9c40aeef21600a6af5101bdd8be08490b813d5947fe961b70765ac58bd910cadde8f4f847e622bfd550df69d6b65ea06cf9c49893ffd09ce7b05da5a SHA512 9120fadad71ff983ca5d0139912bbff034ffdadd74ed2ba9dc6f0a3050a849ef04dc7ff9e1a33a3551109cec6dc402261736b0db1bc571bfeedb20c4c056e1fe
-EBUILD confix-9999.ebuild 1914 BLAKE2B 0e5d34ff92d400b72cbea426ee83b5fec5bacc65b6c784c5911b7b54aecea5ac2a8cda45f2e135250d8f5960fceffaadb122f43b2384a61c7debcb58f7815333 SHA512 d2afb4f15fc0953a42b1c174581606a92f9182ddb3cea6e0a5c778e5ff1b03cacecaa7d9e9a1b307e51e08fda779b4126cb8a19763236e5b33e12356a1022baa
-MISC metadata.xml 329 BLAKE2B ce9d264f3d40c4c4a7078cfed1f27f93c06420904a98051031a91bc600c33708c10291128b48be7065eb493866d4a15d9140b5933954eba9716a7dde376e001a SHA512 a2e7c1b3ef9b2228e2820c0aa46354d771b518e7a5f854f1f06850840929846b12125b4f526a7f0282b3e9545c5cf7ed670ef2f2047c7deb0c6de40b9667b321
diff --git a/dev-util/confix/confix-2.3.5-r2.ebuild b/dev-util/confix/confix-2.3.5-r2.ebuild
deleted file mode 100644
index d840e82bf489..000000000000
--- a/dev-util/confix/confix-2.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-2.3.5-r3.ebuild b/dev-util/confix/confix-2.3.5-r3.ebuild
deleted file mode 100644
index 11af017cd57e..000000000000
--- a/dev-util/confix/confix-2.3.5-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch
-	# support -no-undefined libtool flag
-	"${FILESDIR}"/${P}-support-no_undefined.patch
-	# drop deprecated 'dist-shar' automake flag
-	"${FILESDIR}"/${P}-nodist-shar.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
deleted file mode 100644
index 3cedd69d8468..000000000000
--- a/dev-util/confix/confix-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 subversion
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-ESVN_REPO_URI="https://svn.code.sf.net/p/confix/svn/confix/trunk"
-ESVN_PROJECT="${PN}"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/files/2.1.0/jni-hpux.patch b/dev-util/confix/files/2.1.0/jni-hpux.patch
deleted file mode 100644
index bd1b626e7bc2..000000000000
--- a/dev-util/confix/files/2.1.0/jni-hpux.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4.orig	2007-02-07 21:16:20.000000000 +0100
-+++ Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4	2007-02-07 21:16:34.000000000 +0100
-@@ -67,6 +67,7 @@
- mingw*)			_JNI_INC_SUBDIRS="win32";;
- cygwin*)		_JNI_INC_SUBDIRS="win32";;
- interix*)		_JNI_INC_SUBDIRS="win32";;
-+hpux*)			_JNI_INC_SUBDIRS="hp-ux";;
- *)              _JNI_INC_SUBDIRS="genunix";;
- esac
- 
diff --git a/dev-util/confix/files/2.3.0/exeext.patch b/dev-util/confix/files/2.3.0/exeext.patch
deleted file mode 100644
index 98576f5c9f8b..000000000000
--- a/dev-util/confix/files/2.3.0/exeext.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
---- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
-+++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
-@@ -472,7 +472,15 @@
-         
-         # register automatic tests and set their environment
- 
--        tests = self.dir_primary('check', 'PROGRAMS') + \
-+        test_tmp = self.dir_primary('check', 'PROGRAMS')
-+        count = 0
-+        for prog in test_tmp:
-+            prog += "$(EXEEXT)"
-+            test_tmp[count] = prog
-+            count += 1
-+            pass
-+
-+        tests = test_tmp + \
-                 self.dir_primary('check', 'SCRIPTS')
-         if len(tests):
-             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.3.0/ext-ac-archive.patch b/dev-util/confix/files/2.3.0/ext-ac-archive.patch
deleted file mode 100644
index 32122c95bfe2..000000000000
--- a/dev-util/confix/files/2.3.0/ext-ac-archive.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
---- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
-+++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
-@@ -16,7 +16,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA
- 
--import autoconf_archive
-+#import autoconf_archive
- import kde_hack
- 
- from libconfix.core.utils.error import Error
-@@ -29,7 +29,7 @@
- 
- def bootstrap(packageroot, use_kde_hack, argv0, path=None):
-     aclocal_incdirs = []
--    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
-+    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
- 
-     # if package's configure.ac looks like using libtool, then we
-     # assume that the package must be libtoolize'd.
-diff -ru confix-9999.orig/setup.py confix-9999/setup.py
---- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
-+++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
-@@ -41,8 +41,8 @@
-     return result
- 
- datafiles = []
--datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
--datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
- 
- # scripts to put in the auxdir.
- datafiles.extend([('share/confix/kde-hack',
diff --git a/dev-util/confix/files/2.3.0/local-libs-first.patch b/dev-util/confix/files/2.3.0/local-libs-first.patch
deleted file mode 100644
index 29d4a7a1cc9d..000000000000
--- a/dev-util/confix/files/2.3.0/local-libs-first.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-With libtool, link local libraries with /path/to/libfile.la instead of libpath,
-to avoid encoding local libpath into installed la-file.
-These also have to be linked first, to avoid finding already installed
-libraries of previous versions during libtool-relink.
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py Confix-2.3.0/libconfix/plugins/automake/c/out_c.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py	2010-07-06 12:55:59.286540943 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/c/out_c.py	2010-07-06 13:01:23.574428852 +0200
-@@ -411,6 +411,8 @@
-         """
-         assert isinstance(linked_builder, LinkedBuilder)
-         
-+        local_paths = []
-+        local_libraries = []
-         native_paths = []
-         native_libraries = []
-         external_linkline = []
-@@ -424,8 +426,11 @@
- 
-         for bi in native_libs_to_use:
-             if isinstance(bi, BuildInfo_CLibrary_NativeLocal):
--                native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
--                native_libraries.append('-l'+bi.basename())
-+                if self.__use_libtool:
-+                    local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.basename()+'.la']))
-+                else:
-+                    local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
-+                    local_libraries.append('-l'+bi.basename())
-                 continue
-             if isinstance(bi, BuildInfo_CLibrary_NativeInstalled):
-                 using_installed_library = True
-@@ -447,7 +452,7 @@
-             external_linkline.extend(elem)
-             pass
- 
--        return native_paths + native_libraries + external_linkline
-+        return local_paths + local_libraries + native_paths + native_libraries + external_linkline
- 
-     def external_libpath(self):
-         """ For unit tests only. """
diff --git a/dev-util/confix/files/2.3.0/new-automake.patch b/dev-util/confix/files/2.3.0/new-automake.patch
deleted file mode 100644
index d6f24a4cae81..000000000000
--- a/dev-util/confix/files/2.3.0/new-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py Confix-2.3.0/libconfix/plugins/automake/out_automake.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py	2010-07-12 13:15:49.254867387 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/out_automake.py	2010-07-12 13:17:29.755908602 +0200
-@@ -170,7 +170,7 @@
- 
- 
-         # our minimum required automake version is 1.9
--        self.makefile_am().add_automake_options('1.9')
-+        # self.makefile_am().add_automake_options('1.9')
- 
- 
-         # enable dist'ing in the following formats
diff --git a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch b/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
deleted file mode 100644
index bccc437de44c..000000000000
--- a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-------------------------------------------------------------------------
-r961 | mhaubi | 2017-09-26 15:34:00 +0200 (Tue, 26 Sep 2017) | 1 line
-
-drop 'dist-shar', deprecated by newer automake
-
-Index: doc/confix.texi
-===================================================================
-#--- doc/confix.texi	(revision 960)
-#+++ doc/confix.texi	(working copy)
-#@@ -992,9 +992,6 @@
- @code{dist-bzip2} creates a @file{.tar.bz2} distribution.
- 
- @item
--@code{dist-shar} creates a shell archive distribution.
--
--@item
- @code{dist-zip} create a zip file (popular on Windows).
- 
- @item
-Index: libconfix/plugins/automake/out_automake.py
-===================================================================
---- libconfix/plugins/automake/out_automake.py	(revision 960)
-+++ libconfix/plugins/automake/out_automake.py	(working copy)
-@@ -175,7 +175,6 @@
- 
-         # enable dist'ing in the following formats
-         self.makefile_am().add_automake_options('dist-bzip2')
--        self.makefile_am().add_automake_options('dist-shar')
-         self.makefile_am().add_automake_options('dist-zip')
- 
- 
-Index: libconfix/plugins/automake/tests/output.py
-===================================================================
---- libconfix/plugins/automake/tests/output.py	(revision 960)
-+++ libconfix/plugins/automake/tests/output.py	(working copy)
-@@ -146,7 +146,7 @@
- 
-         self.failUnless('1.9' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-bzip2' in rootdir_automake_builder.makefile_am().automake_options())
--        self.failUnless('dist-shar' in rootdir_automake_builder.makefile_am().automake_options())
-+        self.failUnless('dist-shar' not in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-zip' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless(const.CONFIX2_DIR in rootdir_automake_builder.makefile_am().extra_dist())
-         self.failUnless(const.CONFIX2_PKG in rootdir_automake_builder.makefile_am().extra_dist())
diff --git a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch b/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
deleted file mode 100644
index a6ffaae89c98..000000000000
--- a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-------------------------------------------------------------------------
-r960 | mhaubi | 2017-09-26 14:51:18 +0200 (Tue, 26 Sep 2017) | 10 lines
-
-add 'has_undefined_symbols' property for libraries
-
-Windows does not support undefined symbols in shared libraries,
-so libtool refuses to create DLLs without the -no-undefined flag.
-
-Adding explicit HAS_UNDEFINED_SYMBOLS(False) api call per library,
-and the optional (has_undefined_symbols=False) argument to AutoC().
-
-For backwards compatibility, default is (has_undefined_symbols=True).
-
-------------------------------------------------------------------------
-Index: libconfix/plugins/automake/c/out_c.py
-===================================================================
---- libconfix/plugins/automake/c/out_c.py	(revision 959)
-+++ libconfix/plugins/automake/c/out_c.py	(revision 960)
-@@ -487,6 +487,9 @@
-                 elif b.default_version() is not None:
-                     automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-release '+b.default_version())
-                     pass
-+                if b.has_undefined_symbols() is False:
-+                    automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-no-undefined')
-+                    pass
-                 pass
-             else:
-                 automake_output_builder.configure_ac().add_paragraph(
-Index: libconfix/plugins/c/clusterer.py
-===================================================================
---- libconfix/plugins/c/clusterer.py	(revision 959)
-+++ libconfix/plugins/c/clusterer.py	(revision 960)
-@@ -33,7 +33,7 @@
- import types
- 
- class CClustererSetup(Setup):
--    def __init__(self, linkednamefinder=None):
-+    def __init__(self, linkednamefinder=None, has_undefined_symbols=True):
-         assert linkednamefinder is None or isinstance(linkednamefinder, NameFinder)
-         Setup.__init__(self)
-         if linkednamefinder is None:
-@@ -41,10 +41,11 @@
-         else:
-             self.__namefinder = linkednamefinder
-             pass
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def setup(self, dirbuilder):
--        clusterer = CClusterer(namefinder=self.__namefinder)
-+        clusterer = CClusterer(namefinder=self.__namefinder, has_undefined_symbols=self.__has_undefined_symbols)
-         dirbuilder.add_builder(clusterer)
-         dirbuilder.add_interface(CClustererInterfaceProxy(clusterer=clusterer))
-         pass
-@@ -51,11 +52,12 @@
-     pass
- 
- class CClusterer(Builder):
--    def __init__(self, namefinder):
-+    def __init__(self, namefinder, has_undefined_symbols=True):
-         Builder.__init__(self)
-         self.__namefinder = namefinder
-         self.__libname = None
-         self.__libtool_version_info = None
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def shortname(self):
-@@ -85,6 +87,15 @@
-             pass
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        for builder in self.parentbuilder().iter_builders():
-+            if isinstance(builder, LibraryBuilder):
-+                builder.set_has_undefined_symbols(has_undefined_symbols)
-+                break
-+            pass
-+        pass
-+
-     def enlarge(self):
-         super(CClusterer, self).enlarge()
- 
-@@ -163,7 +174,8 @@
-             LibraryBuilder(
-                 basename=libname,
-                 version=self.__libtool_version_info,
--                default_version=self.package().version()))
-+                default_version=self.package().version(),
-+                has_undefined_symbols=self.__has_undefined_symbols))
-         for b in itertools.chain(nomain_builders, header_builders):
-             library.add_member(b)
-             pass
-@@ -229,6 +241,13 @@
-             pass
-         self.__clusterer.set_libtool_version_info(version)
-         pass
-+
-+    def HAS_UNDEFINED_SYMBOLS(self, has_undefined_symbols):
-+        if type(has_undefined_symbols) is not types.BooleanType:
-+            raise Error("HAS_UNDEFINED_SYMBOLS(): 'has_undefined_symbols' argument must be a boolean")
-+        self.__clusterer.set_has_undefined_symbols(has_undefined_symbols)
-+        pass
-+
-     pass
- 
- class NameFinder:
-Index: libconfix/plugins/c/explicit_iface.py
-===================================================================
---- libconfix/plugins/c/explicit_iface.py	(revision 959)
-+++ libconfix/plugins/c/explicit_iface.py	(revision 960)
-@@ -104,7 +104,7 @@
-         self.__dirbuilder.add_builder(yacc)
-         return yacc
- 
--    def LIBRARY(self, members, basename=None, version=None):
-+    def LIBRARY(self, members, basename=None, version=None, undefined_symbols=True):
-         the_basename = basename
-         if the_basename is None:
-             the_basename=LongNameFinder().find_libname(
-@@ -113,7 +113,8 @@
-             pass
-         library = LibraryBuilder(basename=the_basename,
-                                  version=version,
--                                 default_version=self.__dirbuilder.package().version())
-+                                 default_version=self.__dirbuilder.package().version(),
-+                                 has_undefined_symbols=undefined_symbols)
-         for m in members:
-             library.add_member(m)
-             pass
-Index: libconfix/plugins/c/library.py
-===================================================================
---- libconfix/plugins/c/library.py	(revision 959)
-+++ libconfix/plugins/c/library.py	(revision 960)
-@@ -25,7 +25,8 @@
-     def __init__(self,
-                  basename,
-                  version,
--                 default_version):
-+                 default_version,
-+                 has_undefined_symbols):
- 
-         # library version. passed to libtool as "-version-info
-         # <current>:<revision>:<age>", for example.
-@@ -40,6 +41,7 @@
-         self.__basename = basename
-         self.__version = version
-         self.__default_version = default_version
-+        self.__has_undefined_symbols = has_undefined_symbols
- 
-         self.__buildinfo_added = False
-         
-@@ -82,6 +84,10 @@
-         super(LibraryBuilder, self).force_enlarge()
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        pass
-+
-     def version(self):
-         return self.__version
- 
-@@ -88,4 +94,7 @@
-     def default_version(self):
-         return self.__default_version
- 
-+    def has_undefined_symbols(self):
-+        return self.__has_undefined_symbols
-+
-     pass
-Index: libconfix/plugins/c/setups/default_setup.py
-===================================================================
---- libconfix/plugins/c/setups/default_setup.py	(revision 959)
-+++ libconfix/plugins/c/setups/default_setup.py	(revision 960)
-@@ -25,8 +25,8 @@
- 
- from libconfix.core.machinery.setup import CompositeSetup
- 
--def make_core_setups(linkednamefinder):
--    return [CClustererSetup(linkednamefinder=linkednamefinder),
-+def make_core_setups(linkednamefinder, has_undefined_symbols):
-+    return [CClustererSetup(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols),
-             CCreatorSetup(),
-             CommonInterfaceSetup(),
-             RelocatedHeadersSetup(),
-@@ -34,8 +34,9 @@
- 
- class DefaultCSetup(CompositeSetup):
-     def __init__(self,
--                 linkednamefinder=None):
--        setups = make_core_setups(linkednamefinder=linkednamefinder)
-+                 linkednamefinder=None,
-+                 has_undefined_symbols=True):
-+        setups = make_core_setups(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols)
-         setups.append(ImplicitInterfaceSetup())
-         CompositeSetup.__init__(
-             self,
-Index: libconfix/setups/c.py
-===================================================================
---- libconfix/setups/c.py	(revision 959)
-+++ libconfix/setups/c.py	(revision 960)
-@@ -26,7 +26,7 @@
-     pass
- 
- class AutoC(CompositeSetup):
--    def __init__(self, libnamefinder=None):
--        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder)])
-+    def __init__(self, libnamefinder=None, has_undefined_symbols=True):
-+        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder, has_undefined_symbols=has_undefined_symbols)])
-         pass
-     pass
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
deleted file mode 100644
index 5cbfb3aa5288..000000000000
--- a/dev-util/confix/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>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">confix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cookiecutter-1.6.0 b/dev-util/cookiecutter-1.6.0
new file mode 100644
index 000000000000..16b08651f13b
--- /dev/null
+++ b/dev-util/cookiecutter-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/future-0.15.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-python/binaryornot-0.2.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/jinja-2.7[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/click-5.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/whichcraft-0.1.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(-)] >=dev-python/poyo-0.4.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/jinja2-time-0.1.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/requests-2.18.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/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(-)] test? ( dev-python/pytest[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/pytest-cov[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/pytest-mock-1.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(-)] dev-python/pytest-catchlog[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/freezegun[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 ) 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=Command-line utility to create projects from cookiecutters (project templates)
+EAPI=6
+HOMEPAGE=https://github.com/audreyr/cookiecutter
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/future-0.15.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-python/binaryornot-0.2.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/jinja-2.7[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/click-5.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/whichcraft-0.1.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(-)] >=dev-python/poyo-0.4.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/jinja2-time-0.1.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/requests-2.18.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/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(-)]
+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/audreyr/cookiecutter/archive/1.6.0.tar.gz -> cookiecutter-1.6.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_=e7d45a232eb3afc94e22940615ef1eda
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
deleted file mode 100644
index 89a4e956f04e..000000000000
--- a/dev-util/cookiecutter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
-EBUILD cookiecutter-1.6.0.ebuild 1235 BLAKE2B fd25d796cbcbd0ecf74a6be1ff726410e64d2087994368d8f738222e537dbc07d32ad7b85ab7d2b9dc5ce069974ec3e6839629873beb20ca754229183d3468a1 SHA512 986bc22ca47c3fa13ceee343af77c3c989c6b790a8bb209e9505d0dea250590b5ccc0a9f2cabb510090b4a693cc80263a6d3db6087fbda9c21636553f565e75e
-MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
deleted file mode 100644
index d82dc5afd760..000000000000
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ /dev/null
@@ -1,43 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
-HOMEPAGE="https://github.com/audreyr/cookiecutter"
-
-SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/whichcraft-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/poyo-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-time-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-vcs/git )"
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
deleted file mode 100644
index a263231b7fd8..000000000000
--- a/dev-util/cookiecutter/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>cedk@gentoo.org</email>
-		<name>Cédric Krier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">audreyr/cookiecutter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cppcheck-1.81 b/dev-util/cppcheck-1.81
new file mode 100644
index 000000000000..4ff4da597f42
--- /dev/null
+++ b/dev-util/cppcheck-1.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig 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=static analyzer of C/C++ code
+EAPI=6
+HOMEPAGE=http://cppcheck.sourceforge.net
+IUSE=htmlreport pcre qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~arm64 hppa sparc x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport: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 ) 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=mirror://sourceforge/cppcheck/cppcheck-1.81.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=163b489391677156d7e19f7035b5999d
diff --git a/dev-util/cppcheck-9999 b/dev-util/cppcheck-9999
new file mode 100644
index 000000000000..080fa62de118
--- /dev/null
+++ b/dev-util/cppcheck-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/tinyxml2-2 htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig 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=static analyzer of C/C++ code
+EAPI=6
+HOMEPAGE=http://cppcheck.sourceforge.net
+IUSE=htmlreport pcre qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/tinyxml2-2 htmlreport? ( dev-python/pygments[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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport: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 ) 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	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ada0b6fbc1acd2b27c42a25acb5eb8e7
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
deleted file mode 100644
index 37285e8779c0..000000000000
--- a/dev-util/cppcheck/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
-DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
-EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B fdea3ee8878f094db25a6cab68d4b9698aae4c9b898630e3d05e606a111704db383d112c4f58b55fbc6d5c980b3f2eb2ee7655651021834cfec8b06bdcda73a0 SHA512 889b589a4fa15a5f558e80dbb15005959ed6aade00737a3af16e40d12f79f04d25b3eb6c4a4333b7784a224a087cdf904914a85b148cee4bcba8d9bcc9c1fb02
-EBUILD cppcheck-9999.ebuild 2181 BLAKE2B a1c647fda42b74ea213f10113dc1a3b788009fb578c41f36cf287f4ec962046b35ec40822e4255af487f10aaf99b37766be7b13158bbdd5db48e652990c81ff2 SHA512 1ca33c9a1cc82de5dec24baf64ce40b58d9a980e4d45bf5bc5c75b7cf7d1a3d277072fbc8d8e7c6ecf238146c0dc628043c790dfb62c0318d26cafda084f8aaf
-MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
diff --git a/dev-util/cppcheck/cppcheck-1.81.ebuild b/dev-util/cppcheck/cppcheck-1.81.ebuild
deleted file mode 100644
index ce60d5ec062a..000000000000
--- a/dev-util/cppcheck/cppcheck-1.81.ebuild
+++ /dev/null
@@ -1,107 +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 flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa sparc x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++0x
-
-	# Drop bundled libs, patch Makefile generator and re-run it
-	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
-}
-
-src_configure() {
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
-	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui
-		eqmake5
-		emake
-		popd
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final}
-	mv -v lib/library.o{,.final}
-	mv -v cli/cppcheckexecutor.o{,.final}
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,}
-	mv -v lib/library.o{.final,}
-	mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
-
-	insinto "/usr/share/${PN}/cfg"
-	doins cfg/*.cfg
-	if use qt5 ; then
-		dobin gui/${PN}-gui
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
deleted file mode 100644
index 2ef2f6f37cad..000000000000
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ /dev/null
@@ -1,107 +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 flag-o-matic qmake-utils toolchain-funcs git-r3
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
-	>=dev-libs/tinyxml2-2
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++0x
-
-	# Drop bundled libs, patch Makefile generator and re-run it
-	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
-}
-
-src_configure() {
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
-	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui
-		eqmake5
-		emake
-		popd
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final}
-	mv -v lib/library.o{,.final}
-	mv -v cli/cppcheckexecutor.o{,.final}
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,}
-	mv -v lib/library.o{.final,}
-	mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
-
-	insinto "/usr/share/${PN}/cfg"
-	doins cfg/*.cfg
-	if use qt5 ; then
-		dobin gui/${PN}-gui
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
deleted file mode 100644
index 9d8558466595..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- cppcheck-9999/gui/gui.pro
-+++ cppcheck-9999/gui/gui.pro
-@@ -19,6 +19,7 @@
-     DEFINES += CPPCHECKLIB_IMPORT
- }
- LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
- 
- DESTDIR = .
- RCC_DIR = temp
---- cppcheck-9999/tools/dmake.cpp
-+++ cppcheck-9999/tools/dmake.cpp
-@@ -123,7 +123,6 @@
- 
-     std::vector<std::string> extfiles;
-     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
--    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
- 
-     std::vector<std::string> clifiles;
-     getCppFiles(clifiles, "cli/", false);
-@@ -172,7 +171,6 @@
-         std::ofstream fout1("test/testfiles.pri");
-         if (fout1.is_open()) {
-             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
--            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
-             fout1 << "\n\nSOURCES += ";
-             for (unsigned int i = 0; i < testfiles.size(); ++i) {
-                 const std::string filename(testfiles[i].substr(5));
-@@ -337,9 +335,9 @@
-          << "endif\n\n";
- 
-     makeConditionalVariable(fout, "PREFIX", "/usr");
--    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp");
- 
-     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
-     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
---- cppcheck-9999/externals/externals.pri
-+++ cppcheck-9999/externals/externals.pri
-@@ -1,8 +1,5 @@
--INCLUDEPATH += $${PWD}/simplecpp \

--               $${PWD}/tinyxml

-+INCLUDEPATH += $${PWD}/simplecpp

- 

--HEADERS += $${PWD}/simplecpp/simplecpp.h \

--           $${PWD}/tinyxml/tinyxml2.h

-+HEADERS += $${PWD}/simplecpp/simplecpp.h

- 

--SOURCES += $${PWD}/simplecpp/simplecpp.cpp \

--           $${PWD}/tinyxml/tinyxml2.cpp

-+SOURCES += $${PWD}/simplecpp/simplecpp.cpp

diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
deleted file mode 100644
index 3bf4b78228a1..000000000000
--- a/dev-util/cppcheck/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<use>
-		<flag name="htmlreport">install cppcheck-htmlreport</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">cppcheck</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cppi-1.18 b/dev-util/cppi-1.18
new file mode 100644
index 000000000000..13fb186e0410
--- /dev/null
+++ b/dev-util/cppi-1.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
+DESCRIPTION=a cpp directive indenter
+EAPI=4
+HOMEPAGE=https://savannah.gnu.org/projects/cppi
+IUSE=nls
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/cppi/cppi-1.18.tar.xz
+_md5_=c035a131f37f85cc568fe3251897ec0b
diff --git a/dev-util/cppi/Manifest b/dev-util/cppi/Manifest
deleted file mode 100644
index c9d5e4831a23..000000000000
--- a/dev-util/cppi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cppi-1.18.tar.xz 515664 BLAKE2B a9f354f4aca8e46f362c733a6fbfc5984bae369d0dde2b9aafbceae2ebb33d0ab2311479820c98c64406533494a1e201e704e763cb8df06e8fd1f11761684a8b SHA512 eec4f67d857680c763802b04c3964ad12505dcffe80f12567a729bea30fdd459f99af0e0f6a8179952bb356b5dd753d862782bb3950fa07e54ffe723565df7de
-EBUILD cppi-1.18.ebuild 454 BLAKE2B b279f616faaba95a5eb85c8fd0b34d6d734a7c8bd7e27fd760db25ddbe19f71a7327a8463b63acc39180241f8b933fcb725ba76a2e6c20e6a0f673119299df4e SHA512 220ea2f2d0d03b73b5590b701637c9c2c34378e158a8a1c7267630c40c562f46a032a002f3d1d0edb977cfaf27c2725594654093b08888dd92dacd6092475605
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/dev-util/cppi/cppi-1.18.ebuild b/dev-util/cppi/cppi-1.18.ebuild
deleted file mode 100644
index 386f67f693bf..000000000000
--- a/dev-util/cppi/cppi-1.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="a cpp directive indenter"
-HOMEPAGE="https://savannah.gnu.org/projects/cppi"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS THANKS TODO )
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
deleted file mode 100644
index f9f8bbfd9405..000000000000
--- a/dev-util/cppi/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>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cpptest-1.1.2 b/dev-util/cpptest-1.1.2
new file mode 100644
index 000000000000..6dc1e44810e6
--- /dev/null
+++ b/dev-util/cpptest-1.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=Simple but powerful unit testing framework for C++
+EAPI=4
+HOMEPAGE=http://cpptest.sourceforge.net/
+IUSE=doc
+KEYWORDS=amd64 ~arm ppc ppc64 x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.2.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_=0023da47b96dcf0a8a7a59c68cd6e156
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
deleted file mode 100644
index b13a56b51dd4..000000000000
--- a/dev-util/cpptest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpptest-1.1.2.tar.gz 458982 BLAKE2B dbb144196ec5726822f859397f5429e743bdc9bd840c2dab198f19512d2d0ff66b33e8b1018be2616944e300b0bc0e2fd247b7c7a5a290096f8d402592f1441b SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a
-EBUILD cpptest-1.1.2.ebuild 585 BLAKE2B 88751b5235040b917f4c0b84064c3e6db41cba60c4daca8405140874359906c8c623008ae88b337e57c27f4e213ba00fd3c56df9819821f5e8c28adb93452763 SHA512 52b488314d202a8e067fa7dc0c6e67c7ff70981109031795288e21aec233c38d5531d79a1ab7b17ca40667b4bbfbb5e5dac11a729e092d1662ef5040b2f5a60d
-MISC metadata.xml 604 BLAKE2B 2d0f5d155ead0d2035142bd395d1d057a4473d6d724b287bf6429a0c120eb340c16e5626929400acde2377b4c34de6fbb3016021f0b759b6fd16265ed67be017 SHA512 7df99419d82f5c714e2c941f810e3a930569045299b63dd9c2eb851628124c410afd30cc1aeac52ddb651e1e48ae8f41727f02c856b0f5a01d16aec318aa82dd
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
deleted file mode 100644
index b7fa89f0e8d1..000000000000
--- a/dev-util/cpptest/cpptest-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Simple but powerful unit testing framework for C++"
-HOMEPAGE="http://cpptest.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-DOCS=( AUTHORS BUGS NEWS README )
-
-src_configure() {
-	econf \
-		$(use_enable doc) \
-		--htmldir=/usr/share/doc/${PF}/html/
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-util/cpptest/metadata.xml b/dev-util/cpptest/metadata.xml
deleted file mode 100644
index 42e4ae1c3bb8..000000000000
--- a/dev-util/cpptest/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>
-	<longdescription lang="en">
-		CppTest is a portable and powerful, yet simple, unit testing framework for handling
-		automated tests in C++. The focus lies on usability and extendability.
-		Several output formats are supported and new ones are easily added.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cpptest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cppunit-1.13.1 b/dev-util/cppunit-1.13.1
new file mode 100644
index 000000000000..500f948e464f
--- /dev/null
+++ b/dev-util/cppunit-1.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz )
+DESCRIPTION=C++ port of the famous JUnit framework for unit testing
+EAPI=4
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
+IUSE=doc examples static-libs
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.13.1.tar.gz
+_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_=e4614dce2c6f2cb8327cf83918accad0
diff --git a/dev-util/cppunit-1.13.2-r2 b/dev-util/cppunit-1.13.2-r2
new file mode 100644
index 000000000000..d54d107b9264
--- /dev/null
+++ b/dev-util/cppunit-1.13.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz )
+DESCRIPTION=C++ port of the famous JUnit framework for unit testing
+EAPI=5
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
+IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=91c9a07d9627885059e87ef79277571e
diff --git a/dev-util/cppunit-1.14.0 b/dev-util/cppunit-1.14.0
new file mode 100644
index 000000000000..d1c094b99a8d
--- /dev/null
+++ b/dev-util/cppunit-1.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz )
+DESCRIPTION=C++ port of the famous JUnit framework for unit testing
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
+IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3fc575da0d53b324025d440e2f7e6b03
diff --git a/dev-util/cppunit-9999 b/dev-util/cppunit-9999
new file mode 100644
index 000000000000..3f9ad673c627
--- /dev/null
+++ b/dev-util/cppunit-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz ) >=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=C++ port of the famous JUnit framework for unit testing
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
+IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=LGPL-2.1
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ad58cb6f976f33f95b5faba530ee7a5f
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
deleted file mode 100644
index dcb20c42077d..000000000000
--- a/dev-util/cppunit/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST cppunit-1.13.1.tar.gz 841334 BLAKE2B 4c27d666900e46fb2146f939ce7f5f2b036c971616c0642c3f601f349b14d7bb8d3a389fc93f31fe133b4df37551d0381e76bbcfb1785a4becf30db57726ca56 SHA512 3b588dd0ed35eca1dec1a7dcf21da40307b1da26d8e29a26a2fcb16cd4ba7e4dfdf58b6c3d537af2ad127c418b11ba62a1168312abb200d5aab8cb8475766a9d
-DIST cppunit-1.13.2.tar.gz 953596 BLAKE2B 205a631dde2cdd2b543be3e39c66331499f7f76e734bf227e94958dc1a4ce57e3ec11a3d555ddf3b8bb8a55b34478b74ac766147630478a53af0c96b606b43e6 SHA512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd
-DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
-EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2cb8cdba41b116b6d73f4c28982b29676ac8904628ff75da8a4b1c9aff5d4e58190c4da05d90087e81040b03005 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5
-EBUILD cppunit-1.13.2-r2.ebuild 1727 BLAKE2B 9b1ae6e1f7c4390c8af78bd81fb59f0356453785613075f58c7ca707a0013e6878c74374b6525645c449e077603810164e4991627c4c8a628d5a69de483b1032 SHA512 1bff7dfb467e8cbd8b3ab440cfd0755cc7ca99824acfc729f579a3eb528947acb9cffcd7d9429853e3b8974cc5c9614da9edb5f7dd7826c7b8f09769d2036780
-EBUILD cppunit-1.14.0.ebuild 1726 BLAKE2B 3dd80a2efe5f5085fa6ef22b77967654389d767c01ade5a17b9c512afab779f35bdf323ae50393f1730bde8e7239c99e059a171a0866d17f098b8b661bf19c10 SHA512 c03a4a41c4faa5ad5337c97c24f3f268707250b847c7c9565ba1451bd2f84d2707708581e16fd92dbcc3a74f3c84c653656d3c37c3e59b9a5925353a3350fc6a
-EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-util/cppunit/cppunit-1.13.1.ebuild b/dev-util/cppunit/cppunit-1.13.1.ebuild
deleted file mode 100644
index 3384ff90fa8d..000000000000
--- a/dev-util/cppunit/cppunit-1.13.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-2 autotools
-inherit eutils flag-o-matic
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
deleted file mode 100644
index 753684a176d2..000000000000
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cppunit-config
-)
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
deleted file mode 100644
index 7d7191bbb95f..000000000000
--- a/dev-util/cppunit/cppunit-1.14.0.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
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--disable-werror
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
-		rm -r "${ED%/}"/usr/share/${PN} || die
-	fi
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
deleted file mode 100644
index 6df8af21bf91..000000000000
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--disable-werror
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
-		rm -r "${ED%/}"/usr/share/${PN} || die
-	fi
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
deleted file mode 100644
index 41cd682e0ecf..000000000000
--- a/dev-util/cppunit/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>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cpputest-3.8 b/dev-util/cpputest-3.8
new file mode 100644
index 000000000000..b836d1e0f7a9
--- /dev/null
+++ b/dev-util/cpputest-3.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=test? ( >=dev-cpp/gtest-1.8.0 )
+DESCRIPTION=unit testing and mocking framework for C/C++
+EAPI=6
+HOMEPAGE=https://cpputest.github.io/ https://github.com/cpputest/cpputest
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
+_md5_=91275f107a85cd60618a4ab74e500bec
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
deleted file mode 100644
index bacccbdcb6d8..000000000000
--- a/dev-util/cpputest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 485 BLAKE2B a1a2966cbd1e938415ec0087dfc59cb6e7dd38703389a515aca6e3f878ea1559b91e88ad54e71e887e521d31a95a2b073fb4fc773baab5693d31189c83ab4f17 SHA512 5f21962d6bb2e094164b8b0ef8e2e34b4e300429478c0f36669b1ded7b1038f7122ba1b3c1d3c0e23f8f082c53d775b002e09783b3ea0312736a3aa5a20f0f9e
-MISC metadata.xml 328 BLAKE2B dbdadf9d2d03017d5e24445929a424c4c8b23382641b2abdec83a1da14ce67ea7f8e4087b1c0d36786da46068a47acf9a94247140b3bb539176c88bc586f5e91 SHA512 fc08c57ee29388f77cdd94b984673c63793f055b5a399c77ebbe4a71e546437b19727a497a9a5f20a1d3b90129e731c824d52f57d028dbcd9556a1fd30d8e9c5
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
deleted file mode 100644
index af20f1f08b02..000000000000
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="unit testing and mocking framework for C/C++"
-HOMEPAGE="https://cpputest.github.io/ https://github.com/cpputest/cpputest"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
deleted file mode 100644
index abfba2deb920..000000000000
--- a/dev-util/cpputest/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cpputest/cpputest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cproto-4.7e b/dev-util/cproto-4.7e
new file mode 100644
index 000000000000..52cffe7ad61b
--- /dev/null
+++ b/dev-util/cproto-4.7e
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=Generate C function prototypes from C source code
+EAPI=0
+HOMEPAGE=http://invisible-island.net/cproto/
+KEYWORDS=alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://invisible-island.net/cproto/cproto-4_7e.tgz
+_md5_=11a41562e5f123b6ff2dc7d66e0f0f3a
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
deleted file mode 100644
index 2dec160beac5..000000000000
--- a/dev-util/cproto/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cproto-4_7e.tgz 145919 BLAKE2B 97e3b3bf3b282299d177bf2ea8548f91f8dc6432671b93187d91fc00ca02807f5d3a370cc563cbb46fa163f23fe5ff034d9e148e6621eaf87f7e9658e925c6fc SHA512 c9a1da8e19d85600109127e2de079cff5e66e51f0f3220f9a69e72e720ed6d745ef456b3a645bbb4755073c6ce59411d0137d9012da545736e92380f41c83985
-EBUILD cproto-4.7e.ebuild 574 BLAKE2B 2cca24598eb2536a18df9132a0dc010979f10803a5e263db5fe6bf1c75a45836ce122d2d76ac04646a49eb15fd27d713ac444bd022ff39b45224fe8378c5c34d SHA512 6a6d3cc55ab1e845916b82197114a9c108eb8aea24ad1284eb115f5d13a7f1db52b949aecbb87462428c40a7ec68c57bf6da37ed03e00ec25bb6afa5ed5473e3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7e.ebuild b/dev-util/cproto/cproto-4.7e.ebuild
deleted file mode 100644
index 14609348833f..000000000000
--- a/dev-util/cproto/cproto-4.7e.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PV="4_7e"
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Generate C function prototypes from C source code"
-HOMEPAGE="http://invisible-island.net/cproto/"
-SRC_URI="ftp://invisible-island.net/cproto/${MY_P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-devel/flex
-	virtual/yacc"
-RDEPEND=""
-
-src_install() {
-	dobin cproto || die
-	doman cproto.1
-	dodoc README CHANGES
-}
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/cproto/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/dev-util/cpuinfo-collection-20070104 b/dev-util/cpuinfo-collection-20070104
new file mode 100644
index 000000000000..c038e2be5956
--- /dev/null
+++ b/dev-util/cpuinfo-collection-20070104
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=huge collection of /proc/cpuinfo files
+EAPI=0
+HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-04January2007.tar.gz
+_md5_=e6d9c099e9b92efa2c54d6c98281f14a
diff --git a/dev-util/cpuinfo-collection-20101114 b/dev-util/cpuinfo-collection-20101114
new file mode 100644
index 000000000000..f913eb28bf4f
--- /dev/null
+++ b/dev-util/cpuinfo-collection-20101114
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=huge collection of /proc/cpuinfo files
+EAPI=5
+HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-14November2010.tar.gz
+_md5_=0435641f315c042a1dd59884a81cd840
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
deleted file mode 100644
index a6b748223c12..000000000000
--- a/dev-util/cpuinfo-collection/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST test_proc-04January2007.tar.gz 28831 BLAKE2B 1d405fb971eb0a4958a6127fadd9535ba24529b88d63e22ee726b6296ef5bf77f20e739b4c9475f8f20879950ed9fdb85a53f19dd7f14b91613b51b3a8403407 SHA512 6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922
-DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-EBUILD cpuinfo-collection-20070104.ebuild 558 BLAKE2B 5949deb685d52180a0a082fe90dfc66196a287a8d320c97cf152cf6f40987d14663a892c00a7ee4a8d172119da564337b5ac1caeeb47a5d5244ecb2242908575 SHA512 cabde97b357707de00f6545b1ebb7d10cea3212f279791a5cca81f19a877060a893420bd2be5d1aac0415872089d7d4304423fb4210345d36d9023ede6d37fdd
-EBUILD cpuinfo-collection-20101114.ebuild 569 BLAKE2B 6d6ce7d7ecc561c103e0f0142413581db70b85064002f5e5aed9cf5b6c058a3f77223616e84502202b901bc341ffb619a90f3148ffe260fd631a10872474368b SHA512 ffb9aab99d69680dc2df9b5ff9148b92bd4beec3b795f5186eae5d544cb0557f5caf436057d8b34e0b14cb8fb0fc4f6efdd53efa15bce41cf4ead28a73be300d
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
deleted file mode 100644
index 2355333bcff1..000000000000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.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
-
-MY_P=test_proc-${PV:6:2}January${PV:0:4}
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/cpuinfo
-	doins -r * || die
-}
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
deleted file mode 100644
index 6f6a5bd6334c..000000000000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=test_proc-${PV:6:2}November${PV:0:4}
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/cpuinfo
-	doins -r * || die
-}
diff --git a/dev-util/cpuinfo-collection/metadata.xml b/dev-util/cpuinfo-collection/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/dev-util/cpuinfo-collection/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>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cram-0.7 b/dev-util/cram-0.7
new file mode 100644
index 000000000000..24f67e383433
--- /dev/null
+++ b/dev-util/cram-0.7
@@ -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=Functional testing framework for command line applications
+EAPI=6
+HOMEPAGE=https://bitheap.org/cram/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cram/cram-0.7.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_=e04cd31fff623eb4e61a39c89e9ff946
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
deleted file mode 100644
index 2b3ef1b2d10d..000000000000
--- a/dev-util/cram/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 485 BLAKE2B fb18332acaa5fffa849f15f790507f785c1be0e99aa1b82a748ff4c9c8386e7aa6843222f9bfa8207e53dfe5ddbd4815d8c082381caac5384c97fd890a402633 SHA512 d8b3e3c81533c39b847dd9032e5efb9f330a8e13b304d53bfbbf6d2c8f1a6e3cea1d33a24317bc32cc21b20bb96b1f0c5719ea4e3325e4cdd54a2d92c727ea75
-MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
deleted file mode 100644
index df20e5706629..000000000000
--- a/dev-util/cram/cram-0.7.ebuild
+++ /dev/null
@@ -1,20 +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 distutils-r1
-
-DESCRIPTION="Functional testing framework for command line applications"
-HOMEPAGE="https://bitheap.org/cram/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cram/metadata.xml b/dev-util/cram/metadata.xml
deleted file mode 100644
index 324041586322..000000000000
--- a/dev-util/cram/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>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-	<longdescription lang="en">
-		Cram is a functional testing framework for command line applications.
-		Cram tests look like snippets of interactive shell sessions. Cram
-		runs each command and compares the command output in the test with
-		the command's actual output.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">cram</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/crash-6.1.4 b/dev-util/crash-6.1.4
new file mode 100644
index 000000000000..faa42a31fca0
--- /dev/null
+++ b/dev-util/crash-6.1.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-6.1.4.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_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/dev-util/crash-7.0.0 b/dev-util/crash-7.0.0
new file mode 100644
index 000000000000..87a59da2a689
--- /dev/null
+++ b/dev-util/crash-7.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.0.0.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_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/dev-util/crash-7.0.3 b/dev-util/crash-7.0.3
new file mode 100644
index 000000000000..6030848506cd
--- /dev/null
+++ b/dev-util/crash-7.0.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.0.3.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_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/dev-util/crash-7.0.7 b/dev-util/crash-7.0.7
new file mode 100644
index 000000000000..4eaaa4b9b437
--- /dev/null
+++ b/dev-util/crash-7.0.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.0.7.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_=8083c7c38c9bada1d6b07f1a054e12cd
diff --git a/dev-util/crash-7.1.4 b/dev-util/crash-7.1.4
new file mode 100644
index 000000000000..234a2bd50b5c
--- /dev/null
+++ b/dev-util/crash-7.1.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.1.4.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_=c17bb0abc6381e0fd035966d9df2084e
diff --git a/dev-util/crash-7.1.8 b/dev-util/crash-7.1.8
new file mode 100644
index 000000000000..7982a12f60a7
--- /dev/null
+++ b/dev-util/crash-7.1.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.1.8.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_=b5d1217cfe0147c2f30cd6ca3c4b0d58
diff --git a/dev-util/crash-7.1.9 b/dev-util/crash-7.1.9
new file mode 100644
index 000000000000..a919b2aeea52
--- /dev/null
+++ b/dev-util/crash-7.1.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
+EAPI=5
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.1.9.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_=b5d1217cfe0147c2f30cd6ca3c4b0d58
diff --git a/dev-util/crash-7.2.1 b/dev-util/crash-7.2.1
new file mode 100644
index 000000000000..81340a5fe129
--- /dev/null
+++ b/dev-util/crash-7.2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
+EAPI=6
+HOMEPAGE=https://people.redhat.com/anderson/
+KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://people.redhat.com/anderson/crash-7.2.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
+_md5_=0ef1da04d1da951c25445b06e7a0ec71
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
deleted file mode 100644
index c005ee9d36b0..000000000000
--- a/dev-util/crash/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX crash-5.1.1-install-fix.patch 469 BLAKE2B 110aada551499ba765499de40880b8658bac253adf066de0f33fb43ac99c7738aac90e8254eab46626024392903d3d859fc2304e21fc427bab830ac77721f14f SHA512 c9f08e57a3cfd6b1ca4d8a7f5d497658430e0f2c16f1ce73c8fdac4d6566d48e56ab8acf53f4c4db1e88943f188967cbce23b64ecb117aae598f92128f4d78ef
-AUX crash-7.1.4-sysmacros.patch 692 BLAKE2B cf5672e27f87c53008356d0b0d2fba61221f4111dcb1fd64f1564e53abac926aa04eb876687c5ae35ab1549dd2ab16f069275ef0a2a29bb48aa99cc0bec00989 SHA512 5ff35ce3c9a1eacf5842c1077a272678941ce787b9bf5746f2222aba6bef077fecaf026fb2b039fec3e0f4594dadfd521527a4510cccf54ec2c6d1a87de9775e
-DIST crash-6.1.4.tar.gz 26781448 BLAKE2B 4a0a02bc9e5ae69e7dfaa777569c4af39a87a28f1c67cf09ea349acdc58b2160e27d2c8b9d6ce116ad98ad22db3545783250218dfc466303bd82100fe9038315 SHA512 b9f2e2a84dcf5765422e2aad845c292955455793284b9a8fd32b59836ca220b861645646a3c15b33f29e7bffa4916a692fbcbe02b2274aa0279d21d51605bd4e
-DIST crash-7.0.0.tar.gz 32007997 BLAKE2B b92db03e396cdf7252ef6b281a216d9736a30de24ab0cd2a01e66fed058c7928c26c9a25ad30251b0b03764e1bb1d537cafc82457b2abdf31aaabbb35ca6552a SHA512 29f59b73a7cd17f6f6473511831d2c8610e2464057e260c1673b52f5e3476bc64bdd0cdcfff36ead16957b98b985dbd19b7d7a6daa29e115eea2e5271c4aeb4f
-DIST crash-7.0.3.tar.gz 32020508 BLAKE2B 7445559c901b3ea2a42dfea4597d8d27bd94ad3dfbd14ebc451968d7887748db74991b50e0952ab37405f75fa3367107a350e02baf9fdbb94af8212e98a16b17 SHA512 bff8781589709a161975954abf5dc2fde6f937cbe334bf23aa889d32114eb2337d918c4c3e7b5e26beb437bfa9d6939339941af8542296ab69c8c51245be76ec
-DIST crash-7.0.7.tar.gz 32041666 BLAKE2B 80593221da82c978eec8edb7916cef0585d62182fa078a4a44a267bc52e310f234998cc8bebe07039b1e61ad86a52a4452066afaa2ee8d7143afe9377c2a8d0f SHA512 51ac33705c8b40117d67797a6f03b78fdaa1be08035f32162816abea906d5193a6fde5f2c826d962047c1ece871ff403e91700c757fe91fd4f940b9bb75c936f
-DIST crash-7.1.4.tar.gz 32137593 BLAKE2B 829335875e111bcf09d3dfc49ce17c893ad8c75b4f275a6e68d3e8698f0da209d769b6667b58569a373046d6553678e6168b50785e18c25c29c47713f8dc71a9 SHA512 6d536397418b99baaf8ae2bd76d72e60c5f92a7aaeef929f81301e58930ee9848e3e146a43ccac7350602c49c1cea4a31f0b74c267d6afd3b5a23f960a1c9cc6
-DIST crash-7.1.8.tar.gz 32154942 BLAKE2B e918e0e1be435edc0c0f6dfa0f2a73ed1e418c1c9f0291a4d6e5429bb51fd94f9530cdf13b812e6ba40a92537d79a8a1d36ea4c17b052b36ed8d56c0209f94db SHA512 21aa71b61077f7f361360f19214d8259a4e813ca5c3a5fb027f32376a7367e7eb16cf2f8a0a4b49b205c5e8550192c49fc64812afd1ccaceacf8d7649ba20bf1
-DIST crash-7.1.9.tar.gz 32160154 BLAKE2B efba2011dc583ee386107aa6808a25d74d0de175c92872ed22daa8d3a3cf756e569e514e1e703bf653de2744a94205b97cf3bec037c0f1d021d8041f52970681 SHA512 1200df0d2509ea864f568ee4861c3b6819b61c2594d61a5f993560b03f3f50a3388ba8fbde2e9d630c96ee9d390ba03eb687732352153b50866c65519591c4ab
-DIST crash-7.2.1.tar.gz 32178379 BLAKE2B 290841a2c430021993074cb870e4532f6eaafbe9c8b799fbc876fd2784504440e9eae9ce08c4e06acadd30a2e095ac5ddfe95880222867670ceac18d7a3a01ad SHA512 c20bc0e901bd91f642f73ef5bf624bf6d898f771e4fbb3f8c3ced4575baf3373e116dbd4c9ed72f0c1f232a4c38c6317072b5138fa3dbd39bbe6d6c032ee1b36
-EBUILD crash-6.1.4.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.0.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.3.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.7.ebuild 503 BLAKE2B 1bf0e8a4d06849d11902f218efd276a55796507e5d34217d0f32fef0f62fd06f6f8a913aaa1a0f3920f79c7a57270bcb08a611c86aa13b1ab5489b6864feeec7 SHA512 a87573e295d8291bfac1ec024d9a4bd31361dcaf6e9cf16bdf35647daa7b6f2f962a1ab428454373c71e34b6828819cbad22318463ea7325e298a63bde8c3b98
-EBUILD crash-7.1.4.ebuild 532 BLAKE2B 3829582253a432bcde5313c5e6fb9b5198215d1695dcab9fb9f80bdc84a38d587510481de1b6e8b83b3bbb85c6e2d6de48fd2d5e72149b26b65c4ba8c0d432f2 SHA512 5d9d6709a5a87ed15fb854dd1041dfd8b92edeb5f21ca08070e14be512b7941aaeb3f32f785b87d70663e198a842158dd3337074dbf21dd9a26c3b752f3d3800
-EBUILD crash-7.1.8.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
-EBUILD crash-7.1.9.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
-EBUILD crash-7.2.1.ebuild 529 BLAKE2B 9d986dab9878fd28f88c1b353b48c28efb37368353ff371c741b07327d79c20c42c151ba39c13e763a9f2b1db6e936793bd2cc9ff8f8015890f2c58168ca6f71 SHA512 774ab7f7c87dd8bbcc971e1791e01e6eb939a8e31882f26039d85e93089e6fe51f0abde34a8c3f4fa8bdaef7ffb89d905f02e88cb4808942801bc0d1e2e8c277
-MISC metadata.xml 647 BLAKE2B d88035e0778e0f8e6af171e7bfcd3eff14ee964f2521e00ec2d8b978ab560a4e321a60cce49775dc2f34187107309aea657f55bde348cfc4a830be4aff60463c SHA512 4e5b97c2f7306f4113f842e4683a2f4c3ed684c229c8e21483d08889e4a1d8656bfda699300cd71c70389510816f19d5eb93a37715c5861b669b285bff61ef78
diff --git a/dev-util/crash/crash-6.1.4.ebuild b/dev-util/crash/crash-6.1.4.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-6.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.0.ebuild b/dev-util/crash/crash-7.0.0.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-7.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.3.ebuild b/dev-util/crash/crash-7.0.3.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-7.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.7.ebuild b/dev-util/crash/crash-7.0.7.ebuild
deleted file mode 100644
index e16819baaf09..000000000000
--- a/dev-util/crash/crash-7.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.1.4.ebuild b/dev-util/crash/crash-7.1.4.ebuild
deleted file mode 100644
index 6583d7e9041b..000000000000
--- a/dev-util/crash/crash-7.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-	epatch "${FILESDIR}"/${PN}-7.1.4-sysmacros.patch #580244
-}
diff --git a/dev-util/crash/crash-7.1.8.ebuild b/dev-util/crash/crash-7.1.8.ebuild
deleted file mode 100644
index d2d1df9f47a7..000000000000
--- a/dev-util/crash/crash-7.1.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.1.9.ebuild b/dev-util/crash/crash-7.1.9.ebuild
deleted file mode 100644
index d2d1df9f47a7..000000000000
--- a/dev-util/crash/crash-7.1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.2.1.ebuild b/dev-util/crash/crash-7.2.1.ebuild
deleted file mode 100644
index f5ba2740d29c..000000000000
--- a/dev-util/crash/crash-7.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-# there is no "make test" target, but there is a test.c so the automatic
-# make rules catch it and tests fail
-RESTRICT="test"
diff --git a/dev-util/crash/files/crash-5.1.1-install-fix.patch b/dev-util/crash/files/crash-5.1.1-install-fix.patch
deleted file mode 100644
index 98b86759361d..000000000000
--- a/dev-util/crash/files/crash-5.1.1-install-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur crash-5.1.1/Makefile crash-5.1.1-fixes//Makefile
---- crash-5.1.1/Makefile	2010-12-23 12:59:44.000000000 -0600
-+++ crash-5.1.1-fixes//Makefile	2011-01-26 13:17:11.000000000 -0600
-@@ -322,7 +322,7 @@
- 	cc -c ${CRASH_CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
- 
- install:
--	/usr/bin/install ${PROGRAM} ${INSTALLDIR}
-+	/usr/bin/install -D ${PROGRAM} ${INSTALLDIR}/${PROGRAM}
- #	/usr/bin/install ${PROGRAM}d ${INSTALLDIR}
- 
- unconfig: make_configure
diff --git a/dev-util/crash/files/crash-7.1.4-sysmacros.patch b/dev-util/crash/files/crash-7.1.4-sysmacros.patch
deleted file mode 100644
index 6e6d40cca4d2..000000000000
--- a/dev-util/crash/files/crash-7.1.4-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f22dabb45448e5a8d2df85703fd72b0f83fe7eda Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 21 Apr 2016 00:44:04 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
-Linux C libraries are updating to drop the implicit include, so we need
-to include it explicitly.
----
- filesys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/filesys.c b/filesys.c
-index 2ed25f4..9b59998 100644
---- a/filesys.c
-+++ b/filesys.c
-@@ -16,6 +16,7 @@
-  */
- 
- #include "defs.h"
-+#include <sys/sysmacros.h>
- #include <linux/major.h>
- #include <regex.h>
- #include <sys/utsname.h>
--- 
-2.7.4
-
diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
deleted file mode 100644
index bfe00424921c..000000000000
--- a/dev-util/crash/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>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<longdescription lang="en">
-		The Red Hat crash analysis utility is loosely based on the SVR4 UNIX
-		crash command, but has been significantly enhanced by completely merging
-		it with the GNU gdb debugger. The marriage of the two effectively
-		combines the kernel-specific nature of the traditional UNIX crash
-		utility with the source code level debugging capabilities of gdb. 
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/creduce-2.7.0 b/dev-util/creduce-2.7.0
new file mode 100644
index 000000000000..85740488464c
--- /dev/null
+++ b/dev-util/creduce-2.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=C-Reduce - a plugin-based C program reducer
+EAPI=6
+HOMEPAGE=https://embed.cs.utah.edu/creduce/
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+SLOT=0
+SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f3f29a0a87a29c74ed7364be33767ce6
diff --git a/dev-util/creduce-2.7.0-r1 b/dev-util/creduce-2.7.0-r1
new file mode 100644
index 000000000000..156e860a34d7
--- /dev/null
+++ b/dev-util/creduce-2.7.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=C-Reduce - a plugin-based C program reducer
+EAPI=6
+HOMEPAGE=https://embed.cs.utah.edu/creduce/
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+SLOT=0
+SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=84b763f76449d540091d192a7f6a195e
diff --git a/dev-util/creduce-2.8.0_pre20180411 b/dev-util/creduce-2.8.0_pre20180411
new file mode 100644
index 000000000000..c31023aa73a7
--- /dev/null
+++ b/dev-util/creduce-2.8.0_pre20180411
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-6:= dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=C-Reduce - a plugin-based C program reducer
+EAPI=6
+HOMEPAGE=https://embed.cs.utah.edu/creduce/
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-6:= dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+SLOT=0
+SRC_URI=https://github.com/csmith-project/creduce/archive/48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz -> creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4ca17c68e7d9b3567a2fd8f580aae5a0
diff --git a/dev-util/creduce-9999 b/dev-util/creduce-9999
new file mode 100644
index 000000000000..a8556838049d
--- /dev/null
+++ b/dev-util/creduce-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-4:= dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=C-Reduce - a plugin-based C program reducer
+EAPI=6
+HOMEPAGE=https://embed.cs.utah.edu/creduce/
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-4:= dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ecac853cd201251e44a7b6a6a8a1d9f
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
deleted file mode 100644
index 24b797495711..000000000000
--- a/dev-util/creduce/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
-DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
-DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
-EBUILD creduce-2.7.0-r1.ebuild 831 BLAKE2B 90b54fbd845dbe404bbb18cde38882f2fdc7adff440d7da52ee23941f538bc8bc95608af410a0b9a7de333387750095b733cddd57829cf4381cdd17a4b7cbe62 SHA512 5526fc208eb9c6d1c3e30db997a0787a80868723443795230f178a3227d4aa5d964f4e3813a76915ab38ed56ef48573671ed976edead59ac199ab24696e3a513
-EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
-EBUILD creduce-2.8.0_pre20180411.ebuild 905 BLAKE2B a9d06624abb5e882c827048dc2f78fd4ac545bffb0fa356c6a2000e19850c64fe92efdc0f41f605fade209ad9dc3135b7dc77d84f9c44324df831835735e8892 SHA512 3cde436cf4de037d3ddb2885f10252dea84860d33f95f7f0025b4e04078f5031b1bef9ced855f77610f64dac7cf326b3d31fa73065db12fe76584c7ad23822c4
-EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.7.0-r1.ebuild b/dev-util/creduce/creduce-2.7.0-r1.ebuild
deleted file mode 100644
index 85c8633fbf6e..000000000000
--- a/dev-util/creduce/creduce-2.7.0-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="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils llvm
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LLVM_MAX_SLOT=5
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	sys-devel/clang:${LLVM_MAX_SLOT}"
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-5.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
diff --git a/dev-util/creduce/creduce-2.7.0.ebuild b/dev-util/creduce/creduce-2.7.0.ebuild
deleted file mode 100644
index 9fae9a665c8b..000000000000
--- a/dev-util/creduce/creduce-2.7.0.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils llvm
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	sys-devel/clang:4"
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
-
-LLVM_MAX_SLOT=4
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
deleted file mode 100644
index 10d19d7cec06..000000000000
--- a/dev-util/creduce/creduce-2.8.0_pre20180411.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils llvm
-
-EGIT_COMMIT="48e622ba74bc35c5a81299d3a34b9b14038d6a70"
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	>=sys-devel/clang-6:="
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
diff --git a/dev-util/creduce/creduce-9999.ebuild b/dev-util/creduce/creduce-9999.ebuild
deleted file mode 100644
index b7accd15defa..000000000000
--- a/dev-util/creduce/creduce-9999.ebuild
+++ /dev/null
@@ -1,36 +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/csmith-project/${PN}"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils git-r3 llvm
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	>=sys-devel/clang-4:="
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
diff --git a/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch b/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
deleted file mode 100644
index ecf2ac70fa81..000000000000
--- a/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 97e2b29956adbe61973228ef7d8bff28e83d04d4 Mon Sep 17 00:00:00 2001
-From: Yang Chen <chenyang@cs.utah.edu>
-Date: Thu, 27 Apr 2017 20:55:32 -0700
-Subject: [PATCH] Fix build failure with LLVM trunk
-
-Patch provided by Markus Trippelsdorf. Thanks!
-
-"InputKind was refactored in Clang r301442.
-
-The IK_Preprocessed* comparisons are superfluous now and can be dropped."
----
- clang_delta/TransformationManager.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
-index 8b6bdf454847..5db190cd71d1 100644
---- a/clang_delta/TransformationManager.cpp
-+++ b/clang_delta/TransformationManager.cpp
-@@ -101,16 +101,16 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-   CompilerInvocation &Invocation = ClangInstance->getInvocation();
-   InputKind IK = FrontendOptions::getInputKindForExtension(
-         StringRef(SrcFileName).rsplit('.').second);
--  if ((IK == IK_C) || (IK == IK_PreprocessedC)) {
--    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_C, T, PPOpts);
-+  if (IK.getLanguage() == InputKind::C) {
-+    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::C, T, PPOpts);
-   }
--  else if ((IK == IK_CXX) || (IK == IK_PreprocessedCXX)) {
-+  else if (IK.getLanguage() == InputKind::CXX) {
-     // ISSUE: it might cause some problems when building AST
--    // for a function which has a non-declared callee, e.g., 
--    // It results an empty AST for the caller. 
--    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_CXX, T, PPOpts);
-+    // for a function which has a non-declared callee, e.g.,
-+    // It results an empty AST for the caller.
-+    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::CXX, T, PPOpts);
-   }
--  else if(IK == IK_OpenCL) {
-+  else if(IK.getLanguage() == InputKind::OpenCL) {
-     //Commandline parameters
-     std::vector<const char*> Args;
-     Args.push_back("-x");
-@@ -135,7 +135,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-                                        &Args[0], &Args[0] + Args.size(),
-                                        ClangInstance->getDiagnostics());
-     Invocation.setLangDefaults(ClangInstance->getLangOpts(),
--                               IK_OpenCL, T, PPOpts);
-+                               InputKind::OpenCL, T, PPOpts);
-   }
-   else {
-     ErrorMsg = "Unsupported file type!";
--- 
-2.15.1
-
diff --git a/dev-util/creduce/metadata.xml b/dev-util/creduce/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/dev-util/creduce/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>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/cscope-15.8a-r1 b/dev-util/cscope-15.8a-r1
new file mode 100644
index 000000000000..9688e1dd3584
--- /dev/null
+++ b/dev-util/cscope-15.8a-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs ) sys-devel/flex virtual/pkgconfig virtual/yacc >=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=Interactively examine a C program
+EAPI=6
+HOMEPAGE=http://cscope.sourceforge.net/
+IUSE=emacs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD GPL-2+
+RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs )
+SLOT=0
+SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5bd830e8272a2c496b185d69bb370ead
diff --git a/dev-util/cscope-15.8a-r2 b/dev-util/cscope-15.8a-r2
new file mode 100644
index 000000000000..ec5100ad9105
--- /dev/null
+++ b/dev-util/cscope-15.8a-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs ) sys-devel/flex virtual/pkgconfig virtual/yacc >=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=Interactively examine a C program
+EAPI=6
+HOMEPAGE=http://cscope.sourceforge.net/
+IUSE=emacs
+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 ~x86-solaris
+LICENSE=BSD GPL-2+
+RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( virtual/emacs )
+SLOT=0
+SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=814cc947599eeb3066de373f5475d547
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
deleted file mode 100644
index 010d25d3de19..000000000000
--- a/dev-util/cscope/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 50cscope-gentoo.el 1442 BLAKE2B 73a5542b5ac18dd6ffb34169764cae590cb009c3d04816cb09361d24ea16c3e2fdb2355cca2301e932108fbb333ff433783b75bb379ecf4ec8996f8e162f422a SHA512 63bb70766d69a85f78c43204e3539bcabaf5765f19703f6f8ad1dcc2bc076c1c20623a3120eeeaff89842fac9f17d5b3f17820780eab9844716cbcd6a138d384
-AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231cc61099e854ded076f66034ab400c0f49db7ba5eeb43ee7cd3e1d5d9c0ba488b282f050ffe532da9910324688 SHA512 24c3a876c34786c8ff2b51256c05da5c8334cc8befb3db40faba8af8f34abbec78062f1baf8e0dc0adf9f37731b10310e61cd46c08a6e78baa767234e483e7d5
-AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
-DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
-EBUILD cscope-15.8a-r1.ebuild 1388 BLAKE2B 41c1a647a086729d21b1321d64d86e8684c8cf204f632c6c8ccff268af4ab8a22d49cc59f9598d4814479f8fcd6ab30e7a997002f63ecef625c5bb80c68ed9d1 SHA512 b9d1b76bb68f5352fbd21b3668c518708e5ccc0580d9052ba556874d6bec06961d900bf06191e88870d741a408886fb4ae5efc9d3f974448ea6d26cd569ef0ca
-EBUILD cscope-15.8a-r2.ebuild 1601 BLAKE2B 21d72755f774fc5bd2ca5767dbb34753c5f330c16138edc16df5e4c85f8bbdfb7f45680ae4c0450df3c84de2b384e89e79797b34acc1b4d49915c8d16c77606a SHA512 80dca153c05cfa98f2bcefd5901a977ac4492815b51a2f05ac31cebe32154b82a86d09e90c563cb96b0d63f9e3e45be4245d585412d77b53e32e4c02bc274d7a
-MISC metadata.xml 1086 BLAKE2B 9fecf3d723e58a1235e3ae94b6a009c16cf91ecf0b27c32de7d8a8f96308e41908b9f2881083acfbf329685cce188b8ee0fb864333d566bc915e1ca2d572ac3f SHA512 a8ebddecfe959cb05a992749f12183baba41950b39e197bd1db0528969dd4e1814dc159555b2e24d85249373da4b60bf05a7d86aac2d7b8969d6d2bed2ab59e1
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
deleted file mode 100644
index 597e787b4abc..000000000000
--- a/dev-util/cscope/cscope-15.8a-r1.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
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
deleted file mode 100644
index cc6a6c15981e..000000000000
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD 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 ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eapply "${FILESDIR}/${PN}-15.6-darwin.patch"
-	eapply_user
-	mv configure.{in,ac} || die
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_configure() {
-	econf --with-ncurses="${EPREFIX}"/usr
-}
-
-src_compile() {
-	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/files/50cscope-gentoo.el b/dev-util/cscope/files/50cscope-gentoo.el
deleted file mode 100644
index 08fd4b449352..000000000000
--- a/dev-util/cscope/files/50cscope-gentoo.el
+++ /dev/null
@@ -1,34 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'cscope-minor-mode "xcscope")
-(autoload 'cscope-display-buffer "xcscope"
-  "Display the *cscope* buffer." t)
-(autoload 'cscope-display-buffer-toggle "xcscope"
-  "Toggle cscope-display-cscope-buffer, which corresponds to
-\"Auto display *cscope* buffer\"." t)
-(autoload 'cscope-next-symbol "xcscope"
-  "Move to the next symbol in the *cscope* buffer." t)
-(autoload 'cscope-next-file "xcscope"
-  "Move to the next file in the *cscope* buffer." t)
-(autoload 'cscope-prev-symbol "xcscope"
-  "Move to the previous symbol in the *cscope* buffer." t)
-(autoload 'cscope-prev-file "xcscope"
-  "Move to the previous file in the *cscope* buffer." t)
-(autoload 'cscope-pop-mark "xcscope"
-  "Pop back to where cscope was last invoked." t)
-(autoload 'cscope-set-initial-directory "xcscope"
-  "Set the cscope-initial-directory variable." t)
-(autoload 'cscope-unset-initial-directory "xcscope"
-  "Unset the cscope-initial-directory variable." t)
-(autoload 'cscope-find-this-symbol "xcscope"
-  "Locate a symbol in source code." t)
-(autoload 'cscope-find-global-definition "xcscope"
-  "Find a symbol's global definition." t)
-(autoload 'cscope-find-global-definition-no-prompting "xcscope"
-  "Find a symbol's global definition without prompting." t)
-
-(defun cscope:hook ()
-  (cscope-minor-mode))
-(add-hook 'c-mode-hook 'cscope:hook)
-(add-hook 'c++-mode-hook 'cscope:hook)
-(add-hook 'dired-mode-hook 'cscope:hook)
diff --git a/dev-util/cscope/files/cscope-15.6-darwin.patch b/dev-util/cscope/files/cscope-15.6-darwin.patch
deleted file mode 100644
index e755f3257efd..000000000000
--- a/dev-util/cscope/files/cscope-15.6-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/constants.h
-+++ b/src/constants.h
-@@ -103,7 +103,7 @@
- #define INCLUDES	8
- #define	FIELDS		9
- 
--#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
-+#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ && !__MACH__
- # define TERMINFO	0	/* no terminfo curses */
- #else
- # define TERMINFO	1
diff --git a/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch b/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
deleted file mode 100644
index 6b4c17fe9145..000000000000
--- a/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/269305
-
---- cscope-15.7a-orig/contrib/ocs	2004-06-21 20:13:22.000000000 +0200
-+++ cscope-15.7a/contrib/ocs	2009-05-11 22:33:51.000000000 +0200
-@@ -75,17 +75,10 @@
- 
- #set the default value for SYSDIR 
- if [ -z "${SYSDIR}" ]; then
--   SYSDIR=/usr/local/lib/cs
-+   SYSDIR=/var/lib/cs
-    echo setting default sysdir
- fi
- 
--#check that SYSDIR exists
--if [ ! -d ${SYSDIR} ]; then
--   echo -n $SYSDIR does not exist. 
--   echo Please create the directory and set SYSDIR appropriately
--   exit 
--fi
--
- # Check that cscope is in PATH
- type cscope 1>/dev/null 2>&1
- 
diff --git a/dev-util/cscope/metadata.xml b/dev-util/cscope/metadata.xml
deleted file mode 100644
index d474ab0ab2b1..000000000000
--- a/dev-util/cscope/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>vim@gentoo.org</email>
-  <name>Gentoo Vim Project</name>
-</maintainer>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  Cscope is a developer's tool for browsing source code.  Cscope allows
-  searching code for:
-
-    * cross referenced symbols
-    * global definitions
-    * callees and callers
-    * text strings and regular expression patterns
-    * files and files including a file
-
-  Other features:
-
-    * curses based (text screen)
-    * fast searches
-    * fuzzy parser supports C and is flexible enough to be useful for
-      C++, Java and other documents
-    * command line mode for inclusion in scripts or as a backend to GUIs
-
-  Cscope is distributed with xcscope which provides tight integration
-  with GNU Emacs.
-</longdescription>
-<upstream>
-  <remote-id type="sourceforge">cscope</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-util/csup-20060318-r1 b/dev-util/csup-20060318-r1
new file mode 100644
index 000000000000..31ff0f7c8dc7
--- /dev/null
+++ b/dev-util/csup-20060318-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/zlib:0= dev-libs/openssl:0= >=sys-devel/bison-2.1
+DESCRIPTION=A rewrite of CVSup
+EAPI=6
+HOMEPAGE=http://www.mu.org/~mux/csup.html
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=sys-libs/zlib:0= dev-libs/openssl:0= !>=sys-freebsd/freebsd-ubin-6.2_beta1
+SLOT=0
+SRC_URI=http://mu.org/~mux/csup-snap-20060318.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c0a198250e923445ac906fcd6ddcae82
diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest
deleted file mode 100644
index 853b89c2578d..000000000000
--- a/dev-util/csup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX csup-20060318-respectflags.patch 1374 BLAKE2B 45f3e110cc6607cf12962daf4d0a00ae831d1b91253c3a7b44be32f5523932a77eec86cdcd8f484d18461df6f4862fdb88cb28c5d8806bb4502968605f5897ff SHA512 e112fd37dae7f037e7700579ab59e8611b5f09f0d8351bd2c909e22e393b05f697a51348fab79ba95d31e28b727e62b4a4ce2f8dc22402ac16efcfa4204a1d8b
-DIST csup-snap-20060318.tgz 78968 BLAKE2B 9d257e5af438ed784402e427714fc652c5daa403f5cb2240147df5e8c68d2f81eee43da1242b80c82d6bbda3c5534e14c0d6e27ba57442d5b6c34ef1d69ed397 SHA512 60e40f6f903df81b1667af31397978ce99d33b6849dd2476232b325415a391e6840a29e70af85b928a3c7beea55cf3064d3b48d61b9c20c2280dc3f675adcd5a
-EBUILD csup-20060318-r1.ebuild 754 BLAKE2B df091d48f5382631f821da4633af208a8fcc250f13e6e19c420c1f514f17e755f949995c22dbb4daa99e50325be471b8f244346e0b7943eb048b449f573f2263 SHA512 c2257a971cac2266d2b4b197b0d1f08071613c4828eb86a0ec89061765c1c4cf76c75b2f06ff894f1f8c4375299b76566381f2acaedcca3c31be9f800af52852
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/dev-util/csup/csup-20060318-r1.ebuild b/dev-util/csup/csup-20060318-r1.ebuild
deleted file mode 100644
index 4bd23eb5dced..000000000000
--- a/dev-util/csup/csup-20060318-r1.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
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A rewrite of CVSup"
-HOMEPAGE="http://www.mu.org/~mux/csup.html"
-SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-DEPEND="
-	sys-libs/zlib:0=
-	dev-libs/openssl:0="
-
-RDEPEND="
-	${DEPEND}
-	!>=sys-freebsd/freebsd-ubin-6.2_beta1"
-
-DEPEND="
-	${DEPEND}
-	>=sys-devel/bison-2.1"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${P}-respectflags.patch")
-
-src_compile() {
-	# unable to work with yacc, but bison is ok.
-	emake \
-		CC="$(tc-getCC)" \
-		PREFIX=/usr \
-		YACC=bison
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/dev-util/csup/files/csup-20060318-respectflags.patch b/dev-util/csup/files/csup-20060318-respectflags.patch
deleted file mode 100644
index c95a974c75ed..000000000000
--- a/dev-util/csup/files/csup-20060318-respectflags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: csup/GNUmakefile
-===================================================================
---- csup.orig/GNUmakefile
-+++ csup/GNUmakefile
-@@ -21,7 +21,7 @@ WARNS=	-Wall -W -Wno-unused-parameter -W
- 	-Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \
- 	-Wnested-externs -Wredundant-decls -Wno-format-y2k
- 
--CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include
-+CFLAGS+= -I$(PREFIX)/include
- ifeq ($(UNAME), Linux)
- 	CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
- endif
-@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin)
- 	CFLAGS+= -DHAVE_FFLAGS
- endif
- CFLAGS+= $(WARNS)
--LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
-+LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
- 
- .PHONY: all clean install
- 
- all: csup csup.1.gz
- 
- csup: $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
- 
- config.c: parse.h
- 
-Index: csup/Makefile
-===================================================================
---- csup.orig/Makefile
-+++ csup/Makefile
-@@ -11,7 +11,7 @@ SRCS=	attrstack.c config.c detailer.c di
- 	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
- 	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
- 
--CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
-+CFLAGS+=	-I. -I${.CURDIR} -pthread -DHAVE_FFLAGS
- WARNS?=		6
- 
- # A bit of tweaking is needed to get this Makefile working
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
deleted file mode 100644
index a00f3aeb1f81..000000000000
--- a/dev-util/csup/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>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/ctags-20161028 b/dev-util/ctags-20161028
new file mode 100644
index 000000000000..bc1a1f5e34fa
--- /dev/null
+++ b/dev-util/ctags-20161028
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) dev-python/docutils virtual/pkgconfig
+DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=6
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IUSE=json xml yaml
+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
+LICENSE=GPL-2
+RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~radhermit/vim/ctags-20161028.tar.xz
+_md5_=c87168bcbd400f59bca1149692c5a347
diff --git a/dev-util/ctags-20170704 b/dev-util/ctags-20170704
new file mode 100644
index 000000000000..86c6826484e3
--- /dev/null
+++ b/dev-util/ctags-20170704
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) dev-python/docutils 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=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=6
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IUSE=json xml yaml
+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
+LICENSE=GPL-2
+RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/ctags/archive/0645b2c833e4ca956970cc96fab32a1b04c0c55c.tar.gz -> ctags-20170704.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c3d10e30b828438f90a04a890abf7478
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
deleted file mode 100644
index 75867c175da0..000000000000
--- a/dev-util/ctags/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
-DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
-DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
-EBUILD ctags-20161028.ebuild 1727 BLAKE2B b461614b554f4a489d230b6892878b96968f2483b3a6951f206c5e50b852df641aef7025f4d6b50df9951556dfbc165ffac8a2b88d63bda4270151b906167d75 SHA512 ddcd0d9a4d410de17e7d752711c481417d1e93cacf3c3f335da79a33ef37f48d63182d0f0cf12c147ed4a67f7747911789f342dd63adbe90bfd6d5cf6bba6b1d
-EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
-MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
deleted file mode 100644
index 9734f3d20018..000000000000
--- a/dev-util/ctags/ctags-20161028.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
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="json xml yaml"
-
-COMMON_DEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-eselect/eselect-ctags
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-automagic-deps.patch )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20170704.ebuild b/dev-util/ctags/ctags-20170704.ebuild
deleted file mode 100644
index 0fc5b8e6e8fb..000000000000
--- a/dev-util/ctags/ctags-20170704.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="0645b2c833e4ca956970cc96fab32a1b04c0c55c"
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="json xml yaml"
-
-CDEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-RDEPEND="
-	${CDEPEND}
-	app-eselect/eselect-ctags
-"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	./misc/dist-test-cases > makefiles/test-cases.mak || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
deleted file mode 100644
index 980d7d1c5ac5..000000000000
--- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Add options to control libxml2, jansson, and libyaml automagic deps.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -585,30 +585,48 @@
- AC_CHECK_FUNCS(fork waitpid execv pipe,[enable_xcmd=yes],[enable_xcmd=no])
- AM_CONDITIONAL([ENABLE_XCMD], [test "xyes" = "x$enable_xcmd"])
- 
-+AC_ARG_ENABLE([xml],
-+	[AS_HELP_STRING([--enable-xml],
-+		[enable xml support [no]])])
-+
- AH_TEMPLATE([HAVE_LIBXML],
- 	[Define this value if libxml is available.])
- dnl About the condition of version
- dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html
--PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
--		       [have_libxml=yes
--		       AC_DEFINE(HAVE_LIBXML)],
--		       [have_libxml=no])
-+AS_IF([test "${enable_xml}" = "yes"], [
-+	PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
-+			       [have_libxml=yes
-+			       AC_DEFINE(HAVE_LIBXML)],
-+			       [AC_MSG_ERROR([libxml2 not found])])
-+])
- AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes)
- 
-+AC_ARG_ENABLE([json],
-+	[AS_HELP_STRING([--enable-json],
-+		[enable json support [no]])])
-+
- AH_TEMPLATE([HAVE_JANSSON],
- 	[Define this value if jansson is available.])
--PKG_CHECK_MODULES(JANSSON, jansson,
--		       [have_jansson=yes
--		       AC_DEFINE(HAVE_JANSSON)],
--		       [have_jansson=no])
-+AS_IF([test "${enable_json}" = "yes"], [
-+	PKG_CHECK_MODULES(JANSSON, jansson,
-+			       [have_jansson=yes
-+			       AC_DEFINE(HAVE_JANSSON)],
-+			       [AC_MSG_ERROR([jansson not found])])
-+])
- AM_CONDITIONAL(HAVE_JANSSON, test "x$have_jansson" = xyes)
- 
-+AC_ARG_ENABLE([yaml],
-+	[AS_HELP_STRING([--enable-yaml],
-+		[enable yaml support [no]])])
-+
- AH_TEMPLATE([HAVE_LIBYAML],
- 	[Define this value if libyaml is available.])
--PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
--		       [have_libyaml=yes
--		       AC_DEFINE(HAVE_LIBYAML)],
--		       [have_libyaml=no])
-+AS_IF([test "${enable_yaml}" = "yes"], [ 
-+	PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
-+			       [have_libyaml=yes
-+			       AC_DEFINE(HAVE_LIBYAML)],
-+			       [AC_MSG_ERROR([libyaml not found])])
-+])
- AM_CONDITIONAL(HAVE_LIBYAML, test "x$have_libyaml" = xyes)
- 
- 
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
deleted file mode 100644
index 60fa8ffe0294..000000000000
--- a/dev-util/ctags/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="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-  <use>
-    <flag name="json">Enable JSON output support</flag>
-    <flag name="xml">Enable XML parsing support</flag>
-    <flag name="yaml">Enable YAML parsing support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">gnuada</remote-id>
-    <remote-id type="github">universal-ctags/ctags</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-2.4.0-r1 b/dev-util/cucumber-2.4.0-r1
new file mode 100644
index 000000000000..e2c1c4daee20
--- /dev/null
+++ b/dev-util/cucumber-2.4.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-2[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-2[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=5
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c33dfcb8d20f9d74bd74bcdbbc3b8f5c
diff --git a/dev-util/cucumber-3.0.2 b/dev-util/cucumber-3.0.2
new file mode 100644
index 000000000000..72a292357744
--- /dev/null
+++ b/dev-util/cucumber-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.0[ruby_targets_ruby23] dev-util/cucumber-expressions:4.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.0[ruby_targets_ruby24] dev-util/cucumber-expressions:4.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.0[ruby_targets_ruby23] dev-util/cucumber-expressions:4.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.0[ruby_targets_ruby24] dev-util/cucumber-expressions:4.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.0.2.tar.gz -> cucumber-3.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74870452751e2b33bd0a6bbe64ceb1bc
diff --git a/dev-util/cucumber-3.1.0 b/dev-util/cucumber-3.1.0
new file mode 100644
index 000000000000..bf7cf4487631
--- /dev/null
+++ b/dev-util/cucumber-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3a580f41eee8b34d93430d809ff04265
diff --git a/dev-util/cucumber-3.1.0-r1 b/dev-util/cucumber-3.1.0-r1
new file mode 100644
index 000000000000..8ce857abd947
--- /dev/null
+++ b/dev-util/cucumber-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5dcf64ad37dc4893ad19517e59bc608d
diff --git a/dev-util/cucumber-3.1.1 b/dev-util/cucumber-3.1.1
new file mode 100644
index 000000000000..e7e04973cae4
--- /dev/null
+++ b/dev-util/cucumber-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:6.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:6.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.1.tar.gz -> cucumber-3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0522dcd8f48678f3023db92ead6458b5
diff --git a/dev-util/cucumber-core-1.5.0 b/dev-util/cucumber-core-1.5.0
new file mode 100644
index 000000000000..dac1c15c671f
--- /dev/null
+++ b/dev-util/cucumber-core-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=5
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-core-1.5.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=471bd5982c4064cc3db54cf11d4ccded
diff --git a/dev-util/cucumber-core-3.0.0 b/dev-util/cucumber-core-3.0.0
new file mode 100644
index 000000000000..978a0871ad1b
--- /dev/null
+++ b/dev-util/cucumber-core-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby23] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby24] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby23] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby24] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=3.0
+SRC_URI=mirror://rubygems/cucumber-core-3.0.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6c17be0aa4610f933bd70e0b9431863
diff --git a/dev-util/cucumber-core-3.1.0-r1 b/dev-util/cucumber-core-3.1.0-r1
new file mode 100644
index 000000000000..e81fe1022055
--- /dev/null
+++ b/dev-util/cucumber-core-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3.1
+SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.1.0.tar.gz -> cucumber-core-3.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b580d985e8d2e828280acdb99b116184
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
deleted file mode 100644
index 8d1347b77d81..000000000000
--- a/dev-util/cucumber-core/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
-DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
-DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
-EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
-EBUILD cucumber-core-3.0.0.ebuild 802 BLAKE2B d969e10078b0127a60683db02e4124458cd9ee666a0143e7c484efcf3ee8e0dac3dd0465f07f3fd78e1b0a6348497769ea8b4a6e738dd5b0d90f143631e4d960 SHA512 48c3ba8925b5b7b09fcd2cddadddccbfc2749ce2bad8724d23006e37a8f0280b0d7d7aa4d4e0f41f41b54e429f12e993262a6bf85518cd212f9784ab689ef6ca
-EBUILD cucumber-core-3.1.0-r1.ebuild 976 BLAKE2B 35f0b120baf995712a7e2c21d2b1fe0c69a067466ca91795a5da3deed20991c4323b8e71cadf25b00b3cf4e543036bd24f59ce289de4dc5c800fb5bb86fd32e0 SHA512 890710ba3a5a91f996c1da8c9e6e0a11a539891db63155c98a2de0f54a66a201a06fb71070667282876d11c1e6e6866553ef3e8dbcb458323505fd5ef6c691e5
-MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
deleted file mode 100644
index 0e0b55d4e916..000000000000
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/gherkin-4.0:4
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
deleted file mode 100644
index 078c3dd6b019..000000000000
--- a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="3.0"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/backports-3.8.0
-	>=dev-util/cucumber-tag_expressions-1.0.1
-	>=dev-ruby/gherkin-4.1.3
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild b/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild
deleted file mode 100644
index f3c9451e8d5c..000000000000
--- a/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-core-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="3.1"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/backports-3.8.0
-	>=dev-util/cucumber-tag_expressions-1.1.0
-	>=dev-ruby/gherkin-5.0.0
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-core/metadata.xml b/dev-util/cucumber-core/metadata.xml
deleted file mode 100644
index 06c13e2d2e33..000000000000
--- a/dev-util/cucumber-core/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-expressions-4.0.4 b/dev-util/cucumber-expressions-4.0.4
new file mode 100644
index 000000000000..e598c47d5cec
--- /dev/null
+++ b/dev-util/cucumber-expressions-4.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=4.0
+SRC_URI=mirror://rubygems/cucumber-expressions-4.0.4.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2ed17dea5b2abfa29d9598718e8e7e9f
diff --git a/dev-util/cucumber-expressions-5.0.18 b/dev-util/cucumber-expressions-5.0.18
new file mode 100644
index 000000000000..ccbd23aa3936
--- /dev/null
+++ b/dev-util/cucumber-expressions-5.0.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.0
+SRC_URI=mirror://rubygems/cucumber-expressions-5.0.18.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=00d9e8b5b45395bf87dc46a9d29f9321
diff --git a/dev-util/cucumber-expressions-6.0.0 b/dev-util/cucumber-expressions-6.0.0
new file mode 100644
index 000000000000..61dad6659d44
--- /dev/null
+++ b/dev-util/cucumber-expressions-6.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=6.0
+SRC_URI=mirror://rubygems/cucumber-expressions-6.0.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb4381ed80cd25037da69cf0bd87fa09
diff --git a/dev-util/cucumber-expressions-6.0.1 b/dev-util/cucumber-expressions-6.0.1
new file mode 100644
index 000000000000..511b1421301b
--- /dev/null
+++ b/dev-util/cucumber-expressions-6.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=6.0
+SRC_URI=mirror://rubygems/cucumber-expressions-6.0.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb4381ed80cd25037da69cf0bd87fa09
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
deleted file mode 100644
index b510d832d4c1..000000000000
--- a/dev-util/cucumber-expressions/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
-DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
-DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
-DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-4.0.4.ebuild 486 BLAKE2B 1e32843c530edd3b6c108c2a8d88b6cec0072c5043f32f68ba245be22c8464791a416f4f81f806f7bb6a25cfb510071bd1641d48b236b63885fc73fe31abfad4 SHA512 2ef549ece304bec61447cb885034cdd8b4c654ae418dbf0efa12a151dabe382eb57f99cd7546d4166808754206db30b2797e324c9e4fadd2461c7978b57fbfd7
-EBUILD cucumber-expressions-5.0.18.ebuild 486 BLAKE2B 5c9ef936e8f7695dc4a5f046bcf60de90c3c9fe9b6fa2d0dd6607084a4c0940c5162cdf9bbd14ca4dfd73681851874a33cf6adb36ecceec5c5adc18e4677e0e1 SHA512 8d5ea7734d0bb8a03b6b00c748a20af66075c84191280a0e9ba98236cb11eb900bc6c36977a5936b3ef698b32d34cb6e17db8c616265d10a87fc2b55ccdbd975
-EBUILD cucumber-expressions-6.0.0.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
-EBUILD cucumber-expressions-6.0.1.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
-MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
deleted file mode 100644
index c7f9c901c4f6..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="4.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
deleted file mode 100644
index cc906e2cd480..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
deleted file mode 100644
index d7125ec4950d..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="6.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
deleted file mode 100644
index d7125ec4950d..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="6.0"
diff --git a/dev-util/cucumber-expressions/metadata.xml b/dev-util/cucumber-expressions/metadata.xml
deleted file mode 100644
index cc08d19c6f5d..000000000000
--- a/dev-util/cucumber-expressions/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-rails-1.5.0 b/dev-util/cucumber-rails-1.5.0
new file mode 100644
index 000000000000..64975d81e654
--- /dev/null
+++ b/dev-util/cucumber-rails-1.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios for Rails
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-rails-1.5.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef81d5483ae0b580bbedd33439ac238e
diff --git a/dev-util/cucumber-rails-1.6.0 b/dev-util/cucumber-rails-1.6.0
new file mode 100644
index 000000000000..673490251251
--- /dev/null
+++ b/dev-util/cucumber-rails-1.6.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-4:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-4:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25] <dev-util/cucumber-4[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby25] <dev-ruby/capybara-4:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] <dev-ruby/railties-6:*[ruby_targets_ruby25] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby25] <dev-ruby/mime-types-4:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios for Rails
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-4:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-4:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-util/cucumber-3.0.2[ruby_targets_ruby25] <dev-util/cucumber-4[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8[ruby_targets_ruby25] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby25] <dev-ruby/capybara-4:*[ruby_targets_ruby25] >=dev-ruby/railties-4:*[ruby_targets_ruby25] <dev-ruby/railties-6:*[ruby_targets_ruby25] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby25] <dev-ruby/mime-types-4:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-rails-1.6.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=34f30c80a3d3524e946b85758ad4873c
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
deleted file mode 100644
index 11c8ad3ee642..000000000000
--- a/dev-util/cucumber-rails/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
-DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
-EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
-EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
-MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
deleted file mode 100644
index dac64878d7b4..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-1.3.8 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-3:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-5.2:*
-	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
deleted file mode 100644
index 4bb922cd0f1e..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-4:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
-	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/metadata.xml b/dev-util/cucumber-rails/metadata.xml
deleted file mode 100644
index cc08d19c6f5d..000000000000
--- a/dev-util/cucumber-rails/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-tag_expressions-1.0.1 b/dev-util/cucumber-tag_expressions-1.0.1
new file mode 100644
index 000000000000..2481d5ef9476
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=6
+HOMEPAGE=https://docs.cucumber.io/tag-expressions/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.0.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/dev-util/cucumber-tag_expressions-1.1.0 b/dev-util/cucumber-tag_expressions-1.1.0
new file mode 100644
index 000000000000..1445c9ef68a2
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=6
+HOMEPAGE=https://docs.cucumber.io/tag-expressions/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/dev-util/cucumber-tag_expressions-1.1.1 b/dev-util/cucumber-tag_expressions-1.1.1
new file mode 100644
index 000000000000..dea062aec388
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=6
+HOMEPAGE=https://docs.cucumber.io/tag-expressions/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f0fa6e9438c4be90ca2a684fb3f89bb
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
deleted file mode 100644
index a23edc403679..000000000000
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
-DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
-DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.0.1.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
-EBUILD cucumber-tag_expressions-1.1.0.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 454 BLAKE2B 5379c198ebbf7759aabbb6bdb44eba7545c6999c5b09b25cdfb9f860656ca915e1785e2d7d1e3383640429da14b7cfdd01b5b46813c2ed3ab87654aeeb81befe SHA512 a621fbf6ff27058535e682a7bed6151f9f513d9a3226d5db34bcf633def18c27231ee97146602b3029bfe68661d94beb5c99435e420995dc3a08122c9e260018
-MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
deleted file mode 100644
index 8f80157a5c95..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/metadata.xml b/dev-util/cucumber-tag_expressions/metadata.xml
deleted file mode 100644
index cc08d19c6f5d..000000000000
--- a/dev-util/cucumber-tag_expressions/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-wire-0.0.1 b/dev-util/cucumber-wire-0.0.1
new file mode 100644
index 000000000000..29e4b894368b
--- /dev/null
+++ b/dev-util/cucumber-wire-0.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=5
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ad7e5a1a70c446091cc1cc406a696c5c
diff --git a/dev-util/cucumber-wire-0.0.1-r1 b/dev-util/cucumber-wire-0.0.1-r1
new file mode 100644
index 000000000000..1a6b7303f822
--- /dev/null
+++ b/dev-util/cucumber-wire-0.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=93c18d86b21e4d4a422fe3a18cffe031
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
deleted file mode 100644
index b8615250ae8a..000000000000
--- a/dev-util/cucumber-wire/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 516 BLAKE2B aecf7b1742435703fb954a08a33f06ba9dc580cda3dd81a16b3535a360855b3f97a4f221de200d8b31c696bddcb1d0d9fa2a11fed60de09d8300633408c5722f SHA512 fc57e20e5776f624fba2521da9b5b484f07066f0cf7e6f2d95dd6b5a5ce082330908fa9f01fae613416f43d6a708d5a7efd61a6ab3ed6af6bb3eacbf1458aa45
-EBUILD cucumber-wire-0.0.1.ebuild 522 BLAKE2B 649204a8b9a48f5e4009cf10d18e0c67b538e718f1887f88aaabf9ba778fa210b77275f70673ff904f6f121b7071854b206231ee6f7771b95138cbf5d98a57e4 SHA512 272aa3faaf6f654acdd283927b6793fb7ba48613b1c6d4078ac860930a812bd79b7a9e5ac3154fd7514d56e00cd04a6d415683e1e12b2e9c41654216c6e4afae
-MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
deleted file mode 100644
index be85573610b5..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
deleted file mode 100644
index 54901eb96507..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber-wire/metadata.xml b/dev-util/cucumber-wire/metadata.xml
deleted file mode 100644
index 06c13e2d2e33..000000000000
--- a/dev-util/cucumber-wire/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
deleted file mode 100644
index 85f2170f440a..000000000000
--- a/dev-util/cucumber/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
-DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
-DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
-DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
-EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2.ebuild 2647 BLAKE2B 6169a30d1088099f1f60fdd7f69511ee274aeef666e5a8191bdec4401339daaded672057d33e786110a2fed547cfb6b541a4a3be5a2ac81b9d7cd3b8951db2bd SHA512 f2aed1372c838cebdeba0cfb62040051a72b3d18e675b946c124e3c0ec803a41eb428504df63c0a4ae8c6a52dfb5a191ec71cedba8abe4a1a005eb3bb5ba8bd3
-EBUILD cucumber-3.1.0-r1.ebuild 2647 BLAKE2B d878d4265ac2bea4b53ffb3289a49e222a4e0a54543d196dd7461d770264f98637a47b0ddb1e52f2475af2ba7087959f427927eed82782fb6e43acc7f67901aa SHA512 7d4cf3e6c816ba46c831087919ac26145a69b2b65b24c1f76adf928de4be92f3a10f903e59018b733ac5dafebb03faded26c110591de424648eabebaae1c2178
-EBUILD cucumber-3.1.0.ebuild 2647 BLAKE2B a39172067580737b00f0e45119003068fd91fca2263b9d1078363b0eff8104d2c89d961c41af86b666f7dd904cea297f9e4600c2d636834ffce169602d823228 SHA512 d8421261bbfe1701356e5fc567e07d76980ecc23f96bdac3864c13b493082f7486b4653d99b182bfa2c1ae51e6ceefcabdd5b3466c086650799d98ff5980bda2
-EBUILD cucumber-3.1.1.ebuild 2655 BLAKE2B 96e9220a6868f3e8d06bc85d4fe9bf92ca9ceaa6d0c7628498c075f22cf80fd558ae271954a4007f8d8d382ef261b2d6fe4390421caabd1055d52a47da098952 SHA512 69f323164545f975dde2b2e2b05c16977291e02e3682fa4e474219266f28f6cb70a3f33b56a5515d63324291339e04c21b69d0bd361bf521191ace23882b07ec
-MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
deleted file mode 100644
index 86915e9f5a72..000000000000
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		dev-ruby/bundler
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-2
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	>=dev-util/cucumber-core-1.5.0:0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
-	>=dev-ruby/gherkin-4.0:4
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid specs that fail due to changes in the ruby backtrace,
-	# introduced in newer versions of dev-lang/ruby, bug 628580
-	rm -f features/docs/defining_steps/nested_steps.feature
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
deleted file mode 100644
index 4c7db705b892..000000000000
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.0
-	dev-util/cucumber-expressions:4.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
-	dev-ruby/gherkin:4
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
deleted file mode 100644
index 6b671bfcda10..000000000000
--- a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:5.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	dev-ruby/gherkin:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.0.ebuild b/dev-util/cucumber/cucumber-3.1.0.ebuild
deleted file mode 100644
index 181b5b116503..000000000000
--- a/dev-util/cucumber/cucumber-3.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:5.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
-	dev-ruby/gherkin:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.1.ebuild b/dev-util/cucumber/cucumber-3.1.1.ebuild
deleted file mode 100644
index 4235b44e8374..000000000000
--- a/dev-util/cucumber/cucumber-3.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/metadata.xml b/dev-util/cucumber/metadata.xml
deleted file mode 100644
index 06c13e2d2e33..000000000000
--- a/dev-util/cucumber/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>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cunit-2.1_p2-r1 b/dev-util/cunit-2.1_p2-r1
new file mode 100644
index 000000000000..a40ec6626c8c
--- /dev/null
+++ b/dev-util/cunit-2.1_p2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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=CUnit - C Unit Test Framework
+EAPI=5
+HOMEPAGE=http://cunit.sourceforge.net
+IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-2-src.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4d31d6cc3b6a7f7f37e8d943d5eac574
diff --git a/dev-util/cunit-2.1_p3 b/dev-util/cunit-2.1_p3
new file mode 100644
index 000000000000..f05c6ccec324
--- /dev/null
+++ b/dev-util/cunit-2.1_p3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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=C Unit Test Framework
+EAPI=6
+HOMEPAGE=http://cunit.sourceforge.net
+IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1d0f34b207fa5fa56295fe58db6fbf1c
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
deleted file mode 100644
index 0cd59e6dff41..000000000000
--- a/dev-util/cunit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST CUnit-2.1-2-src.tar.bz2 349037 BLAKE2B 51122ae79f15ebaf3b4a4f46acc8f1e08e918097d1308409b02e722e6eb7e0147d14461dd834dfbdb95ad8bc230076c05b3700348781e2a9b31bf29898c61435 SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d
-DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p2-r1.ebuild 1373 BLAKE2B df6b3baa7a39d9db5f8dcab29a3956457d14b2d3d03374a93bacb6efe5ff8ab683e92c922155cbcb6a4e56830efd5afa5be69b19a59c728dd5b49a840d9788a0 SHA512 c166a390e38e30e9416cf287c8f29d94e777f65e3375c46056b58f21aba0f923608b7b875100c5cdf175eed07d9d2deb5e0f2ac4364fc49480e612708b5ee7d4
-EBUILD cunit-2.1_p3.ebuild 1384 BLAKE2B 7cbcf32948969a5669c8f17cbf428f19f848bfac875a9230cfa87f0dc703ba2547e97c4451a982320f7c6e0995d221869c076a1863a79bcceceb4e5e81b459f5 SHA512 62a6c3d04d65a41fdb3f9546c0455666411674548d63335be1e427f56471647dc5e956d26ca7116370dca804ddf8dc1e6fc301c7c40017a36c644a324805428a
-MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
deleted file mode 100644
index 4b8d7f86d7b4..000000000000
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN='CUnit'
-MY_PV="${PV/_p*}-2"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="CUnit - C Unit Test Framework"
-SRC_URI="mirror://sourceforge/cunit/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://cunit.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ncurses static-libs"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-src_prepare() {
-	sed -e "/^docdir/d" -i doc/Makefile.am || die
-	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
-		-i doc/headers/Makefile.am || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-
-	append-cppflags -D_BSD_SOURCE
-
-	# unable to find headers otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local LIBS=${LIBS}
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		--disable-debug \
-		$(use_enable ncurses curses)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
deleted file mode 100644
index 297393113af6..000000000000
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN="CUnit"
-MY_PV="${PV/_p*}-3"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="C Unit Test Framework"
-SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
-HOMEPAGE="http://cunit.sourceforge.net"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ncurses static-libs"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-src_prepare() {
-	default
-
-	sed -e "/^docdir/d" -i doc/Makefile.am || die
-	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
-		-i doc/headers/Makefile.am || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-
-	append-cppflags -D_BSD_SOURCE
-
-	# unable to find headers otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local LIBS=${LIBS}
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		--disable-debug \
-		$(use_enable ncurses curses)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-util/cunit/metadata.xml b/dev-util/cunit/metadata.xml
deleted file mode 100644
index 4d2f287374f8..000000000000
--- a/dev-util/cunit/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cunit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cutils-1.6-r4 b/dev-util/cutils-1.6-r4
new file mode 100644
index 000000000000..81f83df57f3d
--- /dev/null
+++ b/dev-util/cutils-1.6-r4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-devel/flex
+DESCRIPTION=C language utilities
+EAPI=4
+HOMEPAGE=http://www.sigala.it/sandro/software.php#cutils
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://www.sigala.it/sandro/files/cutils-1.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_=524c68d8168f3c99a52aaec9b66ea73e
diff --git a/dev-util/cutils/Manifest b/dev-util/cutils/Manifest
deleted file mode 100644
index 37c0d6abe890..000000000000
--- a/dev-util/cutils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cutils-1.6-case-insensitive.patch 312 BLAKE2B 58b98dc60606dd5ad0992a233c768fc26fb7aa0edd5f8ed6af392a8c1c47a30a60303736de1dfa4fdcfdd8a989132cd7c59eb48011c84cd7fba88398a8c32c3a SHA512 d2eb81f3fece124cf0bad215f19bcaf805ee006dd673f39c3f7eae92904fbeafc77bc1fae6bc0e5f70613180ca29e015145654cfc5dab2ea75cdeb08d636335e
-AUX cutils-infopage.patch 458 BLAKE2B 444ed84a751a5fbb0179d6ffdba3445af20ba45120c2964fb47531060fc01fcde4a40b0635b5b76e8f54a52b696414d996614eac8814e18919e9507b865cbdb1 SHA512 53fbcaec4fdaf1b7804752f952f6fa2f8715601be2ce5185557c2a1378504b7158c398f59e674eed9fc30e95e51157ce8c4c8f71e9a08c63daf97efd7210eba6
-DIST cutils-1.6.tar.gz 128722 BLAKE2B a3589660c188ae4459911e73686e4322d190964fc40f802a5d1a8932c2cf1ea0b989f1f9a3f76845757e90e850b376cc8b019ddaf995b6e1648b2912cf9d531b SHA512 49a0f6ed210be01eec335903dee7ac6000bfa9d9c05a31b9a9fd6ae8534c8058d774f884d55b2b9fa029abc30beeca1866d8a74389b76158ebb216fb3dfad6eb
-EBUILD cutils-1.6-r4.ebuild 1251 BLAKE2B e5533fe9d2f83dfb96fe3124fe4f631d73630cf139e1ee8ce966486faa569b6c70804957bcbae2e6187f50a206297e9f580dc9edfcb8ef844cd5fb9ffae832a2 SHA512 ccfde76e2884a85680e59d79878f3bf26ddfe01ad7f243b634c84e964f62e223674effbe00ed95b13494deb83af79e8c62d4a793d9c00a0ce07fb102b6465da7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
deleted file mode 100644
index 8f333cb5c84e..000000000000
--- a/dev-util/cutils/cutils-1.6-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="C language utilities"
-HOMEPAGE="http://www.sigala.it/sandro/software.php#cutils"
-SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-infopage.patch
-
-	epatch "${FILESDIR}"/${P}-case-insensitive.patch
-
-	mv "${S}"/src/cdecl/cdecl.1 			\
-		"${S}"/src/cdecl/cutils-cdecl.1 || die
-	# Force rebuild of cutils.info
-	rm -f "${S}"/doc/cutils.info || die
-
-	sed -e "s/cdecl/cutils-cdecl/g"	\
-		-i "${S}"/doc/cutils.texi || die
-	sed -e "/PROG/s/cdecl/cutils-cdecl/" \
-		-i "${S}"/src/cdecl/Makefile.in || die
-	sed -e "/Xr/s/cdecl/cutils-cdecl/" \
-		-i "${S}"/src/cundecl/cundecl.1 || die
-	sed -i "/Nm/s/cdecl/cutils-cdecl/" \
-		"${S}"/src/cdecl/cutils-cdecl.1 || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -j1
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS HISTORY NEWS README
-}
-
-pkg_postinst () {
-	elog "cdecl was installed as cutils-cdecl because of a naming conflict"
-	elog "with dev-util/cdecl."
-}
diff --git a/dev-util/cutils/files/cutils-1.6-case-insensitive.patch b/dev-util/cutils/files/cutils-1.6-case-insensitive.patch
deleted file mode 100644
index 67318d0f55d8..000000000000
--- a/dev-util/cutils/files/cutils-1.6-case-insensitive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-* On case insensitive filesystems, INSTALL is seen as the target install,
-  resulting in no installation at all.
-
---- cutils-1.6/Makefile.in
-+++ cutils-1.6/Makefile.in
-@@ -8,6 +8,8 @@
- 		(cd $$f && $(MAKE) $@); \
- 	done
- 
-+.PHONY : install
-+
- distclean:
- 	@for f in $(subdirs); do \
- 		(cd $$f && $(MAKE) $@); \
diff --git a/dev-util/cutils/files/cutils-infopage.patch b/dev-util/cutils/files/cutils-infopage.patch
deleted file mode 100644
index 2b19aeee2d6e..000000000000
--- a/dev-util/cutils/files/cutils-infopage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Add category, and entry to the texinfo document.
-
---- cutils-1.6/doc/cutils.texi.orig	2008-11-24 23:18:41.732038120 +0000
-+++ cutils-1.6/doc/cutils.texi	2008-11-24 23:18:27.907038555 +0000
-@@ -7,6 +7,11 @@
- @c unwise to comment it out when running a master in case there are
- @c overfulls which are deemed okay.
- 
-+@dircategory Programming
-+@direntry
-+* cutils: (cutils).            C language utilities.
-+@end direntry
-+
- @iftex
- @c @finalout
- @end iftex
diff --git a/dev-util/cutils/metadata.xml b/dev-util/cutils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/cutils/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/dev-util/cutter-1.0 b/dev-util/cutter-1.0
new file mode 100644
index 000000000000..a04de98a6590
--- /dev/null
+++ b/dev-util/cutter-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-util/radare2
+DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
+EAPI=6
+HOMEPAGE=http://www.radare.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-util/radare2
+SLOT=0
+SRC_URI=https://github.com/radareorg/cutter/archive/v1.0.tar.gz -> cutter-1.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e3de6061f3cb8a4f50096652fd1f07ea
diff --git a/dev-util/cutter-1.4 b/dev-util/cutter-1.4
new file mode 100644
index 000000000000..c7719491eef3
--- /dev/null
+++ b/dev-util/cutter-1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-util/radare2-2.6.0 jupyter? ( dev-python/jupyter ) webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
+EAPI=7
+HOMEPAGE=https://www.radare.org
+IUSE=jupyter webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-util/radare2-2.6.0 jupyter? ( dev-python/jupyter ) webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+REQUIRED_USE=webengine? ( jupyter )
+SLOT=0
+SRC_URI=https://github.com/radareorg/cutter/archive/v1.4.tar.gz -> cutter-1.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8becdfd879ad4debc27c95c99eefa68c
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
deleted file mode 100644
index 07c249eb3687..000000000000
--- a/dev-util/cutter/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cutter-1.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
-DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
-DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
-EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
-EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
-MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.0.ebuild b/dev-util/cutter/cutter-1.0.ebuild
deleted file mode 100644
index 2c1e84fe599d..000000000000
--- a/dev-util/cutter/cutter-1.0.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
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-util/radare2
-"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5 PREFIX="/usr" src
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/dev-util/cutter/cutter-1.4.ebuild b/dev-util/cutter/cutter-1.4.ebuild
deleted file mode 100644
index 829f75395bb5..000000000000
--- a/dev-util/cutter/cutter-1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="https://www.radare.org"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )"
-
-DEPEND="
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	>=dev-util/radare2-2.6.0
-	jupyter? ( dev-python/jupyter )
-	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
-		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
-		PREFIX=\'${EPREFIX}/usr\'
-	)
-
-	eqmake5 "${myqmakeargs[@]}" src
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/dev-util/cutter/files/cutter-1.4-python3-config.patch b/dev-util/cutter/files/cutter-1.4-python3-config.patch
deleted file mode 100644
index 51a811dbb33f..000000000000
--- a/dev-util/cutter/files/cutter-1.4-python3-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Cutter.pro	2018-04-24 17:43:11.000000000 +0900
-+++ b/src/Cutter.pro	2018-07-08 21:21:34.280748499 +0900
-@@ -74,11 +74,13 @@
-         LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
-         DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
-     } else {
--        CONFIG += link_pkgconfig
--        !packagesExist(python3) {
--            error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
-+        system(type python3-config) {
-+            LIBS += $$system(python3-config --libs)
-+            TMP = $$system(python3-config --includes)
-+            INCLUDEPATH += $$replace(TMP, "-I", "")
-+        } else {
-+            error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
-         }
--        PKGCONFIG += python3
-     }
- }
-
diff --git a/dev-util/cutter/metadata.xml b/dev-util/cutter/metadata.xml
deleted file mode 100644
index f2af393dbcf5..000000000000
--- a/dev-util/cutter/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>otakuto.gentoo@gmail.com</email>
-        <name>Tact Yoshida</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">radareorg/cutter</remote-id>
-    </upstream>
-    <use>
-        <flag name="jupyter">Add support for jupyter notebook</flag>
-        <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for in-app jupyter browser</flag>
-    </use>
-</pkgmetadata>
diff --git a/dev-util/cwdiff-0.2.8 b/dev-util/cwdiff-0.2.8
new file mode 100644
index 000000000000..3ffb33c4af7a
--- /dev/null
+++ b/dev-util/cwdiff-0.2.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=5
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=a2ps mercurial
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
+SLOT=0
+SRC_URI=https://github.com/junghans/cwdiff/archive/v0.2.8.tar.gz -> cwdiff-0.2.8.tar.gz
+_md5_=b15d6721efafc46a1bab2d4b5e16c877
diff --git a/dev-util/cwdiff-0.3.0 b/dev-util/cwdiff-0.3.0
new file mode 100644
index 000000000000..407aac37fbc7
--- /dev/null
+++ b/dev-util/cwdiff-0.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-apps/help2man sys-apps/coreutils
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=5
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=a2ps mercurial
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
+SLOT=0
+SRC_URI=https://github.com/junghans/cwdiff/archive/v0.3.0.tar.gz -> cwdiff-0.3.0.tar.gz
+_md5_=1ba80455842f3363f06c4f7aaed2d54e
diff --git a/dev-util/cwdiff-0.3.1 b/dev-util/cwdiff-0.3.1
new file mode 100644
index 000000000000..a71655532cb7
--- /dev/null
+++ b/dev-util/cwdiff-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-apps/help2man sys-apps/coreutils
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=5
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=a2ps mercurial
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
+SLOT=0
+SRC_URI=https://github.com/junghans/cwdiff/archive/v0.3.1.tar.gz -> cwdiff-0.3.1.tar.gz
+_md5_=1ba80455842f3363f06c4f7aaed2d54e
diff --git a/dev-util/cwdiff-0.4.0 b/dev-util/cwdiff-0.4.0
new file mode 100644
index 000000000000..03ae043d95bc
--- /dev/null
+++ b/dev-util/cwdiff-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-apps/help2man sys-apps/coreutils
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=5
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=mercurial
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils mercurial? ( dev-vcs/mercurial )
+SLOT=0
+SRC_URI=https://github.com/junghans/cwdiff/archive/v0.4.0.tar.gz -> cwdiff-0.4.0.tar.gz
+_md5_=d492a4d10c3c120cffeeebf46cee7dcf
diff --git a/dev-util/cwdiff-9999 b/dev-util/cwdiff-9999
new file mode 100644
index 000000000000..c22786ec7c26
--- /dev/null
+++ b/dev-util/cwdiff-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=sys-apps/help2man sys-apps/coreutils >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=6
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=mercurial
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils mercurial? ( dev-vcs/mercurial )
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=98a4f58804c8cd7181181fae36796e12
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
deleted file mode 100644
index 422831572f82..000000000000
--- a/dev-util/cwdiff/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST cwdiff-0.2.8.tar.gz 4246 BLAKE2B 6161bda18738c5b7c5605349fdf7a726d63f6fadc8c5fe5d36587b06674c74a41de86910aec67e12926f9fa586b485bfee02895d8d8e3bb6f50970a6e4814d5d SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09
-DIST cwdiff-0.3.0.tar.gz 4666 BLAKE2B 9f3b660647723dd34939bdc29450c02001f7430955fbfd0197cc0713b516fcb4124e853b9c8828606f20c3cc363aa5f4cb0d6d38004f021a47c0ed2494229523 SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0
-DIST cwdiff-0.3.1.tar.gz 4706 BLAKE2B 644d1a42a8fa4119f844f55910b625343f757939ff82babd7d3702ee3759efcf005e4d7405505bba593795af79da452eaae469b550892ab5f37ebdca47f93ed0 SHA512 ffea1f699d333655eebfe96048dcc96c57408d42915d707e10b9231a27cc7a8803c3b47876227e24da67376ec18f9261739b9fb13889f8b47d336ca048cbfa72
-DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
-EBUILD cwdiff-0.2.8.ebuild 731 BLAKE2B 7d2271f3cd663251c7aedeb7fb5d68200280544e1b2853144db422eae450235cdc2c8371ab6fd38259188a641dbac21c5224c5c2ff7e30571192369182b74106 SHA512 0548e44125aea1066cf6479ecdd3ee615497ac2becb6297b74ab9b5165e76686a06684bbc966404f32e22f17b30688c3e837494084ed457defcb1b8343b4f979
-EBUILD cwdiff-0.3.0.ebuild 853 BLAKE2B f7612d2df6ea29bf694101a0da56fb2c1e43227ff908c4450041f25bbe8dd9b0e3dbc4634a705f094661a14f186113291d8f0d26661f21360997c6ed5de36ec3 SHA512 edade4c56f8cf28a0f6908865a09568add9709fea082e09cfbffd73b373f9bdf4db1faadf5aa6eec8e9ad80e810c46817878e3e1cf96d7a0f6f568fcc194f905
-EBUILD cwdiff-0.3.1.ebuild 853 BLAKE2B f7612d2df6ea29bf694101a0da56fb2c1e43227ff908c4450041f25bbe8dd9b0e3dbc4634a705f094661a14f186113291d8f0d26661f21360997c6ed5de36ec3 SHA512 edade4c56f8cf28a0f6908865a09568add9709fea082e09cfbffd73b373f9bdf4db1faadf5aa6eec8e9ad80e810c46817878e3e1cf96d7a0f6f568fcc194f905
-EBUILD cwdiff-0.4.0.ebuild 823 BLAKE2B 5f508d00c906419e439b197dc15d2c04f1393397d49289b35cab57a5886a7e501c169e1741978b7fe6c936dafc7f678b8350d5693b868ce078f85696d3250ac0 SHA512 6028325f18dacb79f5f76b5ab448fdbf1c5417ec277d64c4a530c1f521342abcad99a9a4fde2160b5a3dcb2f1e70dd63e6ea6b7dbf64198a3a08a0fc9499c9b2
-EBUILD cwdiff-9999.ebuild 823 BLAKE2B 208bfbebcb8b642196ca2893cf33afc94e1f0b0b27294258d853a8bb880a403941e0ae461113cc920a3125c7eeac3ca1286f7a14f5675bf0dbb0a01c35bd43ce SHA512 f8699b6eea1d13d42d70c10954582773d0e50f86531767c11e34ce03f2cad9318d137c8d1294a4d27c81bfd9e20275f684b87354330420e8c32bc6c916be9560
-MISC metadata.xml 518 BLAKE2B 9455d9d70800cb227223da8642b5f23eda28a77d6bb8126e49d3bfb6fa761cabb2999c8dc5dd36a176aa98367d2d41ee935c5bb25f78522b5ee3235d329ca45b SHA512 08009caaf17aab80858770126cb2915890400c85f35121c5da2aee9bf9cd0640c3614a9b33c1afde6e270f212509d8604a7460a759027924420f1e508694d569
diff --git a/dev-util/cwdiff/cwdiff-0.2.8.ebuild b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
deleted file mode 100644
index 88eb1087bfb0..000000000000
--- a/dev-util/cwdiff/cwdiff-0.2.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="a2ps mercurial"
-
-DEPEND=""
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install () {
-	dobin "${PN}"
-	if use mercurial ; then
-		insinto /etc/mercurial/hgrc.d
-		doins hgrc.d/"${PN}".rc
-	fi
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.0.ebuild b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.0.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
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.1.ebuild b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.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
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
deleted file mode 100644
index 77fac3a57420..000000000000
--- a/dev-util/cwdiff/cwdiff-0.4.0.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
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
deleted file mode 100644
index 59f7eb49bc90..000000000000
--- a/dev-util/cwdiff/cwdiff-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=6
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
deleted file mode 100644
index fb6f52b0def6..000000000000
--- a/dev-util/cwdiff/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<use>
-		<flag name="a2ps">install <pkg>app-text/a2ps</pkg> for postscript output</flag>
-		<flag name="mercurial">install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">junghans/cwdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cyclo-2.1.0 b/dev-util/cyclo-2.1.0
new file mode 100644
index 000000000000..60c08c2d6c0d
--- /dev/null
+++ b/dev-util/cyclo-2.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=sys-devel/flex
+DESCRIPTION=Computes cyclomatic complexity metrics on C source code.
+EAPI=5
+HOMEPAGE=https://github.com/sarnold/cyclo
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/sarnold/cyclo/archive/2.1.0.tar.gz -> cyclo-2.1.0.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_=335cc8911a07624587f8a1fb9b9cad57
diff --git a/dev-util/cyclo/Manifest b/dev-util/cyclo/Manifest
deleted file mode 100644
index ffce66480a69..000000000000
--- a/dev-util/cyclo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cyclo-2.1.0.tar.gz 27120 BLAKE2B ead104641bd7b4d1522007fa1ddd9839c8eaf9b78c1d1c1af4c7b8f49faa31c41759993890e7efbbf854fce44daca326e224989174411d74b3f58de9edb5dc3d SHA512 19cf4116e55ba3dff6e49536fed7e5a8da4cc2b691874b5356e67763652785b3f349cb309629e9aca66be15f1c4632ece8bcd5cc3b69373a5a7923eab8058382
-EBUILD cyclo-2.1.0.ebuild 1045 BLAKE2B 7746c2b7d67200c056454f5e96ad6bfe6e8fae98d199b50e743f0def1f29f685b8f37a70c66ad314c33a6807900d12272aed698c43a1790c7b192bc60fedee45 SHA512 471e26f0e828075db53f14b093150e84af1897a468893d1d6d480f16c9bfa961769b7b30978dca58cc3a863e7aa42fc868c49a7bc3ebc5e6c90f68b5459ef718
-MISC metadata.xml 426 BLAKE2B 6309e178465751dee1cd84a71c1402fd5fff423db131e43f0639e98b67b762effb4e091650aacad503ae5bc3557db3dce3204620c5992c2d87f78bce40c51427 SHA512 fdfe058a00119d456af23e314426ead9fa02903e9c3b91c9176cd2dd611b46e876e8c3787a9d6937682b6b3d65eb5f688348f7cbffd9197a666042f02bacb6ac
diff --git a/dev-util/cyclo/cyclo-2.1.0.ebuild b/dev-util/cyclo/cyclo-2.1.0.ebuild
deleted file mode 100644
index 7f3353155ed8..000000000000
--- a/dev-util/cyclo/cyclo-2.1.0.ebuild
+++ /dev/null
@@ -1,48 +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="Computes cyclomatic complexity metrics on C source code."
-HOMEPAGE="https://github.com/sarnold/cyclo"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/sarnold/cyclo.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND="sys-devel/flex"
-
-src_compile() {
-	local my_opts
-	my_opts="CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	if ! use debug ; then
-		DBG="" emake ${my_opts} || die "make failed"
-	else
-		export STRIP_MASK="*/bin/*"
-		if [ -n "${DEBUG}" ] ; then
-			DBG="${DEBUG}" emake ${my_opts} \
-				|| die "make debug failed"
-		else
-			emake ${my_opts} || die "make debug failed"
-		fi
-	fi
-}
-
-src_test() {
-	make -f Makefile.test test
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${ED}" install
-}
diff --git a/dev-util/cyclo/metadata.xml b/dev-util/cyclo/metadata.xml
deleted file mode 100644
index aefcf1b14858..000000000000
--- a/dev-util/cyclo/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>nerdboy@gentoo.org</email>
-	<name>Steve Arnold</name>
-</maintainer>
-<maintainer type="person">
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">sarnold/cyclo</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-util/d-feet-0.3.12 b/dev-util/d-feet-0.3.12
new file mode 100644
index 000000000000..27016d94ee9a
--- /dev/null
+++ b/dev-util/d-feet-0.3.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+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(+)?] >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= app-text/yelp-tools >=dev-util/intltool-0.40.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=D-Feet is a powerful D-Bus debugger
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
+IUSE=test +X 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 test
+KEYWORDS=amd64 x86
+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(+)?] >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 >=dev-python/pygobject-3.3.91:3[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/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
+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=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.12.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4c47f0d77de7736bd0e90f03d42641a0
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
deleted file mode 100644
index 8eef84257374..000000000000
--- a/dev-util/d-feet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST d-feet-0.3.12.tar.xz 184308 BLAKE2B 1e0bb31c768cff357db735ed924cd0d768cb0412ccb6b722569c906671fd4929f67d62cbc09d37b1176755dff228c659013c1ec27d785c4175e534a4458c3fd3 SHA512 ef7a8aa57893cc210327420e954d39d256733839e6a171b8e035f15089fdf963c708a39c3b931b8a85d9faf78a1be324576c5fa2440db8305c1bfc8a8d9e991e
-EBUILD d-feet-0.3.12.ebuild 1371 BLAKE2B 4d4ec516e42720b5953b57803139b9abb87bd4f648a7e7cbaedb76c7672059f2a1a225d2078ddd9e2fc44b2a26adc7d2e7668d3e16aea050fd767ecfc6922ae6 SHA512 ca9ee296ba275e6404d8ec6534fbe408f34c54b14bcd34d0e93d545feccaa364fa43d76fe883b17d83aa06f318be9b5ff1ff0282b59974660038915430fe7c64
-MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.12.ebuild b/dev-util/d-feet/d-feet-0.3.12.ebuild
deleted file mode 100644
index bf844224340c..000000000000
--- a/dev-util/d-feet/d-feet-0.3.12.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test +X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	>=dev-libs/gobject-introspection-0.9.6:=
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/glib-2.34:2
-	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
-	>=sys-apps/dbus-1
-	X? ( x11-libs/libwnck:3[introspection] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-"
-
-src_prepare() {
-	python_fix_shebang .
-
-	# Do not run update-desktop-database (sandbox violation)
-	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
-		-i data/Makefile.am data/Makefile.in || die
-
-	# disable pep8 - checking python whitespace style is not useful for us
-	sed -e 's/pep8 /# pep8 /' \
-		-i src/tests/Makefile.am src/tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# disable pep8 - checking python code style is not useful downstream
-	# (especially when that style check fails!)
-	gnome2_src_configure \
-		$(use_enable test tests) \
-		PEP8=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
deleted file mode 100644
index bac79bab471d..000000000000
--- a/dev-util/d-feet/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>cardoe@gentoo.org</email>
-  <name>Doug Goldstein</name>
-  <description>Feel free to bump or do any updates as needed</description>
-</maintainer>
-<maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/dbus-test-runner-12.10.1 b/dev-util/dbus-test-runner-12.10.1
new file mode 100644
index 000000000000..9263b13dc49b
--- /dev/null
+++ b/dev-util/dbus-test-runner-12.10.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.34:2 dev-util/intltool test? ( dev-util/bustle )
+DESCRIPTION=Run executables under a new DBus session for testing
+EAPI=4
+HOMEPAGE=https://launchpad.net/dbus-test-runner
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.34:2
+SLOT=0
+SRC_URI=https://launchpad.net/dbus-test-runner/12.10/12.10.1/+download/dbus-test-runner-12.10.1.tar.gz
+_md5_=1ecfb3943f47ac4fc962771318409454
diff --git a/dev-util/dbus-test-runner-15.04.0_p100 b/dev-util/dbus-test-runner-15.04.0_p100
new file mode 100644
index 000000000000..3e3ed81de206
--- /dev/null
+++ b/dev-util/dbus-test-runner-15.04.0_p100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.34:2 dev-python/dbusmock[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/xz-utils dev-util/intltool
+DESCRIPTION=Run executables under a new DBus session for testing
+EAPI=6
+HOMEPAGE=https://launchpad.net/dbus-test-runner
+IUSE=test 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.34:2 dev-python/dbusmock[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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://dev.gentoo.org/~mgorny/dist/dbus-test-runner-15.04.0_p100.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1a2acc7253e90a24e26185e482c32112
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
deleted file mode 100644
index 74d5dfb7247d..000000000000
--- a/dev-util/dbus-test-runner/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dbus-test-runner-12.10.1.tar.gz 382108 BLAKE2B 760ed88f089b92ff3d51bc7342f11691e760b2aeb107e2dfcd903f1ebc3acc2e1ad6dfe3768d29329408770f562f8dd9656f7aed8e45d7e6b5334f5d328d5c0c SHA512 6d40d607fdc417ebb9aaa6dc3cdd41a8ff1563cb3791689d17a99d105a0c16dad8ffcaf3da7ab6b8c3dcae17d2eba1bf8a6a5d92dc1d3de0975218220ed3c9c0
-DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
-EBUILD dbus-test-runner-12.10.1.ebuild 748 BLAKE2B b5cbba38435ada80f7d75a47ae8cda181a750d3f2d4aea8a6f0f4b8a5e0f1602c11925b37b974600f3d575ea762231eb0ea35565521aed0b640d195f5fd50101 SHA512 9a1f2b4ed8b757ca09a1195d567716620d7ecea9d45e4ee4c31d478c29cc5b2a95941f536a9c59e8c4c61b34f8e55d823d655ebb5641f93e0a41dbb339cf85fa
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1062 BLAKE2B 73a351c0093d81041de019f72f4abd77a83d3ccc2c1cf58568cbf6ca6e9f7ca31aa481cb76cc4d976118a28cdd564adbd18eeb099c27e30ce4ce482e887a7089 SHA512 46db266c277e6a3d5c02bfab1b1a695422629d003b4ff5696e2283cc472db6a3a13239789fe8849e765a04f7ea2f4318d316423afa0111067ae9dcb8bf20f659
-MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
deleted file mode 100644
index c69ab316a910..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_MAJOR_VERSION=12.10
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://launchpad.net/${PN}/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.34:2
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	test? ( dev-util/bustle )
-"
-
-src_prepare() {
-	# Drop -Werror usage
-	sed -e 's/-Werror//' \
-		-i libdbustest/Makefile.{am,in} \
-		-i src/Makefile.{am,in} \
-		-i tests/Makefile.{am,in} \
-		|| die
-}
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
deleted file mode 100644
index 97a40fe0f91f..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit flag-o-matic python-single-r1
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.34:2
-	dev-python/dbusmock[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	dev-util/intltool
-"
-# now optional:
-#	test? ( dev-util/bustle )
-
-src_prepare() {
-	default
-
-	# bind to specific Python version (with dbusmock installed)
-	sed -i -e "s:python3:${EPYTHON}:" \
-		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
-}
-
-src_configure() {
-	append-flags -Wno-error
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dbus-test-runner/metadata.xml b/dev-util/dbus-test-runner/metadata.xml
deleted file mode 100644
index 10ad7bb86af4..000000000000
--- a/dev-util/dbus-test-runner/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">dbus-test-runner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ddd-3.3.12-r3 b/dev-util/ddd-3.3.12-r3
new file mode 100644
index 000000000000..7ac95e8d3007
--- /dev/null
+++ b/dev-util/ddd-3.3.12-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline ) x11-base/xorg-proto >=app-portage/elt-patches-20170422
+DESCRIPTION=Graphical front-end for command-line debuggers
+EAPI=4
+HOMEPAGE=https://www.gnu.org/software/ddd
+IUSE=+gnuplot readline
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3 LGPL-3 FDL-1.1
+RDEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline ) x11-apps/xfontsel gnuplot? ( sci-visualization/gnuplot )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
+_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_=46f477c93744dd1089e96216a1216264
diff --git a/dev-util/ddd-3.3.12-r4 b/dev-util/ddd-3.3.12-r4
new file mode 100644
index 000000000000..1f09c480fcc4
--- /dev/null
+++ b/dev-util/ddd-3.3.12-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:* ) x11-base/xorg-proto >=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=Graphical front-end for command-line debuggers
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/ddd
+IUSE=readline
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux
+LICENSE=GPL-3 LGPL-3 FDL-1.1
+RDEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:* ) x11-apps/xfontsel
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
+_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_=7aed9845e461015c5774467d5cfe6584
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
deleted file mode 100644
index e16a01527a61..000000000000
--- a/dev-util/ddd/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ddd-3.3.12-gcc44.patch 209 BLAKE2B ce05a8f213e505680297aa3de998efada5c4db48ea18fa3a5474b8aeb266fa85c582723ac3a9b52a7ece0ec7636782a1dc69d69ed073becb8dc834839e907715 SHA512 9373fee21d92b5661c659bcad0f9ce4bca25c86eba40d5d6e498f454cd56af225f290431bd79bfd98a6da5e49180ccb8fd37c144fb99e8b75c886c066e48b129
-AUX ddd-3.3.12-gdb-disassembler-bug.patch 266 BLAKE2B a5658a1513adc116a81de7ec7bfb3eca4002043629a7b939970b8d902e1534d31df0ab8252a7dd2e5f998bc0df4d632bb5cb04662e81391b0e26e6a09809e35b SHA512 15ca238a9ac88c0736c861b962558f09be53f1bc85a5d46d6efb8d6c7ff6fc089b9f730dc0b691d65bbc40010cbd4d2cc4947f369d12271c214770114d533b14
-AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f388b6dac3d724b284820472ca83ce81811df838e26d66d3bf1a558c9de8f51f22037b70cff3207f82104b40 SHA512 830115e517f754702892549d780003033e29fc0668824540cc63c3270e8445549896505a6584ccee104d94ffcf152bff679d946922f9d6fffc75d77abdbb8a59
-AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
-DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r3.ebuild 2112 BLAKE2B 499dd54516ba63d41f665b293f020712f5c6a2c1b0dbceff83da6e716614a77b6cd9b0b470e67ab332830edc95edb6087c1175354bb2d00f2c9e53b048caf027 SHA512 0660e012bfc359ecb50d79bd1e24e5b60f8aedeeb737534b7d5133fce140bbca9138f283d1f36ae9b6fcd3a87f55613d33f749d6f148687e42d4e59957d33950
-EBUILD ddd-3.3.12-r4.ebuild 2256 BLAKE2B 6fdae531b7aee21be37ca2c90c9e4042cbbb7388d42bedb5f198da4b7c4b2ec8793763eb4e24d50ea620dcf3e96be099cd50a550e0e49891bcae9f9c3eca1779 SHA512 a6614f1ad38fd3c479476f870b9c7ca09602d2592e5e2f9bff2005b441b0d88747ec5cad84268c0ef6670dc3ca5c1072f88d307a45dc3c807ddce629bf89981d
-MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r3.ebuild b/dev-util/ddd/ddd-3.3.12-r3.ebuild
deleted file mode 100644
index 25d5352a90b8..000000000000
--- a/dev-util/ddd/ddd-3.3.12-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Graphical front-end for command-line debuggers"
-HOMEPAGE="https://www.gnu.org/software/ddd"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+gnuplot readline"
-
-COMMON_DEPEND="
-	sys-devel/gdb
-	sys-libs/ncurses
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	>=x11-libs/motif-2.3:0
-	ppc? ( dev-libs/elfutils )
-	ppc64? ( dev-libs/elfutils )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xfontsel
-	gnuplot? ( sci-visualization/gnuplot )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
-	"${FILESDIR}/${PN}-3.3.12-man.patch"
-)
-
-DOCS=(
-	AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
-	doc/ddd{-paper.ps,.pdf,-themes.pdf}
-)
-
-AUTOTOOLS_AUTORECONF=1
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--with-termlib=ncurses
-		$(use_with readline)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	# Remove app defaults
-	rm -f "${S}"/ddd/Ddd
-
-	# Install ddd distribution
-	autotools-utils_src_install
-
-	# Install application icon
-	doicon "${S}"/icons/ddd.xpm
-}
-
-pkg_postinst() {
-	if ! use gnuplot; then
-		echo
-		elog "To enable data visualization in DDD, install sci-visualization/gnuplot,"
-		elog "or re-emerge DDD with gnuplot USE flag (recommended)."
-		elog "For flat file package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
-		elog "For directory package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
-	fi
-	echo
-	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
-	elog "    virtual/jdk"
-	elog "    app-shells/bashdb"
-	elog "    dev-lang/perl"
-	elog "    dev-python/pydb"
-	echo
-}
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
deleted file mode 100644
index 4110ccf39cd6..000000000000
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-DESCRIPTION="Graphical front-end for command-line debuggers"
-HOMEPAGE="https://www.gnu.org/software/ddd"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="readline"
-
-COMMON_DEPEND="
-	sys-devel/gdb
-	sys-libs/ncurses:*
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	>=x11-libs/motif-2.3:0
-	ppc? ( dev-libs/elfutils )
-	ppc64? ( dev-libs/elfutils )
-	readline? ( sys-libs/readline:* )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xfontsel
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
-	"${FILESDIR}/${PN}-3.3.12-man.patch"
-	"${FILESDIR}/${PN}-3.3.12-tinfo.patch"
-)
-
-DOCS=(
-	AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
-	doc/ddd{-paper.ps,.pdf,-themes.pdf}
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with readline)
-}
-
-src_install() {
-	# Remove app defaults
-	rm -f "${S}"/ddd/Ddd
-
-	# Install ddd distribution
-	default
-
-	# Install application icon
-	doicon "${S}"/icons/ddd.xpm
-}
-
-pkg_postinst() {
-	if ! has_version sci-visualization/gnuplot; then
-		echo
-		elog "To enable data visualization in DDD, install sci-visualization/gnuplot."
-		elog "For flat file package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
-		elog "For directory package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
-		elog
-	fi
-	echo
-	elog "Important notice: if you encounter DDD crashes during visualization, you might"
-	elog "have hit bug #459324. Try switching to plotting in external window:"
-	elog "Select Edit|Preferences|Helpers and switch 'plot window' to 'external'"
-	elog
-	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
-	elog "    virtual/jdk"
-	elog "    app-shells/bashdb"
-	elog "    dev-lang/perl"
-	elog "    dev-python/pydb"
-	echo
-}
diff --git a/dev-util/ddd/files/ddd-3.3.12-gcc44.patch b/dev-util/ddd/files/ddd-3.3.12-gcc44.patch
deleted file mode 100644
index 2464b2b4a9c4..000000000000
--- a/dev-util/ddd/files/ddd-3.3.12-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ddd-3.3.12-orig/ddd/strclass.C
-+++ ddd-3.3.12/ddd/strclass.C
-@@ -39,6 +39,7 @@
- #include <limits.h>
- #include <new>
- #include <stdlib.h>
-+#include <stdio.h>
- 
- void string::error(const char* msg) const
- {
diff --git a/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch b/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
deleted file mode 100644
index 738cda5946f9..000000000000
--- a/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ddd/GDBAgent.C	2004-09-01 20:07:38.000000000 +0200
-+++ b/ddd/GDBAgent.C	2010-06-15 14:16:34.000000000 +0200
-@@ -3078,7 +3078,7 @@
-     {
-         string end_( end );
- 	normalize_address(end_);
--	cmd += ' ';
-+	cmd += ',';
- 	cmd += end_;
-     }
-     return cmd;
diff --git a/dev-util/ddd/files/ddd-3.3.12-man.patch b/dev-util/ddd/files/ddd-3.3.12-man.patch
deleted file mode 100644
index 06f9deb806f0..000000000000
--- a/dev-util/ddd/files/ddd-3.3.12-man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN ddd-3.3.12/ddd/Makefile.am ddd-my/ddd/Makefile.am
---- ddd-3.3.12/ddd/Makefile.am	2009-02-11 18:25:07.000000000 +0100
-+++ ddd-my/ddd/Makefile.am	2012-11-06 01:48:46.363493473 +0100
-@@ -1371,10 +1371,8 @@
- man_MANS = ddd.1
- 
- # `ddd.man' has 8-bit format, `ddd.1' has 7-bit format
--ddd.1:   ddd.man $(srcdir)/unumlaut.sed
--	-$(SED) -f $(srcdir)/unumlaut.sed ddd.man | $(DELETE_CR) > $@~ \
--	    && $(MV) $@~ $@
--
-+ddd.1:   ddd.man
-+	iconv -f ISO8859-15 -t UTF-8 ddd.man > ddd.1
- 
- 
- # -----------------------------------------------------------------------------
diff --git a/dev-util/ddd/files/ddd-3.3.12-tinfo.patch b/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
deleted file mode 100644
index ab7df14ae9d9..000000000000
--- a/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -360,7 +360,7 @@
- dnl
- _termlib="${ddd_termlib}"
- if test "x${ddd_termlib}" = x; then
--  _termlib="mytinfo ncurses curses termcap terminfo termlib"
-+  _termlib="mytinfo ncurses tinfo curses termcap terminfo termlib"
- fi
- _termlib_path=
- if test x"${ddd_termlib_libraries_path}" != x; then
diff --git a/dev-util/ddd/metadata.xml b/dev-util/ddd/metadata.xml
deleted file mode 100644
index 97858007ab0b..000000000000
--- a/dev-util/ddd/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>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<longdescription lang="en">
-		GNU DDD is a graphical front-end for command-line debuggers such as
-		GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash debugger,
-		or the Python debugger. Besides ``usual'' front-end features such as
-		viewing source texts, DDD has become famous through its interactive
-		graphical data display, where data structures are displayed as graphs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/debhelper-11.3.2 b/dev-util/debhelper-11.3.2
new file mode 100644
index 000000000000..4475c0bfc45c
--- /dev/null
+++ b/dev-util/debhelper-11.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/dev-util/debhelper-11.3.4 b/dev-util/debhelper-11.3.4
new file mode 100644
index 000000000000..8971e707c352
--- /dev/null
+++ b/dev-util/debhelper-11.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/dev-util/debhelper-11.3.5 b/dev-util/debhelper-11.3.5
new file mode 100644
index 000000000000..51f661aaf69a
--- /dev/null
+++ b/dev-util/debhelper-11.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.5.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/dev-util/debhelper-9.20160814 b/dev-util/debhelper-9.20160814
new file mode 100644
index 000000000000..7cdfd6e32efd
--- /dev/null
+++ b/dev-util/debhelper-9.20160814
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=5
+HOMEPAGE=https://packages.qa.debian.org/d/debhelper.html
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20160814.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8bc46ba433f4491dc384c37b70e77223
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
deleted file mode 100644
index 5cb91326f7d7..000000000000
--- a/dev-util/debhelper/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
-DIST debhelper_11.3.4.tar.xz 467684 BLAKE2B 8c5bef040c231c91cef1958cf797b8ddcbb40cee5303c3d6ebe26945462abd6ccb09dc905c0034ec3c48c8c725a0bfe1ee567e96cc5495a08a630adad1863f32 SHA512 2d24948b05396767ce303f9ae73e0640e48510830f7113f494ee91825c6646b7420a65a195f9a68cd2ed21d47d4ab7bf122fee7d7ecf6d5d928e3c51b1b45d2f
-DIST debhelper_11.3.5.tar.xz 467732 BLAKE2B b5d035b57057f36bbc1e6e09f7a0acc6fab2141e2d99cfcc963101a6f939b6a46fa2a1aff899f4a4f11b064c79221e3b91dff8a3f541988c39d6f221506abbdc SHA512 7c5b37a6c6683964835609ec9a6ea65e5121af017ecaab79a88a55252eee010aae064b2d89f24a957c431ac345cd43376815c9b703d6e43a2a098aff6836864e
-DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.3.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
-EBUILD debhelper-11.3.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
-EBUILD debhelper-11.3.5.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
-EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
-MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.3.2.ebuild b/dev-util/debhelper/debhelper-11.3.2.ebuild
deleted file mode 100644
index eb7e5fa626c2..000000000000
--- a/dev-util/debhelper/debhelper-11.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-11.3.4.ebuild b/dev-util/debhelper/debhelper-11.3.4.ebuild
deleted file mode 100644
index eb7e5fa626c2..000000000000
--- a/dev-util/debhelper/debhelper-11.3.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-11.3.5.ebuild b/dev-util/debhelper/debhelper-11.3.5.ebuild
deleted file mode 100644
index eb7e5fa626c2..000000000000
--- a/dev-util/debhelper/debhelper-11.3.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
deleted file mode 100644
index 10f0449075ea..000000000000
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://packages.qa.debian.org/d/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
deleted file mode 100644
index 6fcc384cc403..000000000000
--- a/dev-util/debhelper/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>deb-tools@gentoo.org</email>
-	<name>Gentoo Debian Tools Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/debootstrap-1.0.103 b/dev-util/debootstrap-1.0.103
new file mode 100644
index 000000000000..df0c227f547d
--- /dev/null
+++ b/dev-util/debootstrap-1.0.103
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.103.tar.gz mirror://gentoo/devices.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_=92d627779b3299fd0240974f831cf2c9
diff --git a/dev-util/debootstrap-1.0.104 b/dev-util/debootstrap-1.0.104
new file mode 100644
index 000000000000..ea0304708fef
--- /dev/null
+++ b/dev-util/debootstrap-1.0.104
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.104.tar.gz mirror://gentoo/devices.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_=92d627779b3299fd0240974f831cf2c9
diff --git a/dev-util/debootstrap-1.0.106 b/dev-util/debootstrap-1.0.106
new file mode 100644
index 000000000000..21bc15b3c08a
--- /dev/null
+++ b/dev-util/debootstrap-1.0.106
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.106.tar.gz mirror://gentoo/devices.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_=92d627779b3299fd0240974f831cf2c9
diff --git a/dev-util/debootstrap-1.0.89 b/dev-util/debootstrap-1.0.89
new file mode 100644
index 000000000000..5a9268789cbc
--- /dev/null
+++ b/dev-util/debootstrap-1.0.89
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.89.tar.gz mirror://gentoo/devices.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_=d83190da67a81a13fa768c5d31882713
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
deleted file mode 100644
index 6b71b1405885..000000000000
--- a/dev-util/debootstrap/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST debootstrap_1.0.103.tar.gz 73167 BLAKE2B 063e27c1d58826bb7fec7879a5876df33b0da27cdbbdce3aa5ffecbcb70dba2814817e644725a132100cc7c7d182576bb2ba813f96bb4b289d06622d073da9d3 SHA512 4b43db32c46e5b69db9885494bc1f91197a40311c05196bf1c6e17d0a1f0519dbf61c8f5731c8627a708b8dfc8f3ba78e822a21879a5caf0d70046e3b7e60aa2
-DIST debootstrap_1.0.104.tar.gz 73264 BLAKE2B 28b4d1d1ad389dfb13f049529e5d14e1d8d82abf58b802ff25787e5c791c5d25aa2fd349f923b4e4d29bcbed78f2d32769189e110b6788acb67fb5499454dc52 SHA512 cfefa225a804e353195dedf5fbf0b005e7ac988f66c934927a312a32e8bbe9fd1083647fbafc5dbb3c7b55613887beb2c6296e3a5b8ed705b9ce18e850ee27a4
-DIST debootstrap_1.0.106.tar.gz 73686 BLAKE2B c6dbaa19ab702e49117b56ed04928f0ba6656ee9af8f206ae376af72baf114b20175b32e1c6d6b2fbc7b851e204445b4758a0edc147b94c687ddb5bca8457252 SHA512 86eee4ea1782cd96f364df748b3c7c62a48728c3371fe708937ebb76d75d0ad967d76af7a7f6cc1eb7a8623bba817137b49ffe145378489126d38021dd2882b2
-DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
-DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.103.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.104.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.106.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
-MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.103.ebuild b/dev-util/debootstrap/debootstrap-1.0.103.ebuild
deleted file mode 100644
index 93ffd5d2d1aa..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.103.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.104.ebuild b/dev-util/debootstrap/debootstrap-1.0.104.ebuild
deleted file mode 100644
index 93ffd5d2d1aa..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.104.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.106.ebuild b/dev-util/debootstrap/debootstrap-1.0.106.ebuild
deleted file mode 100644
index 93ffd5d2d1aa..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.106.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.89.ebuild b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
deleted file mode 100644
index bcc76a47559d..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.89.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-S=${WORKDIR}/${PN}
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
deleted file mode 100644
index e2792cd33e75..000000000000
--- a/dev-util/debootstrap/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>deb-tools@gentoo.org</email>
-<name>Gentoo Debian Tools Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/debugedit-0.5.3.5-r1 b/dev-util/debugedit-0.5.3.5-r1
new file mode 100644
index 000000000000..e47434b8b9c5
--- /dev/null
+++ b/dev-util/debugedit-0.5.3.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/popt dev-libs/elfutils dev-libs/beecrypt
+DESCRIPTION=standalone debugedit taken from rpm
+EAPI=5
+HOMEPAGE=http://www.rpm5.org/
+KEYWORDS=amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt dev-libs/elfutils dev-libs/beecrypt
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~swegener/distfiles/debugedit-5.3.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/debugedit-5.3.5.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_=418a83a6e2cd1bfd6667925ba8f7254e
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
deleted file mode 100644
index fbf85517b8a5..000000000000
--- a/dev-util/debugedit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94cc4b0e737a6cb287f4741705b94782ef9bfd2a87e3284a63ddba20961d0a676823ac4145247edc328c46087d95842a2c SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af
-AUX update.sh 1690 BLAKE2B f2f913fbbc3e06f1ee5ae8423253c67080471dfb0176e6c1b4ef3665a7b3b1ab24d7811ea8611c8afbd5b56072c12c0b97b08f87faf176d160ecee19f57f624e SHA512 5b271427d6391f717286289c5ec6eb794e99b7f0bd966100d3db03f84507000bc9256526f4ad6cdf809ff1800d53d5ed64d76bb14733507563d7a6123c9fc422
-DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
-EBUILD debugedit-0.5.3.5-r1.ebuild 948 BLAKE2B 1a5a19e80f3491a726caa708f13047069c4923a8829e99f351d7f823d1233cc9e152ab7dab992abcc9f8bc527dfe43bff45bbcaa7d8ab61503a1da1357a83ba1 SHA512 6660837428c4aca44724a4de55239ee5b71b16ac809e586378f37778ff058319e327715b89bb5fecdf850d259daae037544366957856db76b3ae9e9807c3f547
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
deleted file mode 100644
index 2ef416c8ba0f..000000000000
--- a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# To recreate this tarball, just grab latest rpm5 release:
-#	http://rpm5.org/files/rpm/
-# The files are in tools/
-# Or see $FILESDIR/update.sh
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-# See #653906 for the need to reversion.
-MY_PV=${PV#0.}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="standalone debugedit taken from rpm"
-HOMEPAGE="http://www.rpm5.org/"
-SRC_URI="https://dev.gentoo.org/~swegener/distfiles/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-libs/popt
-	dev-libs/elfutils
-	dev-libs/beecrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.3.5-DWARF-4.patch #400663
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch b/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
deleted file mode 100644
index 3e1406196e9b..000000000000
--- a/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-add DWARF 4 support
-
-https://bugs.gentoo.org/400663
-https://bugzilla.redhat.com/show_bug.cgi?id=707677
-
---- debugedit-5.3.5/debugedit.c	2011-10-11 05:37:49.000000000 +0200
-+++ debugedit-5.3.5/debugedit.c	2012-01-25 01:27:23.487999039 +0100
-@@ -70,6 +70,10 @@
- #include <rpmtag.h>
- 
- #define DW_TAG_partial_unit 0x3c
-+#define DW_FORM_sec_offset 0x17
-+#define DW_FORM_exprloc 0x18
-+#define DW_FORM_flag_present 0x19
-+#define DW_FORM_ref_sig8 0x20
- 
- char *base_dir = NULL;
- char *dest_dir = NULL;
-@@ -246,6 +250,7 @@
- #define DEBUG_STR	8
- #define DEBUG_FRAME	9
- #define DEBUG_RANGES	10
-+#define DEBUG_TYPES	11
-     { ".debug_info", NULL, NULL, 0, 0, 0 },
-     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
-     { ".debug_line", NULL, NULL, 0, 0, 0 },
-@@ -257,6 +262,7 @@
-     { ".debug_str", NULL, NULL, 0, 0, 0 },
-     { ".debug_frame", NULL, NULL, 0, 0, 0 },
-     { ".debug_ranges", NULL, NULL, 0, 0, 0 },
-+    { ".debug_types", NULL, NULL, 0, 0, 0 },
-     { NULL, NULL, NULL, 0, 0, 0 }
-   };
- 
-@@ -349,7 +355,8 @@
- 		goto no_memory;
- 	    }
- 	  form = read_uleb128 (ptr);
--	  if (form == 2 || form > DW_FORM_indirect)
-+	  if (form == 2
-+	      || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8))
- 	    {
- 	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
- 	      htab_delete (h);
-@@ -378,7 +385,6 @@
- canonicalize_path (const char *s, char *d)
- {
-   char *rv = d;
--  const char *sroot;
-   char *droot;
- 
-   if (IS_DIR_SEPARATOR (*s))
-@@ -394,7 +400,6 @@
- 	s++;
-     }
-   droot = d;
--  sroot = s;
- 
-   while (*s)
-     {
-@@ -513,7 +518,7 @@
-     }
- 
-   value = read_16 (ptr);
--  if (value != 2 && value != 3)
-+  if (value != 2 && value != 3 && value != 4)
-     {
-       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- 	     value);
-@@ -529,8 +534,8 @@
-       return 1;
-     }
-   
--  opcode_base = ptr[4];
--  ptr = dir = ptr + 4 + opcode_base;
-+  opcode_base = ptr[4 + (value >= 4)];
-+  ptr = dir = ptr + 4 + (value >= 4) + opcode_base;
-   
-   /* dir table: */
-   value = 1;
-@@ -758,7 +763,8 @@
- 	{
- 	  if (t->attr[i].attr == DW_AT_stmt_list)
- 	    {
--	      if (form == DW_FORM_data4)
-+	      if (form == DW_FORM_data4
-+		  || form == DW_FORM_sec_offset)
- 		{
- 		  list_offs = do_read_32_relocated (ptr);
- 		  found_list_offs = 1;
-@@ -864,6 +870,8 @@
- 	      else
- 		ptr += 4;
- 	      break;
-+	    case DW_FORM_flag_present:
-+	      break;
- 	    case DW_FORM_addr:
- 	      ptr += ptr_size;
- 	      break;
-@@ -878,10 +886,12 @@
- 	      break;
- 	    case DW_FORM_ref4:
- 	    case DW_FORM_data4:
-+	    case DW_FORM_sec_offset:
- 	      ptr += 4;
- 	      break;
- 	    case DW_FORM_ref8:
- 	    case DW_FORM_data8:
-+	    case DW_FORM_ref_sig8:
- 	      ptr += 8;
- 	      break;
- 	    case DW_FORM_sdata:
-@@ -910,6 +920,7 @@
- 	      form = DW_FORM_block1;
- 	      break;
- 	    case DW_FORM_block:
-+	    case DW_FORM_exprloc:
- 	      len = read_uleb128 (ptr);
- 	      form = DW_FORM_block1;
- 	      assert (len < UINT_MAX);
-@@ -1213,7 +1224,7 @@
- 		}
- 	      
- 	      cu_version = read_16 (ptr);
--	      if (cu_version != 2 && cu_version != 3)
-+	      if (cu_version != 2 && cu_version != 3 && cu_version != 4)
- 		{
- 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- 			 cu_version);
diff --git a/dev-util/debugedit/files/update.sh b/dev-util/debugedit/files/update.sh
deleted file mode 100755
index 3fed29ad6dc2..000000000000
--- a/dev-util/debugedit/files/update.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-DISTDIR="$(portageq envvar DISTDIR 2>/dev/null)"
-DISTDIR="${DISTDIR:-/usr/portage/distfiles}"
-if [[ ! -d "${DISTDIR}" ]] ; then
-	echo "No DISTDIR found."
-	exit 1
-fi
-
-PN=debugedit
-
-gentoo_functions="/lib/gentoo/functions.sh"
-if [[ -f "${gentoo_functions}" ]] ; then
-	. "${gentoo_functions}"
-else
-	echo "Failed to source ${gentoo_functions} file."
-	echo "Please install sys-apps/gentoo-functions package."
-	exit 1
-fi
-
-set -e
-
-einfo "Getting updated index"
-rm -f index.html
-wget -q http://rpm5.org/
-
-PV=$(sed -n '/Production:/{n;s:.*RPM ::;s:<.*::;p;q}' index.html)
-einfo "Latest upstream version: ${PV}"
-rm -f index.html
-
-P="${PN}-${PV}"
-A=${P}.tar.bz2
-
-e=${P}.ebuild
-if [[ -e ../${e} ]] ; then
-	einfo "All up to date"
-	exit 0
-fi
-
-#tf=${DISTDIR}/${A}
-#if [[ ! -e ${tf} ]] ; then
-#	einfo "Cannot find ${tf}"
-#	exit 0
-#fi
-
-einfo "Fetching latest rpm tarball"
-r=rpm-${PV}
-wget -nv http://rpm5.org/files/rpm/rpm-${PV%.*}/${r}.tar.gz -P ${DISTDIR} -c
-
-einfo "Unpacking ${r}"
-rm -rf ${r}
-tar xf ${DISTDIR}/${r}.tar.gz
-
-einfo "Creating ${P}"
-rm -rf ${P}
-mkdir ${P}
-cp Makefile ${r}/tools/{hashtab.?,debugedit.c} ${P}/
-pushd ${P} >/dev/null
-more=true
-while ${more} ; do
-	more=false
-	for h in $(grep '#include' *.[ch] | awk '{print $NF}' | sed 's:[<>"]::g') ; do
-		[[ ${h} == */* ]] && continue
-		rh=$(find ../${r} -name ${h##*/})
-		if [[ -n ${rh} ]] && [[ ! -e ${rh##*/} ]] ; then
-			# don't copy glibc includes
-			if ! grep -qs 'This file is part of the GNU C Library' ${rh} ; then
-				cp ${rh} ./
-				more=true
-			fi
-		fi
-	done
-done
-popd >/dev/null
-tar jcf ${A} ${P}
-
-einfo "Testing build"
-pushd ${P} >/dev/null
-make -s
-popd >/dev/null
-
-einfo "Cleaning up"
-rm -rf ${P} ${r}
-du -b ${A}
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/dev-util/debugedit/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>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/dejagnu-1.4.4-r3 b/dev-util/dejagnu-1.4.4-r3
new file mode 100644
index 000000000000..af69b6048a36
--- /dev/null
+++ b/dev-util/dejagnu-1.4.4-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test unpack
+DEPEND=dev-lang/tcl dev-tcltk/expect
+DESCRIPTION=framework for testing other programs
+EAPI=0
+HOMEPAGE=https://www.gnu.org/software/dejagnu/
+IUSE=doc
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl dev-tcltk/expect
+SLOT=0
+SRC_URI=mirror://gnu/dejagnu/dejagnu-1.4.4.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_=4f4c55db4fef2fc94944506d4b765e5a
diff --git a/dev-util/dejagnu-1.5 b/dev-util/dejagnu-1.5
new file mode 100644
index 000000000000..d63dee61ef1a
--- /dev/null
+++ b/dev-util/dejagnu-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/tcl dev-tcltk/expect
+DESCRIPTION=framework for testing other programs
+EAPI=0
+HOMEPAGE=https://www.gnu.org/software/dejagnu/
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-lang/tcl dev-tcltk/expect
+SLOT=0
+SRC_URI=mirror://gnu/dejagnu/dejagnu-1.5.tar.gz
+_md5_=dc32b86e233371a919bd1b11d3f1b5f7
diff --git a/dev-util/dejagnu-1.6 b/dev-util/dejagnu-1.6
new file mode 100644
index 000000000000..5fbeac98c012
--- /dev/null
+++ b/dev-util/dejagnu-1.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/tcl dev-tcltk/expect
+DESCRIPTION=Framework for testing other programs
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/dejagnu/
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.tar.gz
+_md5_=b52e4325abf41d3220a483a1a1ffeec0
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
deleted file mode 100644
index 2904c5c28e5d..000000000000
--- a/dev-util/dejagnu/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX dejagnu-1.4.4-rsh-username.patch 1304 BLAKE2B 58fee39ac991d63c0de7177343428b60fc8f84259107837d92608bb252e3c3876251bdace3ca035e69df6a06a2e65b9bf1a5dfbb1668e79e0be3615f9c3bf36b SHA512 9d1d9c29759f4ffe137da1d9dea535b507b924e95adb1fff35e4755e06bab22a31b0d7cb3d3d2336353c099cc9aa0b639689a58e5226e23e8db4235fa67d4dd4
-AUX dejagnu-1.4.4-testglue-protos.patch 393 BLAKE2B 5bb8b2240a6f0eca3cbd18b073143a005fe73e0812ff8602107b2f93ae9a72e67fd68f3bc9213f93c31e4ef66a646b7557c04a6f32488243bb979110e2d40383 SHA512 5f8ff3f472ec3bfe3b426486a02816f821e089ebb5efaf7a2467a0eb06f6a79e46a56f81f79c9af07958d4ff5e0a1de3593711724f8cdaf88ff0009b73bf169b
-AUX dejagnu-ignore-libwarning.patch 1129 BLAKE2B 5fc7cbba3acecd3e51e66dcc68da4d3f3c314c781bd67d69d28c2c59aff94a0354ae00676d94d70120a987927f45c64aa076df0f223d2e2c8a35552a924cb1eb SHA512 e31f5218d29ac648842b93828cb5f3bdb8b3276a9c672efe27a10ba19bcaae1fd026fbf40e516a4639856469972de583b816b7187f8c544523aac37f12f5621e
-DIST dejagnu-1.4.4.tar.gz 1080346 BLAKE2B 183566795c2ba9cf4acbc9c39e93a45b50409eefef0ae2039cbdf56135e367552d190e5b01b5bceab4e26b3b05c0ea68e892b7c6bd419bc38bcfc7c5be27645e SHA512 fae08d4801b6a815af8771896e6e5eb12b297b773faa89743eac28d08c7eac6ed7e530921acdba1b9a7903990060c520497d281651d29d98ab0def1dbfab392e
-DIST dejagnu-1.5.tar.gz 576269 BLAKE2B df7767e5b8adbad7315e3489d3f8a267043e2bf27ed120ad7e534b9a6dc8c5ae2fa5fdbf7ff6fe530605998af4a09cc3b4b94881837b5f3c6336a9c515b5c7e2 SHA512 a9486e28f7ce25c34b59d00c0e4862bbb4b7a01d8faae0d1f28669b9d3ded9ed233b892aa27c34e1d06911f071d894aba7c1469e2fd0bddaa5611c2383e4974f
-DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.4.4-r3.ebuild 987 BLAKE2B 4691d1c0d8ebb2f3065e257baad8e9f9b098b45072fa055692e07d470599b2c7b19a41694158cfd9983763fd6f89638856ce1975da0d2383b2620ebc911ea027 SHA512 cfff2240532dd13861c68c5e279e55d9466dfe01275fa668700dc573b003305f03256b9ae86553c1e93f181b801cb943f49ddc0de8aca38749eb9cbbbc108673
-EBUILD dejagnu-1.5.ebuild 801 BLAKE2B c0486854835b12c998cd3fd273858f5c3230dadc2071e908c4f1ffdd3b93b8391f0a6830b517c74e1cfc0cb7de86da2af320e55c71921203fba11954b2eaba9f SHA512 809c6ce3913880be91f9efd9a76e26affa5a8269a8047443c87584659ed03b25ecf9f6f5db65a22a82e9000994420699d8ffbd90dacbb6b01ab28d6458bc169a
-EBUILD dejagnu-1.6.ebuild 737 BLAKE2B 5bba994236b2cce0e03ce5e2144c955fd0a2f3b22f174279ed958088399bccb1805175383935d70cfbb51ed86c7ea960be6e3d898fa04a1fd9c92086fc58dc07 SHA512 caf18bc683b57ba5f35d332f93300b324cd3fff5a167fde260e11c9df0a0f3d03fc40f486f848b78a9854d143e36fe2bf244e8ee34337f0fd49dcd53d8f41a02
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
deleted file mode 100644
index d1e7f9a820b1..000000000000
--- a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="framework for testing other programs"
-HOMEPAGE="https://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc"
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/dejagnu-ignore-libwarning.patch
-	epatch "${FILESDIR}"/${P}-rsh-username.patch
-	epatch "${FILESDIR}"/${P}-testglue-protos.patch
-}
-
-src_test() {
-	# if you dont have dejagnu emerged yet, you cant
-	# run the tests ... crazy aint it :)
-	type -p runtest || return 0
-	emake check || die "check failed :("
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml -r doc/html/
-}
diff --git a/dev-util/dejagnu/dejagnu-1.5.ebuild b/dev-util/dejagnu/dejagnu-1.5.ebuild
deleted file mode 100644
index 5b3deb69ffc5..000000000000
--- a/dev-util/dejagnu/dejagnu-1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="framework for testing other programs"
-HOMEPAGE="https://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc"
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-src_test() {
-	# if you dont have dejagnu emerged yet, you cant
-	# run the tests ... crazy aint it :)
-	type -p runtest || return 0
-	emake check || die "check failed :("
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml -r doc/html/
-}
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
deleted file mode 100644
index 331d31f60aee..000000000000
--- a/dev-util/dejagnu/dejagnu-1.6.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="Framework for testing other programs"
-HOMEPAGE="https://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-src_test() {
-	# if you dont have dejagnu emerged yet, you cant
-	# run the tests ... crazy aint it :)
-	type -p runtest || return 0
-	emake check
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
deleted file mode 100644
index ff4e970a4fd4..000000000000
--- a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-fix from upstream:
-
-2004-03-05  Daniel Jacobowitz  <drow@mvista.com>
-                                                                                
-	* lib/remote.exp (standard_spawn): Fix rsh username support.
-
-diff --git a/lib/remote.exp b/lib/remote.exp
-index b57276e..cdec0d2 100644
---- a/lib/remote.exp
-+++ b/lib/remote.exp
-@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
-         set RSH [board_info $dest rsh_prog]
-     }
- 
--    if ![board_info $dest exists username] {
--        set rsh_useropts ""
--    } else {
--        set rsh_useropts "-l $username"
--    }
--
-     if [board_info $dest exists hostname] {
- 	set remote [board_info $dest hostname]
-     } else {
- 	set remote $dest
-     }
- 
--    spawn $RSH $rsh_useropts $remote $commandline
-+    if ![board_info $dest exists username] {
-+        spawn $RSH $remote $commandline
-+    } else {
-+        spawn $RSH -l [board_info $dest username] $remote $commandline
-+    }
-+
-     set board_info($dest,fileid) $spawn_id
-     return $spawn_id
- }
-@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
-     }
- 
-     if {$code == 1} {
-+        if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
-+
- 	if { $error_sect != "" } {
- 	    set code [catch {uplevel $error_sect} string]
- 	} else {
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
deleted file mode 100644
index 4ddaffb1c66d..000000000000
--- a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-fix from upstream:
-
-2004-08-20  Daniel Jacobowitz  <dan@debian.org>
-
-	* testglue.c: Prototype abort(3) and exit(3).
-
-diff --git a/testglue.c b/testglue.c
-index 55a7f92..4ede6eb 100644
---- a/testglue.c
-+++ b/testglue.c
-@@ -40,6 +40,10 @@
- #define ORIG_ABORT __wrap_abort
- #define ORIG_MAIN __wrap_main
- #endif
-+
-+extern void abort (void);
-+extern void exit (int);
-+
- #endif
- 
- #ifdef REAL_MAIN
diff --git a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
deleted file mode 100644
index f4af06e6ff89..000000000000
--- a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-dejagnu/ChangeLog
-	* lib/target.exp (prune_warnings): Correct pic/PIC regexp.
-	Ignore incompatible library warning.
-
-Index: dejagnu/lib/target.exp
-===================================================================
-RCS file: /cvs/src/src/dejagnu/lib/target.exp,v
-retrieving revision 1.12
-diff -u -p -r1.12 target.exp
---- dejagnu/lib/target.exp	21 Apr 2002 08:47:07 -0000	1.12
-+++ dejagnu/lib/target.exp	9 Jun 2003 07:34:06 -0000
-@@ -279,7 +279,10 @@ proc prune_warnings { text } {
-     regsub -all "(^|\n)\[^\n\]*: warning:   as it has already been specified\[^\n\]*" $text "" text
- 
-     # Cygwin cc1 warns about -fpic and -fPIC
--    regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
-+    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text
-+
-+    # Ignore linker warning when searching 64bit libraries in /lib.
-+    regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text
- 
-     # It might be tempting to get carried away and delete blank lines, etc.
-     # Just delete *exactly* what we're ask to, and that's it.
diff --git a/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
deleted file mode 100644
index e396f3755977..000000000000
--- a/dev-util/dejagnu/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>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/desktop-file-utils-0.23 b/dev-util/desktop-file-utils-0.23
new file mode 100644
index 000000000000..a0b8eedfb10f
--- /dev/null
+++ b/dev-util/desktop-file-utils-0.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.12:2 emacs? ( virtual/emacs ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Command line utilities to work with desktop menu entries
+EAPI=6
+HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
+IUSE=emacs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( virtual/emacs )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.23.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ec9d4f1b34664edeea7ee2ddaba6924
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
deleted file mode 100644
index 432c7a9c4edf..000000000000
--- a/dev-util/desktop-file-utils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
-DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
-EBUILD desktop-file-utils-0.23.ebuild 1284 BLAKE2B 7ee49c484dec7684919af3ed443dce419e7afa9cc7864976207ebc6c4600bd961f044a5cac5d582cdb185f82aefd5c10241eaa1d51612a9f420676b25ed18506 SHA512 c380d1255117d4b98182dfcc06c03d643f7094ea2b3229ef68efc075654421603059d9d74443253ee4dd45b82a76a5109482c10659b194c3a101a64016244c93
-MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
deleted file mode 100644
index a336cd83a18c..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.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
-inherit elisp-common eutils
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el b/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el
deleted file mode 100644
index 546947a0b374..000000000000
--- a/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'desktop-entry-mode "desktop-entry-mode" "Desktop Entry mode" t)
-(add-to-list 'auto-mode-alist
- '("\\.desktop\\(\\.in\\)?$" . desktop-entry-mode))
-(add-hook 'desktop-entry-mode-hook 'turn-on-font-lock)
diff --git a/dev-util/desktop-file-utils/metadata.xml b/dev-util/desktop-file-utils/metadata.xml
deleted file mode 100644
index fb76b944f2da..000000000000
--- a/dev-util/desktop-file-utils/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>freedesktop-bugs@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/deskzilla-1.7.1-r1 b/dev-util/deskzilla-1.7.1-r1
new file mode 100644
index 000000000000..9e8a37f7a300
--- /dev/null
+++ b/dev-util/deskzilla-1.7.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A desktop client for Mozilla's Bugzilla bug tracking system
+EAPI=5
+HOMEPAGE=http://almworks.com/deskzilla
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=ALMWorks-1.2
+RDEPEND=>=virtual/jre-1.5 dev-java/picocontainer:1 dev-java/javolution:4 >=dev-java/commons-codec-1.3 >=dev-java/jgoodies-forms-1.0.7 >=dev-java/commons-logging-1.0.4 >=dev-java/xmlrpc-2.0.1 dev-java/xerces:2 dev-java/itext:0 dev-java/jazzy:0 >=dev-java/java-config-2.2.0-r3
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://d1.almworks.com/.files/deskzilla-1_7_1_without_jre.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-util/deskzilla/deskzilla_gentoo.license
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7c68ae80698d1df6d74c62e2891a304
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
deleted file mode 100644
index a9a05c9a1bbd..000000000000
--- a/dev-util/deskzilla/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST deskzilla-1_7_1_without_jre.tar.gz 9248721 BLAKE2B 64ca45e97e99fdcb4c3514573357503ba82ce67a8e67d46206542999912190dc75d1c2cff7b36f6b6337a53b19402d196fb8df9e193aa3042c820539efe39f01 SHA512 86997ebed6b01b39408e8c27ee0c560e506368cc9b12dfc82134addd47c1be746e74cdf908c9e9ee794d6337bb32971f2a07ce7c283b81e4f506027894edbac7
-DIST deskzilla_gentoo.license 1584 BLAKE2B 54e34962f65695111783df55ad22de39051127d907435dce7f30ff829d34d40376a70c7e8522f3733afe6da3dc6dc92c0a7e9f2c2fc4f2436c52b629a8d1eb8a SHA512 60437ba4ed872abc37d41974717a10fb290dcdf8bde31b3bc493fd71d8abbcdec63e236148720558f1867b773b804bc49d4cce6ea5f1b002c39eca5f074e5e9a
-EBUILD deskzilla-1.7.1-r1.ebuild 2797 BLAKE2B 6e0e01e44867c428b995c88ca7a5138e06bc6782156e9043648462744db223bba56e13d87d6c1bd46220dad5574447c9ec5a64b864a501386f62c5e140f1db67 SHA512 154dd3acb983673aabd7ade188d93f8ec1db15f113547107eb8b8b14c966f100aec68e2b9364dd85a5ea9a68fdccbd0c2e20b589e76dfc47d84c1b6d14c4753d
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
deleted file mode 100644
index 66b5d1cf350c..000000000000
--- a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 versionator
-
-DESCRIPTION="A desktop client for Mozilla's Bugzilla bug tracking system"
-HOMEPAGE="http://almworks.com/deskzilla"
-
-MY_PV=$(replace_all_version_separators '_') #${PV/beta/b})
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://d1.almworks.com/.files/${MY_P}_without_jre.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/deskzilla_gentoo.license"
-LICENSE="ALMWorks-1.2"
-# license does not allow redistributing, and they seem to silently update
-# distfiles...
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5
-	dev-java/picocontainer:1
-	dev-java/javolution:4
-	>=dev-java/commons-codec-1.3
-	>=dev-java/jgoodies-forms-1.0.7
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/xmlrpc-2.0.1
-	dev-java/xerces:2
-	dev-java/itext:0
-	dev-java/jazzy:0"
-
-src_unpack() {
-	unpack ${A}
-	# Remove external unaltered bundled jars
-	local lib="${S}/lib"
-	local liborig="${S}/lib.orig"
-	mv ${lib} ${liborig} || die
-	mkdir ${lib} || die
-	# They've patched commons-httpclient (was version 3.0)
-	mv ${liborig}/commons-httpclient.jar ${lib} || die
-	# They've patched nekohtml (was version 0.9.5)
-	mv ${liborig}/nekohtml.jar ${lib} || die
-	# Also jdom (was 1.0), soon they will patch everything and we will just unpack, yay
-	mv ${liborig}/pjdom.jar ${lib} || die
-	# Almworks proprietary lib
-	mv ${liborig}/almworks-tracker-api.jar ${lib} || die
-	# IntelliJ IDEA proprietary lib
-	mv ${liborig}/forms_rt.jar ${lib} || die
-	# God knows what's this. Anyway, proprietary.
-	mv ${liborig}/twocents.jar ${lib} || die
-	rm -rf ${liborig} || die
-}
-
-src_install () {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r components etc license lib log deskzilla.url
-	insinto "${dir}/license"
-	doins "${DISTDIR}"/deskzilla_gentoo.license
-
-	java-pkg_jarinto "${dir}"
-	java-pkg_dojar ${PN}.jar
-	local dep="xerces-2,picocontainer-1,commons-logging,commons-codec"
-	dep+=",jgoodies-forms,javolution-4,xmlrpc,itext,jazzy"
-	java-pkg_register-dependency ${dep}
-	java-pkg_dolauncher ${PN} --main "com.almworks.launcher.Launcher" --java_args "-Xmx256M"
-
-	newdoc README.txt README || die
-	newdoc RELEASE.txt RELEASE || die
-
-	doicon deskzilla.png
-	make_desktop_entry deskzilla "Deskzilla" deskzilla "Development"
-}
-
-pkg_postinst() {
-	elog "The default, evaluation license allows usage for one month."
-	elog "You may switch (per-user) to the license we obtained for Gentoo,"
-	elog "located in /opt/${PN}/license/${PN}_gentoo.license"
-	elog "It is locked to Gentoo, ALM Works and Mozilla bugzilla only."
-	elog "Note that you need to use 1.5 VM to run deskzilla when setting"
-	elog "license or it won't get set due to bug in 1.6+ VMs."
-}
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-util/deskzilla/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>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/devhelp-3.24.0 b/dev-util/devhelp-3.24.0
new file mode 100644
index 000000000000..b7caab1bb920
--- /dev/null
+++ b/dev-util/devhelp-3.24.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.20:3 >=net-libs/webkit-gtk-2.6.0:4 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) 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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An API documentation browser for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
+IUSE=gedit +introspection 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
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.20:3 >=net-libs/webkit-gtk-2.6.0:4 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) gedit? ( 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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gedit[introspection,python,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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas
+REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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/3-3
+SRC_URI=mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4042405851ea62cd14148c0c4eaeb43
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
deleted file mode 100644
index eb7e1491e7ae..000000000000
--- a/dev-util/devhelp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
-MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild
deleted file mode 100644
index b94f8d2e6f4a..000000000000
--- a/dev-util/devhelp/devhelp-3.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-3" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2[dbus]
-	>=x11-libs/gtk+-3.20:3
-	>=net-libs/webkit-gtk-2.6.0:4
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-#  dev-libs/appstream-glib
-#  sys-devel/autoconf-archive
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		${myconf}
-}
diff --git a/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml
deleted file mode 100644
index 04f1a3c98b5d..000000000000
--- a/dev-util/devhelp/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="gedit">Install plugin for <pkg>app-editors/gedit</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/dialog-1.3.20170131 b/dev-util/dialog-1.3.20170131
new file mode 100644
index 000000000000..bf1a3bd13409
--- /dev/null
+++ b/dev-util/dialog-1.3.20170131
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DESCRIPTION=tool to display dialog boxes from a shell
+EAPI=6
+HOMEPAGE=http://invisible-island.net/dialog/dialog.html
+IUSE=examples minimal nls static-libs unicode
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
+SLOT=0/14
+SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170131.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9436b4bc0e496a50580ee182cf53992e
diff --git a/dev-util/dialog-1.3.20171209 b/dev-util/dialog-1.3.20171209
new file mode 100644
index 000000000000..7496ed9d6a63
--- /dev/null
+++ b/dev-util/dialog-1.3.20171209
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DESCRIPTION=tool to display dialog boxes from a shell
+EAPI=6
+HOMEPAGE=https://invisible-island.net/dialog/dialog.html
+IUSE=examples minimal nls static-libs unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
+SLOT=0/14
+SRC_URI=mirror://debian/pool/main/d/dialog/dialog_1.3-20171209.orig.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eb499a387f51303d3b8edb690e84b88f
diff --git a/dev-util/dialog-1.3.20180621 b/dev-util/dialog-1.3.20180621
new file mode 100644
index 000000000000..f8fb6ae4b5a2
--- /dev/null
+++ b/dev-util/dialog-1.3.20180621
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DESCRIPTION=tool to display dialog boxes from a shell
+EAPI=6
+HOMEPAGE=https://invisible-island.net/dialog/
+IUSE=examples minimal nls static-libs unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
+SLOT=0/15
+SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20180621.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a2e82c37e59923cbe7619b7746049c82
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
deleted file mode 100644
index 266c8911cbc3..000000000000
--- a/dev-util/dialog/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20180621.tgz 529123 BLAKE2B bb085e93a0eaedd1fc517bcfe080f8dbf61bf0b28003b38356d66c324baed7dcd2f76917676a1894e76bf3a7d58d3090c95e45624dae37e3e2e885282ab9c5bb SHA512 1c6d794af50a12294e32b99fd9d3eb9451ac4a2f21c5567848b59c7a316b3058463c41fb8f9eb0bce68edbbe463234a6ec893f7a013ceb953eb5da0effe0d274
-DIST dialog_1.3-20171209.orig.tar.gz 511503 BLAKE2B db633f882cce8a0ecd1446c26b305f5567bcdc0fb8e073ff3a443fbf56662638685578040ecd21220192c069899998f587aa04db8185074b4c8af957df77c49c SHA512 0355578bc64e2c75a2aae3ae83aff62eae60556a2890d50a72988efa76b82055755922bc1156a92370d773524865e76b8a0ddcde77fb6e6b5774c987fc22dee8
-EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20171209.ebuild 1350 BLAKE2B a2ae71b554dc8f96da4422d00ffbb49cf3af2456a58e97e8151db89ff16903200108cee08da78fa2e8dab1b36909c2222ad4a6336beba1f4010bdf6d7266f790 SHA512 52522ede770c6101897f8eecc5b0c9ed82c5ddab01a092cde57f7e08052e31188386eae7fa0a9044317b5d25c63502b69aa09dfa535780473a89888f1342ad47
-EBUILD dialog-1.3.20180621.ebuild 1276 BLAKE2B b21d421081fef21de326210e5117f0223203444ac0ae5ef1b4cc972d2fd57c46c0f2b50594a429ff7cd2b7a0e390f372d3781c5c42be65c7b4f2d84488e0137f SHA512 fd98134e5dd69bc3728b40b71933a5e49f3df34f8e22ec5baa02e8eb267ed2191d889086df23e263cd819d31b6363af4f6205a9989a03039ac0c84c9d8620bed
-MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
deleted file mode 100644
index 6584c3579105..000000000000
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 2 '-')"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/14"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/dialog/dialog-1.3.20171209.ebuild b/dev-util/dialog/dialog-1.3.20171209.ebuild
deleted file mode 100644
index 76110e4b945f..000000000000
--- a/dev-util/dialog/dialog-1.3.20171209.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
-inherit eutils multilib versionator
-
-DEB_P="${PN}_$(replace_version_separator 2 '-')"
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/dialog.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${DEB_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/dialog/dialog-1.3.20180621.ebuild b/dev-util/dialog/dialog-1.3.20180621.ebuild
deleted file mode 100644
index ffa55f6cd40c..000000000000
--- a/dev-util/dialog/dialog-1.3.20180621.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
deleted file mode 100644
index 7c5b4a32485b..000000000000
--- a/dev-util/dialog/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>livecd@gentoo.org</email>
-<name>Gentoo LiveCD Project</name>
-</maintainer>
-<use>
-<flag name="minimal">Disable library, install command-line program only</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/diffball-1.0.1 b/dev-util/diffball-1.0.1
new file mode 100644
index 000000000000..8094dbb9546e
--- /dev/null
+++ b/dev-util/diffball-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-libs/zlib-1.1.4 >=app-arch/bzip2-1.0.2 app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Delta compression suite for using/generating binary patches
+EAPI=6
+HOMEPAGE=https://diffball.googlecode.com/
+IUSE=debug
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=sys-libs/zlib-1.1.4 >=app-arch/bzip2-1.0.2 app-arch/xz-utils
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://diffball.googlecode.com/files/diffball-1.0.1.tar.bz2
+_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_=fd5797f014dcfac9d269a799e0d69207
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
deleted file mode 100644
index 168fc05530c4..000000000000
--- a/dev-util/diffball/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
-EBUILD diffball-1.0.1.ebuild 806 BLAKE2B ad4d0357693531577a5c9f6d0f6ca5582af0849bfe0686162de8cb8320b2cc370ef4c325a997a1e804bf6c3b3041e87627bce63e0b4e700b1c42d17a8d564342 SHA512 3c5be0e9608123c1bc5f1bc30b458f59c387e9661cfd27ff5935b6841888e6c94ac779792c206f2b659a1b0dd46fd1c7e40727b9e697fcc1cf1b80a2ea12348e
-MISC metadata.xml 335 BLAKE2B a5e825f2df16ec0a8abe5be5a5e00c986c204b0d46da6a61370f4379b88a181ae473502cb33db6817a05e5c436979f7c2ab30963ff7d85b3d6a7cd01789a4ab2 SHA512 873a67d443a91385a6b7891ee5a09aa3f99cf96410b9165330af17d63333beb72c0e614142274a80ac433089c28a233110b9a142ed3ef2fa269b9a2d2a524e34
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
deleted file mode 100644
index 0902b00c14f9..000000000000
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Delta compression suite for using/generating binary patches"
-HOMEPAGE="https://diffball.googlecode.com/"
-SRC_URI="https://diffball.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=app-arch/bzip2-1.0.2
-	app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Invalid RESTRICT for source package. Investigate.
-RESTRICT="strip"
-
-src_prepare() {
-	# fix bug 548316 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	default
-}
-
-src_configure() {
-	econf $(use_enable debug asserts)
-}
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
deleted file mode 100644
index 70aa8c7d2862..000000000000
--- a/dev-util/diffball/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>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">diffball</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/difffilter-0.3.3 b/dev-util/difffilter-0.3.3
new file mode 100644
index 000000000000..e3ea89a11aab
--- /dev/null
+++ b/dev-util/difffilter-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-text/txt2man ) >=dev-libs/liblist-2.3.1 dev-libs/libstrl dev-libs/tre >=app-portage/elt-patches-20170422
+DESCRIPTION=Filter files out of unified diffs using POSIX extended regular expressions
+EAPI=4
+HOMEPAGE=http://ohnopub.net/~ohnobinki/difffilter/
+IUSE=doc
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/liblist-2.3.1 dev-libs/libstrl dev-libs/tre
+SLOT=0
+SRC_URI=ftp://mirror.ohnopub.net/mirror/difffilter/difffilter-0.3.3.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_=5694d5b60fb5336c4a0f8a3a95c5e0b8
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
deleted file mode 100644
index bcc0baf0b64b..000000000000
--- a/dev-util/difffilter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
-EBUILD difffilter-0.3.3.ebuild 627 BLAKE2B d5e374dfb6c47aaf1db7b0864a2b679272f1fd4757493642ca28af48a90a6f819ca3344bb2a89466ecc039e53653eeafc42a2e3dd9fc0d10c5ee394e521647f8 SHA512 f789e1b968d0d1f79e71ce8fad490e64104ce3f1cc5f67f3e841d78a426982aa2ec7bdc88b316f6701b25663370feb8221c53ad7c2473f0cf6ebe6783e9292b2
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/difffilter/difffilter-0.3.3.ebuild b/dev-util/difffilter/difffilter-0.3.3.ebuild
deleted file mode 100644
index ec2d6786e055..000000000000
--- a/dev-util/difffilter/difffilter-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
-HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
-SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/liblist-2.3.1
-	dev-libs/libstrl
-	dev-libs/tre"
-DEPEND="doc? ( app-text/txt2man )
-	${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/difffilter/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/diffoscope-87 b/dev-util/diffoscope-87
new file mode 100644
index 000000000000..ee7c22105f01
--- /dev/null
+++ b/dev-util/diffoscope-87
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=5
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libarchive-c[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/distro[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) 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_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=mirror://pypi/d/diffoscope/diffoscope-87.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_=d4511b9a5e4c1a447bb98c7d4e39dc5b
diff --git a/dev-util/diffoscope-88 b/dev-util/diffoscope-88
new file mode 100644
index 000000000000..1dbd5868352b
--- /dev/null
+++ b/dev-util/diffoscope-88
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=6
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libarchive-c[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/distro[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) 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_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=mirror://pypi/d/diffoscope/diffoscope-88.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_=73ac6a72fb3d93fa94a92c73937cdf59
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
deleted file mode 100644
index ca3d0f3055d0..000000000000
--- a/dev-util/diffoscope/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac41e4c193c68fc037ab8089745e9b10dddc04b396f2011d22468e00a07392723631021d062f59935a953effd04fa SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
-DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
-EBUILD diffoscope-87.ebuild 1835 BLAKE2B 7e11544ca6290e664e2f243640e70a483ae5aa86ed12b1904c56e46ecb3bfccdf6351e8460df5287006f6ca0c76ed6892bbe8b7804e863f3cc6f592319e4562d SHA512 58ab6f85b61caf31261ede9f807c6bc55a663a3d6582c1f73458b52d8c81bc1009ca8d4966222e2539fce78c0379fe05b938f6f362548b8e5e5f0b785343a1ca
-EBUILD diffoscope-88.ebuild 1884 BLAKE2B dbd6e3783941065ecd855b677b58ae2235cc90f631d9b0d7d415603b730513d32b46da275c3d442990d0b660c5f55761b028170db82737067fec6e4ce6c2a7e4 SHA512 382393caf25441d14a073376273c18691207e4dc3913c736998bac413d5ad1b86bd7843a9030b7bf9d4d78752f538050f95a25887acffc809a07657f116524e4
-MISC metadata.xml 2138 BLAKE2B 026602198d2a0adaf2e0e753ae0b11b2de858dd66303531e8d23dce85e871cb7f14b50267c37d52b16390b0892559e1c29f468637149d08b43e4a33be521bd45 SHA512 9f00c504e6ec4cdf5589e8f37d79567ad6fac661740ac482dbef1b3fae8bc60f24b80585eea8d17f18beb1c4c8e40e6f4172193b405be3e51428f027d2545776
diff --git a/dev-util/diffoscope/diffoscope-87.ebuild b/dev-util/diffoscope/diffoscope-87.ebuild
deleted file mode 100644
index 77784a1f3506..000000000000
--- a/dev-util/diffoscope/diffoscope-87.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )"
diff --git a/dev-util/diffoscope/diffoscope-88.ebuild b/dev-util/diffoscope/diffoscope-88.ebuild
deleted file mode 100644
index 4e57c2b2f0e9..000000000000
--- a/dev-util/diffoscope/diffoscope-88.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
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
deleted file mode 100644
index c6b5b3df2213..000000000000
--- a/dev-util/diffoscope/metadata.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription>
-  diffoscope will try to get to the bottom of what makes files or directories different.
-  It will recursively unpack archives of many kinds and transform various binary formats
-  into more human readable form to compare them.
-  It can compare two tarballs, ISO images, or PDF just as easily.
-</longdescription>
-<use>
-  <flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
-  <flag name="colord">Use <pkg>x11-misc/colord</pkg></flag>
-  <flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
-  <flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
-  <flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>
-  <flag name="dtc">Use <pkg>sys-apps/dtc</pkg></flag>
-  <flag name="e2fsprogs">Use <pkg>sys-fs/e2fsprogs</pkg></flag>
-  <flag name="file">Use <pkg>sys-apps/file</pkg></flag>
-  <flag name="find">Use <pkg>sys-apps/findutils</pkg></flag>
-  <flag name="gettext">Use <pkg>sys-devel/gettext</pkg></flag>
-  <flag name="gpg">Use <pkg>app-crypt/gnupg</pkg></flag>
-  <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
-  <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
-  <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
-  <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
-  <flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
-  <flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>
-  <flag name="R">Use <pkg>dev-lang/R</pkg></flag>
-  <flag name="rpm">Use <pkg>app-arch/rpm</pkg></flag>
-  <flag name="squashfs">Use <pkg>sys-fs/squashfs-tools</pkg></flag>
-  <flag name="ssh">Use <pkg>net-misc/openssh</pkg></flag>
-  <flag name="tar">Use <pkg>app-arch/tar</pkg></flag>
-  <flag name="tcpdump">Use <pkg>net-analyzer/tcpdump</pkg></flag>
-  <flag name="xz">Use <pkg>app-arch/xz-utils</pkg></flag>
-  <flag name="zip">Use <pkg>app-arch/unzip</pkg></flag>
-</use>
-<upstream>
-  <remote-id type="pypi">diffoscope</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-util/diffstat-1.60 b/dev-util/diffstat-1.60
new file mode 100644
index 000000000000..1af666de36ec
--- /dev/null
+++ b/dev-util/diffstat-1.60
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Display a histogram of diff changes
+EAPI=5
+HOMEPAGE=http://invisible-island.net/diffstat/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=HPND
+SLOT=0
+SRC_URI=ftp://invisible-island.net/diffstat/diffstat-1.60.tgz
+_md5_=cff2b98524533dcba9e154578b04a550
diff --git a/dev-util/diffstat-1.61 b/dev-util/diffstat-1.61
new file mode 100644
index 000000000000..f80c7db6fefa
--- /dev/null
+++ b/dev-util/diffstat-1.61
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Display a histogram of diff changes
+EAPI=6
+HOMEPAGE=http://invisible-island.net/diffstat/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=HPND
+SLOT=0
+SRC_URI=ftp://invisible-island.net/diffstat/diffstat-1.61.tgz
+_md5_=1936a845bc7b4f079cac61418679ee74
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
deleted file mode 100644
index 655688fb85f4..000000000000
--- a/dev-util/diffstat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
-DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
-EBUILD diffstat-1.60.ebuild 603 BLAKE2B 0b6336087524d39f4fc139734238e236a54c9f952b00ea01aaafaebf37144296cb453022019c9de0d3a57736e37fd4cc7db3be9114f2bb01208b14522fb5b5f5 SHA512 05f1b9e6c712aef48e86007a1ff059e6bfc7db45d0ed2714ca32bb852216d93edd08c709dea737872f6ad50eb0f7fa93f3900a1a8f3385e94936d79b04b8800e
-EBUILD diffstat-1.61.ebuild 476 BLAKE2B 9a57ba415f5a338f4c4c69b2e6bde145e3eeda76cc1245886a672c417e6a767fb51808e2fbcac8d72633b1477e2be28d6ea2cce5b59cc5bb8fa47423cb11a202 SHA512 adedfaa3c6e22c00afd84afcc3f6141e4ac26efd4ab3f73fe1f992ea78e26ff9a7b2d38e63456069a8e88f99b643e8ae2f0d4ae82386e2d6b398729d0325ccf9
-MISC metadata.xml 370 BLAKE2B da80af289cfaf95658c9a1b5ddde6229fff88a2f98550303c5617d94e65ab99cc11f295d077a25bbb4305f1c0f3933cedbca22e2072089930291aae68f231197 SHA512 f9979216cd41510953e4ad5ea2f7f6081fe730907ca15b0e48106079c0c44ca0fcd9fcaf3fc47aa11e0bd57135ab9dab0828148a37e51de5984612fd028521c6
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
deleted file mode 100644
index de0a11a90895..000000000000
--- a/dev-util/diffstat/diffstat-1.60.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"
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="http://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_configure() {
-	# We can drop this once a new release is made w/newer autotools.
-	export CONFIG_SHELL="/bin/bash" #529744
-	default
-}
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.61.ebuild
deleted file mode 100644
index eb958d03c0b8..000000000000
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="http://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
deleted file mode 100644
index a657c717c2c5..000000000000
--- a/dev-util/diffstat/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>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <upstream>
-    <changelog>http://invisible-island.net/diffstat/CHANGES</changelog>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/diffuse-0.4.8 b/dev-util/diffuse-0.4.8
new file mode 100644
index 000000000000..81f1a7f3ca82
--- /dev/null
+++ b/dev-util/diffuse-0.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !sci-chemistry/tinker
+DESCRIPTION=A graphical tool to compare and merge text files
+EAPI=5
+HOMEPAGE=http://diffuse.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86 ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/diffuse/diffuse-0.4.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cfc7180397f132b1634402b128058d94
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
deleted file mode 100644
index 6c5940709391..000000000000
--- a/dev-util/diffuse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
-EBUILD diffuse-0.4.8.ebuild 1206 BLAKE2B a2bc2515294bd6a6734b81f9973d11505e8f39dcb9ba5aa2abf726c4fcda2ced41100f7304526eca0b84ba90642ae41a19d66dd472114b932a0aaa9584b3d89f SHA512 f2965164c8a5823457c6923961efb955043fea45a8cfe3fb71c39ef26d9387c197697b6ab4264785277512be1d6cc4b028d8ed45693109fa5592e171844098df
-MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8.ebuild
deleted file mode 100644
index 93a43809a4d2..000000000000
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ /dev/null
@@ -1,57 +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 fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/diffuse/metadata.xml b/dev-util/diffuse/metadata.xml
deleted file mode 100644
index ef53d12f435f..000000000000
--- a/dev-util/diffuse/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>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<longdescription>A graphical tool to compare and merge text files</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">diffuse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/dirdiff-2.1-r2 b/dev-util/dirdiff-2.1-r2
new file mode 100644
index 000000000000..a7a8c0f86f88
--- /dev/null
+++ b/dev-util/dirdiff-2.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/tk:0= dev-lang/tcl:0=
+DESCRIPTION=A tool for differing and merging directories
+EAPI=5
+HOMEPAGE=https://www.samba.org/ftp/paulus/
+KEYWORDS=amd64 ~mips ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tk:0= dev-lang/tcl:0=
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/paulus/dirdiff-2.1.tar.gz
+_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_=b571d81552f5eea9495ee8e94fe79040
diff --git a/dev-util/dirdiff-2.1-r3 b/dev-util/dirdiff-2.1-r3
new file mode 100644
index 000000000000..2340ce3c776c
--- /dev/null
+++ b/dev-util/dirdiff-2.1-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/tk:0= dev-lang/tcl:0=
+DESCRIPTION=A tool for differing and merging directories
+EAPI=6
+HOMEPAGE=https://www.samba.org/ftp/paulus/
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tk:0= dev-lang/tcl:0=
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/paulus/dirdiff-2.1.tar.gz
+_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_=ce10772b023c642662dc549ebce655a7
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
deleted file mode 100644
index 8386d8c3b27b..000000000000
--- a/dev-util/dirdiff/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX dirdiff-2.1-build.patch 764 BLAKE2B e91b9e0c5ac370dbc3434015581e7574facdfd94ea782a5b82a9bfe6ef98c589322a7e8f0d2c419afd97101e005288a7a1f7f0350dc4d7ae897790321a4c109f SHA512 7b192071c14fd72733fe250f7ee5fa651f98238eb3238a584039b2f39537f04ed4b1940e2dbfceedc81df6933504c275a9b635d02b34b44186ff73c9e909d077
-AUX dirdiff-2.1-funky-chars.patch 7075 BLAKE2B e0f5a4ab6e4460f982ee9305a7b1f5d47429fd4d9e1b7bc4610c4b3fbb746817d77f06c4fa9fcce5ee919d751081b78a7fbc3e789cc86974b41a7eb6f93c6521 SHA512 966e33714e7bfdf5ea1cd893c07e7305220282543a28bc7054fb59fb75f595ec50a5a4ac81ce3ff49b0bf4877de17075c575fb3ba9e7766f199dcdfc7e52f766
-AUX dirdiff-2.1-include.patch 314 BLAKE2B 379a842839e5ae329fe61b8584204c206ce816cf2c808b1c44e4e8478cfcce9ffa445872170dc80a0e790c0510efd27a2fbe90bbdf830f1caa11087d4e117100 SHA512 a9fb10e5878f07d1f558810a0d34ba423f49c463f0ecf14ad5833b1ec1519ac0b467e387977a6da1bf48794a5dc3522c31f78b34731e61e39331d30c251da0bb
-AUX dirdiff-2.1-tcl8.6.patch 397 BLAKE2B 28ccdc2f87fcb3dda8191710efcc62c5c794bc734fbbe2470e40fa7f7f1337a677e3411b437aefca46afafaab3a94c011603632a26f47c9703668c9c679e8577 SHA512 938c6cf4f815f58f0de2c12b5bd19e8128615aba278c91e9c7a8e462f822b79d22f7d50ff331e095ff77ec979c9fc1a1a3a8bfd80f23c2f0e252a1e05098888e
-AUX dirdiff-2.1-vcs.patch 497 BLAKE2B 1dc187e73fb345074bfda218736137c2b34212186903870b780536ac3023e274a7eb26123deffb121dd153fa0ef00afc46f962a18932318ddd241375b204f517 SHA512 27baa8b3e0710db7ae9b01c1c132681ee71e96e4d19585fe0bdd9584e182ff96e7358df6607a40af054fdb536275b9c5a49581cde2fa934d6cf7f39489eb3a98
-DIST dirdiff-2.1.tar.gz 43105 BLAKE2B 5c9f49cb6b74434482d7d37935d47e235a46e83152d576ff83201c1dd663a101e70f853166624daaea413d9926107b7407790dceca0fbfbf3784fe6999735750 SHA512 826d5a7a633921bec7043c89ccdadff19b4a6328efd09913932b306a48242203fbf6b5bac69d72660acf2c76ce6c8c5e53be62c2e69bbf3e3717e21c544ca261
-EBUILD dirdiff-2.1-r2.ebuild 923 BLAKE2B 7836fdfeecea3fced5d7e8a032fdb454149b8d95b582810245c4d2b0476097bee70bc5c5622b4853640a3a990deaff9ba3e7582694b3bbae8c9ccf2683380f3d SHA512 5ec22626ef3f18f445ccbcc552fa328f59200bb853cc6cd7670be59a8d6a30e612508e9b48380ba146269e05c94e2c4be389fb842e1fb3162779589a120bb240
-EBUILD dirdiff-2.1-r3.ebuild 927 BLAKE2B 64fa1b792664ab953f81df1c19f3923a295abc49e0bce7d9b73b1638b3542fadf6168f07a60d4d54274f70944f3a4631e9d3d2681ecdf7341c7ef0fc8d0609f1 SHA512 97c4df7d6ef588b6a72501e42a88b6efcc32d5e14b7ebae08fefc8d150d777534b2a89dbedb5ba6f988c703aee740c86c94875344d945465aa04792533ddb6ac
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
deleted file mode 100644
index c739a93df91f..000000000000
--- a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A tool for differing and merging directories"
-SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
-HOMEPAGE="https://www.samba.org/ftp/paulus/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/tk:0=
-	dev-lang/tcl:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-vcs.patch \
-		"${FILESDIR}"/${P}-tcl8.6.patch \
-		"${FILESDIR}"/${P}-funky-chars.patch
-	tc-export CC
-	append-cppflags -I"${EPREFIX}"/usr/include/tcl
-}
-
-src_install() {
-	dobin dirdiff
-	dolib.so libfilecmp.so.0.0
-	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
-	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
-	dodoc README
-}
diff --git a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild b/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
deleted file mode 100644
index 9c9f48067a95..000000000000
--- a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A tool for differing and merging directories"
-SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
-HOMEPAGE="https://www.samba.org/ftp/paulus/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-
-DEPEND="
-	dev-lang/tk:0=
-	dev-lang/tcl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-include.patch"
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-vcs.patch"
-	"${FILESDIR}/${P}-tcl8.6.patch"
-	"${FILESDIR}/${P}-funky-chars.patch"
-)
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	tc-export CC
-	append-cppflags -I"${EPREFIX}"/usr/include/tcl
-}
-
-src_install() {
-	dobin "${PN}"
-	dolib.so libfilecmp.so.0.0
-	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
-	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
-	einstalldocs
-}
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-build.patch b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
deleted file mode 100644
index bb5010265196..000000000000
--- a/dev-util/dirdiff/files/dirdiff-2.1-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- Makefile | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b4a49f8..410e018 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,12 +7,17 @@ LIBDIR=$(DESTDIR)/usr/lib
- INSTALL=install
- 
- # You may need to change the -I arguments depending on your system
--CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
-+#CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
-+
-+LIBS = -ltcl
- 
- all:	libfilecmp.so.0.0
- 
--libfilecmp.so.0.0: filecmp.c
--	$(CC) $(CFLAGS) -shared -o $@ filecmp.c
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
-+
-+libfilecmp.so.0.0: filecmp.o
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libfilecmp.so.0 -o $@ filecmp.o $(LIBS)
- 
- install: dirdiff libfilecmp.so.0.0
- 	$(INSTALL) -c dirdiff $(BINDIR)
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
deleted file mode 100644
index 1d4f715ac167..000000000000
--- a/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- cvs-local.orig/dirdiff
-+++ cvs-local/dirdiff
-@@ -563,7 +563,7 @@
- 	    if {$d1 == $d2} continue
- 	    set any 1
- 	    $base.p.$sub1 add command -label "$d2" \
--		    -command "makepatch \"$d1\" \"$d2\""
-+		    -command [list makepatch $d1 $d2]
- 	}
- 	if {$any} {
- 	    $base.p add cascade -label "$d1 ->" -menu $base.p.$sub1
-@@ -579,7 +579,7 @@
-     set i 0
-     foreach d $dirs {
- 	if {!$dirreadonly($i)} {
--	    $base.t add command -label $d -command "touchfiles \"$d\""
-+	    $base.t add command -label $d -command [list touchfiles $d]
- 	}
- 	incr i
-     }
-@@ -677,7 +677,7 @@
-     set i 0
-     foreach d $dirs {
- 	.bar.options add checkbutton -label "Read-only $d" \
--		-variable dirreadonly($i) -command "readonlychange $i"
-+		-variable dirreadonly($i) -command [list readonlychange $i]
- 	incr i
-     }
- 
-@@ -1153,7 +1153,7 @@
- 	if {$xi != ""} {
- 	    set x [lindex $dirs $xi]
- 	    $diffbut add command -label "Show $x" \
--		    -command "showfile \"$x\" \"$selfile\""
-+		    -command [list showfile $x $selfile]
- 	}
-     } elseif {$numgroups > 1} {
- 	if {$numgroups > 2} {
-@@ -1163,7 +1163,7 @@
- 		lappend x [lindex $dirs $i]
- 	    }
- 	    $diffbut add command -label "$numgroups-way diff" \
--		-command "diffn {$x} {$selfile}"
-+		-command [list diffn $x $selfile]
- 	}
- 	for {set gn 1} {$gn < $numgroups} {incr gn} {
- 	    set yi [lindex $groupelts($gn) 0]
-@@ -1184,7 +1184,7 @@
- 		set xi [lindex $groupelts($go) 0]
- 		if {$xi == ""} continue
- 		set x [lindex $dirs $xi]
--		set cmd "diff2 \"$x\" \"$y\" \"$selfile\""
-+		set cmd [list diff2 $x $y $selfile]
- 		if {$numgroups <= 3} {
- 		    if {$compound_ok} {
- 			$diffbut add command -label "$x vs. $y" \
-@@ -1283,7 +1283,7 @@
-                 set cl2 [lindex $bgcolors($ng) $age]
-                 if {$im2 == "ex"} {set im2 ""}
- 		set y [lindex $dirs $dst]
--		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0"
-+		set cmd [list copyselfile $src $dst $selfile 0]
- 		if {$any == 1} {
- 		    if {$compound_ok} {
- 			$copybut add command -label "$x -> $y" \
-@@ -1346,7 +1346,7 @@
-                 set im2 [lindex $agecolors($ng) $age]
-                 set cl2 [lindex $bgcolors($ng) $age]
- 		set y [lindex $dirs $dst]
--		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1"
-+		set cmd [list copyselfile $src $dst $selfile 1]
- 		if {$any == 1} {
- 		    if {$compound_ok} {
- 			$copybut add command -label "$x -> $y" \
-@@ -1392,10 +1392,10 @@
-                 if {$compound_ok} {
- 		    $copybut add command -label "Remove from $x" \
-                         -image ex -compound left \
--			-command "removeselfile \"$dst\" \"$selfile\""
-+			-command [list removeselfile $dst $selfile]
-                 } else {
- 		    $copybut add command -label "Remove from $x" \
--			-command "removeselfile \"$dst\" \"$selfile\""
-+			-command [list removeselfile $dst $selfile]
-                 }
- 	    }
- 	}
-@@ -1415,7 +1415,7 @@
- 		if {$dirreadonly($d)} continue
- 		set y [lindex $dirs $d]
- 		$copybut add command -label "$x -> $y" \
--			-command "copyselfile \"$s\" \"$d\" \"$selfile\" 0"
-+			-command [list copyselfile $s $d $selfile 0]
- 	    }
- 	}
- 	set needsep 1
-@@ -1429,10 +1429,10 @@
-             if {$compound_ok} {
- 	        $copybut add command -label "Remove from $x" \
-                     -image ex -compound left \
--		    -command "removeselfile \"$s\" \"$selfile\""
-+		    -command [list removeselfile $s $selfile]
-             } else {
- 	        $copybut add command -label "Remove from $x" \
--		    -command "removeselfile \"$s\" \"$selfile\""
-+		    -command [list removeselfile $s $selfile]
-             }
- 	}
-     }
-@@ -1469,7 +1469,7 @@
- 
-     # Show the file in an external viewer
-     if { [llength $showprogram] > 0} {
--       eval "exec $showprogram \"$fn\" &"
-+       exec $showprogram $fn &
-        return
-     }
-     # Or make our own viewer
-@@ -1569,7 +1569,7 @@
-     set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag"
- 
-     if { [llength $diffprogram] > 0} {
--       eval "exec $diffprogram \"$path1\" \"$path2\" &"
-+       exec $diffprogram $path1 $path2 &
-        return
-     }
-     # If we used an external diff program, its options are used.  If we didn't,
-@@ -1750,7 +1750,7 @@
- 	    if {$gx == $g && !$dirreadonly($k)} {
- 		set f [lindex $dirs $k]
- 		$mergebut.m add command -label "update $f" \
--		    -command "diffmerge $i \"$f\""
-+		    -command [list diffmerge $i $f]
- 		set path [joinname $f $difffile]
- 		set diffmtime($path) [file mtime $path]
- 	    }
-@@ -1770,7 +1770,7 @@
- 	    if {$gx == $g && !$dirreadonly($k)} {
- 		set f [lindex $dirs $k]
- 		$mpatchbut.m add command -label "for $f" \
--		    -command "diffmpatch $i \"$f\""
-+		    -command [list diffmpatch $i $f]
- 	    }
- 	    incr k
- 	}
-@@ -3424,7 +3424,7 @@
-     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
-     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
-     $w.bar.edit.m add command -label Find \
--	    -command "difffind :merge:$di:$fi $w.t"
-+	    -command [list difffind :merge:$di:$fi $w.t]
-     pack $w.bar.edit -side left
-     frame $w.f -relief sunk -border 2
-     entry $w.f.filename
-@@ -3533,7 +3533,7 @@
-     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
-     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
-     $w.bar.edit.m add command -label Find \
--	    -command "difffind :mpatch:$fi $w.t"
-+	    -command [list difffind :mpatch:$fi $w.t]
-     pack $w.bar.edit -side left
-     frame $w.f -relief sunk -border 2
-     entry $w.f.filename
-@@ -3993,7 +3993,7 @@
-        $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
-        $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
-        $w.bar.edit.m add command -label Find \
--	    -command "difffind :patch:$patchnum $w.t"
-+	    -command [list difffind :patch:$patchnum $w.t]
-        pack $w.bar.edit -side left
-        frame $w.f -relief sunk -border 2
-        label $w.f.l -text "Filename: "
-@@ -4032,23 +4032,23 @@
- 	set p1 [joinname $d1 $f]
- 	set p2 [joinname $d2 $f]
- 	if {[file exists $p1] && [file exists $p2]} {
--	    set fh [open "|diff $contextopt $p1 $p2" r]
-+	    set fh [open [list |diff $contextopt $p1 $p2] r]
- 	} elseif {[file exists $p1] && ! [file exists $p2]} {
--	    set fh [open "|diff $contextopt $p1 $nullfile" r]
-+	    set fh [open [list |diff $contextopt $p1 $nullfile] r]
- 	} elseif {! [file exists $p1] && [file exists $p2]} {
--	    set fh [open "|diff $contextopt $nullfile $p2" r]
-+	    set fh [open [list |diff $contextopt $nullfile $p2] r]
- 	} else {
-             continue
- 	}
- 	fconfigure $fh -blocking 0
--	fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\""
-+	fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f]
- 	return
-     }
-     if {[string match ".*" $w]} {
-        $w.t delete "end - 1c" end
-     } else {
-         close $w
--        eval "exec $showprogram \"$patch_outfile\" &"
-+        exec $showprogram $patch_outfile &
-         # Should we remove the tempfile here?  We don't have it if we used 
-         # the internal viewer
-     }
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-include.patch b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
deleted file mode 100644
index acaed3cf8026..000000000000
--- a/dev-util/dirdiff/files/dirdiff-2.1-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/filecmp.c	2005-04-19 12:22:01.000000000 +0200
-+++ b/filecmp.c	2010-12-30 20:23:24.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <ctype.h>
- #include <tcl.h>
- #include <sys/fcntl.h>
-+#include <unistd.h> /* close() read() */
- 
- #define BSIZE		32768
- #define MAXTAGLEN	512	/* max tag length for sanity, < BSIZE */
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
deleted file mode 100644
index 39d930a51724..000000000000
--- a/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- filecmp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filecmp.c b/filecmp.c
-index 673c1a8..fd4c6e5 100644
---- a/filecmp.c
-+++ b/filecmp.c
-@@ -341,7 +341,7 @@ FileCmpCmd(clientData, interp, argc, argv)
-     if (n1 < 0 || n2 < 0)
- 	return TCL_ERROR;
- 
--    sprintf(interp->result, "%d", same);
-+    sprintf(Tcl_GetStringResult(interp), "%d", same);
-     return TCL_OK;
- }
- 
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
deleted file mode 100644
index b8db24509eaa..000000000000
--- a/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- dirdiff | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dirdiff b/dirdiff
-index c5522b6..f470348 100755
---- a/dirdiff
-+++ b/dirdiff
-@@ -37,7 +37,7 @@ set nxdirmode 0
- set docvsignore 0
- 
- set defaultcvsignore {
--    RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS
-+    RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn .git tags TAGS
-     .make.state .nse_depinfo *~ \#* .\#* ,* _$* *$
-     *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb
-     *.o *.obj *.so *.exe *.Z *.elc *.ln core
diff --git a/dev-util/dirdiff/metadata.xml b/dev-util/dirdiff/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/dirdiff/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/dev-util/dissembler-0.9-r1 b/dev-util/dissembler-0.9-r1
new file mode 100644
index 000000000000..4a2e70f37e26
--- /dev/null
+++ b/dev-util/dissembler-0.9-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=polymorphs bytecode to a printable ASCII string
+EAPI=6
+HOMEPAGE=http://www.securiteam.com/tools/5MP0L2KFPA.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://repo.palkeo.com/repositories/mirror7.meh.or.id/Tools/OTHER_TOOLS/ShellCode/dissembler_0.9.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ca4137327bf77994da13e8c8d4c45aea
diff --git a/dev-util/dissembler/Manifest b/dev-util/dissembler/Manifest
deleted file mode 100644
index da665bfe7601..000000000000
--- a/dev-util/dissembler/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dissembler-0.9-build.patch 392 BLAKE2B 18acff634f9fbe535945f031ea80b0f66aad151c07a9dbb3c1c4a9131f68efb483222851f36644d0cc0424472575353a01c5b26f9a0a922dbe1f393f8c014ebb SHA512 a0d66735d918d6e24b5c69b58d80bc16bf27ecbb5b05b3624903438f74761e43366c0f0b3a963354ef6284c6f77ec8442d07c3e792614b7e47b0e6000c0c2523
-DIST dissembler_0.9.tgz 4479 BLAKE2B f8d964bb092b6e986e13323e3c747d82f3326c1923475fe880f3ed45ee3bda405d314433b5827b6a5d5964589249f96ddaa6bf906dc9bef4faec501e581fae01 SHA512 b6c7e4f42bb41be4320afd5d83abf6a0f1bbb58927931348e8a4ed9ee40ab756baa383ba4a405be5475ab669e5a38947422a4f6a0db16851eb8e6eb9f71f1332
-EBUILD dissembler-0.9-r1.ebuild 600 BLAKE2B 5644f3fc75cc66fd9b5595c497904295d4e41acf332ca8c1d75b87f1330617cb8fcf88889600ed816f6ab9f746e651585b6040af81331440e8fef3905dc3f533 SHA512 528ff09f77da4647d744ab7ce906abdc3758c6e887acea44b322937391ab9d66e0af6678585fcf6e23ae28d61e39a374ad758038c19dc868ff02e4092db64b91
-MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/dissembler/dissembler-0.9-r1.ebuild b/dev-util/dissembler/dissembler-0.9-r1.ebuild
deleted file mode 100644
index 0635a8c2aace..000000000000
--- a/dev-util/dissembler/dissembler-0.9-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${PN}_${PV}
-DESCRIPTION="polymorphs bytecode to a printable ASCII string"
-HOMEPAGE="http://www.securiteam.com/tools/5MP0L2KFPA.html"
-SRC_URI="https://repo.palkeo.com/repositories/mirror7.meh.or.id/Tools/OTHER_TOOLS/ShellCode/${MY_P}.tgz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ${PN}.txt
-}
diff --git a/dev-util/dissembler/files/dissembler-0.9-build.patch b/dev-util/dissembler/files/dissembler-0.9-build.patch
deleted file mode 100644
index 0271d6243452..000000000000
--- a/dev-util/dissembler/files/dissembler-0.9-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/dissembler.c
-+++ b/dissembler.c
-@@ -16,6 +16,9 @@
- 
-          /*   FOR EDUCATIONAL PURPOSES ONLY  */
-
-+#define _GNU_SOURCE 
-+#include <string.h>
-+#include <unistd.h>
- #include <stdio.h>
- #include <sys/stat.h>
- #include <ctype.h>
-@@ -217,7 +217,7 @@ freedom:
- 			fprintf(fh, "P");
- 	}
- 	fprintf(fh,"\n");
--	if(fh != stdout) close(fh);
-+	if(fh != stdout) fclose(fh);
- 	free(mem-21);
- }
- 
diff --git a/dev-util/dissembler/metadata.xml b/dev-util/dissembler/metadata.xml
deleted file mode 100644
index b4a27e94fc24..000000000000
--- a/dev-util/dissembler/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/distro-info-0.14 b/dev-util/distro-info-0.14
new file mode 100644
index 000000000000..22e8affe8b36
--- /dev/null
+++ b/dev-util/distro-info-0.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:= python? ( 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(-)] ) python? ( 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(-)] ) test? ( dev-util/shunit2 dev-python/pylint[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=Provides information about the Debian distributions' releases
+EAPI=6
+HOMEPAGE=https://debian.org
+IUSE=python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=ISC
+RDEPEND=dev-lang/perl:= python? ( 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-util/distro-info-data
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.14.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=657cffec634aab988d2444d0813548ac
diff --git a/dev-util/distro-info-data-0.29 b/dev-util/distro-info-data-0.29
new file mode 100644
index 000000000000..e73975b01c7b
--- /dev/null
+++ b/dev-util/distro-info-data-0.29
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Information about the Debian distributions' releases (data files)
+EAPI=6
+HOMEPAGE=https://debian.org/
+KEYWORDS=amd64 x86
+LICENSE=ISC
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/distro-info-data/distro-info-data_0.29.tar.xz
+_md5_=8099c684604959342f1d74e48eedf652
diff --git a/dev-util/distro-info-data-0.32 b/dev-util/distro-info-data-0.32
new file mode 100644
index 000000000000..44d8139cb667
--- /dev/null
+++ b/dev-util/distro-info-data-0.32
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Information about the Debian distributions' releases (data files)
+EAPI=6
+HOMEPAGE=https://debian.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/distro-info-data/distro-info-data_0.32.tar.xz
+_md5_=99f2cc7c524f3b117d0645051f1f9c66
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
deleted file mode 100644
index a0b030453386..000000000000
--- a/dev-util/distro-info-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST distro-info-data_0.29.tar.xz 6004 BLAKE2B 5b59d444fac259634c9ca7349a8b93c7167fe839971d4761bf133ae8adbd866a41c14af79ee2f149259da8b8ee5e193a2b1b09165b6ad29cafea31c968470e4f SHA512 1c06ce8e0fef12a499623a0c48147c9e99352946c9bdc89a810b413179cff0df43bcd87f839dc200277f3ef8498a34077987121093390551bcf2eb1822da9f2f
-DIST distro-info-data_0.32.tar.xz 6216 BLAKE2B 627a4ada570fbf01bfd18386a7dc9c83280667674a5c52c363222167f32dcde725649c9eecf979d58c7eb155458b41a8ac77e4d7eb0c908975886e5e95f75d8c SHA512 3bbf79104c4b20d7ee02a83c4ea7852c65e7c7b2870d1f237df67d985fd2d52ea75292d80c5fc10af7ea69c89145f2e52670663b759f74a159e0f8c51ef545fd
-EBUILD distro-info-data-0.29.ebuild 429 BLAKE2B 4db3f1370a5e2b3f81a36f9f971d3ef0b3f8f63caa731e06d76321655ce28345cb087761b700c039fc4ae86fc683982dfd39e7c7ea341ba2cd3272b635a94e3e SHA512 afcfea1a2a5bfdf74dc35205a191a3bc634223083243a56cbb3857132dd93aefa4d35e4ba8a5d641f3448dae18bef4262d8c71a721cee8bcc155458ed8db5793
-EBUILD distro-info-data-0.32.ebuild 453 BLAKE2B 0b6cf9f11a85750901eb7258fd07a444092e6e440f3002a91b916eff73c5450c5af33b4d095dc60cb402478f4d7ca3c47ebe458e9bdd08c72b1f8f0096316302 SHA512 385aedcdaeab786b4ecb1532aff7624d94566b434e88e86401453c14264e7f0f3a316acf82af958b5bbf1cbc81d8fc2350a290375fede3863f4af8a8d51dd867
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info-data/distro-info-data-0.29.ebuild b/dev-util/distro-info-data/distro-info-data-0.29.ebuild
deleted file mode 100644
index b47f4ef5ba60..000000000000
--- a/dev-util/distro-info-data/distro-info-data-0.29.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Information about the Debian distributions' releases (data files)"
-HOMEPAGE="https://debian.org/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-# Package provides only csv data and test script
-# written in python
-RESTRICT="test"
diff --git a/dev-util/distro-info-data/distro-info-data-0.32.ebuild b/dev-util/distro-info-data/distro-info-data-0.32.ebuild
deleted file mode 100644
index 81be8e5f7e20..000000000000
--- a/dev-util/distro-info-data/distro-info-data-0.32.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Information about the Debian distributions' releases (data files)"
-HOMEPAGE="https://debian.org/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Package provides only csv data and test script
-# written in python
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-util/distro-info-data/metadata.xml b/dev-util/distro-info-data/metadata.xml
deleted file mode 100644
index 425c7b2eae49..000000000000
--- a/dev-util/distro-info-data/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>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
deleted file mode 100644
index 755803e4909f..000000000000
--- a/dev-util/distro-info/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
-EBUILD distro-info-0.14.ebuild 1920 BLAKE2B adec92fe296311cfc572751e60c13df5cd32fdbf63b81a6e5c1acf474cc9e3777cb235155c80ce4ccb744e23cb8dc0fd9190a4dae76eddca29c37197394c2811 SHA512 4c75ee6a854e6c8afc78a27fdef03799ff5c0a1c66c0f92cc058a04e00c950eb49b94f320309417a8b56bbc2143171a5a2235e45457f5abaa71e73778495addb
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
deleted file mode 100644
index 3f9afb1fe1d4..000000000000
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ /dev/null
@@ -1,93 +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} )
-DISTUTILS_OPTIONAL=true
-
-inherit distutils-r1
-
-DESCRIPTION="Provides information about the Debian distributions' releases"
-HOMEPAGE="https://debian.org"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="dev-lang/perl:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	test? (
-		dev-util/shunit2
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-util/distro-info-data"
-
-src_prepare() {
-	default
-
-	# 1. Gentoo do not provides dpkg vendor information
-	# 2. Strip *FLAGS
-	# 3. Strip predefined CFLAGS
-	# 4. Point to correct perl's vendorlib
-	# 5. Remove python tests - python eclass will be used instead
-	sed -e "/cd python && python/d" \
-		-e "/VENDOR/d" \
-		-e "/dpkg-buildflags/d" \
-		-e "s/-g -O2//g" \
-		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
-		-e "/pyversions/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_configure() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";') \
-		DESTDIR="${D}" install
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	TZ=UTC default
-
-	if use python; then
-		python_test() {
-			esetup.py test
-		}
-
-		pushd ./python > /dev/null || die
-		distutils-r1_src_test
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-util/distro-info/metadata.xml b/dev-util/distro-info/metadata.xml
deleted file mode 100644
index 425c7b2eae49..000000000000
--- a/dev-util/distro-info/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>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/dmake-4.12.2 b/dev-util/dmake-4.12.2
new file mode 100644
index 000000000000..f7a7679159c7
--- /dev/null
+++ b/dev-util/dmake-4.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip sys-apps/groff
+DESCRIPTION=Improved make
+EAPI=4
+HOMEPAGE=https://github.com/mohawk2/dmake
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-1
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.2.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_=2d7f86946489c25a6ce030d0b7bdd10b
diff --git a/dev-util/dmake/Manifest b/dev-util/dmake/Manifest
deleted file mode 100644
index 6e6293d1c19b..000000000000
--- a/dev-util/dmake/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dmake-4.12.2.tar.bz2 461738 BLAKE2B 2a80f5a566f9981d61472717f1df8dcb9634975356c2ca0d4d7053ea32e74f57e5daccd11c41b81bddc7994e57e2b001fc9610800f6d949146a23b1b065b9b16 SHA512 f09453205bd425882d933a7b2cf879d69d795765bb7586e1e35ca5c9e39444cb70cfe56ed9b350f12fae8d484670b4ae418bb5d2da7c0c2ff229d9165caff45b
-EBUILD dmake-4.12.2.ebuild 718 BLAKE2B fbadcd601b72ba1d5d4f51c258d2f598a8d164e246f6f3554f42063b84efd88b484bc32df86f7ff8492319cd64347fae67f783c70370c8f462f8a820ec8cfc71 SHA512 9c66facdb6c01941c1938c286c47bdc30ec0cc378fc8050ad917ee45953add53a89c3bcf7213f1f71d6fbffbaaae86f4878a8b0989ea5d0e78b8422781a9a0d2
-MISC metadata.xml 344 BLAKE2B f2c92c79559dbac781b2df55e670968f5c04e6b56977169aab0b2fd4293b5b3f2366d5a4260f6d374af3082edbcbce7cde7869b1b9a1ac4a872c0a9f0f511a6e SHA512 2870dddb5cf78fa4147f6b670fafd687a04cb77808bd78707c21f3e4d863d8ddfb99f36ccaa8f0b58595be9175100a1736d7ceed26c61001d9b17a1752151a9f
diff --git a/dev-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
deleted file mode 100644
index 9029df2aefed..000000000000
--- a/dev-util/dmake/dmake-4.12.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Improved make"
-HOMEPAGE="https://github.com/mohawk2/dmake"
-SRC_URI="http://${PN}.apache-extras.org.codespot.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-# test failure, reported upstream at
-# https://code.google.com/a/apache-extras.org/p/dmake/issues/detail?id=1
-RESTRICT="test"
-
-DEPEND="
-	app-arch/unzip
-	sys-apps/groff
-"
-RDEPEND=""
-
-src_prepare() {
-	# make tests executable, bug #404989
-	chmod +x tests/targets-{1..12} || die
-}
-
-src_install () {
-	default
-	newman man/dmake.tf dmake.1
-}
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
deleted file mode 100644
index 03752c4d0dab..000000000000
--- a/dev-util/dmake/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>chithanh@gentoo.org</email>
-		<name>Chí-Thanh Christopher Nguyễn</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mohawk2/dmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/docker-distribution-pruner-0_p20170401 b/dev-util/docker-distribution-pruner-0_p20170401
new file mode 100644
index 000000000000..954513107b1a
--- /dev/null
+++ b/dev-util/docker-distribution-pruner-0_p20170401
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Clean all old container revisions from registry
+EAPI=6
+HOMEPAGE=https://gitlab.com/gitlab-org/docker-distribution-pruner
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/docker-distribution-pruner/repository/archive.tar.gz?ref=207b308c12b1717c6e3d2adf5e1ffe504c64f56e -> docker-distribution-pruner-0_p20170401.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=2a895d4f21b0cebebaa800efdc2ffffb
diff --git a/dev-util/docker-distribution-pruner/Manifest b/dev-util/docker-distribution-pruner/Manifest
deleted file mode 100644
index c16471d8bcd2..000000000000
--- a/dev-util/docker-distribution-pruner/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST docker-distribution-pruner-0_p20170401.tar.gz 6245783 BLAKE2B 7fd29631ff4072a4ef7a9486d8dd9f4b17a2238f94c93e670e7b7af4ba93c8a6577e9ce9f2d248d5d16fb7279f4517317e2c63413424250f14f01d4c47628f5b SHA512 8e2bf3c9be37f7b16299e1e7219d646e2b037ff40ba244bb2262905ab9864b212d7f96d844a096b057c6111440d66236f8ed5eb4a61e95f7a81bac3516f65cdd
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-EBUILD docker-distribution-pruner-0_p20170401.ebuild 870 BLAKE2B 665caae201de3e9badd85854df24e0b64f195bc8be2f00e7f7ea096c9274a8c1ed265729b9120844c2456da1c2370ba6f03d3b91fa246c4a4176696e6392f14b SHA512 238ed42112227b6b6429bacc4b4c09978c4dba8f495b137551d5a6244f7c4cda8e0ac8c64b002c02ab012b3c1889caffef4da5286144876b519d7d9290997a01
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
diff --git a/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild b/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
deleted file mode 100644
index 3eafca49e433..000000000000
--- a/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="gitlab.com/gitlab-org/${PN}/..."
-EGIT_COMMIT="207b308c12b1717c6e3d2adf5e1ffe504c64f56e"
-
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml" )
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN%/*}/repository/archive.tar.gz?ref=${EGIT_COMMIT} -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Clean all old container revisions from registry"
-HOMEPAGE="https://gitlab.com/gitlab-org/docker-distribution-pruner"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}" go install gitlab.com/gitlab-org/docker-distribution-pruner || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/${PN}
-}
diff --git a/dev-util/docker-distribution-pruner/metadata.xml b/dev-util/docker-distribution-pruner/metadata.xml
deleted file mode 100644
index b372191c798e..000000000000
--- a/dev-util/docker-distribution-pruner/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/dev-util/docker-ls-0.3.1 b/dev-util/docker-ls-0.3.1
new file mode 100644
index 000000000000..476710b202db
--- /dev/null
+++ b/dev-util/docker-ls-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Tools for browsing and manipulating docker registries
+EAPI=6
+HOMEPAGE=https://github.com/mayflower/docker-ls
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mayflower/docker-ls/archive/d80310976c9707e261e57ebfa9acf4e0b1781460.tar.gz -> docker-ls-0.3.1.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=671a36e6006836a439f5e1eb879a8d7b
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
deleted file mode 100644
index f9ab1b2a4796..000000000000
--- a/dev-util/docker-ls/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
-EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
-MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
diff --git a/dev-util/docker-ls/docker-ls-0.3.1.ebuild b/dev-util/docker-ls/docker-ls-0.3.1.ebuild
deleted file mode 100644
index 554c4d8b4715..000000000000
--- a/dev-util/docker-ls/docker-ls-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mayflower/${PN}"
-EGIT_COMMIT="d80310976c9707e261e57ebfa9acf4e0b1781460"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tools for browsing and manipulating docker registries"
-HOMEPAGE="https://github.com/mayflower/docker-ls"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/\"git\", \"rev-parse\", \"--short\", \"HEAD\"/\"echo\", \"${EGIT_COMMIT:0:7}\"/"\
-	src/${EGO_PN}/generators/version.go || die
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}" go generate ${EGO_PN}/lib/... || die
-	GOPATH="${WORKDIR}/${P}" go install ${EGO_PN}/cli/... || die
-	popd || die
-	bin/${PN} autocomplete bash > ${PN}.bash || die
-	bin/${PN} autocomplete zsh > ${PN}.zsh || die
-	bin/docker-rm autocomplete bash > docker-rm.bash || die
-	bin/docker-rm autocomplete zsh > docker-rm.zsh || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/{README,CHANGELOG}.md
-	newbashcomp ${PN}.bash ${PN}
-	newbashcomp docker-rm.bash docker-rm
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-	newins docker-rm.zsh _docker-rm
-}
diff --git a/dev-util/docker-ls/metadata.xml b/dev-util/docker-ls/metadata.xml
deleted file mode 100644
index 06d6a6e291cb..000000000000
--- a/dev-util/docker-ls/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-needed -->
-	<upstream>
-		<remote-id type="github">golang/crypto</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/dogtail-0.9.10 b/dev-util/dogtail-0.9.10
new file mode 100644
index 000000000000..ebe69f3a87e5
--- /dev/null
+++ b/dev-util/dogtail-0.9.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=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(-)] >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI test tool and automation framework using accessibility framework
+EAPI=6
+HOMEPAGE=https://gitlab.com/dogtail/dogtail/commits/master
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[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/pycairo[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/pygobject: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(-)] dev-python/pillow[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(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/libwnck:3[introspection] x11-base/xorg-server[xvfb] x11-apps/xinit 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://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	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	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=18d98487985bbcb7e4ef4e0050d0f86e
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
deleted file mode 100644
index 6a5f6c67dfc1..000000000000
--- a/dev-util/dogtail/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
-DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-EBUILD dogtail-0.9.10.ebuild 1474 BLAKE2B 1b4b6f087b7cbaac0b14591414d153adc330f846f281f8cc27adf332b0cf1bceac8bba4adfd10cf8897a4c48f47523a70c2f7d9a913dd5cdd3bb03a3b787740c SHA512 63a411d3a2566fc8a8760c5fdce6f6fdcaf3b6df52bdb729ba9bf99c87d034af55f095b0afdae4842de7b9760174080c9fe55a1805feccc12dd8b6180ff20555
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
deleted file mode 100644
index 935b8334b61f..000000000000
--- a/dev-util/dogtail/dogtail-0.9.10.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=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 gnome2-utils xdg
-
-DESCRIPTION="GUI test tool and automation framework using accessibility framework"
-HOMEPAGE="https://gitlab.com/dogtail/dogtail/commits/master"
-SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-base/xorg-server[xvfb]
-	x11-apps/xinit
-"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# Install docs in one place
-	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
-
-	# Upstream loads resources relative to __file__, which doesn't work with
-	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
-	eapply "${FILESDIR}"/${PN}-0.9.10-gentoo-paths.patch
-	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
-
-	xdg_src_prepare
-	distutils-r1_src_prepare
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/dogtail/files/dogtail-0.9.10-gentoo-paths.patch b/dev-util/dogtail/files/dogtail-0.9.10-gentoo-paths.patch
deleted file mode 100644
index 89d2be2c725a..000000000000
--- a/dev-util/dogtail/files/dogtail-0.9.10-gentoo-paths.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d0dd6c6adb4edcd5147c42af14cd1016a67e84bd Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 12 Aug 2017 00:59:44 +0200
-Subject: [PATCH] Load resources from well-known location
-
-Using __file__ does not work with Gentoo's dev-python/python-exec
-wrapping. Better use hard-coded paths.
-
-Also adds support for prefix.
----
- sniff/sniff | 29 +++++++++--------------------
- 1 file changed, 9 insertions(+), 20 deletions(-)
-
-diff --git a/sniff/sniff b/sniff/sniff
-index 7ce67c7..84f7022 100755
---- a/sniff/sniff
-+++ b/sniff/sniff
-@@ -47,25 +47,18 @@ class SniffApp(object):
-         if os.path.exists('sniff.ui'):
-             self.builder.add_from_file('sniff.ui')
-         else:
--            import os
--            path = os.path.abspath(
--                os.path.join(__file__, os.path.pardir, os.path.pardir))
--            if path == '/':  # in case the path is /bin/sniff
--                path = '/usr'
--            self.builder.add_from_file(path + '/share/dogtail/glade/sniff.ui')
-+            self.builder.add_from_file(os.path.join(
-+                @EPREFIX_USR@,
-+                'share/dogtail/glade/sniff.ui')
-+            )
-         self.app = self.builder.get_object(self.appName)
-         try:
-             self.app.set_icon_from_file('../icons/dogtail-head.svg')
-         except Exception:
--            import os
--            path = os.path.abspath(
--                os.path.join(__file__, os.path.pardir, os.path.pardir))
--            if path is '/':
--                path = '/usr'
--            try:
--                self.app.set_icon_from_file(os.path.join(path, 'share/icons/hicolor/scalable/apps/dogtail-head.svg'))
--            except Exception: # fallback for wierd installations, when sniff is neither in /bin or /usr/bin
--                self.app.set_icon_from_file('/usr/share/icons/hicolor/scalable/apps/dogtail-head.svg')
-+            self.app.set_icon_from_file(os.path.join(
-+                @EPREFIX_USR@,
-+                'share/icons/hicolor/scalable/apps/dogtail-head.svg')
-+            )
-         self.setUpWidgets()
-         self.connectSignals()
-         self.app.show_all()
-@@ -656,11 +649,7 @@ def loadIcon(iconName):
-         pixbuf = GdkPixbuf.Pixbuf.new_from_file('icons/' + iconName)
-     except GObject.GError:
-         import os
--        path = os.path.abspath(
--            os.path.join(__file__, os.path.pardir, os.path.pardir))
--        if path == '/':
--                path = '/usr'
--        iconName = os.path.join(path, 'share/dogtail/icons/', iconName)
-+        iconName = os.path.join(@EPREFIX_USR@, 'share/dogtail/icons/', iconName)
-         pixbuf = GdkPixbuf.Pixbuf.new_from_file(iconName)
-     return pixbuf
- 
--- 
-2.14.0
-
diff --git a/dev-util/dogtail/metadata.xml b/dev-util/dogtail/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/dev-util/dogtail/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>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/doxy-coverage-151229 b/dev-util/doxy-coverage-151229
new file mode 100644
index 000000000000..c864c11155ca
--- /dev/null
+++ b/dev-util/doxy-coverage-151229
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Source Code Documentation Coverage Measurement
+EAPI=6
+HOMEPAGE=https://github.com/alobbs/doxy-coverage
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=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/alobbs/doxy-coverage/archive/29a0bbf43bfecb6872cdca0e4a11733954d25196.tar.gz -> doxy-coverage-151229.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=642e6771e5ea38823ddafe589f3cc282
diff --git a/dev-util/doxy-coverage/Manifest b/dev-util/doxy-coverage/Manifest
deleted file mode 100644
index 45c9b1d25704..000000000000
--- a/dev-util/doxy-coverage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doxy-coverage-151229.tar.gz 3633 BLAKE2B 02e99a841294ec9acdef1a85948d39bd1c8c5a39cc66e1ed48734ba3fd57a5bb027b4b44675d1bafc0cb42777ddd94f17cf99b8c8cc86c61f23c331653e43b53 SHA512 897c36adb6551ad177429d771b6eb7871a8b024d3cb5915d412b13f92cf8e52b87ba3237093345d51fa5dfbf80a800ab69907518b1a5570d1f056a2de43353fe
-EBUILD doxy-coverage-151229.ebuild 614 BLAKE2B 69daead4e93cb9d89a8ed382e9bc670dd603ef8f2a229cde1a301c871ab6486d00688be405f5697286ebb4f1dffa0e37df4df3578f5be22eacb6f297ef7d3b9a SHA512 c50c945b8b629374db86798cb4b3478c7853e2d76f77b623327aa06a67a99560a84a8c335b97e1ba0bc0f84cf34aaef22eddae39dcf3c7c50b67f83a35e8de08
-MISC metadata.xml 405 BLAKE2B 90494442a57563acf15505d646a7311b568980bfeb0f02a09d079e0be2f83d2e0d04331a3f18c38db6e06f3f89ce8256f586af9497431a3e57e7c2c2e517e8ee SHA512 770c698b430f7c7bd93f0dcdbcdb21128da96680825c72e00e7607e8b68e4d159e63bb3f752e168b94041e1e1257bbacaeef11ce0161ad7c1803b211e1ed1580
diff --git a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
deleted file mode 100644
index 7852bde09cfb..000000000000
--- a/dev-util/doxy-coverage/doxy-coverage-151229.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 vcs-snapshot
-
-COMMIT="29a0bbf43bfecb6872cdca0e4a11733954d25196"
-DESCRIPTION="Source Code Documentation Coverage Measurement"
-HOMEPAGE="https://github.com/alobbs/doxy-coverage"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	default
-	python_foreach_impl python_newexe "${PN}"{.py,}
-}
diff --git a/dev-util/doxy-coverage/metadata.xml b/dev-util/doxy-coverage/metadata.xml
deleted file mode 100644
index 9e05095ffffb..000000000000
--- a/dev-util/doxy-coverage/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lobbs/doxy-coverage</remote-id>
-		<bugs-to>https://github.com/alobbs/doxy-coverage/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/dput-ng-1.10 b/dev-util/dput-ng-1.10
new file mode 100644
index 000000000000..ae9c1204c195
--- /dev/null
+++ b/dev-util/dput-ng-1.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/distro-info[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/asciidoc test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Next generation Debian package upload tool
+EAPI=6
+HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
+IUSE=test python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/distro-info[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.10.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69fae0cfd5cb975a30572f996549ff34
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
deleted file mode 100644
index df773f3f9183..000000000000
--- a/dev-util/dput-ng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
-EBUILD dput-ng-1.10.ebuild 1715 BLAKE2B faa98615ae8c62f3acd13b8240de04ddbc8640c87ba042bc3e9e9fed5e9a6a1243811993758b24d328ab7256b0bb968a208530cf17bc7ebc81a7f31721666da5 SHA512 77c5f94d12b1f7c61d214ef6630e8ea226fdf6cf6b1a0c94fd9b2c9d8205269881722ef85b3a00083e74d85fc9c9e5f9bf8c98c6dd1e3299ed9762f5e1050626
-MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.10.ebuild b/dev-util/dput-ng/dput-ng-1.10.ebuild
deleted file mode 100644
index 2192829fcc8c..000000000000
--- a/dev-util/dput-ng/dput-ng-1.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-debian[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-util/distro-info[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-debian[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN/-/}"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/"${PN}".bash-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dput-ng/metadata.xml b/dev-util/dput-ng/metadata.xml
deleted file mode 100644
index 425c7b2eae49..000000000000
--- a/dev-util/dput-ng/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>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/drone-0.7.3 b/dev-util/drone-0.7.3
new file mode 100644
index 000000000000..1cc1833c72fc
--- /dev/null
+++ b/dev-util/drone-0.7.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
+DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone/archive/f604d592bc356fcade4aec67eba9b7fba8eed655.tar.gz -> drone-0.7.3.tar.gz https://github.com/drone/drone-ui/archive/2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz -> github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a8b9c31b259bb01b1cc2cda281bfdf0d
diff --git a/dev-util/drone-0.8.5 b/dev-util/drone-0.8.5
new file mode 100644
index 000000000000..be99c18c3c62
--- /dev/null
+++ b/dev-util/drone-0.8.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
+DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone/archive/81103a98208b0bfc76be5b07194f359fbc80183b.tar.gz -> drone-0.8.5.tar.gz https://github.com/drone/drone-ui/archive/4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz -> github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/golang/net/archive/6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz -> github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c6c62a6e507f35a30b3d92ef3e64f171
diff --git a/dev-util/drone-cli-0.7.0_p20170717 b/dev-util/drone-cli-0.7.0_p20170717
new file mode 100644
index 000000000000..ab1161a06bf0
--- /dev/null
+++ b/dev-util/drone-cli-0.7.0_p20170717
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/4a5e8a2acb2c82c5a4e6b96b6849f59962dfb668.tar.gz -> drone-cli-0.7.0_p20170717.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=049e2d7b3a868a04cee607b5be8b11b8
diff --git a/dev-util/drone-cli-0.8.6 b/dev-util/drone-cli-0.8.6
new file mode 100644
index 000000000000..5f85792ea7ad
--- /dev/null
+++ b/dev-util/drone-cli-0.8.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.6.tar.gz -> drone-cli-0.8.6.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=2f650b5537815bcddd9d02a3a8279719
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
deleted file mode 100644
index 7d7263114d75..000000000000
--- a/dev-util/drone-cli/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
-EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
-MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild b/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild
deleted file mode 100644
index 9133bfec3093..000000000000
--- a/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="4a5e8a2acb2c82c5a4e6b96b6849f59962dfb668"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-0.8.6.ebuild b/dev-util/drone-cli/drone-cli-0.8.6.ebuild
deleted file mode 100644
index 8598f228df1d..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="800d6949bd96847b4d5c400e261b18386ea2226f"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/metadata.xml b/dev-util/drone-cli/metadata.xml
deleted file mode 100644
index 0795718a1cc2..000000000000
--- a/dev-util/drone-cli/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">drone/drone-cli</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
deleted file mode 100644
index f7b58a54ccb0..000000000000
--- a/dev-util/drone/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX drone-agent.confd 390 BLAKE2B 2d26f961515a3e2e33090b0d6e9fcb1435831df94fe9988b279fe02e02366590a24cf1ee85abc983eb74fce80731ba224153dd049b8507ee6c4ca7aee2644395 SHA512 98577854ac5c3a2b94d065acafe11efb17ac519c71768428b391d14054c875dab3c0153c944c58a52fcb28f96b30f7ea8b0736b2f9858c9e0f20f39b6909220e
-AUX drone-agent.initd 440 BLAKE2B 2ba0de82e2b952fcede927aa9d3f796ddc3d3268c6aeb16ba05661e721f6f8cb4900d8ea2655d44b195f7cf686e10830cb27b50000aa5ac1e7728218f48a332d SHA512 ad1571951a4d75e0a9e69da20958a70ef6558d2e15d4dc625d4004c28036643d1ec1756ccb4404860b385cb54ece2fd8d14b7a457d3696d8e7d3fbf0b1082a91
-AUX drone-server.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
-AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28517ed784fc0713e342f6684b13995a8f4404f51b7504f7515c8a652621f6884b9e0fe36ae6b9ed1269e SHA512 969a7a1947c791bb8788b1fa4d36df1ead66c1312c8f4188970178ef7cbca3b9a108bce955a012285330155be15eb270a1675aee7d317c2cff4cb4554d461a38
-AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
-AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
-DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a326f31c594917c5ba02122a4e061168344148c113a32e0d14791e59e95a71bb224cd04bef7d1586703fd77fd SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66
-DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
-DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
-DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
-DIST github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz 940111 BLAKE2B f1b2a50d9aa73a7aa8f20cff17247c0b555fc14d64bd75dd320d8df8166d7ed0b29bfa15021f5f8251e6c3a1909217bc6e4ba3208f2bb010789a9449ef3a2296 SHA512 24d4d72a1a502c1f4f9523d85dde6070a1a47ea72860a00eb64812acf27cadd22ca4422575b1a58b1b55e1997e8fe959b645d8810e2c128ab09c73f9e81c5f72
-DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
-EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f9048df6086853a062436a5a6463b24664ab556a9d3f3bb3297a0ae9c76d21895475e3c29e9257ce3543a17c70 SHA512 26edd24f0e66e13a3f397cac24b14c0ee0237ead70fa8204f7b2a76aa0495670a9783b7dddc7d363c778f2d973fb5bc6c75dcb61c8fc9359ee168a2d3356b0df
-EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
-MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.7.3.ebuild b/dev-util/drone/drone-0.7.3.ebuild
deleted file mode 100644
index e6bf0d86c01d..000000000000
--- a/dev-util/drone/drone-0.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="f604d592bc356fcade4aec67eba9b7fba8eed655"
-EGO_VENDOR=( "github.com/drone/drone-ui 2910d0ee662816a2463d31f0988b1ecccd0410b5" )
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"\
-		go install -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	newbin bin/drone drone-server
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone.initd drone
-	newconfd "${FILESDIR}"/drone.confd drone
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.5.ebuild b/dev-util/drone/drone-0.8.5.ebuild
deleted file mode 100644
index acf6c6eba84f..000000000000
--- a/dev-util/drone/drone-0.8.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=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="81103a98208b0bfc76be5b07194f359fbc80183b"
-EGO_VENDOR=( "github.com/drone/drone-ui 4d60e46e3938c277e90de404cc6236530beaab3d"
-	"github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
-	"golang.org/x/net 6078986fec03a1dcc236c34816c71b0e05018fda github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/files/drone-agent.confd b/dev-util/drone/files/drone-agent.confd
deleted file mode 100644
index bfe82b16c756..000000000000
--- a/dev-util/drone/files/drone-agent.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# arguments for drone-agent
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SERVER=
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_BACKOFF=15s
-#DRONE_TIMEOUT=15m
-#DRONE_MAX_LOGS=5
-#DRONE_PLUGIN_PULL=true
-#DRONE_PLUGIN_PRIVILEGED
-#DOCKER_HOST
-#DOCKER_TLS_VERIFY
-#DOCKER_CERT_PATH
-#DOCKER_MAX_PROCS=2
-#DOCKER_OS=linux
-#DOCKER_ARCH=amd64
-#HTTP_PROXY=
-#HTTPS_PROXY=
-#NO_PROXY=
diff --git a/dev-util/drone/files/drone-agent.initd b/dev-util/drone/files/drone-agent.initd
deleted file mode 100644
index d14b11f80d33..000000000000
--- a/dev-util/drone/files/drone-agent.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI Agent"
-pidfile=${pidfile:-"/run/drone/${SVCNAME}.pid"}
-user=${user:-drone}
-group=${group:-drone}
-
-command="/usr/bin/drone-agent"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/drone/${SVCNAME}.log \
-	--stderr /var/log/drone/${SVCNAME}.log"
diff --git a/dev-util/drone/files/drone-server.confd b/dev-util/drone/files/drone-server.confd
deleted file mode 100644
index 3d4fd461402d..000000000000
--- a/dev-util/drone/files/drone-server.confd
+++ /dev/null
@@ -1,47 +0,0 @@
-# arguments for drone
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_SERVER_CERT=
-#DRONE_SERVER_KEY=
-#DRONE_ADMIN=
-#DRONE_ORGS=
-#DRONE_OPEN=false
-#DRONE_YAML=.drone.yml
-#DRONE_CACHE_TTY=15m
-DRONE_DATABASE_DRIVER=sqlite3
-DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
-DRONE_GITHUB=true
-#DRONE_GITHUB_URL=https://github.com
-#DRONE_GITHUB_CLIENT=
-#DRONE_GITHUB_SECRET=
-#DRONE_GITHUB_SCOPE=
-#DRONE_GITHUB_GIT_USERNAME=
-#DRONE_GITHUB_GIT_PASSWORD=
-#DRONE_GITHUB_PRIVATE_MODE=false
-#DRONE_GITHUB_MERGE_REF=true
-#DRONE_GITHUB_CONTEXT=continuous-integration/drone
-#DRONE_GITHUB_SKIP_VERIFY=false
-#DRONE_GOGS=false
-#DRONE_GOGS_URL=
-#DRONE_GOGS_GIT_USERNAME=
-#DRONE_GOGS_GIT_PASSWORD=
-#DRONE_GOGS_PRIVATE_MODE=
-#DRONE_GOGS_SKIP_VERIFY=false
-#DRONE_BITBUCKET=false
-#DRONE_BITBUCKET_CLIENT=
-#DRONE_BITBUCKET_SECRET=
-#DRONE_STASH=false
-#DRONE_STASH_URL=
-#DRONE_STASH_CONSUMER_KEY=
-#DRONE_STASH_CONSUMER_RSA=
-#DRONE_STASH_GIT_USERNAME=
-#DRONE_STASH_GIT_PASSWORD=
-#DRONE_GITLAB=false
-#DRONE_GITLAB_URL=https://gitlab.com
-#DRONE_GITLAB_CLIENT=
-#DRONE_GITLAB_SECRET=
-#DRONE_GITLAB_GIT_USERNAME=
-#DRONE_GITLAB_GIT_PASSWORD=
-#DRONE_GITLAB_SKIP_VERIFY=false
-#DRONE_GITLAB_PRIVATE_MODE=false
diff --git a/dev-util/drone/files/drone-server.initd b/dev-util/drone/files/drone-server.initd
deleted file mode 100644
index fe87c713db9e..000000000000
--- a/dev-util/drone/files/drone-server.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-drone}
-group=${group:-drone}
-
-command="/usr/bin/drone-server"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
diff --git a/dev-util/drone/files/drone.confd b/dev-util/drone/files/drone.confd
deleted file mode 100644
index 3d4fd461402d..000000000000
--- a/dev-util/drone/files/drone.confd
+++ /dev/null
@@ -1,47 +0,0 @@
-# arguments for drone
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_SERVER_CERT=
-#DRONE_SERVER_KEY=
-#DRONE_ADMIN=
-#DRONE_ORGS=
-#DRONE_OPEN=false
-#DRONE_YAML=.drone.yml
-#DRONE_CACHE_TTY=15m
-DRONE_DATABASE_DRIVER=sqlite3
-DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
-DRONE_GITHUB=true
-#DRONE_GITHUB_URL=https://github.com
-#DRONE_GITHUB_CLIENT=
-#DRONE_GITHUB_SECRET=
-#DRONE_GITHUB_SCOPE=
-#DRONE_GITHUB_GIT_USERNAME=
-#DRONE_GITHUB_GIT_PASSWORD=
-#DRONE_GITHUB_PRIVATE_MODE=false
-#DRONE_GITHUB_MERGE_REF=true
-#DRONE_GITHUB_CONTEXT=continuous-integration/drone
-#DRONE_GITHUB_SKIP_VERIFY=false
-#DRONE_GOGS=false
-#DRONE_GOGS_URL=
-#DRONE_GOGS_GIT_USERNAME=
-#DRONE_GOGS_GIT_PASSWORD=
-#DRONE_GOGS_PRIVATE_MODE=
-#DRONE_GOGS_SKIP_VERIFY=false
-#DRONE_BITBUCKET=false
-#DRONE_BITBUCKET_CLIENT=
-#DRONE_BITBUCKET_SECRET=
-#DRONE_STASH=false
-#DRONE_STASH_URL=
-#DRONE_STASH_CONSUMER_KEY=
-#DRONE_STASH_CONSUMER_RSA=
-#DRONE_STASH_GIT_USERNAME=
-#DRONE_STASH_GIT_PASSWORD=
-#DRONE_GITLAB=false
-#DRONE_GITLAB_URL=https://gitlab.com
-#DRONE_GITLAB_CLIENT=
-#DRONE_GITLAB_SECRET=
-#DRONE_GITLAB_GIT_USERNAME=
-#DRONE_GITLAB_GIT_PASSWORD=
-#DRONE_GITLAB_SKIP_VERIFY=false
-#DRONE_GITLAB_PRIVATE_MODE=false
diff --git a/dev-util/drone/files/drone.initd b/dev-util/drone/files/drone.initd
deleted file mode 100644
index a7219c7d7612..000000000000
--- a/dev-util/drone/files/drone.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/drone-server server"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
diff --git a/dev-util/drone/metadata.xml b/dev-util/drone/metadata.xml
deleted file mode 100644
index 5a7b39bbcff9..000000000000
--- a/dev-util/drone/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">drone/drone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/dropwatch-1.4-r1 b/dev-util/dropwatch-1.4-r1
new file mode 100644
index 000000000000..f8fd8b0c7d93
--- /dev/null
+++ b/dev-util/dropwatch-1.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:= virtual/pkgconfig
+DESCRIPTION=A utility to interface to the kernel to monitor for dropped network packets
+EAPI=5
+HOMEPAGE=https://fedorahosted.org/dropwatch/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:=
+SLOT=0
+SRC_URI=https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-1.4.tbz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7710b057f84563a344fb1e3528a999ac
diff --git a/dev-util/dropwatch-1.4_p20150706 b/dev-util/dropwatch-1.4_p20150706
new file mode 100644
index 000000000000..d176e5bfa9e9
--- /dev/null
+++ b/dev-util/dropwatch-1.4_p20150706
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=dev-libs/libnl:3 sys-libs/binutils-libs:= sys-libs/readline:= virtual/pkgconfig
+DESCRIPTION=A utility to interface to the kernel to monitor for dropped network packets
+EAPI=6
+HOMEPAGE=https://fedorahosted.org/dropwatch/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs:= sys-libs/readline:=
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/dropwatch-1.4_p20150706.tar.xz
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=214846a1889f7a7012fc43bd47accbdd
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
deleted file mode 100644
index 775ecd77226e..000000000000
--- a/dev-util/dropwatch/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX dropwatch-1.4-binutils-2.23.patch 1767 BLAKE2B 2d5a39985393e61daa1a197edae420391d6d56b2a9cda8a46b2bdb6d5d0289933961837489fa7da66b2920a984bc0f36d4c33764ee5c2f3f60258d4907e1d87a SHA512 678749e2f37c9e8c5613a884919e0ebf9039850f5fa9a62829d66783e703f6aa3c69a2d040b37f4657d2c43edf46d4792d9d87270a4fe4b590bcc36114470b45
-AUX dropwatch-1.4-makefile.patch 639 BLAKE2B ee87268a51705bfed07eae5bcf4a75972d35f7f0075919279c916f2eb502d31b437bf0cbe0fb4587605cadca12d8bf55a8d14ca49bd177ab5344a6a649bf0516 SHA512 cf9756fe238041d5a9a764e81f5294832146905a809fccff999cf45d28015fc70ac0239b57b2e7d994095d5b45b484ea2b14e36210cc10bc1e4ef8ad3d9031f5
-AUX dropwatch-1.4_p20150706-makefile.patch 563 BLAKE2B db75ff88089272f9f0603b4e6ffdbe669e312188c03eba712fcd01152f1cb00bf2b17a720c0dc7137d95158db83b10c7a8f1bb2ba3a647cfd469abb778b1445c SHA512 763781d0a3718978c2fb98ad42183633f6e93c122739bd4b3020698674b4c3c35592337be5f7a3c839ab3bc4599cd10a85a19f1d19bd9635961fcc08c78f0b01
-DIST dropwatch-1.4.tbz2 32199 BLAKE2B 2f6a053ed2fc1280ba5aacef79b6b43903eb115ab0b81ed6dbdd7d789dccd5dcfc7d42a76718c73b3c6cc8013ef9a8a1a0e00be83ee2944ad2f101d0193f3a3f SHA512 a5744ea156464c53d31d5b54bcaf9bd61f2035285059bc05a3eec20be71d1451a6191237f194dc5d8e6fb6fcbb81d9ef87adf5ac2d878cc1f159191c47118e29
-DIST dropwatch-1.4_p20150706.tar.xz 14880 BLAKE2B 4df44a517447a7e99fe5d84a79421c9810c3b67524eb1d208c36ebb503dd43c715e57c678c33a90689707680d1f42b9d30d00080894f22889553e551a23adfa6 SHA512 f78f19f063408cb655869e662e92709b1cec820ab35b11272b87a990c380e0799c6e9067dcf53edab795916347dfe3fd04932f9699c3f5649f96d62567957fbd
-EBUILD dropwatch-1.4-r1.ebuild 920 BLAKE2B eddf223a1aa87b162f3121aeca2c192464205da609fed9c8261128cc194f0e4a72369c32694fadd36316a897cce87cc6f2983cc82f31ba8429c8205c25ab92b8 SHA512 6a5cdadcd68ba947df0a97ad46ce2df53b2def1137064b8153bd0d900fc0e92db4c17a08a7c3ab2eddd69e7245d7ce18912cb586132c2d5ea86ee0db9ff48157
-EBUILD dropwatch-1.4_p20150706.ebuild 867 BLAKE2B 86dd6191da4827c62a18db05a01f3163bf6c6af8df1574ee0783d3969e87bfedda4376450e6a465181cc0afd3b547c302f5596259b1ea81585dd93d3167fd969 SHA512 466bef588bc88d7b02439386b3d4e6659922369f05eb1cba5eada751b1271b813723ba5382ddcc6903c9fa3491f1d1d33a74568a7dd087808d0ec81a489c4e81
-MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild b/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
deleted file mode 100644
index 341fd711b330..000000000000
--- a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A utility to interface to the kernel to monitor for dropped network packets"
-HOMEPAGE="https://fedorahosted.org/dropwatch/"
-SRC_URI="https://fedorahosted.org/releases/d/r/dropwatch/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libnl:3
-	sys-libs/binutils-libs
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_DROP_MONITOR"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-binutils-2.23.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -C src
-}
-
-src_install() {
-	dobin "src/${PN}"
-	doman "doc/${PN}.1"
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "Ensure that 'drop_monitor' kernel module is loaded before running ${PN}"
-}
diff --git a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
deleted file mode 100644
index f4d2002b7f7b..000000000000
--- a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A utility to interface to the kernel to monitor for dropped network packets"
-HOMEPAGE="https://fedorahosted.org/dropwatch/"
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libnl:3
-	sys-libs/binutils-libs:=
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_DROP_MONITOR"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${PN}-1.4-binutils-2.23.patch"
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" -C src
-}
-
-src_install() {
-	dobin "src/${PN}"
-	doman "doc/${PN}.1"
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "Ensure that 'drop_monitor' kernel module is loaded before running ${PN}"
-}
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
deleted file mode 100644
index 1a7fa7913e42..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit a5aa2c3cbae207d12b9f2fded36a47031c55be36
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Thu Nov 17 00:04:47 2016 +0300
-
-    Fix build with recent binutils
-    
-    Gentoo-Bug:         457980
-    Upstream Ticket:    5
-
-diff --git a/src/lookup.c b/src/lookup.c
-index ba54991..809981b 100644
---- a/src/lookup.c
-+++ b/src/lookup.c
-@@ -27,13 +27,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- extern struct lookup_methods bfd_methods;
- extern struct lookup_methods kallsym_methods;
-diff --git a/src/lookup.h b/src/lookup.h
-index e6568d8..47a7b56 100644
---- a/src/lookup.h
-+++ b/src/lookup.h
-@@ -28,6 +28,9 @@
- #include <stdlib.h>
- #include <asm/types.h>
- 
-+// satisfy PR 14072 in bfd.h
-+#define PACKAGE 1
-+#define PACKAGE_VERSION 1
- 
- /*
-  * Initalization routine
-diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
-index cc7010b..271d426 100644
---- a/src/lookup_bfd.c
-+++ b/src/lookup_bfd.c
-@@ -25,13 +25,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- 
- static int lookup_bfd_init(void)
-diff --git a/src/lookup_kas.c b/src/lookup_kas.c
-index 16e639f..556cb62 100644
---- a/src/lookup_kas.c
-+++ b/src/lookup_kas.c
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -33,6 +32,7 @@
- #include <sys/queue.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- struct symbol_entry {
- 	char *sym_name;
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
deleted file mode 100644
index 14ffcc83513e..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig	2012-10-24 13:27:12.000000000 +0400
-+++ src/Makefile	2012-10-24 13:27:47.000000000 +0400
-@@ -1,14 +1,14 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
--LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
-+CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
-+LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
-+	$(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS)
- 
- %.o: %.c
--	gcc $(CFLAGS) $<
-+	$(CC) $(CFLAGS) $<
- clean:
- 	rm -f dropwatch *.o
- 
diff --git a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
deleted file mode 100644
index d2a9a6b761b6..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5bc6aaa..4eab2e8 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,14 +1,14 @@
- all: dropwatch
- 
- CPPFLAGS += -D_GNU_SOURCE
--CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0)
- LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
- 
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK.o) $(CFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- clean:
- 	$(RM) dropwatch *.o
diff --git a/dev-util/dropwatch/metadata.xml b/dev-util/dropwatch/metadata.xml
deleted file mode 100644
index 4343afde9aa5..000000000000
--- a/dev-util/dropwatch/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>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/duma-2.5.13 b/dev-util/duma-2.5.13
new file mode 100644
index 000000000000..fbe2fc30c514
--- /dev/null
+++ b/dev-util/duma-2.5.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
+EAPI=0
+HOMEPAGE=http://duma.sourceforge.net/
+IUSE=examples
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash
+SLOT=0
+SRC_URI=mirror://sourceforge/duma/duma_2_5_13.tar.gz
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=abb53e261d4615dbe6d84103f0a27965
diff --git a/dev-util/duma-2.5.15-r2 b/dev-util/duma-2.5.15-r2
new file mode 100644
index 000000000000..f7747d1a7d92
--- /dev/null
+++ b/dev-util/duma-2.5.15-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
+EAPI=6
+HOMEPAGE=http://duma.sourceforge.net
+IUSE=examples
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6534ccc00b846f96600be69fc0b7d463
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
deleted file mode 100644
index 1c964aaf7c13..000000000000
--- a/dev-util/duma/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
-DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
-DIST duma_2_5_13.tar.gz 233157 BLAKE2B 233e9dda882ce380af65311adf21052fdf9d023c654aa50a156f79aafba25d1e2db116bffaa9b39232bf0d0c1ace248505ceaf24a1f7a3f24c4d2f34a7bf5ec0 SHA512 da0f46a697f95cbb17d0dbb3135df779ac347fd9e63c1578d2d732300d5288958d02b5a271e84292a8279c1ebc3dc153f896cbeca916cf18aba8e54788671288
-DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.13.ebuild 2156 BLAKE2B e080af45afcce44b77019025b628f1779c7a2ead3971220eecd45bb948d1310fae8fd3937dd905b6d44b3f5dc6655506e168983fcb1e76ee429bd4f3aa211868 SHA512 e65d893ac599e030e229941c66f50a4a145a8dd13aa848f8a4aac1a66193fc76a54184e1f287f4bcf68aa965d970778dbe42427a9559cc377e70160d316ef729
-EBUILD duma-2.5.15-r2.ebuild 2242 BLAKE2B f995afe5c9881c45ccaf50ef1a5371bb5c8347578c5ad32e9e0d75b92c456bef23895145fba2a194a39151352f5cc028bb03ced90d1b04d8d80002d0a2517f89 SHA512 4691aeae4fb436653248344174b052eb26c41e7cc9c9eac35bb6b913a077b8513261764308286dd6e629e1c02f914083ae1f78db6337a78cd354a4a5d5048abf
-MISC metadata.xml 600 BLAKE2B ad3ed230f64bc5ead8d50bf7f8949e783ad95f90efbd5bbf8a8a39e6a4a7876d3a4371a5116096d53ba24866accdb6498c816f87da40885f9f7359921bcdeff0 SHA512 f849e5c61d27430f2c7de1f86ac9f12b8424571703e08661bccb0415743bf2e88aea981e72a5b1c287c949c6634e975c5e3f9882b9a29171389bed998c352f08
diff --git a/dev-util/duma/duma-2.5.13.ebuild b/dev-util/duma/duma-2.5.13.ebuild
deleted file mode 100644
index 8b98e3cc5459..000000000000
--- a/dev-util/duma/duma-2.5.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}_$(replace_all_version_separators '_')"
-
-DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
-HOMEPAGE="http://duma.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	#DUMA_OPTIONS="-DDUMA_LIB_NO_LEAKDETECTION"
-	DUMA_OPTIONS="-DDUMA_USE_FRAMENO"
-	if [ -n "${DUMA_OPTIONS}" ]; then
-	    ewarn ""
-	    elog "Custom build options are ${DUMA_OPTIONS}."
-	else
-	    ewarn ""
-	    elog "Custom build options are not set!"
-	fi
-	elog "See the package Makefile for for more options (also installed"
-	elog "with package docs as Makefile.duma)."
-	ewarn ""
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:(prefix)/lib:(prefix)/$(get_libdir):g" Makefile
-	sed -i -e "s:share/doc/duma:share/doc/${P}:g" Makefile
-}
-
-src_compile(){
-	replace-flags O? O0
-	append-flags -Wall -Wextra -U_FORTIFY_SOURCE
-	tc-export AR CC CXX LD RANLIB
-
-	use amd64 && export DUMA_ALIGNMENT=16
-
-	make CPPFLAGS="${DUMA_OPTIONS}" reconfig || die "make reconfig failed"
-	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC) || die "make failed"
-}
-
-src_test() {
-	ewarn "Control-C now if you want to disable tests..."
-	epause 5
-
-	cd "${S}"
-	use amd64 && export DUMA_ALIGNMENT=16
-	make CFLAGS="${DUMA_OPTIONS} ${CFLAGS}" \
-	    CC=$(tc-getCC) test || die "make test failed"
-
-	elog ""
-	ewarn "Check output above to verify all tests have passed.  Both"
-	ewarn "static and dynamic confidence tests should say PASSED."
-	elog ""
-}
-
-src_install(){
-	# make install fails nicely here on the first file...
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGELOG TODO
-	# All the good comments on duma build options are in the Makefile
-	newdoc Makefile Makefile.duma
-
-	if use examples; then
-	    insinto /usr/share/doc/${P}/examples
-	    doins example[1-6].cpp
-	    doins example_makes/ex6/Makefile
-	fi
-}
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
deleted file mode 100644
index 5f6cbd88a61c..000000000000
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-MY_P=${PN}_$(replace_all_version_separators '_')
-
-DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
-HOMEPAGE="http://duma.sourceforge.net"
-SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz
-	mirror://gentoo/${P}-GNUmakefile.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${WORKDIR}"/${P}-GNUmakefile.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	# other flags will break duma
-	export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE"
-	tc-export AR CC CXX LD RANLIB
-
-	case "${CHOST}" in
-		*-linux-gnu)
-			OS=linux;;
-		*-solaris*)
-			OS=solaris;;
-		*-darwin*)
-			OS=osx;;
-		*-freebsd*)
-			OS=freebsd;;
-		*-netbsd*)
-			OS=netbsd;;
-		*-cygwin*)
-			OS=cygwin;;
-		**-irix**)
-			OS=irix;;
-	esac
-	export OS="${OS}"
-	elog "Detected OS is: ${OS}"
-
-	if use amd64 && ! [ -n "${DUMA_ALIGNMENT}" ]; then
-		export DUMA_ALIGNMENT=16
-		elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64,"
-	fi
-
-}
-
-src_compile() {
-	# The below must be run first if distcc is enabled, otherwise
-	# the real build breaks on parallel makes.
-	emake reconfig
-	emake
-}
-
-src_test() {
-	emake test
-
-	elog "Please, see the output above to verify all tests have passed."
-	elog "Both static and dynamic confidence tests should say PASSED."
-}
-
-src_install(){
-	emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \
-		docdir="${D}/usr/share/doc/${PF}" install
-
-	sed -i "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" "${D}"/usr/bin/duma \
-		|| die "sed failed"
-
-	dodoc CHANGELOG TODO GNUmakefile
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins example[1-6].cpp example_makes/ex6/Makefile
-	fi
-}
-
-pkg_postinst() {
-	elog "See the GNUmakefile which will be also installed at"
-	elog "/usr/share/doc/${PF} for more options. You can now export"
-	elog "varibles to the build system easily, e.g.:"
-	elog "# export CPPFLAGS=\"-DFLAG\" (or by using append-cppflags)"
-	elog "# export DUMA_ALIGNMENT=${DUMA_ALIGNMENT} (Default is 16 for x86_64)"
-	elog "See more information about DUMA_ALIGNMENT from Readme.txt"
-}
diff --git a/dev-util/duma/files/duma-2.5.15-gcc6.patch b/dev-util/duma/files/duma-2.5.15-gcc6.patch
deleted file mode 100644
index 7cffef2b4e2c..000000000000
--- a/dev-util/duma/files/duma-2.5.15-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- duma_2_5_15/dumapp.cpp.old	2016-09-21 19:28:01.286332961 -0400
-+++ duma_2_5_15/dumapp.cpp	2016-09-21 19:28:06.722907238 -0400
-@@ -190,7 +190,9 @@
-  * (11) = (a) ; ASW
-  */
- void * DUMA_CDECL operator new( DUMA_SIZE_T size )
-+#if __cplusplus < 201103L
- throw(std::bad_alloc)
-+#endif
- {
-   return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_UK);
- }
-@@ -254,7 +256,9 @@
-  * (21) = (a) ; AAW
-  */
- void * DUMA_CDECL operator new[]( DUMA_SIZE_T size )
-+#if __cplusplus < 201103L
- throw(std::bad_alloc)
-+#endif
- {
-   return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_UK);
- }
diff --git a/dev-util/duma/metadata.xml b/dev-util/duma/metadata.xml
deleted file mode 100644
index 8e3b12d940a2..000000000000
--- a/dev-util/duma/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-  <longdescription>
-DUMA is an open-source library (under GNU General Public License) to 
-detect buffer overruns and under-runs in C and C++ programs. This 
-library is a fork of Buce Perens Electric Fence library and adds 
-some new features to it.</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">duma</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/dwarves-1.10_p20140618 b/dev-util/dwarves-1.10_p20140618
new file mode 100644
index 000000000000..32282efa84e4
--- /dev/null
+++ b/dev-util/dwarves-1.10_p20140618
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~flameeyes/dwarves/dwarves-1.10_p20140618.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75bcaa4ac057514b5e9e4e6e80ed168a
diff --git a/dev-util/dwarves-1.10_p20160519 b/dev-util/dwarves-1.10_p20160519
new file mode 100644
index 000000000000..b3f048b499b1
--- /dev/null
+++ b/dev-util/dwarves-1.10_p20160519
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zzam/dwarves/dwarves-1.10_p20160519.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=646f5f01039e08fabace4d73a5136dd6
diff --git a/dev-util/dwarves-1.10_p20160630 b/dev-util/dwarves-1.10_p20160630
new file mode 100644
index 000000000000..7983112e48cf
--- /dev/null
+++ b/dev-util/dwarves-1.10_p20160630
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zzam/dwarves/dwarves-1.10_p20160630.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=646f5f01039e08fabace4d73a5136dd6
diff --git a/dev-util/dwarves-9999 b/dev-util/dwarves-9999
new file mode 100644
index 000000000000..b8944649c3b1
--- /dev/null
+++ b/dev-util/dwarves-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 dev-vcs/git
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+IUSE=debug python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/elfutils-0.131 sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=924985786de12b23981c0a13bec7e078
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
deleted file mode 100644
index 9ff1d5bfa767..000000000000
--- a/dev-util/dwarves/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-DIST dwarves-1.10_p20140618.tar.xz 105912 BLAKE2B f1dd0a2206c09a259f1efde86bbaf946dcee92c680f59102059fbe770b1d4fb3776effabd096a7b94e068fa9ef1ea0947f489add2e5171db1ee3e325a507ef95 SHA512 522a6d674da5cc2316c180bcb4e90419d5811ff34e6aeeef875950dbcc4c12ea5a133d159360629d687f93ae2db622bb87d9b94a747aade90a61b239b9137a2c
-DIST dwarves-1.10_p20160519.tar.xz 106532 BLAKE2B f8bcd60fb65a9905fe8027431e38f594bba0d944c8a2ef0b25d078980773a6ffc6882b045783c63f089f605b9dc7b17c44758b24accacad563e4fe0cc235b39e SHA512 74797e934db900e78235705f70de45667e4ba7f56c0b7454d148365b8c87b617dcbf07fa12bdfdcaa2c129cd2111b029b458e71f77261b237de46fc2759a37da
-DIST dwarves-1.10_p20160630.tar.xz 106700 BLAKE2B 002c3c7e3d94dbfa199d78ae8be5a2cd4d95dab69e542c9fda6660aeae4e183bd0eee8926a5d1c54d58eb75538e35ae16ddf78e071714d0ab08444abebb8252e SHA512 f33ffbca0ef0dd89add5275c01a35e7c6298c4dae73be9c197887c54608ffb0edb95b8792f8a51ab29d80051682752d6f1c2596a486f61bc18e6cd47e2b7e4b0
-EBUILD dwarves-1.10_p20140618.ebuild 1038 BLAKE2B 4b7554e6e3430285a0ee841ae2468a30b66f69f391c3246bae594b91fe920627cee83499441eaad5d882d42613a900bf1ea9131fa0f6de19194426056c8119c8 SHA512 6cc3333ecaf75f0cf910f2c364d56eace6c7ea89b52377a4d79275e485e01398745d5ac45cf0201a4cf3215b6a57d53b3e8a96dc0a65b2cc5b4e864824b11637
-EBUILD dwarves-1.10_p20160519.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
-EBUILD dwarves-1.10_p20160630.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
-EBUILD dwarves-9999.ebuild 926 BLAKE2B 6f6bff98a7f3e0463f5a89a27cec543122f9857468ab263e5027a8a4fafa5f4a9c46eedd53da7b9c0bfabfc788538ff738acdb748c1045a33ba6a024be6d24ef SHA512 dbed04e6cf4e2c5f0aed91ba35c299ad88f1a3bbf95f278ce48c4ee1b34751f6246f73d6fabc207fc83d6d4b28918c549634bffd1e621da2cb7e8a26d9f58ab9
-MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.10_p20140618.ebuild b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
deleted file mode 100644
index eb68a1845533..000000000000
--- a/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
+++ /dev/null
@@ -1,44 +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 multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.10_p20160519.ebuild b/dev-util/dwarves/dwarves-1.10_p20160519.ebuild
deleted file mode 100644
index b9cd76e48e45..000000000000
--- a/dev-util/dwarves/dwarves-1.10_p20160519.ebuild
+++ /dev/null
@@ -1,44 +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 multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.10_p20160630.ebuild b/dev-util/dwarves/dwarves-1.10_p20160630.ebuild
deleted file mode 100644
index b9cd76e48e45..000000000000
--- a/dev-util/dwarves/dwarves-1.10_p20160630.ebuild
+++ /dev/null
@@ -1,44 +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 multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
deleted file mode 100644
index a82314e5ae50..000000000000
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils git-2 python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/files/dwarves-1.10-python-import.patch b/dev-util/dwarves/files/dwarves-1.10-python-import.patch
deleted file mode 100644
index e308ac6e2788..000000000000
--- a/dev-util/dwarves/files/dwarves-1.10-python-import.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=423817
-
---- dwarves-1.10/ostra/ostra-cg
-+++ dwarves-1.10/ostra/ostra-cg
-@@ -10,7 +10,9 @@
- # under the terms of version 2 of the GNU General Public License as
- # published by the Free Software Foundation.
- 
--import sys, datetime, os, ostra
-+import sys
-+sys.path.insert(0, "/usr/share/dwarves/runtime/python")
-+import datetime, os, ostra
- 
- class_def = None
- 
diff --git a/dev-util/dwarves/metadata.xml b/dev-util/dwarves/metadata.xml
deleted file mode 100644
index 28be736073c3..000000000000
--- a/dev-util/dwarves/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>zzam@gentoo.org</email>
-    <name>Matthias Schwarzott</name>
-  </maintainer>
-  <longdescription lang="en">
-    The more-than-seven dwarves is a collection of tools that allows
-    to inspect and query the DWARF2 information present in ELF files
-    built with full debug information. These tools include pahole
-    (Poke-a-hole) and codiff, and were originally designed to inspect
-    the Linux kernel and its modules, but can be used in for
-    user-space software too.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/dwdiff-2.1.0 b/dev-util/dwdiff-2.1.0
new file mode 100644
index 000000000000..ad181101736c
--- /dev/null
+++ b/dev-util/dwdiff-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
+DESCRIPTION=diff-like program operating at word level instead of line level
+EAPI=5
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
+IUSE=nls
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= sys-apps/diffutils
+SLOT=0
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.0.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_=58d764380ac294dea9ba8f9c3876c618
diff --git a/dev-util/dwdiff-2.1.0-r1 b/dev-util/dwdiff-2.1.0-r1
new file mode 100644
index 000000000000..be265db9b7db
--- /dev/null
+++ b/dev-util/dwdiff-2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
+DESCRIPTION=diff-like program operating at word level instead of line level
+EAPI=6
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= sys-apps/diffutils
+SLOT=0
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.0.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_=4abe909d2e07b2ef15929519894cdbcd
diff --git a/dev-util/dwdiff-2.1.1 b/dev-util/dwdiff-2.1.1
new file mode 100644
index 000000000000..7e194ebf3f6b
--- /dev/null
+++ b/dev-util/dwdiff-2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
+DESCRIPTION=diff-like program operating at word level instead of line level
+EAPI=6
+HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= sys-apps/diffutils
+SLOT=0
+SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.1.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_=4abe909d2e07b2ef15929519894cdbcd
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
deleted file mode 100644
index 38184e69e03b..000000000000
--- a/dev-util/dwdiff/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST dwdiff-2.1.0.tar.bz2 79224 BLAKE2B a201c300532757d293bbcdc61f91d81e3a2dcbc4847540bae278be561535b7ef2b6a191e2946b8af941f6550168893a17365e3020771a4468387567c4b3452f3 SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021
-DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-EBUILD dwdiff-2.1.0-r1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
-EBUILD dwdiff-2.1.0.ebuild 830 BLAKE2B 0f80d0d578d0ad1d2fb0c565ddb384bda81878f94bacd5b398b983b48c8ed003411748e104b926dd03f6ef2d01bb7fa9fcb2f56816117f79cbcee638a42d56a9 SHA512 eff5be39b231c56c647f5823f9c3c897e21718ef1ddef5e5a85b0cab43c34d15f69b81ec64b6f694c2f4228435b9098192bfc666766d2cfa1acf3742ec1671de
-EBUILD dwdiff-2.1.1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
-MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
deleted file mode 100644
index b549a993acad..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/diffutils"
-
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
deleted file mode 100644
index acd2c98c7343..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.0.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
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
deleted file mode 100644
index b549a993acad..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/diffutils"
-
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/metadata.xml b/dev-util/dwdiff/metadata.xml
deleted file mode 100644
index 294c350c6960..000000000000
--- a/dev-util/dwdiff/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>monsieurp@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/edb-debugger-0.9.21 b/dev-util/edb-debugger-0.9.21
new file mode 100644
index 000000000000..9cb6d68ca04a
--- /dev/null
+++ b/dev-util/edb-debugger-0.9.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/boost-1.35.0 virtual/pkgconfig >=dev-libs/capstone-3.0 graphviz? ( >=media-gfx/graphviz-2.38.0 ) dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtnetwork:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
+EAPI=6
+HOMEPAGE=https://github.com/eteran/edb-debugger
+IUSE=graphviz legacy-mem-write pax_kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/capstone-3.0 graphviz? ( >=media-gfx/graphviz-2.38.0 ) dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtnetwork:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/eteran/edb-debugger/releases/download/0.9.21/edb-debugger-0.9.21.tgz
+_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_=9268ec0f57871692f24c820b5cf63f7b
diff --git a/dev-util/edb-debugger-9999 b/dev-util/edb-debugger-9999
new file mode 100644
index 000000000000..88ca563aa1db
--- /dev/null
+++ b/dev-util/edb-debugger-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/boost-1.35.0 virtual/pkgconfig >=dev-libs/capstone-3.0 graphviz? ( >=media-gfx/graphviz-2.38.0 ) dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtnetwork:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
+EAPI=6
+HOMEPAGE=https://github.com/eteran/edb-debugger
+IUSE=debug graphviz
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/capstone-3.0 graphviz? ( >=media-gfx/graphviz-2.38.0 ) dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtnetwork:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9549d8c50afde4b875ff8b638891a2a
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
deleted file mode 100644
index 736b8cbb5ea2..000000000000
--- a/dev-util/edb-debugger/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
-EBUILD edb-debugger-0.9.21.ebuild 2109 BLAKE2B f8412190b29713ca51b90cc322a92974a879c897c79d7145c3e0fb79d2f9c46b333064a4f2538b4a515f5131dbd38f939fb65192e9d7996458d7df03fec55f0e SHA512 d1d932deeb4109438e97c4b8417b3fa493d40a86e3582ace599097047691d1c6148ac3b62ec1b500af25171db3cfd790a8b67bb04289ae5ac7c819b0dc836def
-EBUILD edb-debugger-9999.ebuild 1238 BLAKE2B a31e56662cb09b439fcbad13011e05a931fc05f6099793336c9b74e6cde709b86a1e6d85b9b8e7c2eb66e8eacb627581313f1968ae5ef95ba84b56a5c6133bf2 SHA512 24763b7327d5d23dff879bd230c0c56c0a88dd6a7fb94c13699ce6b45c371bbf6d27c8b72736e26f25877758f004e4d46997858349a36b00ef96d701bddb459b
-MISC metadata.xml 688 BLAKE2B eaf7922cca384a33aa16e2593ecaed8de0eab807ed8781c9bb8bba754d82ef2234b74e75ca77817f5a568bd044949572bfdeee9d9ab5981c79fd3952ff587a5b SHA512 f83568251c245ecc4b3c2aebebd461e5ef765f79736a97c230bd58bdfa4da3643aa2e9fc6ca2b80eacf81ec2af6c1102c5f432002505ac6ad7977675aa629d65
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
deleted file mode 100644
index 8d159b715b63..000000000000
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2+"
-IUSE="graphviz legacy-mem-write pax_kernel"
-SLOT="0"
-
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/edb-debugger-${PV}"
-
-RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	"
-DEPEND="
-	>=dev-libs/boost-1.35.0
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare(){
-	#Remove this in a future version; There won't be any edb48-logo.png
-	sed -i  '/edb48-logo/d' CMakeLists.txt || die
-
-	#Make the desktop's entries somewhat cuter
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
-	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DQT_VERSION=Qt5
-	)
-	if use pax_kernel || use legacy-mem-write; then
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
-	else
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cd src/images/ || die
-	newicon "edb48-logo.png" "edb.png"
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use legacy-mem-write; then
-		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
-		ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
-	else
-		ewarn
-		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
-		ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
-		ewarn
-	fi
-}
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
deleted file mode 100644
index 800b7d58d535..000000000000
--- a/dev-util/edb-debugger/edb-debugger-9999.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 cmake-utils git-r3
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2+"
-IUSE="debug graphviz"
-SLOT="0"
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
-KEYWORDS=""
-
-RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	"
-DEPEND="
-	>=dev-libs/boost-1.35.0
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare(){
-	#Make the desktop's entries somewhat cuter
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
-	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	mycmakeargs+=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DQT_VERSION=Qt5
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
deleted file mode 100644
index 9be9b854d3f5..000000000000
--- a/dev-util/edb-debugger/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>petross404@gmail.com</email>
-		<name>Petros S</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-		<flag name="graphviz">Add support for the Graphviz library</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">eteran/edb-debugger</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/editorconfig-geany-0.1_p20160725 b/dev-util/editorconfig-geany-0.1_p20160725
new file mode 100644
index 000000000000..7fcc662ee82c
--- /dev/null
+++ b/dev-util/editorconfig-geany-0.1_p20160725
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-text/editorconfig-core-c:= dev-util/geany
+DESCRIPTION=EditorConfig plugin for Geany
+EAPI=6
+HOMEPAGE=https://github.com/editorconfig/editorconfig-geany/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/editorconfig-core-c:=
+SLOT=0
+SRC_URI=https://github.com/editorconfig/editorconfig-geany/archive/9dce3bb476728a8f4124aefe12e0a4ffc8567dff.tar.gz -> editorconfig-geany-0.1_p20160725.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ef94698a0fae12eba9b638c15e204445
diff --git a/dev-util/editorconfig-geany/Manifest b/dev-util/editorconfig-geany/Manifest
deleted file mode 100644
index 5479e97f8e83..000000000000
--- a/dev-util/editorconfig-geany/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST editorconfig-geany-0.1_p20160725.tar.gz 10336 BLAKE2B 0794a7c90c46eb107822a2ceba92ae5dbcafcbe11aac519d8cd2102d92b93c578f3f49e31f7e281df2c3a90facaf29df5fdfa0b2970dd75894356066f4c40a0a SHA512 ac8c4d46c17a5592c8f75a4100cfa1eaa55cb5333a1a6330ae84249d6df3b9ae4b454ee9c68b88ad777f5bea22ad1f3ce0a63bf89a1dd41d13abcfbd2a585734
-EBUILD editorconfig-geany-0.1_p20160725.ebuild 952 BLAKE2B f53dd862c4c27b6c061fc5e9f7bb97760b5ffd301e1f50b74695e9b4888ba0b6459dc1d7d5a818cf916083b78d1d39a85c016d6005a36e674c6fbd781a01412f SHA512 1bfbb0bc98b7bf9adaca636eea5a06481b0f645731ce5967711e7d68ca596cd0296f62b23bb6f8b2805fa220be60d88a112a44c6363ed1e6056a8ee6037cd24f
-MISC metadata.xml 314 BLAKE2B 0689cfb21238bdd9c4c59ab9c9809bf9e99a29d5f18afcdc1c278a623bc10bdb631f1883e729ea0ce3eab0da320054a8c7da2ca707b471167f4c4f74db3d052f SHA512 c6fe2f783aaacb434eca03948af5b32f1b3cd96d701c5f237ff8b0d4ff068ec4ec67daf1715801087b3e54df5451140680caeccac53cc5aae6c0c4a6ea872124
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
deleted file mode 100644
index de7614d662ba..000000000000
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="EditorConfig plugin for Geany"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-geany/"
-EGIT_COMMIT="9dce3bb476728a8f4124aefe12e0a4ffc8567dff"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-CDEPEND="app-text/editorconfig-core-c:="
-DEPEND="${CDEPEND}
-	dev-util/geany"
-RDEPEND="${CDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	eapply_user
-	sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
-		-e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" --cflags geany geany) ${CFLAGS}|" \
-		-e "s|\`pkg-config[^\`]*\`||" \
-		-i Makefile || die
-}
-
-src_install() {
-	exeinto "$("$(tc-getPKG_CONFIG)" --variable=libdir geany)/geany"
-	doexe ${PN}.so
-	dodoc README.md
-}
diff --git a/dev-util/editorconfig-geany/metadata.xml b/dev-util/editorconfig-geany/metadata.xml
deleted file mode 100644
index fdf1680257c9..000000000000
--- a/dev-util/editorconfig-geany/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>
-	<upstream>
-		<remote-id type="github">editorconfig/editorconfig-geany</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/egypt-1.10 b/dev-util/egypt-1.10
new file mode 100644
index 000000000000..26e186bf0ac7
--- /dev/null
+++ b/dev-util/egypt-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=devilishly simple tool for creating call graphs of C programs
+EAPI=5
+HOMEPAGE=http://www.gson.org/egypt/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=http://www.gson.org/egypt/download/egypt-1.10.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_=3af27e2197b3947c438cb8ff7ce0ea01
diff --git a/dev-util/egypt/Manifest b/dev-util/egypt/Manifest
deleted file mode 100644
index 4930d6c8d961..000000000000
--- a/dev-util/egypt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST egypt-1.10.tar.gz 4670 BLAKE2B 66ec84fec092cc8e0e29a866cca4d574ce069af395a9bdfb05e0124390e0a01907a3fc6a0dc94a1bdc652166c4deafd7b8ef03d9808133c584df3827c1803371 SHA512 81e98b3d379301f1c0919aeb46d45264772b7d9d77277cb842c8ed7b944d61918e530f4e9e2c56451445dc2c6a312fd76086a81e193540baa3d56f3bb56b438d
-EBUILD egypt-1.10.ebuild 382 BLAKE2B 77f4d5e2e1c65991995dd837077e68ab26bf2437cf7a39709505b6b962cccb399c40d21b1a22c835534870fbfa7306cc8fe3d4aa5dc79f2f5ab4275a99dbcaf4 SHA512 93e0fb2570325594814335b10a69595664e34c6695a1af1425e4c253d5f575a6f923433a35fcf2535cc098680678fc0d374cae65f3b3ce2f759e334a637d199b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/egypt/egypt-1.10.ebuild b/dev-util/egypt/egypt-1.10.ebuild
deleted file mode 100644
index 5001a75c53a8..000000000000
--- a/dev-util/egypt/egypt-1.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="devilishly simple tool for creating call graphs of C programs"
-HOMEPAGE="http://www.gson.org/egypt/"
-SRC_URI="http://www.gson.org/egypt/download/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-util/egypt/metadata.xml b/dev-util/egypt/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/egypt/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/dev-util/electron-1.6.16 b/dev-util/electron-1.6.16
new file mode 100644
index 000000000000..2f9c3436bfee
--- /dev/null
+++ b/dev-util/electron-1.6.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cross platform application development framework based on web technologies
+EAPI=6
+HOMEPAGE=https://electronjs.org/
+IUSE=cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts x11-libs/gtk+:2 selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=1.6
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.16.tar.gz -> electron-1.6.16.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz -> electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.6.16.tar.gz -> electron-patches-1.6.16.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de3d4415034bb1c230dd795e7a6477d0
diff --git a/dev-util/electron-1.7.15 b/dev-util/electron-1.7.15
new file mode 100644
index 000000000000..ce464ab680e3
--- /dev/null
+++ b/dev-util/electron-1.7.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.7.0:=[postproc,svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cross platform application development framework based on web technologies
+EAPI=6
+HOMEPAGE=https://electronjs.org/
+IUSE=cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.7.0:=[postproc,svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3[X] ) selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=1.7
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.110.tar.xz https://github.com/electron/electron/archive/v1.7.15.tar.gz -> electron-1.7.15.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/node/archive/a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz -> electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz https://github.com/zcbenz/native-mate/archive/7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz -> electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz https://github.com/electron/pdf-viewer/archive/beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz -> electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz -> electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.7.15.tar.gz -> electron-patches-1.7.15.tar.gz https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a7814fa6e8ce92b2052850713904264
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
deleted file mode 100644
index a39d5d39f6b7..000000000000
--- a/dev-util/electron/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX electron-1.7.15-v8-crankshaft-rce-fix.patch 1581 BLAKE2B a78c4bccca8ca37957d714e6cb29c893fabdd1960a4b20145e6d86f701ff6be69b2495d90563fa5314c350c60d7d81c382a417347f924ae1c24ff13a0e90fa82 SHA512 3a9423434ce03744b5eb7c8850c6908e8c94e23fed3bc5d87bde09e6c47eb429eb0852b8453b3311a2f640b8d9d136343155743d633206ff85c9ac5a4f75106f
-AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b24a1b5c6c4494126e16573f2bafe503389566507d60818880286efca8ccc9ce8f5cc560faf76f2df6c42 SHA512 cc36ab3406dcaedfd9472e94c53d3f25c4f5e25e2d1275e2bc99b8e18ffdf6de1583f7e0ceadfb8a8d10ab3e5d7018b84ec506e3b31a0a55cfb9453fb19ad3d0
-DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
-DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
-DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
-DIST chromium-58.0.3029.110.tar.xz 518167664 BLAKE2B dc9b4eee10236b892c82c6c12f649aed30454124496794485430e6119ee83e420564b2f2fbd21a3d1525cfb3de3524210c50770cbf74b2dbfdb18b35445a740a SHA512 412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f
-DIST electron-1.6.16.tar.gz 4957555 BLAKE2B c72433ed076bc6b68b81b136db4dcf1a0fe17f16c7859e5176c215d86164f0c3d531310d8edbee9f52038722aa6dbc7934d9d9a5511bcb978bb9c255122f1794 SHA512 f657aae526defa8526948c89b8667475d1fb27f1884a1a4655773052cf3b3578483d3d51e35e6aa077579c3023056eec5d2a06f24a2c4013ca078fb82f850182
-DIST electron-1.7.15.tar.gz 5172906 BLAKE2B 9b3785eed455cf2864572582a37cb7b107e96b207879c8975870383714bc1103073840409246392433af7c4edf2404d519d16ea4185cb1e6925b2ef6cf93a9aa SHA512 ade60d6810a85f9d92ff8213d2c38059f49dd8304220feb0759622390176d9a145b14b2df1b2541cb153ffff4c83d00001297c3d85de0530a1a75e0544e22fe2
-DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
-DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
-DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
-DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
-DIST electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz 70588 BLAKE2B 1f4d76577547c3dc24ca615f16563260ef44e6d6944ae0486cd7965bbdfa4149f26fe827c13cdbc8372eec95c1698763a56a645ac9845f9685ef752e33ab5ddb SHA512 2d065b024eb9928ba8abfa03d729b3ab1da96f436b76999371641dd468b38167b0812ff8538db1b7e1dc6a4f102cfbcce9cb8580837d593b0369d37c9f63c2c7
-DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
-DIST electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz 24066 BLAKE2B 622d0ee16fd35a98c154bad7cd271350b6d0c2da0d1df1b0effde6ddb52eea3530921a746c96eed2130ae403c3ef00dac8a86a8a896afcc9b4e74d03a17fb727 SHA512 99a6e67469852a84a7a4b1585a1ff9d32491f9bab511a3853c630ac30bf1c703d0b1c0f8830a546f2665dfe87f1f582860dfabb332909f6973e64dff2ed4b5f4
-DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
-DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
-DIST electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz 46772284 BLAKE2B 453ade1d1540f099d7225f3c758fc1455dcae3a6b8ada00c20b85519bfd61beb3fc3beb083f063de2ce52c5b2e83eb67acea23f2605e201031b42552747e522b SHA512 532bc27e026fd032e8747150bac885277ae2e6cede3053e61690b846e380d664daa0b49e843c44d937a5f84f902f149323b8dc873dcfcf8ddc27b6feb1df750d
-DIST electron-patches-1.6.16.tar.gz 28592 BLAKE2B bd64ff7ad03a8ecb9422702cc33746d57464228a3ee7ae7fa9ecc30ad5507a8cb2db71caf5f6700cfe1d963e9957d50c1e5c784e148aaabc11aef9d90d2508f0 SHA512 b53b5f88532a0898878abac71b36c410c3734da871266703932238f707e54a4f6af92cc4792dc645ba02069ec5e9e548317e0e121556210f69dfbb63d5a1fa03
-DIST electron-patches-1.7.15.tar.gz 58386 BLAKE2B d11ae9fd93cecb71a1ae625ab2377be0040c19ab2c858e4afba72835b4dab3d2f8c19d4192ff9ce4452ddefe54c07800d7530fee443e08b8140ea428752ac4b0 SHA512 deb639de2fcb2f1451e3fdc5dd8beb7fb24d86406430f2202fbda8e719dc7c4f14e9edcded00b8a452e22eac926fb21ab19b16fbc22778a8315d68da3441ae8d
-DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
-DIST electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz 38752 BLAKE2B 0fa9e928d64d31fec04c542cb4a4277497d42c621a500cbcb77783bdd20f6251ac075f779229a1f43645f8181734b8a213fa77dc2b906b7846f725978996b488 SHA512 76f996b4a14290f1c3d061c9c2bb3d5869c53c1ef0e395b8faa6dd3470787dd2c6f492d5dcba18d805c0ccc1c6e2a3a602bf873876075d160f69a899a79d953d
-DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD electron-1.6.16.ebuild 28088 BLAKE2B afaa3c13bff2adb837230c5b44a07a7725b50ea3f4b7e263538c53b5d9f22e837499b089b405b4708bdafb5bfee852c34229c988a5f6c4336f6cc12802868dd1 SHA512 55a4c3c9663294a77d89b8a85a176aad32a4ba9c579be9e5513ecc8742edbf4f2b4e7e94f82a13a44f9d21490735f4a71727938de88864c1d2fc23dd4d7aec0f
-EBUILD electron-1.7.15.ebuild 27961 BLAKE2B adf311387891f08a03493bc4750ec33381a26a3a5877e5bc34946ab0ab97667d79580d24c26674ce314ebccea7cfdb581e536415529dcdc2dd4753fe31c8b00d SHA512 420a2c29b85d773cdf72db90dd1d0e4de03ce9f658d12578a2ad7da5ec825c51685a8934a22bd2161ac2f16af8056a37f1e1a61b1e85ba35e1323cb1513b9b99
-MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
diff --git a/dev-util/electron/electron-1.6.16.ebuild b/dev-util/electron/electron-1.6.16.ebuild
deleted file mode 100644
index 58491cdd5640..000000000000
--- a/dev-util/electron/electron-1.6.16.ebuild
+++ /dev/null
@@ -1,881 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="56.0.2924.87"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="909c49265493bd095c27cefd999567be2107899a"
-# Keep this in sync with vendor/node
-NODE_COMMIT="9b1683e7000481ec6214eafa3eef7ac4594eb410"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a050a339cfeabcfb5f07c313161d2ee27b6c3a39"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with script/lib/config.py:LIBCHROMIUMCONTENT_COMMIT
-LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-
-PATCHES_P="gentoo-electron-patches-${P}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> electron-${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libvpx:=[svc]
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	media-libs/flac:=
-	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	x11-libs/gtk+:2
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	net-libs/nodejs
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Apply libcc Chromium patches.
-	cd "${CHROMIUM_S}" || die
-	_unnest_patches "${LIBCC_S}/patches"
-	eapply "${LIBCC_S}/patches"
-
-	# Apply Gentoo patches
-	cd "${S}" || die
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/numerics
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/murmurhash
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libusb
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/openh264
-		third_party/openmax_dl
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libjpeg
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/smhasher
-		third_party/sqlite
-		third_party/tcmalloc
-		third_party/usrsctp
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/x86inc
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries="
-		flac
-		harfbuzz-ng
-		icu
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		re2
-		snappy
-		yasm
-		zlib"
-	if use system-ffmpeg; then
-		gn_system_libraries+=" ffmpeg"
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gnome true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_gtk3=false"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared --without-bundled-v8 --shared-openssl \
-		--shared-http-parser --shared-zlib --without-npm \
-		--with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-
-	einfo "Configuring chromiumcontent..."
-	# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
-	# Remove the glibc allocator shim so that it doesn't get picked up
-	# by Electron's build_libs script.
-	rm out/Release/obj/base/allocator/unified_allocator_shim/allocator_shim_default_dispatch_to_glibc.o || die
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-	out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/brightray/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/electron-1.7.15.ebuild b/dev-util/electron/electron-1.7.15.ebuild
deleted file mode 100644
index ee39885c1cfa..000000000000
--- a/dev-util/electron/electron-1.7.15.ebuild
+++ /dev/null
@@ -1,888 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
-
-# Keep this in sync with vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="58.0.3029.110"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/node
-NODE_COMMIT="a992f2ff412b85606ec1d4c1eb00ad832fa1e640"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="7d9c1a80f025f4c46f7da8ea73246fe0f1968579"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="2f7b83669315f9492380334d1a8b1cd9bc758efd"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-NINJA_VERSION="1.8.2"
-
-PATCHES_P="gentoo-electron-patches-${P}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
-	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
-	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gconf? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	>=media-libs/libvpx-1.7.0:=[postproc,svc]
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3[X] )
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	net-libs/nodejs
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/chrome/browser"
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Fix broken patch
-	cd "${LIBCC_S}" || die
-	eapply "${FILESDIR}/${P}-v8-crankshaft-rce-fix.patch"
-
-	# Apply libcc Chromium patches.
-	cd "${CHROMIUM_S}" || die
-	_unnest_patches "${LIBCC_S}/patches"
-	eapply "${LIBCC_S}/patches"
-
-	# Apply Gentoo patches
-	cd "${S}" || die
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	if use gtk3; then
-		sed -i -e 's/gtk2/gtk3/g' "${CHROMIUM_S}/chromiumcontent/BUILD.gn" \
-		|| die
-	fi
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/numerics
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/murmurhash
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libusb
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
-		third_party/openh264
-		third_party/openmax_dl
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libjpeg
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/smhasher
-		third_party/sqlite
-		third_party/tcmalloc
-		third_party/usrsctp
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/x86inc
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		harfbuzz-ng
-		icu
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		re2
-		snappy
-		yasm
-		zlib)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg )
-	fi
-	build/linux/unbundle/replace_gn_files.py \
-		--system-libraries ${gn_system_libraries[@]} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gconf true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --shared-libuv cannot be used as electron's node fork
-	# patches uv_loop structure.
-	./configure --shared --without-bundled-v8 --shared-openssl \
-		--shared-http-parser --shared-zlib --without-npm \
-		--with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	einfo "Configuring chromiumcontent..."
-	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
-	out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gconf use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch b/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch
deleted file mode 100644
index b18722448df8..000000000000
--- a/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3c8f3a181afb7407ca6b8dd6605dcea3a8e78ba8 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Sat, 24 Mar 2018 13:34:10 -0400
-Subject: [PATCH] Fix crankshaft RCE patch
-
----
- patches/v8/crankshaft-hydrogen-rce.patch | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/patches/v8/crankshaft-hydrogen-rce.patch b/patches/v8/crankshaft-hydrogen-rce.patch
-index d99d964..273705e 100644
---- a/patches/v8/crankshaft-hydrogen-rce.patch
-+++ b/patches/v8/crankshaft-hydrogen-rce.patch
-@@ -1,16 +1,17 @@
- diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
--index d55bb37..d595617 100644
-+index d55bb37..2833c63 100644
- --- a/src/crankshaft/hydrogen.cc
- +++ b/src/crankshaft/hydrogen.cc
--@@ -7176,7 +7176,10 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
-+@@ -7176,8 +7176,11 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
-    // Get transition target for each map (NULL == no transition).
-    for (int i = 0; i < maps->length(); ++i) {
-      Handle<Map> map = maps->at(i);
- +    // Don't generate elements kind transitions from stable maps.
-      Map* transitioned_map =
-+-        map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
- +        map->is_stable()
- +            ? nullptr
- +            : map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
---         map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
-      if (transitioned_map != nullptr) {
-        transition_target.Add(handle(transitioned_map));
-+     } else {
--- 
-2.16.1
-
diff --git a/dev-util/electron/files/toolchain/BUILD.gn b/dev-util/electron/files/toolchain/BUILD.gn
deleted file mode 100644
index 78f7b57e3be5..000000000000
--- a/dev-util/electron/files/toolchain/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-import("//build/toolchain/gcc_toolchain.gni")
-
-gcc_toolchain("default") {
-  cc = getenv("CC")
-  cxx = getenv("CXX")
-  ar = getenv("AR")
-  nm = getenv("NM")
-  ld = cxx
-
-  extra_cflags = getenv("CFLAGS")
-  extra_cppflags = getenv("CPPFLAGS")
-  extra_cxxflags = getenv("CXXFLAGS")
-  extra_ldflags = getenv("LDFLAGS")
-
-  toolchain_args = {
-    current_cpu = current_cpu
-    current_os = current_os
-  }
-}
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
deleted file mode 100644
index b401858fffc6..000000000000
--- a/dev-util/electron/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>elvis@magic.io</email>
-		<name>Elvis Pranskevichus</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
-	<use>
-		<flag name="gconf">Use gnome-base/gconf</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-		<flag name="lto">Build with link time optimization enabled</flag>
-		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
-		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
-		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
-		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">elprans/asar</remote-id>
-		<remote-id type="github">elprans/gentoo-electron-patches</remote-id>
-		<remote-id type="github">elprans/grit</remote-id>
-		<remote-id type="github">elprans/node-browserify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/elfkickers-3.0a b/dev-util/elfkickers-3.0a
new file mode 100644
index 000000000000..eb92c01b8920
--- /dev/null
+++ b/dev-util/elfkickers-3.0a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=app-misc/pax-utils
+DESCRIPTION=collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc
+EAPI=4
+HOMEPAGE=http://www.muppetlabs.com/~breadbox/software/elfkickers.html
+IUSE=doc
+KEYWORDS=amd64 arm ~hppa ~mips sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-3.0a.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_=1d71ebc113aa951650085fd7865f7c77
diff --git a/dev-util/elfkickers-3.1 b/dev-util/elfkickers-3.1
new file mode 100644
index 000000000000..cd5895d2a847
--- /dev/null
+++ b/dev-util/elfkickers-3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=app-misc/pax-utils
+DESCRIPTION=collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc
+EAPI=6
+HOMEPAGE=http://www.muppetlabs.com/~breadbox/software/elfkickers.html
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-3.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e0a3ce439525d585a2d0923323b92eed
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
deleted file mode 100644
index 91305b445894..000000000000
--- a/dev-util/elfkickers/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX add-freebsd-elf-defs.patch 1937 BLAKE2B d7983f6a93dc7a4621fe2da97de6dda8ea1d938996835fad6100c8c561aca37e2fa6b4ba796cb04bbd6d5674e05a84f02df22d954c731777652265f5a18768af SHA512 3f480926cc89ebf3a02bf0fbb8e304226e9b58bed2bc887854a8935915a444822093264e98856f55fb76e3c32127914e171e3da5ebfc05fed5a2d02931e970c2
-AUX create-destdir-path.patch 472 BLAKE2B a24251218f06f88df395945071125d6c3be515bd6e9d2a06154498b8775db3276efaeb8457a87ee99c6173bff71d029b0bd0fe74cec632131a09bc6ef9a544a1 SHA512 d84f70310786a5f550164145c1983d826a8ccf6616bf691e19592f91aa7c6549e96fefe27e5622fbca6c4db1cfa75362a67ba7b8d6d4fb365b34cf527743a3cf
-AUX elfkickers-3.1-create-destdir-path.patch 620 BLAKE2B 97cb8593a14405aba7ed766323272559c140258aec9dbdf04781d75f5b185790a2f5a7cf11511ab80eb0ef224bca43c8c6bbf7971f982484f2c4ec6fd6a3ce9e SHA512 63805893f21f7b4688c4363fa0e9fdd721ad14a03e657ca73b80850726c7c3178fc538005d5e8a47746f0496aea2b9899a39b511dc73556231141a02cf46d281
-AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178aca6bb42c3f93b271f2132fedf793b71f1f216ab57e4e05fb299a06ff0f47e0626d5067ae44c79b3b96b41fb40d40a935bcd24596272b7 SHA512 fc44d407d1cab8e26af3a7011d82a8f236ef330d881308c28ecc0685e5e8e11b3477ed67c59284ed0905ddd5d62e76f88b99ee4b27dcfb2f5d188f0318ebc1ef
-AUX respect-CFLAGS-LDFLAGS.patch 3237 BLAKE2B 084f594a98b7ad36edd87fbd0f841cb4858370d90f495df2bede43c0b0b87e41a775eed4dbef18f43152f75b3953dd8837f16ea3420a3943e71dc2b4a8dbe581 SHA512 85b1dd45111e7171701c4ef81e3aa23fbd5088c50cce890cf1d27c4de3560311f215bd43e3b0295e9c7917b07dca5c3431c2a705bbef80c0d90fd409ccebe664
-DIST ELFkickers-3.0a.tar.gz 100112 BLAKE2B 3fad92a6fd0cb285d8df2d529f95eccd7df8382925520989a3096354170535e02c890f5d5b4f6ae5a520750afe2477625371ee71f1bfc5d6b35d752749c7dc5a SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c
-DIST ELFkickers-3.1.tar.gz 101406 BLAKE2B 8de2c27904909ede753b94cebe87789b27f02f98ce54342031330579a7ae021585117be4b61d8c7895c9c6a2c9b33f398cde9be1070ccbe24e51669db59bba73 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b
-EBUILD elfkickers-3.0a.ebuild 864 BLAKE2B d6284ed6c47c8ced0370f2f8a6aa9599a529e3b4c20a480a04dd9cd345bf469aa17989428d63d006d1894f7028e11576d24bec5da77e4c190c57f30490ca9884 SHA512 cda14dadbe6dadfeb44f9df4955c118c19ba9ccb66941e1653a95615ae812d22fecb8aaff8e7472fb8a246e194f238717b1512ff83aac1a7348bb684436b968c
-EBUILD elfkickers-3.1.ebuild 870 BLAKE2B 69651cd29c0800bddc94ebae1f2a04d1271f798885426b16faf6378ee815c377444264ad5c5e23ff378da2f1459b54b23a7e02d1c752b0144643121feef01066 SHA512 ebf1a110c5eaff0479afe381f7d9b1c5c4b9405446b3bb5b839ac76e1d68799ce16115af0a7ea33a40711c585d5ec039665586b3744a51e67e3e9d82ac506f98
-MISC metadata.xml 657 BLAKE2B 81a73ead5e1fee87a15c34c14135154148a9bf3449d8d7160bc18427edab55caf7d1916943bc8bc0e42f402031d8753c5102f504e191904f21b37996de36d24a SHA512 4519d4c439e25c4c70dabe91740ea572f084f4756cbf471f346d4bf0c85226f7254fbc9744ba32bd168885b238950d01de99bcd1baa7f24939b94daba41750a7
diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
deleted file mode 100644
index 7e9fab33ac24..000000000000
--- a/dev-util/elfkickers/elfkickers-3.0a.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-MY_PN=${PN/elf/ELF}-${PV}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
-	epatch "${FILESDIR}"/create-destdir-path.patch
-	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
-	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}
diff --git a/dev-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
deleted file mode 100644
index 0fd4830cc4eb..000000000000
--- a/dev-util/elfkickers/elfkickers-3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_PN=${PN/elf/ELF}-${PV}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-CFLAGS-LDFLAGS.patch
-	"${FILESDIR}"/${P}-create-destdir-path.patch
-	"${FILESDIR}"/add-freebsd-elf-defs.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) all
-}
diff --git a/dev-util/elfkickers/files/add-freebsd-elf-defs.patch b/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
deleted file mode 100644
index 792a91d6dfb2..000000000000
--- a/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./elfrw/elfrw.h.orig	2011-05-31 01:47:08.000000000 +0200
-+++ ./elfrw/elfrw.h	2011-06-08 12:16:37.000000000 +0200
-@@ -10,6 +10,24 @@
- #include <stdio.h>
- #include <elf.h>
- 
-+#ifdef __FreeBSD__
-+typedef uint16_t Elf64_Section;
-+
-+#define PT_GNU_STACK	0x6474e551
-+#define PT_GNU_RELRO	0x6474e552
-+
-+#if  __FreeBSD_version < 700022
-+#define SHT_GNU_HASH	0x6ffffff6
-+#define EM_CRIS		76
-+#define EM_M32R		88
-+#define EM_MN10300	89
-+#endif
-+
-+#define ELFCLASSNUM 3
-+#define ELFDATANUM  3
-+#define EV_NUM      2
-+#endif
-+
- /*
-  * The initialization functions. Call one of these to set the flavor
-  * of ELF structures to translate to and from. The library can be
---- ./elftoc/readelf.h.orig	2011-05-22 20:46:29.000000000 +0200
-+++ ./elftoc/readelf.h	2011-06-08 12:16:37.000000000 +0200
-@@ -7,6 +7,12 @@
- #ifndef	_readelf_h_
- #define	_readelf_h_
- 
-+#ifdef __FreeBSD__
-+#define ELFCLASSNUM 3
-+#define ELFDATANUM  3
-+#define EV_NUM      2
-+#endif
-+
- /* Read all of the basic headers from the file image (namely the ELF
-  * header, the program segment header table, and the section header
-  * table). False is returned if the file could not be parsed as an ELF
---- ./elftoc/pieces.c.orig	2011-05-26 03:25:14.000000000 +0200
-+++ ./elftoc/pieces.c	2011-06-08 12:16:37.000000000 +0200
-@@ -16,6 +16,10 @@
- #include "out.h"
- #include "pieces.h"
- 
-+#ifdef __FreeBSD__
-+typedef uint64_t Elf32_Xword;
-+#endif
-+
- /* Flags used to insert warnings in the generated source code.
-  */
- #define	PW_MISALIGNED	0x0001	/* piece misaligned for original type */
---- ./elftoc/outbase.h.orig	2011-05-22 20:46:29.000000000 +0200
-+++ ./elftoc/outbase.h	2011-06-08 12:16:37.000000000 +0200
-@@ -7,6 +7,10 @@
- #ifndef _outbase_h_
- #define _outbase_h_
- 
-+#ifdef __FreeBSD__
-+#define NT_AUXV     6
-+#endif
-+
- /* Set the current output file. Call this before calling any output
-  * functions. (The FILE* argument is given as a void* so as to not
-  * include stdio.h here.)
diff --git a/dev-util/elfkickers/files/create-destdir-path.patch b/dev-util/elfkickers/files/create-destdir-path.patch
deleted file mode 100644
index d279db0ad606..000000000000
--- a/dev-util/elfkickers/files/create-destdir-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig	2011-05-30 16:37:41.000000000 -0400
-+++ Makefile	2011-05-30 16:38:30.000000000 -0400
-@@ -22,8 +22,9 @@
- infect: bin/infect doc/infect.1
- 
- install: $(PROGRAMS:%=bin/%)
--	cp bin/* $(prefix)/bin/.
--	cp doc/* $(prefix)/share/man/man1/.
-+	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
-+	install bin/* $(prefix)/usr/bin
-+	install -m 644 doc/* $(prefix)/usr/share/man/man1
- 
- clean:
- 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch b/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
deleted file mode 100644
index 1f0c3e94fe9b..000000000000
--- a/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur ELFkickers-3.1.orig/Makefile ELFkickers-3.1/Makefile
---- ELFkickers-3.1.orig/Makefile	2015-07-23 13:25:30.000000000 -0400
-+++ ELFkickers-3.1/Makefile	2016-11-16 17:17:08.237039268 -0500
-@@ -24,10 +24,9 @@
- infect: bin/infect doc/infect.1
- 
- install: $(PROGRAMS)
--	mkdir -p $(prefix)/bin
--	cp bin/* $(prefix)/bin/.
--	mkdir -p $(prefix)/share/man/man1
--	cp doc/* $(prefix)/share/man/man1/.
-+	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
-+	install bin/* $(prefix)/usr/bin
-+	install -m 644 doc/* $(prefix)/usr/share/man/man1
- 
- clean:
- 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
deleted file mode 100644
index b285f3b2509c..000000000000
--- a/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Naur ELFkickers-3.1.orig/ebfc/Makefile ELFkickers-3.1/ebfc/Makefile
---- ELFkickers-3.1.orig/ebfc/Makefile	2014-11-17 14:50:34.000000000 -0500
-+++ ELFkickers-3.1/ebfc/Makefile	2016-11-16 17:13:53.297033908 -0500
-@@ -1,7 +1,7 @@
- #  Makefile for ebfc
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
-+CC ?= gcc
-+CFLAGS += -Wno-missing-field-initializers
- 
- ebfc: ebfc.o brainfuck.o libelfparts.a
- 
-diff -Naur ELFkickers-3.1.orig/elfls/Makefile ELFkickers-3.1/elfls/Makefile
---- ELFkickers-3.1.orig/elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
-+++ ELFkickers-3.1/elfls/Makefile	2016-11-16 17:12:48.885032137 -0500
-@@ -1,7 +1,7 @@
- #  Makefile for elfls
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- elfls: elfls.c ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.1.orig/elfrw/Makefile ELFkickers-3.1/elfrw/Makefile
---- ELFkickers-3.1.orig/elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
-+++ ELFkickers-3.1/elfrw/Makefile	2016-11-16 17:13:06.653032625 -0500
-@@ -1,7 +1,6 @@
- #  Makefile for libelfrw.a
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -O3
-+CC ?= gcc
- 
- LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
-           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
-diff -Naur ELFkickers-3.1.orig/elftoc/Makefile ELFkickers-3.1/elftoc/Makefile
---- ELFkickers-3.1.orig/elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
-+++ ELFkickers-3.1/elftoc/Makefile	2016-11-16 17:12:57.549032375 -0500
-@@ -1,8 +1,6 @@
- #  Makefile for elftoc
- 
--CC = gcc
--CFLAGS = -Wall -Wextra
--LDFLAGS = -Wall -Wextra
-+CC ?= gcc
- 
- OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
-        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
-diff -Naur ELFkickers-3.1.orig/infect/Makefile ELFkickers-3.1/infect/Makefile
---- ELFkickers-3.1.orig/infect/Makefile	2011-05-31 02:52:27.000000000 -0400
-+++ ELFkickers-3.1/infect/Makefile	2016-11-16 17:12:30.617031634 -0500
-@@ -1,7 +1,6 @@
- #  Makefile for infect
- 
--CC = gcc
--CFLAGS = -Wall -Wextra
-+CC ?= gcc
- 
- infect: infect.c
- 
-diff -Naur ELFkickers-3.1.orig/objres/Makefile ELFkickers-3.1/objres/Makefile
---- ELFkickers-3.1.orig/objres/Makefile	2016-11-14 16:46:24.000000000 -0500
-+++ ELFkickers-3.1/objres/Makefile	2016-11-16 17:13:40.225033549 -0500
-@@ -1,8 +1,7 @@
- #  Makefile for objres
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
--LDFLAGS = -Wall -Wextra
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- objres: objres.o ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.1.orig/rebind/Makefile ELFkickers-3.1/rebind/Makefile
---- ELFkickers-3.1.orig/rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
-+++ ELFkickers-3.1/rebind/Makefile	2016-11-16 17:13:17.373032920 -0500
-@@ -1,7 +1,7 @@
- #  Makefile for rebind
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- rebind: rebind.c ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.1.orig/sstrip/Makefile ELFkickers-3.1/sstrip/Makefile
---- ELFkickers-3.1.orig/sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
-+++ ELFkickers-3.1/sstrip/Makefile	2016-11-16 17:14:05.949034256 -0500
-@@ -1,7 +1,7 @@
- #  Makefile for sstrip
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- sstrip: sstrip.c ../elfrw/libelfrw.a
- 
diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
deleted file mode 100644
index 6663ef8e79af..000000000000
--- a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Naur ELFkickers-3.0.orig//ebfc/Makefile ELFkickers-3.0/ebfc/Makefile
---- ELFkickers-3.0.orig//ebfc/Makefile	2011-05-24 00:51:07.000000000 -0400
-+++ ELFkickers-3.0/ebfc/Makefile	2011-06-02 23:05:30.000000000 -0400
-@@ -1,7 +1,7 @@
- #  Makefile for ebfc
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
-+CC ?= gcc
-+CFLAGS += -Wno-missing-field-initializers
- 
- ebfc: ebfc.o brainfuck.o libelfparts.a
- 
-diff -Naur ELFkickers-3.0.orig//elfls/Makefile ELFkickers-3.0/elfls/Makefile
---- ELFkickers-3.0.orig//elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
-+++ ELFkickers-3.0/elfls/Makefile	2011-06-02 23:04:15.000000000 -0400
-@@ -1,7 +1,7 @@
- #  Makefile for elfls
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- elfls: elfls.c ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.0.orig//elfrw/Makefile ELFkickers-3.0/elfrw/Makefile
---- ELFkickers-3.0.orig//elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
-+++ ELFkickers-3.0/elfrw/Makefile	2011-06-02 23:04:37.000000000 -0400
-@@ -1,7 +1,6 @@
- #  Makefile for libelfrw.a
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -O3
-+CC ?= gcc
- 
- LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
-           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
-diff -Naur ELFkickers-3.0.orig//elftoc/Makefile ELFkickers-3.0/elftoc/Makefile
---- ELFkickers-3.0.orig//elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
-+++ ELFkickers-3.0/elftoc/Makefile	2011-06-02 23:04:27.000000000 -0400
-@@ -1,8 +1,6 @@
- #  Makefile for elftoc
- 
--CC = gcc
--CFLAGS = -Wall -Wextra
--LDFLAGS = -Wall -Wextra
-+CC ?= gcc
- 
- OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
-        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
-diff -Naur ELFkickers-3.0.orig//infect/Makefile ELFkickers-3.0/infect/Makefile
---- ELFkickers-3.0.orig//infect/Makefile	2011-05-31 02:52:27.000000000 -0400
-+++ ELFkickers-3.0/infect/Makefile	2011-06-02 23:04:01.000000000 -0400
-@@ -1,7 +1,6 @@
- #  Makefile for infect
- 
--CC = gcc
--CFLAGS = -Wall -Wextra
-+CC ?= gcc
- 
- infect: infect.c
- 
-diff -Naur ELFkickers-3.0.orig//objres/Makefile ELFkickers-3.0/objres/Makefile
---- ELFkickers-3.0.orig//objres/Makefile	2011-05-23 23:29:39.000000000 -0400
-+++ ELFkickers-3.0/objres/Makefile	2011-06-02 23:05:08.000000000 -0400
-@@ -1,7 +1,7 @@
- #  Makefile for objres
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- objres: objres.c ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.0.orig//rebind/Makefile ELFkickers-3.0/rebind/Makefile
---- ELFkickers-3.0.orig//rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
-+++ ELFkickers-3.0/rebind/Makefile	2011-06-02 23:04:57.000000000 -0400
-@@ -1,7 +1,7 @@
- #  Makefile for rebind
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- rebind: rebind.c ../elfrw/libelfrw.a
- 
-diff -Naur ELFkickers-3.0.orig//sstrip/Makefile ELFkickers-3.0/sstrip/Makefile
---- ELFkickers-3.0.orig//sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
-+++ ELFkickers-3.0/sstrip/Makefile	2011-06-02 23:05:41.000000000 -0400
-@@ -1,7 +1,7 @@
- #  Makefile for sstrip
- 
--CC = gcc
--CFLAGS = -Wall -Wextra -I../elfrw
-+CC ?= gcc
-+CFLAGS += -I../elfrw
- 
- sstrip: sstrip.c ../elfrw/libelfrw.a
- 
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
deleted file mode 100644
index 2305405b9c6c..000000000000
--- a/dev-util/elfkickers/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>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>hardened@gentoo.org</email>
-		<name>Gentoo Hardened</name>
-	</maintainer>
-	<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
-</pkgmetadata>
diff --git a/dev-util/emilpro-3-r3 b/dev-util/emilpro-3-r3
new file mode 100644
index 000000000000..cb02573c92ef
--- /dev/null
+++ b/dev-util/emilpro-3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=a graphical disassembler for a large number of instruction sets
+EAPI=5
+HOMEPAGE=http://www.emilpro.com/
+IUSE=+system-binutils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0=
+SLOT=0
+SRC_URI=http://www.emilpro.com/emilpro-3.tar.gz !system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )
+_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_=3529a250050b53240f90c65cdad613e6
diff --git a/dev-util/emilpro-9999 b/dev-util/emilpro-9999
new file mode 100644
index 000000000000..701e58d32eb3
--- /dev/null
+++ b/dev-util/emilpro-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0= sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=a graphical disassembler for a large number of instruction sets
+EAPI=5
+HOMEPAGE=http://www.emilpro.com/
+IUSE=+system-binutils
+LICENSE=GPL-2
+RDEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0=
+SLOT=0
+SRC_URI=!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f8ae991a4e9ca52f179e8f6828a6005
diff --git a/dev-util/emilpro/Manifest b/dev-util/emilpro/Manifest
deleted file mode 100644
index 8c428dfabca9..000000000000
--- a/dev-util/emilpro/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX emilpro-3-system-binutils.patch 1639 BLAKE2B 2090f21225210305bc3bb26737ce7a351009cc14bbd09e99162a4c5967755690a6cf24bf3ff233ea61ce21bde497e61b60f722ac3302a093c35ce33d543f7cf4 SHA512 e80467cd91b19c6d4034cf121ff5b812638384e6a6dde6fc8c6dc1a38edb77dbd2ec259fa4e1ef6f8ff8f1a4df9e89bfc4dbaef5fab3ddd7e1020aadac6d3281
-AUX emilpro-9999-system-binutils.patch 1784 BLAKE2B 2d52a9b6bfe8f9afc7ea448415e230f2a6b29b4fed52fa043c4985158e896b201fc32d1312dc69b0fe5ebd794840bae955a6943127772489df8cd074543faad0 SHA512 1edb7f4f534f99cd1b9379040e21ba9fadadc93ecdea67f5da490d3c92d1f7526088451c00959275b6bc9ee02d683f09054d730adcaef2bdb40d77658aa238b7
-AUX or1k-2.patch 1299 BLAKE2B 3096fc122d0551fb6376f48f2f4ee78a11a760cea78a992eb306c51c3d632c615e68de796cba9c787afddcad6aaefe5a51b34ab0d2eb9c12e3d5ede3615a8ec4 SHA512 d142e5cabf6393b8d8af83391ab3e8fd9514e64a67dd6af8175c605402fdfc136cf79c0fc5a6ecd1c2f4c4dcef7a208c363e4c95ed5545d116160f80aed3e17a
-AUX or1k.patch 4386 BLAKE2B 5851de07ac3d48595a61442425123372fa39ac6cb4bcd436e2d7b832c701ab29fd6fe2a800f5fc0be0ef12d04256745ad21b205c2852acae98dabf64de6c2bfe SHA512 7ddc06d15c50095720588899b6fc8889c4184d894fe28c8e6bfca9d9bf4f38a937b4d2722d98c45883c9271e6caac4b838c381c78660233ad8bb91fac1f80bee
-AUX respect-cflags.patch 662 BLAKE2B b7aadf77fc42c717e0246d3c2bc5be58f1d10e933a726972e51a413548b8df76b76c8b0e5bdc9048e88305b0fd1c1dafbc7a625d010efa6bed4047045b136163 SHA512 5d308894752de0df6fee2f19ebc3664a0cd980a3e6babed9707db39a342ce3eb2f2c56e7680d0d9d969b3dff9059c2ef1b9cb14ea23af991b3b9e10653a0bda6
-DIST binutils-2.23.2.tar.bz2 21440347 BLAKE2B 9e85ae032d27b75fd5a868c2d59da470849a67016170b549550f28ae0aeed938e9d887d80de0e3354aa3e9956783e68ce9c0a32e9fce8783620601fb96b57599 SHA512 dec753bbba008f1526b89cf1bd85feba78f362f5333ffdf93953fd131eb755976dec82a0a4ba38c43d2434da007137780cfe674de5414be5cf7ce7fbc6af6d16
-DIST emilpro-3.tar.gz 120276 BLAKE2B 97f45f1ee4f48f936c1332dd8256ecbd4de89fb728691cf18a91d25ffdc725a9d8fc310b7a15a2c9f62d254538058871eedd56448e9e89eb369240ae43e402d4 SHA512 18a90dd672a4fb878f0da1eefacb01f159e25b28c94ea6707578deab74dbf07ee0f9d276e376f4eaff7b00c4dd7edcf5b7cbb3e5b316f4d720fe0343e1c36727
-EBUILD emilpro-3-r3.ebuild 1654 BLAKE2B e074352d7f74a808dc98db2ff3e84cf3c970d2976d1ee7e7d3736339f33b5cc35b26e0698326d69cee1a7a6cebfd07e8ebf7e68ffdeb740442554e2d188270f7 SHA512 df5a61bfcaa3f3f5d0665522c7d9e3622eb90304bcc03d2879a20f110165f5cc3ebe8ba4690c918d2c4c9fd14d940d8ffae1e8c6670b8516b5ae404b7b991f6f
-EBUILD emilpro-9999.ebuild 1579 BLAKE2B f510a5f1ad4d0f0eecc1f5c7a6362b64020ff756999c2ab46f078be5a5ad064111218b6ab9de6cffbf27c5d4a30a63f1c5459b4748008d010c9c8e8b4f38d82e SHA512 dd5005b1322ba00d6b1d323fc73c402109dada2c226eb6353beb88d3ef89d6c141cdb0656afa5ba036a4748de6098062917be14a2f52ea0305bcce3e93fd286c
-MISC metadata.xml 371 BLAKE2B 5070db4fdc4d08e734a6e06436712d07321e07e4da449530e20ae03099b347c5b4491cb7876b7ced979914b6c630d1ae8e200494b1ff94a0f2eb0ab4861a614c SHA512 133f1a99dcc7b0eaa0ed4c28334fb7ee73010987f5435d9d2ccaa1e5956ff4a9cc4f4b0fcb9f755e44fb5e0453aa9b69684a7435ac6d7d4c27bcb01dbe65117c
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
deleted file mode 100644
index e40bc9b228ee..000000000000
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-DESCRIPTION="a graphical disassembler for a large number of instruction sets"
-HOMEPAGE="http://www.emilpro.com/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
-	inherit git-r3
-	KEYWORDS=""
-	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
-else
-	SRC_URI="http://www.emilpro.com/${P}.tar.gz
-		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+system-binutils"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/glibmm
-	dev-cpp/pangomm
-	dev-cpp/cairomm
-	dev-libs/libsigc++:2
-	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
-	net-misc/curl
-	virtual/libelf:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-cflags.patch
-	if use system-binutils; then
-		epatch "${FILESDIR}"/${P}-system-binutils.patch
-	else
-		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
-	fi
-	epatch "${FILESDIR}"/or1k.patch
-	epatch "${FILESDIR}"/or1k-2.patch
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	if use system-binutils; then
-		cmake-utils_src_compile
-	else
-		#bundled binutils is broken, always builds with one thread
-		#but somehow it still fails if I don't do this
-		cd "${BUILD_DIR}"
-		emake -j1
-	fi
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/emilpro
-}
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
deleted file mode 100644
index 3cad6fafde7f..000000000000
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-DESCRIPTION="a graphical disassembler for a large number of instruction sets"
-HOMEPAGE="http://www.emilpro.com/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
-	inherit git-r3
-	KEYWORDS=""
-	SRC_URI="!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
-else
-	SRC_URI="http://www.emilpro.com/${P}.tar.gz
-		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+system-binutils"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/glibmm
-	dev-cpp/pangomm
-	dev-cpp/cairomm
-	dev-libs/libsigc++:2
-	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
-	net-misc/curl
-	virtual/libelf:0="
-# automagic dep
-# dev-util/capstone
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use system-binutils; then
-		epatch "${FILESDIR}"/${P}-system-binutils.patch
-	else
-		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
-	fi
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	if use system-binutils; then
-		cmake-utils_src_compile
-	else
-		#bundled binutils is broken, always builds with one thread
-		#but somehow it still fails if I don't do this
-		cd "${BUILD_DIR}"
-		emake -j1
-	fi
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/emilpro
-}
diff --git a/dev-util/emilpro/files/emilpro-3-system-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
deleted file mode 100644
index d73f402a3005..000000000000
--- a/dev-util/emilpro/files/emilpro-3-system-binutils.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt
---- emilpro-3-orig/CMakeLists.txt	2016-03-29 13:19:47.035441401 -0400
-+++ emilpro-3/CMakeLists.txt	2016-03-29 13:18:36.650443067 -0400
-@@ -11,7 +11,6 @@
- set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- 
- # Dependencies
--include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
- 
- find_package (LibElf REQUIRED)
- find_package (PkgConfig REQUIRED)
-@@ -30,7 +29,6 @@
- pkg_check_modules(LIBCURL libcurl)
- 
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
--LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
- 
- if (HAVE_BFD_MULTIARCH)
- 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
-@@ -110,7 +108,6 @@
- 	src/include/
- 	${CMAKE_BINARY_DIR}
- 	${LIBELF_INCLUDE_DIRS}
--	${CMAKE_BINARY_DIR}/install-binutils/include/
- 	${GTKMM_INCLUDE_DIRS}
- 	${GTKSOURCEVIEWMM_INCLUDE_DIRS}
- 	${LIBXMLPP_INCLUDE_DIRS}
-@@ -128,8 +125,6 @@
- 	tools/squash-instruction-models.cc
- 	)
- 
--set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
--set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
- 
- set (BASE_LIBS
- 	${LIBELF_LIBRARIES}
-diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc
---- emilpro-3-orig/src/namemangler.cc	2016-03-29 13:17:23.957444786 -0400
-+++ emilpro-3/src/namemangler.cc	2016-03-29 13:18:57.306442578 -0400
-@@ -1,7 +1,7 @@
- #include <namemangler.hh>
- 
- #include <bfd.h>
--#include <demangle.h>
-+#include <libiberty/demangle.h>
- 
- using namespace emilpro;
- 
diff --git a/dev-util/emilpro/files/emilpro-9999-system-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
deleted file mode 100644
index 194e8d10b6e4..000000000000
--- a/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt
---- emilpro-9999-orig/CMakeLists.txt	2016-03-29 14:30:48.017340585 -0400
-+++ emilpro-9999/CMakeLists.txt	2016-03-29 14:31:21.335339797 -0400
-@@ -11,7 +11,6 @@
- set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- 
- # Dependencies
--include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
- 
- find_package (LibElf REQUIRED)
- find_package (LibCapstone)
-@@ -40,10 +39,6 @@
- pkg_check_modules(LIBCURL REQUIRED libcurl)
- 
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
--LINK_DIRECTORIES(
--	${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64
--	${CMAKE_BINARY_DIR}/binutils/libiberty
--	)
- 
- if (HAVE_BFD_MULTIARCH)
- 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
-@@ -120,7 +115,6 @@
- set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
- 
- include_directories(
--	${CMAKE_BINARY_DIR}/install-binutils/include/
- 	src/gtk/include/
- 	src/include/
- 	${CMAKE_BINARY_DIR}
-@@ -143,9 +137,6 @@
- 	tools/squash-instruction-models.cc
- 	)
- 
--set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
--set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
--
- set (BASE_LIBS
- 	${LIBELF_LIBRARIES}
- 	opcodes
-diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc
---- emilpro-9999-orig/src/namemangler.cc	2016-03-29 14:30:48.017340585 -0400
-+++ emilpro-9999/src/namemangler.cc	2016-03-29 14:31:06.397340150 -0400
-@@ -1,7 +1,7 @@
- #include <namemangler.hh>
- 
- #include <bfd.h>
--#include <demangle.h>
-+#include <libiberty/demangle.h>
- 
- using namespace emilpro;
- 
diff --git a/dev-util/emilpro/files/or1k-2.patch b/dev-util/emilpro/files/or1k-2.patch
deleted file mode 100644
index 9dd4e195342a..000000000000
--- a/dev-util/emilpro/files/or1k-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5b41e51bfb9fdeac7c6a2441badf8c3b92463fef Mon Sep 17 00:00:00 2001
-From: Alex Chernetz <andy80586@gmail.com>
-Date: Fri, 1 May 2015 14:34:31 -0700
-Subject: [PATCH] Function is print_insn_or1k, not print_insn_little_or1k
-
----
- src/bfd-disassembly.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
-index bf3e768..eeecbe4 100644
---- a/src/bfd-disassembly.cc
-+++ b/src/bfd-disassembly.cc
-@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
- 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
- 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
- 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
--	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
-+	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_or1k);      /* OpenRISC 32 */
- 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
- 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
- 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */
diff --git a/dev-util/emilpro/files/or1k.patch b/dev-util/emilpro/files/or1k.patch
deleted file mode 100644
index e7a4392f0bdb..000000000000
--- a/dev-util/emilpro/files/or1k.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f59c5f424a268313c1fcc009fd1e40c00bf6c4f2 Mon Sep 17 00:00:00 2001
-From: Alex Chernetz <andy80586@gmail.com>
-Date: Fri, 1 May 2015 13:32:27 -0700
-Subject: [PATCH] or32 and openrisc architectures are replaced by or1k in
- current binutils
-
----
- src/architecturefactory.cc | 6 ++----
- src/bfd-disassembly.cc     | 3 +--
- 2 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/architecturefactory.cc b/src/architecturefactory.cc
-index 709b770..25ccf80 100644
---- a/src/architecturefactory.cc
-+++ b/src/architecturefactory.cc
-@@ -10,7 +10,7 @@ ArchitectureFactory::ArchitectureFactory() :
- 	m_architectureNameMap[(unsigned)bfd_arch_m68k] = "m68k";
- 	m_architectureNameMap[(unsigned)bfd_arch_vax] = "vax";
- 	m_architectureNameMap[(unsigned)bfd_arch_i960] = "i960";
--	m_architectureNameMap[(unsigned)bfd_arch_or32] = "or32";
-+	m_architectureNameMap[(unsigned)bfd_arch_or1k] = "or1k";
- 	m_architectureNameMap[(unsigned)bfd_arch_sparc] = "sparc";
- 	m_architectureNameMap[(unsigned)bfd_arch_mips] = "mips";
- 	m_architectureNameMap[(unsigned)bfd_arch_i386] = "i386";
-@@ -68,7 +68,6 @@ ArchitectureFactory::ArchitectureFactory() :
- 	m_architectureNameMap[(unsigned)bfd_arch_cris] = "cris";
- 	m_architectureNameMap[(unsigned)bfd_arch_s390] = "s390";
- 	m_architectureNameMap[(unsigned)bfd_arch_score] = "score";
--	m_architectureNameMap[(unsigned)bfd_arch_openrisc] = "openrisc";
- 	m_architectureNameMap[(unsigned)bfd_arch_mmix] = "mmix";
- 	m_architectureNameMap[(unsigned)bfd_arch_xstormy16] =  "xstormy16";
- 	m_architectureNameMap[(unsigned)bfd_arch_xc16x] = "xc16x";
-@@ -81,7 +80,7 @@ ArchitectureFactory::ArchitectureFactory() :
- 	m_nameArchitectureMap["m68k"] = (unsigned)bfd_arch_m68k;
- 	m_nameArchitectureMap["vax"] = (unsigned)bfd_arch_vax;
- 	m_nameArchitectureMap["i960"] = (unsigned)bfd_arch_i960;
--	m_nameArchitectureMap["or32"] = (unsigned)bfd_arch_or32;
-+	m_nameArchitectureMap["or1k"] = (unsigned)bfd_arch_or1k;
- 	m_nameArchitectureMap["sparc"] = (unsigned)bfd_arch_sparc;
- 	m_nameArchitectureMap["mips"] = (unsigned)bfd_arch_mips;
- 	m_nameArchitectureMap["i386"] = (unsigned)bfd_arch_i386;
-@@ -139,7 +138,6 @@ ArchitectureFactory::ArchitectureFactory() :
- 	m_nameArchitectureMap["cris"] = (unsigned)bfd_arch_cris;
- 	m_nameArchitectureMap["s390"] = (unsigned)bfd_arch_s390;
- 	m_nameArchitectureMap["score"] = (unsigned)bfd_arch_score;
--	m_nameArchitectureMap["openrisc"] = (unsigned)bfd_arch_openrisc;
- 	m_nameArchitectureMap["mmix"] = (unsigned)bfd_arch_mmix;
- 	m_nameArchitectureMap["xstormy16"] =  (unsigned)bfd_arch_xstormy16;
- 	m_nameArchitectureMap["xc16x"] = (unsigned)bfd_arch_xc16x;
-diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
-index 5cda9e2..bf3e768 100644
---- a/src/bfd-disassembly.cc
-+++ b/src/bfd-disassembly.cc
-@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
- 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
- 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
- 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
--	    m_arch[bfd_arch_or32] = BfdArch(bfd_arch_or32, 0, print_insn_little_or32);      /* OpenRISC 32 */
-+	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
- 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
- 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
- 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */
-@@ -89,7 +89,6 @@ class Disassembly : public IDisassembly,
- 	    m_arch[bfd_arch_rl78] = BfdArch(bfd_arch_rl78, 0, print_insn_rl78);
- 	    m_arch[bfd_arch_rx] = BfdArch(bfd_arch_rx, 0, print_insn_rx);        /* Renesas RX.  */
- 	    m_arch[bfd_arch_s390] = BfdArch(bfd_arch_s390, bfd_mach_s390_64, print_insn_s390);      /* IBM s390 */
--	    m_arch[bfd_arch_openrisc] = BfdArch(bfd_arch_openrisc, 0, print_insn_openrisc);  /* OpenRISC */
- 	    m_arch[bfd_arch_mmix] = BfdArch(bfd_arch_mmix, 0, print_insn_mmix);      /* Donald Knuth's educational processor.  */
- 	    m_arch[bfd_arch_xstormy16] = BfdArch(bfd_arch_xstormy16, 0, print_insn_xstormy16);
- 	    m_arch[bfd_arch_msp430] = BfdArch(bfd_arch_msp430, 0, print_insn_msp430);    /* Texas Instruments MSP430 architecture.  */
diff --git a/dev-util/emilpro/files/respect-cflags.patch b/dev-util/emilpro/files/respect-cflags.patch
deleted file mode 100644
index 12d5bd52db5d..000000000000
--- a/dev-util/emilpro/files/respect-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur emilpro-3/CMakeLists.txt emilpro-3-cflags/CMakeLists.txt
---- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
-+++ emilpro-3-cflags/CMakeLists.txt	2014-03-18 17:59:47.534542384 -0400
-@@ -29,7 +29,7 @@
- pkg_check_modules(LIBXMLPP libxml++-2.6)
- pkg_check_modules(LIBCURL libcurl)
- 
--set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
- LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
- 
- if (HAVE_BFD_MULTIARCH)
diff --git a/dev-util/emilpro/metadata.xml b/dev-util/emilpro/metadata.xml
deleted file mode 100644
index cccc81ee370e..000000000000
--- a/dev-util/emilpro/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>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<use>
-<flag name="system-binutils">Use the gentoo binutils instead of building against an unpatched vanilla version</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/eric-17.12-r1 b/dev-util/eric-17.12-r1
new file mode 100644
index 000000000000..61fffda7432f
--- /dev/null
+++ b/dev-util/eric-17.12-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,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_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/sip-4.14.3[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-5.7.1[gui,network,printsupport,sql,svg,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(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),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=A full featured Python IDE using PyQt and QScintilla
+EAPI=6
+HOMEPAGE=https://eric-ide.python-projects.org/
+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 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,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_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/sip-4.14.3[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-5.7.1[gui,network,printsupport,sql,svg,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(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),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[help,webengine,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[help,webkit,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/chardet-3.0.4[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/coverage-4.1.0[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/pygments-2.2.0[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-util/eric:4 !dev-util/eric:5
+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=6
+SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/17.12/eric6-17.12.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3604e6000285dfc5f106661fce823f2b
diff --git a/dev-util/eric-18.03 b/dev-util/eric-18.03
new file mode 100644
index 000000000000..d12ebf34b388
--- /dev/null
+++ b/dev-util/eric-18.03
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,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_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/sip-4.14.3[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-5.7.1[gui,network,printsupport,sql,svg,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(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),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=A full featured Python IDE using PyQt and QScintilla
+EAPI=6
+HOMEPAGE=https://eric-ide.python-projects.org/
+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 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,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_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/sip-4.14.3[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-5.7.1[gui,network,printsupport,sql,svg,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(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),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[help,webengine,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[help,webkit,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/chardet-3.0.4[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/coverage-4.1.0[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/pygments-2.2.0[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-util/eric:4 !dev-util/eric:5
+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=6
+SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/18.03/eric6-18.03.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3604e6000285dfc5f106661fce823f2b
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
deleted file mode 100644
index 35b36ad9d0fa..000000000000
--- a/dev-util/eric/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST eric6-17.12.tar.gz 19035763 BLAKE2B e19195ef0b36ce216dc4f21ec221da4002a20ee3e3e300b80045d31d8793df299c2224f41f562fb59a0f8a65ead4f616df89a905905918dd1ae396d55d77fdc3 SHA512 7144c1fad76eb0f3ccdd2a29fb3fc369ad35d28dfbae1e6b75855b85218df34afa715f3a2df37bd6163e2f3a23a2a9a7f528cfe54f1bc21486ab81da6a69a697
-DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-EBUILD eric-17.12-r1.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
-EBUILD eric-18.03.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
-MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-17.12-r1.ebuild b/dev-util/eric/eric-17.12-r1.ebuild
deleted file mode 100644
index 270355f4d0c8..000000000000
--- a/dev-util/eric/eric-17.12-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	|| (
-		dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}]
-		dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}]
-	)
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-	!dev-util/eric:4
-	!dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
-
-pkg_postinst(){
-	xdg_desktop_database_update
-
-	if ! has_version dev-python/enchant; then
-		elog "You might want to install dev-python/pyenchant for spell checking."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
deleted file mode 100644
index 270355f4d0c8..000000000000
--- a/dev-util/eric/eric-18.03.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	|| (
-		dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}]
-		dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}]
-	)
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-	!dev-util/eric:4
-	!dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
-
-pkg_postinst(){
-	xdg_desktop_database_update
-
-	if ! has_version dev-python/enchant; then
-		elog "You might want to install dev-python/pyenchant for spell checking."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
deleted file mode 100644
index 11e69dd891df..000000000000
--- a/dev-util/eric/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>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">eric-ide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/fatrace-0.12 b/dev-util/fatrace-0.12
new file mode 100644
index 000000000000..57c93dcd2b64
--- /dev/null
+++ b/dev-util/fatrace-0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=powertop? ( 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=report file access events from all running processes
+EAPI=5
+HOMEPAGE=https://launchpad.net/fatrace
+IUSE=powertop kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=powertop? ( 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=powertop? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://launchpad.net/fatrace/trunk/0.12/+download/fatrace-0.12.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7c8ed963c0d67c6bf911ea4cc6ac4aeb
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
deleted file mode 100644
index 652611d75d22..000000000000
--- a/dev-util/fatrace/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fatrace-0.11-sysmacros.patch 295 BLAKE2B a7f5350f0158e1f0c529b3a67a59b4a4255cd640287822b57e1f0952029b899fbdaab15e2d22394357e1210bcbafe8678866462a8213a030d5dfed2ec57f214b SHA512 0b3946043f74b957eb1b8caad39cc1b031e40bad564a1ffaa593dd77d5f96f06a1103d8d0b3689b4fe58f4bb4ff105d81855c9088ea5eec9d4ce6876d4a6f7f9
-DIST fatrace-0.12.tar.bz2 19377 BLAKE2B 5279af5497408fdc614f090060e56552e0f396501a0d4155752ab44bfa666878ab4b969979314051b9b3f529e3870ffdc8071f332dbc146f0d2a7798c8b2549a SHA512 76dfc9dfc5c6b8e13f5d0c5c01c5c1b91093a5d980ded1f8fd776c9e861a6679eea193bcdd92b1c8770c9af346820300f186b7167ff4313e670f27ea31f765ea
-EBUILD fatrace-0.12.ebuild 844 BLAKE2B d20c3845d873391b4a429b541cc45a8f55adc6cff1423e9dd757d34500b3948a1769d812a13494ab5e91fee403bf92e9dfed3f8794b7c92c70eb02baf5297c3d SHA512 befb801bc29cce8b63e896355c68e99b28f3adb4c5eb1b73244653e62e1b576b9485a562295391ba3d507dc62685a6515d3739b9a26888995a775ce80b42376f
-MISC metadata.xml 388 BLAKE2B 3725d4392852682048ac5ef723a192389940988dbacec188d1956b73db5f2988b07c2b0a24912afdefa94765f70ababe8033f8778f82d016ac632d58b16cb84c SHA512 195cef9daf519cc93f44926498d1d58f3751bbdb54df19fe1745d245c4ded2c190da45637bb52a2682a6d2fc5ae692bed0cb3f5c111c4f6e156b11d0690e3036
diff --git a/dev-util/fatrace/fatrace-0.12.ebuild b/dev-util/fatrace/fatrace-0.12.ebuild
deleted file mode 100644
index e6bad36cf676..000000000000
--- a/dev-util/fatrace/fatrace-0.12.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{3_4,3_5,3_6} )
-
-inherit linux-info python-r1 toolchain-funcs
-
-DESCRIPTION="report file access events from all running processes"
-HOMEPAGE="https://launchpad.net/fatrace"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="powertop"
-
-RDEPEND="powertop? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="powertop? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~FANOTIFY"
-
-pkg_setup() {
-	use powertop && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.11-sysmacros.patch #580082
-	tc-export CC
-}
-
-src_install() {
-	dosbin fatrace
-	use powertop && dosbin power-usage-report
-
-	doman fatrace.1
-	dodoc NEWS
-}
diff --git a/dev-util/fatrace/files/fatrace-0.11-sysmacros.patch b/dev-util/fatrace/files/fatrace-0.11-sysmacros.patch
deleted file mode 100644
index 6f1816dc011b..000000000000
--- a/dev-util/fatrace/files/fatrace-0.11-sysmacros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.launchpad.net/fatrace/+bug/1572396
-https://bugs.gentoo.org/580082
-
---- a/fatrace.c
-+++ b/fatrace.c
-@@ -33,6 +33,7 @@
- #include <signal.h>
- #include <time.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/fanotify.h>
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/dev-util/fatrace/metadata.xml b/dev-util/fatrace/metadata.xml
deleted file mode 100644
index 1c2ccfe5c948..000000000000
--- a/dev-util/fatrace/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<use>
-		<flag name="powertop">Add powetop integration</flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">fatrace</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/fhist-1.16 b/dev-util/fhist-1.16
new file mode 100644
index 000000000000..75bcc921ab22
--- /dev/null
+++ b/dev-util/fhist-1.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=sys-devel/gettext sys-apps/groff test? ( app-arch/sharutils ) sys-devel/bison
+DESCRIPTION=File history and comparison tools
+EAPI=0
+HOMEPAGE=http://fhist.sourceforge.net/fhist.html
+IUSE=test
+KEYWORDS=~ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/gettext sys-apps/groff
+SLOT=0
+SRC_URI=http://fhist.sourceforge.net/fhist-1.16.tar.gz
+_md5_=9d147d9f98125a49c6a2eee5dd80e368
diff --git a/dev-util/fhist-1.19 b/dev-util/fhist-1.19
new file mode 100644
index 000000000000..a4d89ab23265
--- /dev/null
+++ b/dev-util/fhist-1.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/libexplain sys-devel/gettext sys-apps/groff sys-devel/bison test? ( app-arch/sharutils )
+DESCRIPTION=File history and comparison tools
+EAPI=4
+HOMEPAGE=http://fhist.sourceforge.net/fhist.html
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libexplain sys-devel/gettext sys-apps/groff
+SLOT=0
+SRC_URI=http://fhist.sourceforge.net/fhist-1.19.tar.gz
+_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_=974ce4e3b2fe1aea2c753acc81467778
diff --git a/dev-util/fhist-1.21 b/dev-util/fhist-1.21
new file mode 100644
index 000000000000..0f4617d1918e
--- /dev/null
+++ b/dev-util/fhist-1.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/libexplain sys-devel/gettext sys-apps/groff sys-devel/bison test? ( app-arch/sharutils )
+DESCRIPTION=File history and comparison tools
+EAPI=5
+HOMEPAGE=http://fhist.sourceforge.net/fhist.html
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libexplain sys-devel/gettext sys-apps/groff
+SLOT=0
+SRC_URI=http://fhist.sourceforge.net/fhist-1.21.D001.tar.gz
+_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_=7df9a22dccb2aa8d551fb024139539b8
diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest
deleted file mode 100644
index b4d0bf059348..000000000000
--- a/dev-util/fhist/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 1.19-ldflags.patch 1742 BLAKE2B aacfbf6f8a3f4f0016e6b2736940c8bc4f6b461222c7942c8dbe5b50eac150cef7a4551a1408fe04a5667e20b7570c26739eeacd52fd1c8cf60d17a1c36bae19 SHA512 350ba6f6b2d1c12b23401e0dc21162f41cafc64d2278cc9b188e7b8680e395677218013c398e84c14f0bf1a8ff2c69729d426d5892c88214eeb7b0c8016ddda9
-AUX fhist-1.21-ldflags.patch 1594 BLAKE2B b98857e3564238cb366728625760e9c43cdb2d0f0824b11c9fe1d3bf2ce396b42cd0cdd4446765aee62288a83fe1353b006e05a342b25f23a952e6c80290a306 SHA512 ddd894daf5e8a86a6d9cde1b29d2a0a61fae8bcf11a86dd16b4e2099eb094489ce20a5849eeb771ef712267da6eb7323d08c9e2e432c39a90d8b3bc310569e5d
-DIST fhist-1.16.tar.gz 383180 BLAKE2B d80c0d72733344498fc3082ca0906b50d4de78b1a6656c2a3b72758fa5e509fd20b40ef6f25c570a93b00db58f563d2c3fd08be40e33096d6e6491e436a13219 SHA512 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d
-DIST fhist-1.19.tar.gz 409083 BLAKE2B 15efaf7441dbdd39bfa21dc74cef912b10cf82c24e4484c44c8469f68570025563b6303dfb003341835124df7b7cb71ff84628f6440f69ab531c53172914af25 SHA512 d93f0ce1b29e527af5de3f49d44ebc11567f53bb0b428322daa42b0a4a14ae75333ffcb9a65ba14b2a6240d57be7bdf7632e6b4eccd071d4e9b6e90c14c317a9
-DIST fhist-1.21.D001.tar.gz 409961 BLAKE2B 275406a8f49d70b41fe1595d907e8a5a3aad8c1802933fec06e7839e22e770975bdcdcc1e743a9c554b1060bf0c4ebd3c23d4efd240fca32ce10096a690b6ba1 SHA512 9f69ba29bdd44b4888decdcfb7db49a29a1c9611ae5cd733af2e3ec04afc498674854616335d13ca732a6485cbffafc6a4072d14a9638ead1dea4412a2070f97
-EBUILD fhist-1.16.ebuild 840 BLAKE2B 119eb14ad08fc9113a3b2943b5002052ae0a1d8c2c9181692bff4ede0833fdc7c1bde8c7086876a1bd7f0108c78cbe5ebbfa60b32ef46667961665c4bb213735 SHA512 78a462dd4bee4aa8c996a0919d328c0674d37c0201d06b60dc5b2724793400153a8d5129e0715e5b946284a30823013631531cf98099edb6f626871c6e76a27b
-EBUILD fhist-1.19.ebuild 623 BLAKE2B 032ad2a7a4f9d5b68bfbd30a369efc5d15526115856dbb6552e3621ead19873b905158f0612c6c1cdb2bb52659997dff208125690db683ae5d62f698a1b986b1 SHA512 28df7e012eb27594d9c26f9cc7a1a2bd36887481db45cd8f0edbc8a5fd6bd56c0606bc7d605322f89f859ee2e4c638c1bfc776b310816d0205c784cc40bde33e
-EBUILD fhist-1.21.ebuild 627 BLAKE2B 5a399048373061e484d6f0736dee1daeb2bb9419e0ecd2c42e9170a328cb9bad6eb7fdefca4d53a88542d1c9abc83afad608ba5fa10836edd787344ae62d6091 SHA512 d1a8ea57a1613f6ea85995deda14da7f5cdd632b552c9d1f20f39285de7e27542b23a5274f8770ddadeaa4aee632dd0ac0797218a7cafe48e684a0535a4cb2b8
-MISC metadata.xml 340 BLAKE2B dcc8a7d3c5b31bddb3b821e922b972f7fb1eb93657f9b6c75114be911fa4a25bf41234403f4525a28d0fad7206e7b7d677751d4310fcd08b33bf93a15fad2819 SHA512 ac21cc184e87106ab2436015b123151f0a647f020492718cde669d0252d94995c937f4e6b393cc90d60ad48fbe7f35451803a18e84717c860946e13a2a7afc35
diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild
deleted file mode 100644
index 28569ab13662..000000000000
--- a/dev-util/fhist/fhist-1.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="File history and comparison tools"
-HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
-SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc x86"
-IUSE="test"
-
-RDEPEND="sys-devel/gettext
-		sys-apps/groff"
-DEPEND="${RDEPEND}
-		test? ( app-arch/sharutils )
-		sys-devel/bison"
-
-MAKEOPTS+=" -j1"
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-}
-
-src_test() {
-	emake sure || die "src_test failed"
-}
-
-src_install () {
-	emake \
-		RPM_BUILD_ROOT="${D}" \
-		NLSDIR="${D}/usr/share/locale" \
-		install || die "make install failed"
-
-	dodoc lib/en/*.txt || die
-	dodoc lib/en/*.ps || die
-
-	# remove duplicate docs etc.
-	rm -r "${D}"/usr/share/fhist
-
-	dodoc MANIFEST README || die
-}
diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
deleted file mode 100644
index c23d28e436b5..000000000000
--- a/dev-util/fhist/fhist-1.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="File history and comparison tools"
-HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
-SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/libexplain
-	sys-devel/gettext
-	sys-apps/groff"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	test? ( app-arch/sharutils )"
-
-src_prepare() {
-	MAKEOPTS+=" -j1"
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	append-cflags -fgnu89-inline
-}
diff --git a/dev-util/fhist/fhist-1.21.ebuild b/dev-util/fhist/fhist-1.21.ebuild
deleted file mode 100644
index 1f783dcb8d3a..000000000000
--- a/dev-util/fhist/fhist-1.21.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="File history and comparison tools"
-HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
-SRC_URI="http://fhist.sourceforge.net/${P}.D001.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/libexplain
-	sys-devel/gettext
-	sys-apps/groff"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	test? ( app-arch/sharutils )"
-
-src_prepare() {
-	MAKEOPTS+=" -j1"
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	append-cflags -fgnu89-inline
-}
diff --git a/dev-util/fhist/files/1.19-ldflags.patch b/dev-util/fhist/files/1.19-ldflags.patch
deleted file mode 100644
index c0fa0e825a9e..000000000000
--- a/dev-util/fhist/files/1.19-ldflags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8aa8408..2c39b28 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -500,8 +500,9 @@ common/sub/expr.$(OBJEXT): common/sub/expr.c common/ac/stdarg.h \
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -c common/sub/expr.c
- 	mv expr.$(OBJEXT) common/sub/expr.$(OBJEXT)
- 
--common/sub/expr_gram.yacc.c common/sub/expr_gram.yacc.h: \
--		common/sub/expr_gram.y
-+common/sub/expr_gram.yacc.c: common/sub/expr_gram.yacc.h
-+
-+common/sub/expr_gram.yacc.h:  common/sub/expr_gram.y
- 	$(YACC) -d common/sub/expr_gram.y
- 	sed -e 's/[yY][yY]/sub_expr_gram_/g' y.tab.c > \
- 		common/sub/expr_gram.yacc.c
-@@ -961,7 +962,7 @@ common/libcommon.a: $(lib_obj)
- fcomp_obj = fcomp/main.$(OBJEXT)
- 
- bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) \
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) \
- 		common/libcommon.a $(LIBS)
- 
- $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
-@@ -974,7 +975,7 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) \
- 		fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
- 
- bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) \
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) \
- 		common/libcommon.a $(LIBS)
- 
- $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
-@@ -983,7 +984,7 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
- fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
- 
- bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) \
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) \
- 		common/libcommon.a $(LIBS)
- 
- $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
diff --git a/dev-util/fhist/files/fhist-1.21-ldflags.patch b/dev-util/fhist/files/fhist-1.21-ldflags.patch
deleted file mode 100644
index 00aab69d7495..000000000000
--- a/dev-util/fhist/files/fhist-1.21-ldflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- Makefile.in | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ba4e4c2..c0e552a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -916,8 +916,8 @@ common/libcommon.a: $(common_obj)
- fcomp_obj = fcomp/main.$(OBJEXT)
- 
- bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
--		$(LDFLAGS) $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
-+		$(LIBS)
- 
- $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
- 	$(INSTALL_PROGRAM) bin/fcomp$(EXEEXT) $@
-@@ -928,8 +928,8 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) fhist/extract.$(OBJEXT)
- 		fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
- 
- bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
--		$(LDFLAGS) $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
-+		$(LIBS)
- 
- $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
- 	$(INSTALL_PROGRAM) bin/fhist$(EXEEXT) $@
-@@ -937,8 +937,8 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
- fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
- 
- bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
--		$(LDFLAGS) $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
-+		$(LIBS)
- 
- $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
- 	$(INSTALL_PROGRAM) bin/fmerge$(EXEEXT) $@
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
deleted file mode 100644
index 71ffe3a34b29..000000000000
--- a/dev-util/fhist/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fhist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/findbugs-3.0.1 b/dev-util/findbugs-3.0.1
new file mode 100644
index 000000000000..bb313a9b56f1
--- /dev/null
+++ b/dev-util/findbugs-3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/jdk-1.7 app-arch/unzip doc? ( app-text/docbook-xsl-stylesheets dev-java/saxon:6.5 ) test? ( dev-java/ant-junit:0 ) dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-5:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Find Bugs in Java Programs
+EAPI=5
+HOMEPAGE=http://findbugs.sourceforge.net/
+IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-5:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4b93e1ca964013bde01f0d8ef06db610
diff --git a/dev-util/findbugs/Manifest b/dev-util/findbugs/Manifest
deleted file mode 100644
index 785a05e8b51a..000000000000
--- a/dev-util/findbugs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch 2267 BLAKE2B e86239e24c9d72e0066056cc4ec5d011a83bfce03b5c65c0d67c0c0e9ce96514253bcbf6825bbdc74ff1712e1461c13de0d6481fe5d5985cb2f12965c1bb9a68 SHA512 66ba7a8f9331b020e7edfae46ca80a1a914bc4ee61b30b2e5f0b18eaf1b60e6dce124e0a3908f588b2e7e240968dcde93125aa32bdf215388b7c3f195a274f83
-AUX 0002-Don-t-bundle-anything-in-the-annotations-jar.patch 785 BLAKE2B 35f72333f22857c541a439c27e96519e66f92a78ac02e5c6c3c4f7a22e086a76120754c8b0e603b8f7cc2cb9cb1fc72c2ffd23bbb35410c6ae2265bc6c92808f SHA512 7810ac73d039bbaf74b6302e73879ac1c13edbe747e400d3d32570f7eeeb89dac5d41c05d2dd5babee4769bb3528bdf826dcb2e244e3a15d8342b9d8f45a6752
-AUX 0003-JDK-1.8-works-fine-for-me.patch 932 BLAKE2B 26813aee8d42c2a35cc3274365d532d2534957599aa20501553243b87c9e779f2ad9bc4deaa369838eb44f2dcb15d8874508bb46d738b985501aff6a1ce65152 SHA512 44dcfc2a45307b71a6106f2c2a8b8343f718816c04614acf9e212cf274f33d0796bab44714c66f75a193d09666269e9e2bdc16b63daad66548faa326780e3fa0
-AUX 0004-Don-t-clean-before-generating-docs.patch 623 BLAKE2B c13fc48a186c82919ca34f35f33c20eb14db041abf6a0fe787999a27f089c70bfac98d2f9e98b8b9cd7c38c179554b42e4c44134157bf7597ab7b94aeae386cf SHA512 4b5eed349a60d78dee3417e20798e8bb6a1054b655438e078d217942379529cb283f36e500b78ab15a893790277111c2ec94ed8c8fe37882aaef126c0af56981
-AUX 0005-Don-t-require-git-to-build.patch 700 BLAKE2B 0c56ef7e6c045e1d1ded9629193a72e0c32d77febd27ec6a3cda961a6bdfd110858989cba1d95b9c416a2a31071d817081f74a513336137d7915d0aee41f7ce3 SHA512 84858e4c64bd3778cc604102df7e8ebb45c5fe4d7f64f065960d78f81c082a11e7037fcf0481d3b7d033bbcec8e24de78bead4d155672092f096029b5239d9bc
-AUX launchers/fb 1190 BLAKE2B a9615d202dba91fa6c34516abf3d9cd765d93d34fc18fb093df9af71361fb5a38145fbc0af18327cb87116c5f874672812ba7f8dcbd428298bd12eb1a41cd5ec SHA512 1e14856fa31f1115509f5efaa0bde86ba4d82fa195a0b2e5218e955f8c51a0b7d5868c2078e6b6fa72d05145395df63b1aa6e923af4008aa555d43c4de6231cf
-AUX launchers/fbwrap 41 BLAKE2B 38bcd17c0c11721d67356967f17e8afa0fdbac5d32a76fe4abe528cd91bb2ef217035123ab3dc0b4e6b0e5f38657e9d7121aa5c1c5a6809db1817ef73e304c61 SHA512 d7b8cb9e8bbb7509b25abfa4f91efca154239f4b107680e4f6125fb236030a3eaae513b89252b7cb6e5893d52bcd3d4706e44733dc0e08a6a99e30865ea30202
-AUX launchers/findbugs 1298 BLAKE2B d91fe99d81ba8f9276ea9ec6d259ea86bc4e54757c0b059de4636a8f1d07bce4663f6e1921dc73f1c4c3ca95e4b2b90800d989e6c2b95fd6977849a2d37b2d1f SHA512 24ba47e65452e36f885a864ae645e58b3a773570bde12371026203d3ca2cd20c2538f4acccf1159b52d2b52d2be913d6ebad794b3f17ab99d4fc3baaa47d1d82
-AUX launchers/findbugs2 1290 BLAKE2B fcb57041f9da8c1baaf4dbbef4d11894c833ea3be0d61ffc400e59b92ec98b13017a0a299c0eca9014c15302437e8b14e924e069698bb90558eb87990ea542c8 SHA512 de0eec2986596e67654ef17771c397c30b064d99d8d78dc89bd61ae309c61233091d82ee56b1965005d2dbfd9afb466b3b98554e602df43ffbf72fec60e764ab
-DIST findbugs-3.0.1-source.zip 9625065 BLAKE2B 26c940ac0eaec16de89ffbbe26d16b0b5c2883a6131a8b3ce93b9a35014a42c221456f977e581d2f4f1b8d9333237c24ac6d5ad8fc2ba6bb018c333b6a09f4eb SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f
-EBUILD findbugs-3.0.1.ebuild 2955 BLAKE2B f386a210ead373879c31e6ae8a642c7a3bc4a112f5a5997eeec2ca8c33a3887b77a2607184e45b0f63f2b597ba26708a50c98d665aca0fcee7ecb520dd1d3517 SHA512 c47b1f6a097d9a5d0dd74764bbf109d82c9d3069af9cae10ed6910c48e33545ed9421768268650c908aeaa0edc06e5b06afcf61d2af19d80d2b31b5362742b9c
-MISC metadata.xml 1055 BLAKE2B 9a54e2835340933630434b6c15666a104d295ce364f027c3034a5261dc4d372ce905f8f1e4102e12c500616fdf12da2d90321b91d7b7309fb7927ef005039f51 SHA512 82e70de38547ae7e6005e773c0144a131e30737bce6c2768cca4f8264a884cc5166bdd018d1e9474bf5e81421ae61651ee9c2ec285f443fb704c67d1876da039
diff --git a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
deleted file mode 100644
index c92e18741ae1..000000000000
--- a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d4ef7a75e6d0e50f6417825d851ad9e5ed757985 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 10 Mar 2015 23:47:00 +0000
-Subject: [PATCH 1/2] Support bcel 6.0 RC3 instead of a random snapshot
-
----
- .../src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java | 2 +-
- findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-index 52468c9..d7cbd0e 100644
---- a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-+++ b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-@@ -50,7 +50,7 @@ import edu.umd.cs.findbugs.bcel.generic.NULL2Z;
-  * @see Frame
-  * @see DataflowAnalysis
-  */
--public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
-+public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> extends EmptyVisitor {
-     private FrameType frame;
- 
-     private Location location;
-diff --git a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-index 5d62092..a36abac 100644
---- a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-+++ b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-@@ -56,7 +56,7 @@ import org.apache.bcel.classfile.StackMap;
- import org.apache.bcel.classfile.StackMapEntry;
- import org.apache.bcel.classfile.Synthetic;
- import org.apache.bcel.classfile.Unknown;
--import org.apache.bcel.classfile.Visitor;
-+import org.apache.bcel.classfile.EmptyVisitor;
- 
- /**
-  * Fixedup of from org.apache.bcel.classfile.Visitor
-@@ -64,7 +64,7 @@ import org.apache.bcel.classfile.Visitor;
-  * @author <A HREF="http://www.cs.umd.edu/~pugh">William Pugh</A>
-  * @version 980818
-  */
--public abstract class BetterVisitor implements Visitor {
-+public abstract class BetterVisitor extends EmptyVisitor {
- 
-     /**
-      * clone() is overridden to change access control from protected to public.
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
deleted file mode 100644
index 67938e4e371c..000000000000
--- a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c956ffd82e5b88be74dca187dc80afcf6559a78f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 11 Mar 2015 21:41:36 +0000
-Subject: [PATCH 2/2] Don't bundle anything in the annotations jar
-
----
- findbugs/build.xml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 698b91f..3eac5d6 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -298,8 +298,6 @@
-             <fileset dir="${src.dir}">
-                 <include name="**/annotations/*.java"/>
-             </fileset>
--            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
--            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
-         </jar>
-     </target>
- 
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
deleted file mode 100644
index ce4e186f0aca..000000000000
--- a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From af7e19734c9bbd21d2f1bf8a66b5ca1c131eeacd Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 13 Mar 2015 00:20:20 +0000
-Subject: [PATCH 3/3] JDK 1.8 works fine for me
-
----
- findbugs/build.xml | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 3eac5d6..48c8f2b 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -122,13 +122,6 @@
-                 </javac>
-     </target>
-     <target name="classes" depends="init">
--        <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo>
--        <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}">
--             <condition>
--                 <equals arg1="1.8" arg2="${ant.java.version}"/>
--             </condition>
--         </fail>
--
-         <!-- Compile Java source files. -->
-         <echo level="info" message="compiling findbugs"/>
-         <javac
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch b/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
deleted file mode 100644
index 670f497e507b..000000000000
--- a/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c73984b12bb3c80a67d993a30c894ee05613d422 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 13 Mar 2015 13:59:22 +0000
-Subject: [PATCH 4/4] Don't clean before generating docs
-
----
- findbugs/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 48c8f2b..d0cbc04 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -652,7 +652,7 @@
-     </target>
- 
- 
--    <target name="checkdocs" depends="clean">
-+    <target name="checkdocs">
-         <!-- FIXME: check whether docs are up to date -->
-     </target>
- 
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
deleted file mode 100644
index acdff2ce96d2..000000000000
--- a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cbf9d81dba1ef0a42f79391c87845d7875a13993 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 18 May 2015 20:41:58 +0100
-Subject: [PATCH 5/5] Don't require git to build
-
----
- findbugs/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index d0cbc04..42c6d09 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -636,7 +636,7 @@
-     </target>
- 
- 
--    <target name="version" depends="classes,-get-git-revision" >
-+    <target name="version" depends="classes" >
-         <echo>${gitrnum}</echo>
-         <java classpathref="tools.classpath"
-               output="${version.props.file}"
--- 
-2.3.3
-
diff --git a/dev-util/findbugs/files/launchers/fb b/dev-util/findbugs/files/launchers/fb
deleted file mode 100644
index 79d44a41681d..000000000000
--- a/dev-util/findbugs/files/launchers/fb
+++ /dev/null
@@ -1,75 +0,0 @@
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.workflow.FB"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		;;
-
-	-help)
-		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
-gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/fbwrap b/dev-util/findbugs/files/launchers/fbwrap
deleted file mode 100644
index 7d208611c13c..000000000000
--- a/dev-util/findbugs/files/launchers/fbwrap
+++ /dev/null
@@ -1,3 +0,0 @@
-fb_mainclass="$1"
-unset fb_jvmargs
-shift
diff --git a/dev-util/findbugs/files/launchers/findbugs b/dev-util/findbugs/files/launchers/findbugs
deleted file mode 100644
index e557ce516212..000000000000
--- a/dev-util/findbugs/files/launchers/findbugs
+++ /dev/null
@@ -1,83 +0,0 @@
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-gui)
-		# this is the default
-		;;
-
-	-gui1)
-		user_props="-Dfindbugs.launchUI=1 $user_props"
-		;;
-
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		;;
-
-	-help)
-		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
-gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/findbugs2 b/dev-util/findbugs/files/launchers/findbugs2
deleted file mode 100644
index d87ea82c0907..000000000000
--- a/dev-util/findbugs/files/launchers/findbugs2
+++ /dev/null
@@ -1,89 +0,0 @@
-# Default UI is GUI2
-fb_launchui="2"
-
-#
-# Stuff we're going to pass to the JVM as JVM arguments.
-#
-jvm_debug=""
-jvm_maxheap="-Xmx768m"
-jvm_ea=""
-jvm_conservespace=""
-jvm_user_props=""
-
-#
-# Process command line args until we hit one we don't recognize.
-#
-finishedArgs=false
-while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; do
-
-	arg=$1
-
-	case $arg in
-		-textui)
-			shift
-			fb_launchui="0"
-			;;
-
-		-gui)
-			shift
-			fb_launchui="2"
-			;;
-
-		-gui1)
-			shift
-			fb_launchui="1"
-			;;
-
-		-maxHeap)
-			shift
-			jvm_maxheap="-Xmx$1m"
-			shift
-			;;
-
-		-ea)
-			shift
-			jvm_ea="-ea"
-			;;
-
-		-debug)
-			shift
-			jvm_debug="-Dfindbugs.debug=true"
-			;;
-
-		-conserveSpace)
-			shift
-			jvm_conservespace="-Dfindbugs.conserveSpace=true"
-			;;
-
-		-property)
-			shift
-			jvm_user_props="-D$1 $jvm_user_props"
-			shift
-			;;
-	
-		-D*=*)
-			jvm_user_props="$1 $user_props"
-			shift
-			;;
-
-		-version)
-			shift
-			fb_launchui="version"
-			;;
-
-		-help)
-			shift
-			fb_launchui="help"
-			;;
-
-		# All arguments starting from the first unrecognized arguments
-		# are passed on to the Java app.
-		*)
-			finishedArgs=true
-			;;
-	esac
-
-done
-
-fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
-fb_jvmargs="$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props -Dfindbugs.launchUI=$fb_launchui"
diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
deleted file mode 100644
index 2498e2e3a9e4..000000000000
--- a/dev-util/findbugs/findbugs-3.0.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Find Bugs in Java Programs"
-HOMEPAGE="http://findbugs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/apple-java-extensions-bin:0
-	>=dev-java/asm-5:4
-	>=dev-java/bcel-6:0
-	dev-java/commons-lang:2.1
-	dev-java/dom4j:1
-	dev-java/hamcrest-core:1.3
-	dev-java/jaxen:1.1
-	dev-java/jcip-annotations:0
-	dev-java/jdepend:0
-	>=dev-java/jformatstring-2.0.3:0
-	dev-java/jsr305:0
-	dev-java/junit:4"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-java/saxon:6.5
-	)
-	test? ( dev-java/ant-junit:0 )
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="apiJavadoc docs"
-EANT_TEST_TARGET="runjunit"
-EANT_GENTOO_CLASSPATH="ant-core,apple-java-extensions-bin,asm-4,bcel,commons-lang-2.1,dom4j-1,hamcrest-core-1.3,jaxen-1.1,jcip-annotations,jdepend,jformatstring,jsr305,junit-4"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)"
-	EANT_EXTRA_ARGS="-Dgitrnum=gentoo -Dxsl.stylesheet.home=${EROOT}usr/share/sgml/docbook/xsl-stylesheets"
-}
-
-java_prepare() {
-	epatch \
-		"${FILESDIR}/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch" \
-		"${FILESDIR}/0002-Don-t-bundle-anything-in-the-annotations-jar.patch" \
-		"${FILESDIR}/0003-JDK-1.8-works-fine-for-me.patch" \
-		"${FILESDIR}/0004-Don-t-clean-before-generating-docs.patch" \
-		"${FILESDIR}/0005-Don-t-require-git-to-build.patch"
-
-	# Remove bundled jars.
-	find -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar lib/{${PN},${PN}-ant,annotations}.jar
-
-	insinto "/usr/share/${PN}/plugin"
-	doins plugin/README
-
-	use source && java-pkg_dosrc src/*/edu
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/html/web"
-		doins -r build/doc/*
-		java-pkg_dojavadoc apiJavaDoc
-	fi
-
-	local SCRIPT CLASS
-	local ARGS="-Dfindbugs.home=${EROOT}usr/share/findbugs"
-
-	ls src/scripts/standard | grep -E -v '^(findbugs2?|fb|fbwrap)$' | while read SCRIPT; do
-		CLASS=$(grep '^fb_mainclass=' "src/scripts/standard/${SCRIPT}" | sed 's/^.*=//')
-		java-pkg_dolauncher "findbugs-${SCRIPT#findbugs-}" \
-			--java_args "${ARGS}" --main "${CLASS}"
-	done
-
-	for SCRIPT in findbugs{,2} fb{,wrap}; do
-		java-pkg_dolauncher "${SCRIPT}" \
-			--java_args "\$fb_jvmargs ${ARGS}" --main '$fb_mainclass' \
-			-pre "${FILESDIR}/launchers/${SCRIPT}"
-	done
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "findbugs ships with many launcher scripts. Most of these have been"
-	elog "installed with a findbugs- prefix to avoid conflicts and confusion"
-	elog "with other executables in the PATH."
-}
diff --git a/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml
deleted file mode 100644
index 7f5d054caa9f..000000000000
--- a/dev-util/findbugs/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. Static analysis means that FindBugs can find bugs by simply inspecting a program's code: executing the program is not necessary. This makes FindBugs very easy to use: in general, you should be able to use it to look for bugs in your code within a few minutes of downloading it. FindBugs works by analyzing Java bytecode (compiled class files), so you don't even need the program's source code to use it. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is less than 50%.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">findbugs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/fix-la-relink-command-0.1.1 b/dev-util/fix-la-relink-command-0.1.1
new file mode 100644
index 000000000000..ad1e185bc6d8
--- /dev/null
+++ b/dev-util/fix-la-relink-command-0.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl virtual/perl-Getopt-Long app-arch/xz-utils
+DESCRIPTION=Helps prevent .la files from relinking to libraries outside a build tree
+EAPI=4
+HOMEPAGE=https://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-command-0.1.1.tar.xz
+_md5_=dafcb7e1bb0a68c37a54ce365fcbe477
diff --git a/dev-util/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
deleted file mode 100644
index 08588b0f5e8c..000000000000
--- a/dev-util/fix-la-relink-command/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fix-la-relink-command-0.1.1.tar.xz 5072 BLAKE2B 6307e92fe27612fab088d54ec74809450dc1cac6a6ed86a4779b758c0cbd058239c9bb9151579d408efa354b32b82e5b1dc4bfd65cdacc8abf1ad2bcb84eca26 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd
-EBUILD fix-la-relink-command-0.1.1.ebuild 731 BLAKE2B d669d7075fee17e6709d18e951d9554cb5a47db302ea18aa544dda075e4991c7e7040944a39865cd3438e07da5b79038dededcef8a9db47072113358655b1b05 SHA512 9dc41b08fa2ea486de6162425b59c6fc4fd402db2effd5dfbbd59e1d1370d0ea69aa360648ab2d9c37fbdd3f226b2bb5b86a7659e4c4ec0de888a5de59aa2ebd
-MISC metadata.xml 358 BLAKE2B 28598e94d3b9d9fa327221a4284b6520e4e75540b176aec29e3415e5ff8414434a1c688da300dd66c1cc80c43935ce8da83970440eb4fcf59f6831a1829ed010 SHA512 f4636dab42e790ace26a3f7c3657ecf9c41a71f4c5d00e1d69c48856f99f7bce9c60478c79c85e53da36166402cb2f04e5d4d70747ee2a57d13dfdf00c120651
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
deleted file mode 100644
index 1a33b2b88318..000000000000
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Helps prevent .la files from relinking to libraries outside a build tree"
-HOMEPAGE="https://dev.gentoo.org/~tetromino/distfiles/${PN}"
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc NEWS
-}
diff --git a/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
deleted file mode 100644
index 70d3e0dcf1d4..000000000000
--- a/dev-util/fix-la-relink-command/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>tetromino@gentoo.org</email>
-<name>Alexandre Rostovtsev</name>
-</maintainer>
-<maintainer type="project">
-<email>gnome@gentoo.org</email>
-<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/flawfinder-1.31 b/dev-util/flawfinder-1.31
new file mode 100644
index 000000000000..b1a89e06a4c4
--- /dev/null
+++ b/dev-util/flawfinder-1.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Examines C/C++ source code for security flaws
+EAPI=5
+HOMEPAGE=https://www.dwheeler.com/flawfinder/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-1.31.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=31be0ab998b3da2f8c3b4e5e32290c92
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
deleted file mode 100644
index e5db1746c548..000000000000
--- a/dev-util/flawfinder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
-EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/flawfinder/flawfinder-1.31.ebuild b/dev-util/flawfinder/flawfinder-1.31.ebuild
deleted file mode 100644
index 6ef0a76bccb4..000000000000
--- a/dev-util/flawfinder/flawfinder-1.31.ebuild
+++ /dev/null
@@ -1,29 +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 eutils python-single-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc announcement ChangeLog README announcement
-	dodoc flawfinder.pdf
-	python_fix_shebang "${ED}"usr/bin/flawfinder
-}
diff --git a/dev-util/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/flawfinder/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/dev-util/ftjam-2.5.3_rc2-r1 b/dev-util/ftjam-2.5.3_rc2-r1
new file mode 100644
index 000000000000..b0fb850ca3b5
--- /dev/null
+++ b/dev-util/ftjam-2.5.3_rc2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=!dev-util/jam sys-devel/bison
+DESCRIPTION=FTJam is a 100% compatible, enhanced implementation of the make alternative Jam
+EAPI=0
+HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
+KEYWORDS=amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=perforce GPL-2
+RDEPEND=!dev-util/jam
+SLOT=0
+SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f9469c613db19cb5a1586ade37eff9c
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
deleted file mode 100644
index 9d8ea42ca16e..000000000000
--- a/dev-util/ftjam/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ftjam-2.5.3-debug-commandline.patch 314 BLAKE2B acc09bae7b2abd0d10ff8557b6c7f28f457b5d009c8117008c01507250afad7b22be92fc1f5f49cd9f8c30783e1d353d3b619c48366c14f011a1ba2ac51014f0 SHA512 c9e59c3785678d347510525b10824af2648f4de040bfc2d97ca2301298628d82f78c13f63b30da1baef0a8c2ed6142fa2db63650fc982601e491aaff8e15378b
-AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922e27f8d36920b2da7fec6d8e58cb480aec7e328155d9ff7bef336b6efafecfd2de4459c087100ce01a6b91e39cf346a2 SHA512 b9b97127c6a5d89759563cd4a1e4f87ed911610b70bbfff309105ab733290f74087bd0eb066eaad860be5624573ad2dfc1245eb45347c2d1c9800033c35e5c0a
-AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
-AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
-DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
-EBUILD ftjam-2.5.3_rc2-r1.ebuild 1124 BLAKE2B 818d3b4e8f887d6d390c2ee0d97d2026400dc27bff8cb6a15fbae9e442218754fae086632558bf47cd821f36048bd1ee3a557feeed51703fc26b90acb00ff86c SHA512 8c9d4eef3f1ea1b424986cdbef297ca1ce4e0f01a3d27e4fd1a18f4801dfd572673250a43d7c679ac4ebeec32d45c2097019c76ab450f3fddececc9258298e5a
-MISC metadata.xml 217 BLAKE2B 55f0e28ee6fed5a28a2b01ba5367d8b0cd6e4d9fac04998f93794be3ad8a1d526d473378623b82888869bf94ddf8838c0134e733c5708e11d2b7ba0c148ab434 SHA512 84ae81764128d1c529f0228dee8311929ec35ad1bd0a8ba684febc06c8f6671b23317b2e04b0ab3670e476209ba085916afe8ada10b855510df91303aad473e5
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
deleted file mode 100644
index ba6613430308..000000000000
--- a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Make jam print the commandline it's executing.
-Only useful for ebuild debugging - I just always forget how to enable it.
-
---- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
-+++ ftjam-2.5.3rc2/builds/unix/Makefile.in
-@@ -16,7 +16,7 @@
- 
- all: jam0
- 	chmod a+w jambase.c
--	./jam0
-+	./jam0 -dx -q
- 
- include common.mk
- 
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
deleted file mode 100644
index 1b33a0f770d3..000000000000
--- a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Respect CC, *FLAGS.  Add datarootdir for autoconf-2.60 warnings.
-
---- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
-+++ ftjam-2.5.3rc2/builds/unix/Makefile.in
-@@ -37,6 +37,7 @@ exec_prefix  := @exec_prefix@
- libdir       := @libdir@
- bindir       := @bindir@
- includedir   := @includedir@
-+datarootdir  := @datarootdir@
- datadir      := @datadir@
- 
- version_info := @version_info@
---- ftjam-2.5.3rc2-orig/jambase.c
-+++ ftjam-2.5.3rc2/jambase.c
-@@ -652,21 +652,21 @@ const char *jambase[] = {
- "\n",
- "AR      ?= ar ru ;\n",
- "AS      ?= as ;\n",
--"ASFLAGS     ?= ;\n",
-+"ASFLAGS     += $(ASFLAGS) ;\n",
- "AWK     ?= awk ;\n",
- "BINDIR      ?= /usr/local/bin ;\n",
--"C++     ?= cc ;\n",
--"C++FLAGS    ?= ;\n",
--"CC      ?= cc ;\n",
--"CCFLAGS     ?= ;\n",
-+"C++     ?= $(CXX) ;\n",
-+"C++FLAGS    += $(CXXFLAGS) ;\n",
-+"CC      ?= $(CC) ;\n",
-+"CCFLAGS     += $(CFLAGS) ;\n",
- "CP      ?= cp -f ;\n",
- "CRELIB      ?= ;\n",
- "DOT     ?= . ;\n",
- "DOTDOT      ?= .. ;\n",
- "EXEMODE     ?= 711 ;\n",
- "FILEMODE    ?= 644 ;\n",
--"FORTRAN     ?= f77 ;\n",
--"FORTRANFLAGS    ?= ;\n",
-+"FORTRAN     ?= $(F77) ;\n",
-+"FORTRANFLAGS    += $(FFLAGS) ;\n",
- "HDRS        ?= ;\n",
- "INSTALLGRIST    ?= installed ;\n",
- "JAMFILE     ?= Jamfile ;\n",
-@@ -674,13 +674,13 @@ const char *jambase[] = {
- "LEX     ?= ;\n",
- "LIBDIR      ?= /usr/local/lib ;\n",
- "LINK        ?= $(CC) ;\n",
--"LINKFLAGS   ?= ;\n",
-+"LINKFLAGS   += $(LDFLAGS) ;\n",
- "LINKLIBS    ?= ;\n",
- "LN      ?= ln ;\n",
- "MANDIR      ?= /usr/local/man ;\n",
- "MKDIR       ?= mkdir ;\n",
- "MV      ?= mv -f ;\n",
--"OPTIM       ?= ;\n",
-+"OPTIM       = ;\n",
- "RCP     ?= rcp ;\n",
- "RM      ?= rm -f ;\n",
- "RMDIR       ?= $(RM) ;\n",
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
deleted file mode 100644
index 44322d64c2cf..000000000000
--- a/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase
---- ftjam-2.5.3rc2-orig/Jambase	2007-06-05 08:20:19.000000000 -0600
-+++ ftjam-2.5.3rc2/Jambase	2008-07-21 19:26:02.000000000 -0600
-@@ -813,7 +813,7 @@ else if $(UNIX)

-     LINKLIBS    ?= ;

-     OPTIM       ?= -O ;

-     RANLIB      ?= ranlib ;

--    YACC        ?= yacc ;

-+    YACC        ?= bison -y ;

-     YACCGEN     ?= .c ;

-     YACCFILES   ?= y.tab ;

-     YACCFLAGS   ?= -d ;

-@@ -882,10 +882,10 @@ DC ?= dmd ;

-     SUFLIB      ?= .a ;

-     SUFOBJ      ?= .o ;

-     UNDEFFLAG   ?= "-u _" ;

--    YACC        ?= ;

--    YACCGEN     ?= ;

--    YACCFILES   ?= ;

--    YACCFLAGS   ?= ;

-+    YACC        ?= bison -y ;

-+    YACCGEN     ?= .c ;

-+    YACCFILES   ?= y.tab ;

-+    YACCFLAGS   ?= -d ;

- 

-     HDRPATTERN =

-             "^[ 	]*#[ 	]*include[ 	]*[<\"]([^\">]*)[\">].*$" ;

-diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c
---- ftjam-2.5.3rc2-orig/jambase.c	2007-06-05 08:31:08.000000000 -0600
-+++ ftjam-2.5.3rc2/jambase.c	2008-07-21 19:27:55.000000000 -0600
-@@ -632,7 +632,7 @@ const char *jambase[] = {
- "LINKLIBS    ?= ;\n",
- "OPTIM       ?= -O ;\n",
- "RANLIB      ?= ranlib ;\n",
--"YACC        ?= yacc ;\n",
-+"YACC        ?= bison -y ;\n",
- "YACCGEN     ?= .c ;\n",
- "YACCFILES   ?= y.tab ;\n",
- "YACCFLAGS   ?= -d ;\n",
-@@ -695,10 +695,10 @@ const char *jambase[] = {
- "SUFLIB      ?= .a ;\n",
- "SUFOBJ      ?= .o ;\n",
- "UNDEFFLAG   ?= \"-u _\" ;\n",
--"YACC        ?= ;\n",
--"YACCGEN     ?= ;\n",
--"YACCFILES   ?= ;\n",
--"YACCFLAGS   ?= ;\n",
-+"YACC        ?= bison -y ;\n",
-+"YACCGEN     ?= .c ;\n",
-+"YACCFILES   ?= y.tab ;\n",
-+"YACCFLAGS   ?= -d ;\n",
- "\n",
- "HDRPATTERN =\n",
- "\"^[ 	]*#[ 	]*include[ 	]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n",
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch b/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch
deleted file mode 100644
index 1b7e69fc2c8f..000000000000
--- a/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur ftjam-2.5.3rc2-orig/Jamfile ftjam-2.5.3rc2/Jamfile
---- ftjam-2.5.3rc2-orig/Jamfile	2007-06-05 08:30:52.000000000 -0600
-+++ ftjam-2.5.3rc2/Jamfile	2007-06-10 12:55:03.000000000 -0600
-@@ -138,16 +138,6 @@
- LinkLibraries 	jam : libjam.a ;
- GenFile 	jambase.c : mkjambase Jambase ;
- 
--if $(UNIX) && ! $(DEBUG)
--{
--  actions Strip
--  {
--    strip $(1)
--  }
--
--  Strip jam ;
--}
--
- Library         libjam.a :
- 		    builtins.c command.c compile.c $(code) expand.c
- 		    glob.c hash.c headers.c lists.c make.c make1.c
-@@ -156,19 +146,6 @@
- 		    hdrmacro.c rope.c
- 		    ;
- 
--# Strip the Jam executable on Mingw
--#
--if $(JAM_TOOLSET) = MINGW
--{
--  actions  Strip
--  {
--    strip $(1)
--  }
--
--  Strip  jam$(SUFEXE) ;
--}
--
--
- if $(BINDIR) 	{ InstallBin $(BINDIR) : jam ; }
- 
- #
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
deleted file mode 100644
index cfca2251a168..000000000000
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator _)
-
-DESCRIPTION="FTJam is a 100% compatible, enhanced implementation of the make alternative Jam"
-HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
-SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
-
-LICENSE="perforce GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="!dev-util/jam
-	sys-devel/bison"
-RDEPEND="!dev-util/jam"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.5.3-nostrip.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-false-flags.patch
-#	epatch "${FILESDIR}"/${PN}-2.5.3-debug-commandline.patch  # development only
-}
-
-src_compile() {
-	tc-export CC
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README README.ORG CHANGES INSTALL RELNOTES
-	dohtml Jam.html Jambase.html Jamfile.html
-}
diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
deleted file mode 100644
index 7a1075ebf9ba..000000000000
--- a/dev-util/ftjam/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="sourceforge">freetype</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ftnchek-3.3.1-r1 b/dev-util/ftnchek-3.3.1-r1
new file mode 100644
index 000000000000..cf9851e13dbe
--- /dev/null
+++ b/dev-util/ftnchek-3.3.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+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
+DESCRIPTION=Static analyzer a la 'lint' for Fortran 77
+EAPI=2
+HOMEPAGE=http://www.dsm.fordham.edu/~ftnchek/
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=bde644eb2a056c8b33e7e2e66975a1a4
diff --git a/dev-util/ftnchek/Manifest b/dev-util/ftnchek/Manifest
deleted file mode 100644
index b3dd1fe652a8..000000000000
--- a/dev-util/ftnchek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ftnchek-3.3.1.tar.gz 1048638 BLAKE2B 4d9e49a826a192ac8ce9ad443fcff3aba03173915130d1e197c4e78cc5c874b509c1772c28e4a3e5c4a911e77d562ae07fa44c728a94c9ac0c16b5e7d0bc174d SHA512 14c698a6d936ffcd1966822f3b307fc2a70ffd5d58dcff27e10a9491562cff12ef75d98c0e67a7053e106df4f6b4d920e8164950778c5e13e7c15543fa2ecc41
-EBUILD ftnchek-3.3.1-r1.ebuild 864 BLAKE2B 4ec242a6c5f435b3dc47773f2be2f7d9dea4823d81cb7fda6f93c538de739420f01d936b6cd563855469d5b60eb746b08418f398024a5fc7f4edd3fa65a73cba SHA512 a08994f17f3dae52992f706aff405ae38ff98f23220dae493400c5e8b7af03d1841876ac55d2311588c3eab68cc63e748735415145970f8eb67400bb5ff2d3fc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
deleted file mode 100644
index 10f581a6233e..000000000000
--- a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="Static analyzer a la 'lint' for Fortran 77"
-HOMEPAGE="http://www.dsm.fordham.edu/~ftnchek/"
-SRC_URI="http://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	#1 Do not strip
-	#2 CFLAGS is used internally, so append to it
-	sed -i Makefile.in \
-		-e '/-$(STRIP)/d' \
-		-e 's|CFLAGS\([[:space:]]*\)=|CFLAGS\1+=|' \
-		|| die "sed Makefile.in"
-
-	#1 Respect CFLAGS
-	#2 Respect LDFLAGS
-	sed -i configure.in \
-		-e 's|OPT=".*"|OPT=""|g' \
-		-e '/^LDFLAGS=/d' \
-		|| die "sed configure.in"
-
-	eautoreconf
-}
-
-src_install() {
-	einstall || die
-	dodoc FAQ PATCHES README ToDo
-	dohtml html/*
-	dodir /usr/share/${PN}
-	cp -r test "${D}"/usr/share/${PN}
-}
diff --git a/dev-util/ftnchek/metadata.xml b/dev-util/ftnchek/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/ftnchek/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/dev-util/fuzz-0.6-r1 b/dev-util/fuzz-0.6-r1
new file mode 100644
index 000000000000..84b9e5c4b045
--- /dev/null
+++ b/dev-util/fuzz-0.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=Stress-tests programs by giving them random input
+EAPI=5
+HOMEPAGE=http://fuzz.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=76e57cd7cc7fec8e7a0e52a7f98e7845
diff --git a/dev-util/fuzz/Manifest b/dev-util/fuzz/Manifest
deleted file mode 100644
index 704aed73f603..000000000000
--- a/dev-util/fuzz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fuzz-0.6.tar.gz 54431 BLAKE2B 8f9652fbcf13038e066d9eff5bb803a9bb76ded9c9f18f9c39981e40530a8fa2ef2fa1aa39e6196908046e7c3dc9acab8ef2adea9a9c8ef824635b1c02aae248 SHA512 87a9b103bb37c91937e2bd4667a33f3792c464f8464fe1f35b022d9c01a13255c7228ab80ce0bfac4ccfdab9a25238a5e1add00e9380cbeb24f95b686d18151b
-DIST fuzz_0.6-7.3.diff.gz 3004 BLAKE2B fbbceb60b58e973ceae6485f26297bd843261db8d80d0988ec08eaf275758d32d5e3c992999543db1e3f1cc546dd881f8fa19b6c027bdb79dc3dad84b8f77ae9 SHA512 aef080a908269d44536071bb6d4a91560d7f357fb2145fc0d0369ea5997fa6a5c1b13b3fc673c370a61add5c76f40df3501f5103f2ac35ddce9662c9345e20af
-EBUILD fuzz-0.6-r1.ebuild 680 BLAKE2B 1347efdd1f830537b560dc3f789d5dd050994dc8fa7878fd2ff0bd88a0236d9293a2f5ad79b0846f3adf99a57a2ae272765d973660d1fceb5b6836608900c575 SHA512 5bac0c017bfb099d72045fd68dee49ce798cdd9c56fb1ff2aac84af3b97809f1e936920bb1c34edf2ad5b30aa10d687fc06f84ed0dc1f6a8ceb3aa7009c162c8
-MISC metadata.xml 300 BLAKE2B f17207f1908f2965eee994e46f9df82b58e3ce96b2f5ca180a42c02cd1a45f34f56ab2fc666a8ffbc1f4e23c1570d61f10a9e23270d15ace015860b28ec09ba0 SHA512 fdcbbda56cbb94b5738e0f3ace1647ec35f228b4251c66a330ba269217f3cfe57893fc05e8e1cf9b2fae0a4845171c74e71bd9af67dbaed25cc5a9c4e034b102
diff --git a/dev-util/fuzz/fuzz-0.6-r1.ebuild b/dev-util/fuzz/fuzz-0.6-r1.ebuild
deleted file mode 100644
index 88242637434a..000000000000
--- a/dev-util/fuzz/fuzz-0.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Stress-tests programs by giving them random input"
-HOMEPAGE="http://fuzz.sourceforge.net/"
-DEB_P="${PN}_${PV}"
-DEB_PR="7.3"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz )
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README ChangeLog AUTHORS
-}
diff --git a/dev-util/fuzz/metadata.xml b/dev-util/fuzz/metadata.xml
deleted file mode 100644
index 63084c2c1f4d..000000000000
--- a/dev-util/fuzz/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>robbat2@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">fuzz</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/gcovr-3.2 b/dev-util/gcovr-3.2
new file mode 100644
index 000000000000..56fe95b8b87a
--- /dev/null
+++ b/dev-util/gcovr-3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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=A Python script for summarizing gcov data
+EAPI=6
+HOMEPAGE=https://github.com/gcovr/gcovr
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+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/gcovr/gcovr/archive/3.2.tar.gz -> gcovr-3.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_=e9553e6675cbd52d3f05d1a0356ee23b
diff --git a/dev-util/gcovr-3.3 b/dev-util/gcovr-3.3
new file mode 100644
index 000000000000..0cf8da0d7e98
--- /dev/null
+++ b/dev-util/gcovr-3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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=A Python script for summarizing gcov data
+EAPI=6
+HOMEPAGE=https://github.com/gcovr/gcovr
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+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://github.com/gcovr/gcovr/archive/3.3.tar.gz -> gcovr-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_=1c593d759570f02b528724db414a9db9
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
deleted file mode 100644
index 90e5fd32af94..000000000000
--- a/dev-util/gcovr/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gcovr-3.2.tar.gz 343748 BLAKE2B 721643e837d6469546a3bc3a191dfebff032e17c9a843c56c16c4440ab09a9db35596bf3e92c46784077e164ea1a97bc8b43151f8bddceb8071596ceec42049f SHA512 b8a810cb156acc1bbff108002f49b358c5b4044a6450c9b6a7a682c841e95f8159d42e4a8a1c4742fa82da1e99085ef4ede29a483291be4d79dcf09003829a45
-DIST gcovr-3.3.tar.gz 323226 BLAKE2B fe3d6ab4d24032f57ee17c3fc44b10e0b177aad01b072306a99abc7dbfee07b5f14ef34412d36938302bc279dffb2a25502981ba952339c1b4e896762defabb0 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08
-EBUILD gcovr-3.2.ebuild 443 BLAKE2B 9b27a284631c1d23988ff1f0b7e96ef63399bfacdd04d600b0f523e6e8938cb84250da9329d2dd5d559e0103a83313449be85424f1e8ec5b27136a44005c8bbe SHA512 6e2095f225deab3771b83816477e6d9a59d2625d1554bfc810073d60b413059d539d2a9c45c75a107e06337c61c517e7a78aef02b03cf29adb48a296641cf414
-EBUILD gcovr-3.3.ebuild 451 BLAKE2B 566f180c178204fc7db0b9ba5bb8f92263a21120d63a1024de77ac8f6f40fd803e4dcca6773c4bfd979a920feee21dc16febeb83063f415d2ebfaae34f64454c SHA512 a00a118ff852939f363f8db716b02a9d2cf5af229a591a18cdbf397ac1909cf035eef49669cb813269ac038704b5d141c023eb76741b70e35611a021f4efa9c2
-MISC metadata.xml 329 BLAKE2B d81db6e30052ad893c6545b86d613ba960324f98b6dc3587c5becc2e0a92277f61f6c1f5005322cda86eeef50213e1f3c7c8b448d20d1cb5f4c6de1cc27c37fa SHA512 f6ba1f1e9cc2036097acb46bee3d5c4c18788862195613026a7678baea38e591fbc13e4dc9570d7ee0bf93a1f03a3bf198147f45de50411253c109c2163dad8d
diff --git a/dev-util/gcovr/gcovr-3.2.ebuild b/dev-util/gcovr/gcovr-3.2.ebuild
deleted file mode 100644
index 51ca37e86b40..000000000000
--- a/dev-util/gcovr/gcovr-3.2.ebuild
+++ /dev/null
@@ -1,16 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python script for summarizing gcov data"
-HOMEPAGE="https://github.com/gcovr/gcovr"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
deleted file mode 100644
index 457c4f4c6415..000000000000
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ /dev/null
@@ -1,16 +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="A Python script for summarizing gcov data"
-HOMEPAGE="https://github.com/gcovr/gcovr"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/gcovr/metadata.xml b/dev-util/gcovr/metadata.xml
deleted file mode 100644
index f5957872efbe..000000000000
--- a/dev-util/gcovr/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>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">gcovr/gcovr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen-2.52.3 b/dev-util/gdbus-codegen-2.52.3
new file mode 100644
index 000000000000..4b0044ad4bbc
--- /dev/null
+++ b/dev-util/gdbus-codegen-2.52.3
@@ -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[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(-)] app-arch/xz-utils 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=GDBus code and documentation generator
+EAPI=5
+HOMEPAGE=https://www.gtk.org/
+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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2+
+PDEPEND=>=dev-libs/glib-2.52.3: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] ) 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(-)] 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=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=056c1e29d76a9b79da377e3a8b9b9603
diff --git a/dev-util/gdbus-codegen-2.54.3 b/dev-util/gdbus-codegen-2.54.3
new file mode 100644
index 000000000000..a189b4db501a
--- /dev/null
+++ b/dev-util/gdbus-codegen-2.54.3
@@ -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[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(-)] app-arch/xz-utils 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=GDBus code and documentation generator
+EAPI=6
+HOMEPAGE=https://www.gtk.org/
+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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2+
+PDEPEND=>=dev-libs/glib-2.54.3: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] ) 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(-)] 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=mirror://gnome/sources/glib/2.54/glib-2.54.3.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af3913cbb6c8453b8dea0986743f7fae
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
deleted file mode 100644
index 9aa370a0e728..000000000000
--- a/dev-util/gdbus-codegen/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed36229e99459062e2b9166003408aa8a1b10b529aa419f18943c6d225a89c2378f9405f8f54b40fe460428a81544359562a2b8db SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499
-AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9ba602149c6a36e69752e948a2be0c559625154a6d6036478d9f30da9d628ada9d62930142fc351686aca0e7f55ec7cc4386 SHA512 122583e4d4f84144c822a37ee9b259e9f3be0dddecaee1d19575e53836122b3c5a283d201e1864c15d1f9b3f7f9827f8e6040a7f856ea1d471842acc28f0dd1a
-AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
-EBUILD gdbus-codegen-2.52.3.ebuild 1312 BLAKE2B 4c90235e3f02cac0c35fd40ea9e217afe0a80792d96f1eff8274fdbf3485c22c8c5b9dfc286bbdf04471653e3e44dde5b86e7e54adf87f3b6d59930d9f459186 SHA512 3171fb9b84f1be1ffef7e745558eba77804f9630e2b1314b2fa10066fe001030aac47b250748d7ec8350dc5c724d33893471e0fc004aa8456b6be1b0224bd641
-EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
deleted file mode 100644
index ffeb17ba2375..000000000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Sun, 20 Jan 2013 20:25:13 +0330
-Subject: [PATCH] glib-2.35.4-external-gdbus-codegen
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..2295481 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.name == 'nt':
--    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
--    path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
- else:
--    path = os.path.join('@datadir@', 'glib-2.0')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+    from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-1.8.1
-
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
deleted file mode 100644
index d3bbba4cb034..000000000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 8050981..932410a 100644
---- a/gdbus-codegen.in
-+++ b/gdbus-codegen.in
-@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.path.basename(filedir) == 'bin':
--    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
--    # adding /some/prefix/bin/../share/glib-2.0 to the python path
--    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
- else:
--    # Assume that the modules we need are in the current directory and add the
--    # parent directory to the python path.
--    path = os.path.join(filedir, '..')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+    from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
deleted file mode 100644
index c5318e30588b..000000000000
--- a/dev-util/gdbus-codegen/files/setup.py-2.32.4
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-setup(name="gdbus_codegen",
-      version="@PV@",
-      packages=["gdbus_codegen"],
-      package_dir={"gdbus_codegen" : ""},
-      scripts=["gdbus-codegen"])
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
deleted file mode 100644
index 54907fc09e81..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.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"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
deleted file mode 100644
index 1ac95b47d966..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.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
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/gdbus-codegen/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/geany-1.30.1 b/dev-util/geany-1.30.1
new file mode 100644
index 000000000000..32b00b19f89f
--- /dev/null
+++ b/dev-util/geany-1.30.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GTK+ based fast and lightweight IDE
+EAPI=6
+HOMEPAGE=https://www.geany.org
+IUSE=gtk3 +vte
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+SLOT=0
+SRC_URI=https://download.geany.org/geany-1.30.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35852be7ec857a7f3d83addaacee80c9
diff --git a/dev-util/geany-1.32 b/dev-util/geany-1.32
new file mode 100644
index 000000000000..76d9f712bca9
--- /dev/null
+++ b/dev-util/geany-1.32
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GTK+ based fast and lightweight IDE
+EAPI=6
+HOMEPAGE=https://www.geany.org
+IUSE=gtk3 +vte
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+SLOT=0
+SRC_URI=https://download.geany.org/geany-1.32.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b7670e4b1c04ca17a8b9600b29e44f5
diff --git a/dev-util/geany-1.33 b/dev-util/geany-1.33
new file mode 100644
index 000000000000..d8899ca285af
--- /dev/null
+++ b/dev-util/geany-1.33
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GTK+ based fast and lightweight IDE
+EAPI=6
+HOMEPAGE=https://www.geany.org
+IUSE=gtk3 +vte
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+SLOT=0
+SRC_URI=https://download.geany.org/geany-1.33.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f888ad9956d6f7e115657fdc92f4051b
diff --git a/dev-util/geany-9999 b/dev-util/geany-9999
new file mode 100644
index 000000000000..2286c5d60eb2
--- /dev/null
+++ b/dev-util/geany-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 >=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=GTK+ based fast and lightweight IDE
+EAPI=6
+HOMEPAGE=https://www.geany.org
+IUSE=gtk3 +vte
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f888ad9956d6f7e115657fdc92f4051b
diff --git a/dev-util/geany-plugins-1.30 b/dev-util/geany-plugins-1.30
new file mode 100644
index 000000000000..9ddf531fbf6c
--- /dev/null
+++ b/dev-util/geany-plugins-1.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=6
+HOMEPAGE=https://plugins.geany.org
+IUSE=gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup python_targets_python2_7
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.30.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ca88577ad7803093e8e5ead624d00cc
diff --git a/dev-util/geany-plugins-1.32 b/dev-util/geany-plugins-1.32
new file mode 100644
index 000000000000..41ced89a7c92
--- /dev/null
+++ b/dev-util/geany-plugins-1.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=6
+HOMEPAGE=https://plugins.geany.org
+IUSE=gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.32.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4787406ffb2568b57b60aefd0eb1b766
diff --git a/dev-util/geany-plugins-1.33 b/dev-util/geany-plugins-1.33
new file mode 100644
index 000000000000..32d487220451
--- /dev/null
+++ b/dev-util/geany-plugins-1.33
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=6
+HOMEPAGE=https://plugins.geany.org
+IUSE=gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/geany-1.32[gtk3=] dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.33.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=377e06aa9802d8b358b7835b8b822a7a
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
deleted file mode 100644
index c1be159048a9..000000000000
--- a/dev-util/geany-plugins/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-DIST geany-plugins-1.32.tar.gz 4655759 BLAKE2B afef1fd304b36daf4da5bd2a753c3de2c3c94d4274716fe726afc4164d98645f3f2436b306b894bb4245d86ee0782058b0181655d42764421b2d24c3e9e4c79d SHA512 0284aa28820361f419a4ca000a8781bc044e112732ea6be7e511841c18d075eceef4abcabc1153ba9ff8229e529d3e44f6aacdc668927323f2d78bb2f8897a06
-DIST geany-plugins-1.33.tar.gz 4671123 BLAKE2B 33471215480597b34e2733b7dc292e94ff12985b645fda76b2e25492573bb866766a3ea5a4598c4f643e9528f8062ffb9bf6ccabbb9be04aecbf23650d9c776d SHA512 d046eb0b7bd3c704b62c84b05564b973203ddabf6c09b94bf3008955735d672077bff1a7cda27d4eba97824231483f3e64b3b0f0234a97a1a2727d535fb28718
-EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.32.ebuild 3182 BLAKE2B 5003867dc35ec00ff63552dbfc57680c0014a8af897da13ab286ed57fba913968c54fb27a2f9758744db1f3d01ebba4118d84dc325b3dc43668d4b00c85d7da1 SHA512 2779d14f320a8dfbbdec5ab9862a5fc6eb2230d09774c018ccb6bbc248b0291ebde97de7b03bff998dd41f1b2d83717531948865c7c2936a500a5a2f18c1957f
-EBUILD geany-plugins-1.33.ebuild 3166 BLAKE2B 3e6beb940b81bd921424b6d1310c2fe402675a86815c6743483d7d9b5c05b4f4cdd1818bf92086430a03bc44b3a5c4bdaf58fb7e71af5da286dcfe2d71ee11a2 SHA512 7d3ac36a212e1deeeff6256aaf6593a65c0ade96e6da40fafe28a3672d46c4b3960c9c5b68c026acfe8c1bd8bed930a5aab9707168f3e7c4fbfdc9dbcb405d93
-MISC metadata.xml 1533 BLAKE2B 33a794171fd9b6a50ea6669c4bc782f40144d7efcf3145c742f4b427c1a2389d9370085ba2661498800324c17b3bfd5608b70c7e1f24892134e338108ae08354 SHA512 7c469c01a2afc24631d1260ca010c59031d61c63c903ce13ccc5147d960f0299c5cad02f4a839df8bef1f5566a49ef443bfdd0b40eea0a4401c8fa6625f532da
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
deleted file mode 100644
index 55544248d9e4..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-GTK_COMMON_DEPEND="
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-"
-COMMON_DEPEND="
-	>=dev-util/geany-1.26[gtk3=]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	autoclose? ( ${GTK_COMMON_DEPEND} )
-	commander? ( ${GTK_COMMON_DEPEND} )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	defineformat? ( ${GTK_COMMON_DEPEND} )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		x11-libs/gtk+:2
-		>=x11-libs/vte-0.28:0
-		)
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bundled lib buster
-	rm markdown/peg-markdown/markdown_lib.c || die
-	# devhelp plugin bundles devhelp
-
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable !gtk3 geanydoc)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# peg-markdown is bundled, use app-text/discount instead
-		--disable-peg-markdown
-		--enable-addons
-		--enable-codenav
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanymacro
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-pretty-printer
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-xmlsnippets
-		$(use_enable autoclose)
-		$(use_enable automark)
-		$(use_enable commander)
-		$(use_enable ctags geanyctags)
-		$(use_enable debugger)
-		$(use_enable defineformat)
-		$(use_enable enchant spellcheck)
-		$(use_enable git gitchangebar)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable multiterm)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable overview)
-		$(use_enable python geanypy)
-		$(use_enable scope)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		# Relies on obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.32.ebuild b/dev-util/geany-plugins/geany-plugins-1.32.ebuild
deleted file mode 100644
index 305048062da6..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.32.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	>=dev-util/geany-1.32[gtk3=]
-	dev-libs/glib:2
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-keyrecord
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown --disable-peg-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.33.ebuild b/dev-util/geany-plugins/geany-plugins-1.33.ebuild
deleted file mode 100644
index 4115b2f8d7be..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.33.ebuild
+++ /dev/null
@@ -1,136 +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 python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	>=dev-util/geany-1.32[gtk3=]
-	dev-libs/glib:2
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown --disable-peg-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED%/}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
deleted file mode 100644
index ba173350cebd..000000000000
--- a/dev-util/geany-plugins/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aklhfex@gmail.com</email>
-		<name>Chris Mayo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-		<flag name="autoclose">Enable the autoclose plugin.</flag>
-		<flag name="automark">Enable the automark plugin</flag>
-		<flag name="commander">Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
-		<flag name="ctags">Enable ctags plugin</flag>
-		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
-		<flag name="defineformat">Enable the defineformat plugin.</flag>
-		<flag name="enchant">Enable spell checking using enchant</flag>
-		<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
-		<flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
-		<flag name="multiterm">Enable the multiterm plugin</flag>
-		<flag name="overview">Enable overview plugin</flag>
-		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
-		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
-		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
deleted file mode 100644
index 4b4ca6ec5135..000000000000
--- a/dev-util/geany/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.32.tar.bz2 4341296 BLAKE2B c12b5608929d308cd9ff66c04a395a48d7ae05e773f201ebce64b883a8b5da73d6e84b1799cfea35ae2c12b02177cc0d43328924daaf8f485a83305d0d8e763a SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d
-DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
-EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.32.ebuild 1571 BLAKE2B 70377944ac9e0c07aa305fcd23acbd6719c02bef77cb08e5e1fb87a7e8fec9c96b92e027e312a095af16008191c6e947fd5f073cd0c86ee61fe70e543ec64814 SHA512 0eedd429a1fb3241c34c5379c754ee71d1083cf518a59090fc352be6ebf0cb940437e0070a427bea019fdf85526e7c9854ce987c4f7ad9a69a2916c467a0a30f
-EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
-EBUILD geany-9999.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
-MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
deleted file mode 100644
index bf2f886d080a..000000000000
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-SRC_URI="https://download.geany.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable gtk3) \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.32.ebuild b/dev-util/geany/geany-1.32.ebuild
deleted file mode 100644
index 568033fe57d5..000000000000
--- a/dev-util/geany/geany-1.32.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-SRC_URI="https://download.geany.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable gtk3) \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.33.ebuild b/dev-util/geany/geany-1.33.ebuild
deleted file mode 100644
index d99d1cea34dd..000000000000
--- a/dev-util/geany/geany-1.33.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
deleted file mode 100644
index d99d1cea34dd..000000000000
--- a/dev-util/geany/geany-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
deleted file mode 100644
index 36e14323b610..000000000000
--- a/dev-util/geany/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<longdescription lang="en">
-		Geany is a small and lightweight integrated development environment.
-		It was developed to provide a small and fast IDE, which has only a
-		few dependencies from other packages. Another goal was to be as
-		independent as possible from a special Desktop Environment like KDE
-		or GNOME. So it is using only the GTK2 toolkit and therefore you need
-		only the GTK2 runtime libraries to run Geany.
-
-		The basic features of Geany are: syntax highlighting; code completion;
-		auto completion of often used constructs like if, for and while;
-		auto completion of XML and HTML tags; call tips; many supported
-		filetypes like C, Java, PHP, HTML, Python, Perl, Pascal; symbol lists.
-	</longdescription>
-	<longdescription lang="fr">
-		Geany est un environnement de développement integré (EDI) petit et
-		léger. Il a été développé pour fournir un EDI petit et rapide, qui ne
-		possède que peu de dépendences avec d'autres paquets. Un autre but
-		était qu'il soit aussi indépendant que possible d'environnements de
-		bureaux comme KDE ou Gnome. Ainsi, il n'utilise que la boîte à outils
-		GTK2.
-
-		Les principales fonctionnalités sont: la coloration syntaxique; la
-		complétion de code source; la complétion automatique de certaines
-		constructions couramment utilisées, comme les blocs "if", "for" et
-		"while"; complétion automatique des balises XML et HTML; info-bulles
-		décrivant la syntaxe d'appel des fonctions; de nombreux langages
-		supportés, comme C, Java, PHP, HTML, Python, Perl, Pascal; liste des
-		symboles.
-	</longdescription>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/gengetopt-2.22.6 b/dev-util/gengetopt-2.22.6
new file mode 100644
index 000000000000..6456aab6ef38
--- /dev/null
+++ b/dev-util/gengetopt-2.22.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+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
+DESCRIPTION=A tool to write command line option parsing code for C programs
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/gengetopt/
+KEYWORDS=amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/gengetopt/gengetopt-2.22.6.tar.gz
+_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_=d4e4253a92278385d92733899392f87c
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
deleted file mode 100644
index a06f725aa821..000000000000
--- a/dev-util/gengetopt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
-AUX gengetopt-2.22.6-makefile.patch 264 BLAKE2B 73c1bef7d171a3acb7dad8930fa1d7ce87cf83b7c395756a6658be276d3c22c2c71f9687d1666870d696fefb2940bb0ffde7d0c1de27c5b574afb6cec59cf747 SHA512 062de57db53d79261132fa62e7ecdbb6a3430231489beadc028e39258407a367033a3490b30a25acc5c1b95f8dec9557889436bd9b645f15ceb6b6b1f6655ebf
-AUX gengetopt-2.22.6-no-docs.patch 247 BLAKE2B 7d703bd0224aa6ea25095eb36902a09695bbd262f0aba524f966b97ae620abf82f230fdaeaaf29f3ad4eecf2c42699c715bd12864e26e646a41cb83d8c51b55c SHA512 05b910473674359173d380a4fc681d824fd2ca4348ff098b5d8a9110fad487ff3827e8e20b8981de4d1db1a692cdf624a5cb4c8230b2fd0182e9bfdd99ea35b7
-DIST gengetopt-2.22.6.tar.gz 1056293 BLAKE2B a99fa2ee362fc7b01ebc4c81f9daa17592a30b63f63883b73ca67885fa39f2ece48bda3f04ed5b98e74785c4030f94cc139df93a847e8789962e51d0950de0c7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc
-EBUILD gengetopt-2.22.6.ebuild 801 BLAKE2B 53d523dc4b84feb8d86bad53e7b2eb0654e0ec252732bd893b8f10ebe29d6179fbebe00faa4729ef2f9ce33f59ec29eaad2f2117165b941d3b7a0a341d24dea7 SHA512 20b5852e27a6075403100c80d678c0c4066c6b0f7db7741321e5b099c7980f1b93d01226a08599bfbc2f965f3744de4e67461fc45dd71a8d5335d6c186079dfd
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch
deleted file mode 100644
index 409bfb810f9e..000000000000
--- a/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,11 +27,11 @@
- 
- dnl directory for docs (html)
- AC_SUBST(gengetoptdocdir)
--gengetoptdocdir=$docdir
-+gengetoptdocdir=$docdir/html
- 
- dnl directory for examples
- AC_SUBST(gengetoptexamplesdir)
--gengetoptexamplesdir=$gengetoptdocdir/examples
-+gengetoptexamplesdir=$docdir/examples
- 
- dnl Checks for C compiler.
- AC_PROG_CC
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
deleted file mode 100644
index f5ecefff9993..000000000000
--- a/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -51,7 +51,7 @@
- 	@LTLIBOBJS@ \
- 	skels/libgen.la
- 
--LDADD = $(top_builddir)/src/libgengetopt.la
-+LDADD = libgengetopt.la
- 
- EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
- cmdline.c cmdline.h \
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
deleted file mode 100644
index 84f0324ea07b..000000000000
--- a/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,5 +19,3 @@
- 
- EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
- SUBDIRS = gl src doc tests
--
--gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
-\ No newline at end of file
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
deleted file mode 100644
index cd8b5f7a020c..000000000000
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="A tool to write command line option parsing code for C programs"
-HOMEPAGE="https://www.gnu.org/software/gengetopt/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-no-docs.patch
-	epatch "${FILESDIR}"/${P}-docdirs.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-util/gengetopt/metadata.xml b/dev-util/gengetopt/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/gengetopt/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/dev-util/gertty-1.3.2 b/dev-util/gertty-1.3.2
new file mode 100644
index 000000000000..7aecfde72ee2
--- /dev/null
+++ b/dev-util/gertty-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[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=Gertty is a console-based interface to the Gerrit Code Review system.
+EAPI=6
+HOMEPAGE=https://pypi.org/project/gertty/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/urwid-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/git-python-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.6.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/voluptuous-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ply-3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[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=mirror://pypi/g/gertty/gertty-1.3.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_=dce6060d0b1997b106d6dc20f3ca796e
diff --git a/dev-util/gertty-1.4.0 b/dev-util/gertty-1.4.0
new file mode 100644
index 000000000000..e1852f34fb2e
--- /dev/null
+++ b/dev-util/gertty-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[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=Gertty is a console-based interface to the Gerrit Code Review system.
+EAPI=6
+HOMEPAGE=https://pypi.org/project/gertty/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/urwid-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/git-python-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.6.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/voluptuous-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ply-3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[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=mirror://pypi/g/gertty/gertty-1.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_=dce6060d0b1997b106d6dc20f3ca796e
diff --git a/dev-util/gertty-1.5.0 b/dev-util/gertty-1.5.0
new file mode 100644
index 000000000000..d50eb2b1c80e
--- /dev/null
+++ b/dev-util/gertty-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.11[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=Gertty is a console-based interface to the Gerrit Code Review system.
+EAPI=6
+HOMEPAGE=https://pypi.org/project/gertty/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/urwid-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/git-python-0.3.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.6.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/voluptuous-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ply-3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[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=mirror://pypi/g/gertty/gertty-1.5.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_=bf5235bd6ac4dce14c71155d80641cab
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
deleted file mode 100644
index bc4ddb1b51be..000000000000
--- a/dev-util/gertty/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gertty-1.3.2.tar.gz 92553 BLAKE2B 2e6771fcf044a8a46e91dbc6f34869be528e0aa4db8344aa26a999bfb9fe1a8e7b18346f1d90f06b7cb436c74a2c04c5528297d126e66b8f985bfc42483c53cc SHA512 b68acb801ceb225fe86d62015fd89bce7ebe34219dbb2f7fe10d991ff06b558a5ed3512e6435ef3ce13324841c473dbec565c7bef23e01567f5bdcbb6aba9136
-DIST gertty-1.4.0.tar.gz 115581 BLAKE2B af1a4ceac5b1e189305463e91d8d79246ccf16d5109b5100c0f928af42c39632d2c4b904c5586428c31d5d12985baf8ed2507c743364d6b26a4a02967b59dfc3 SHA512 9abba6271d3ec95938f07ab4ee76f0b539a7ce7f0bbf9c08509fe9516c14f99ccb7b439d29a30bff6dca99bf39788dc803cd8aed3cc03b531678225fa41102d9
-DIST gertty-1.5.0.tar.gz 119784 BLAKE2B bc563c10009c372de5a702b4ab33d9b6b26a898486fc5a1d840f298b50a779c36467ccf6600b6f29b61d3c15b1cc0bbfe960d0d6a1a71d3f8b8f75dc392ab0dc SHA512 bc47817a3ba9ccce298ee1a646cb43f8a57e9a57a40d898859836b3171abd0cf3c682a5f5811cf3d987a17dbf00dd6706a5dbc5a6a35f1d5ff3a217c68187cda
-EBUILD gertty-1.3.2.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
-EBUILD gertty-1.4.0.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
-EBUILD gertty-1.5.0.ebuild 1155 BLAKE2B f57a4ee9fc24baed0b445aa867b4273745e910cb0fbaa615a7b9aa25f3b15cf286c8b3aa2c2fdff79d1e443900d943ae266427dd1e15ffaac5b5eb27511cd1d4 SHA512 1952c3bbd940575f1218cbf6980012669228ec1642a9d13fd9af4f02742d1dc7b37ec673af515dbef010a8335bd8249db9583339e40a1b03b653a865c354ff9c
-MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
deleted file mode 100644
index 4ed475d08fb0..000000000000
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ /dev/null
@@ -1,38 +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="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
deleted file mode 100644
index 4ed475d08fb0..000000000000
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ /dev/null
@@ -1,38 +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="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0.ebuild
deleted file mode 100644
index dabb69045cdd..000000000000
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/metadata.xml b/dev-util/gertty/metadata.xml
deleted file mode 100644
index fa43bcc48af5..000000000000
--- a/dev-util/gertty/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>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-		Gertty is a console-based interface to the Gerrit Code Review system.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">gertty</remote-id>
-		<remote-id type="github">openstack/gertty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/glade-3.20.2 b/dev-util/glade-3.20.2
new file mode 100644
index 000000000000..e5940a3cc8fd
--- /dev/null
+++ b/dev-util/glade-3.20.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A user interface designer for GTK+ and GNOME
+EAPI=6
+HOMEPAGE=https://glade.gnome.org/
+IUSE=debug +introspection python python_targets_python2_7 test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=3.10/6
+SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=15a89d7e462c8925351c0d77d6d6c938
diff --git a/dev-util/glade-3.20.4 b/dev-util/glade-3.20.4
new file mode 100644
index 000000000000..e4aed785fdef
--- /dev/null
+++ b/dev-util/glade-3.20.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A user interface designer for GTK+ and GNOME
+EAPI=6
+HOMEPAGE=https://glade.gnome.org/
+IUSE=debug +introspection python python_targets_python2_7 test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=3.10/6
+SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c0b1b5ba441da317a324a353c6cdf96c
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
deleted file mode 100644
index 348fb31c032f..000000000000
--- a/dev-util/glade/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
-DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
-EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
-EBUILD glade-3.20.4.ebuild 2392 BLAKE2B bbf88955bf59219bf267237688428ae0388f0b0d0e0effd998ce9ebdae0b3a23105a061e8f4fc90a721d5e7fae185ec0445ca0627fbc5f3486e42c8374bc3dd0 SHA512 752f71915b7429278da6a7b4a10f14cbba5b858faec11b8cf31901fc7e7b99ce1fb31df964792c413fc69a00118a68896f0a803345adf00b5981165c4fb07328
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/files/glade-3.14.1-doc-version.patch b/dev-util/glade/files/glade-3.14.1-doc-version.patch
deleted file mode 100644
index 39c9641719a4..000000000000
--- a/dev-util/glade/files/glade-3.14.1-doc-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 6 May 2012 22:40:47 -0400
-Subject: [PATCH] Version glade documentation
-
-Rename gnome help files to prevent collision with other versions.
-
-Avoid loading glade-3.8's devhelp files.
----
- help/Makefile.am   |    5 ++++-
- src/glade-window.c |    2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/glade-window.c b/src/glade-window.c
-index 89a4549..4eb8be5 100644
---- a/src/glade-window.c
-+++ b/src/glade-window.c
-@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
- {
-   if (glade_util_have_devhelp ())
-     {
--      glade_util_search_devhelp ("gladeui", NULL, NULL);
-+      glade_util_search_devhelp ("gladeui-2", NULL, NULL);
-       return;
-     }
- 
--- 
-1.7.8.6
-
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
deleted file mode 100644
index fcb9aec14d78..000000000000
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
deleted file mode 100644
index 70eb30d633cc..000000000000
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/glade/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/global-6.3.1 b/dev-util/global-6.3.1
new file mode 100644
index 000000000000..65646cecc54a
--- /dev/null
+++ b/dev-util/global-6.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=doc? ( app-text/texi2html sys-apps/texinfo ) >=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=tag system to find an object location in various sources
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/global/global.html
+IUSE=doc emacs vim
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=|| ( dev-libs/libltdl:0 sys-devel/libtool:2 ) sys-libs/ncurses emacs? ( virtual/emacs ) vim? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=mirror://gnu/global/global-6.3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=94659b1c6d40b00d6d908728d8f3a80e
diff --git a/dev-util/global-6.5.7 b/dev-util/global-6.5.7
new file mode 100644
index 000000000000..911d0bf87fb4
--- /dev/null
+++ b/dev-util/global-6.5.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=doc? ( app-text/texi2html sys-apps/texinfo ) >=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=tag system to find an object location in various sources
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/global/global.html
+IUSE=doc emacs vim
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses emacs? ( virtual/emacs ) vim? ( || ( app-editors/vim app-editors/gvim ) ) || ( dev-libs/libltdl:0 sys-devel/libtool:2 )
+SLOT=0
+SRC_URI=mirror://gnu/global/global-6.5.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=92ea72af8695a4989542d09f5e3f7f98
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
deleted file mode 100644
index 03da114e1737..000000000000
--- a/dev-util/global/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a8b47623697b6bfc1f98ac4b3f57ef0fb9a9269215f7f2666191907072064c4e7a4450fce5fc59c9724 SHA512 5a7b4e3eb4ee7ce479766a01dea5f82ab7499e666130b869c8f61ec9dfa69250b4b98357f6eb3d1b14da0348eb2c7d77ec0146d1e85996254a8fd7eaa3f3ff05
-AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
-DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
-DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
-EBUILD global-6.3.1.ebuild 1617 BLAKE2B dffa8f04a1d8598330b7cecb9a61810dba059fc12cdd3c8960c62c9511b37695eaaa399e0e2a8a5cee3d5a8670620038c591f0dab016543540fca670e069a08d SHA512 2a926a45bd9cd724a56bc77f080e5b5aa00642196b177f2d3330c038601c25f5e3a610ac690a1770d2894e3b899f33f1ae91ff4ded914cfc8386417ec134701c
-EBUILD global-6.5.7.ebuild 1633 BLAKE2B 40e16753307ae07fd9585340f1e8baefbb77833dbaf2a6ed7b598aff143fd7adb1c77d98f883a0ce5d2ef576ee29e2aa65f7fffbc27d38fcadaac09620a9be2b SHA512 99b22b10d0c983872e4db53d158b73ac468b4a5fc289f4da4859c0d1ffced1e0d7b7fccc4d00e3fd7c5dc75be317c4d83c2c2fbb07ee56f9f9427f096cfdbfcc
-MISC metadata.xml 523 BLAKE2B cb405d162cba446087d71184d8a8cab49b71f92161dadd534fde3edc6c00a40f6b2ce51cd3ad0d9192a95d12ddb2af25c3c4cf6e4423bba9e896dea0982cca10 SHA512 f4b82abf0a3f88651400730d36b488cedb64a06cc957efdb4164888c99adea1cc6a4ff20372cbc332cbbafe76140d2c42495d375285c635e25d3d1754406818b
diff --git a/dev-util/global/files/50gtags-gentoo.el b/dev-util/global/files/50gtags-gentoo.el
deleted file mode 100644
index cd9c5546de91..000000000000
--- a/dev-util/global/files/50gtags-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; global site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'gtags-mode "gtags"
-  "Toggle Gtags mode, a minor mode for browsing source code using GLOBAL." t)
diff --git a/dev-util/global/files/global-6.2.9-tinfo.patch b/dev-util/global/files/global-6.2.9-tinfo.patch
deleted file mode 100644
index ef247d4abbcb..000000000000
--- a/dev-util/global/files/global-6.2.9-tinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/m4/check_curses.m4 b/m4/check_curses.m4
-index 14aaec5..dca7c0e 100644
---- a/m4/check_curses.m4
-+++ b/m4/check_curses.m4
-@@ -229,16 +229,17 @@ AC_DEFUN([AC_NCURSES], [
- ])
- 
- AC_DEFUN([AC_SEARCH_NCURSES], [
-+    PKG_CHECK_MODULES(NCURSES,ncurses)
-     AS_MESSAGE(checking "location of ncurses.h file"...)
- 
--    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
--    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
--    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
--    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-+    AC_NCURSES(/usr/include, ncurses.h, $NCURSES_LIBS,, "ncurses on /usr/include")
-+    AC_NCURSES(/usr/include/ncurses, ncurses.h, $NCURSES_LIBS, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-+    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include, "ncurses on /usr/local")
-+    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses $NCURSES_LIBS, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
- 
--    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-+    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
- 
--    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-+    AC_NCURSES(/usr/include/ncurses, curses.h, $NCURSES_LIBS, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
- 
-     dnl
-     dnl We couldn't find ncurses, try SysV curses
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
deleted file mode 100644
index eb062c9e9b89..000000000000
--- a/dev-util/global/global-6.3.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="tag system to find an object location in various sources"
-HOMEPAGE="https://www.gnu.org/software/global/global.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="doc emacs vim"
-
-RDEPEND="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
-	sys-libs/ncurses
-	emacs? ( virtual/emacs )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${DEPEND}
-	doc? ( app-text/texi2html sys-apps/texinfo )"
-
-SITEFILE="50gtags-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-6.2.9-tinfo.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}/${PN}")"
-}
-
-src_compile() {
-	if use doc; then
-		texi2pdf -q -o doc/global.pdf doc/global.texi
-		texi2html -o doc/global.html doc/global.texi
-	fi
-
-	if use emacs; then
-		elisp-compile *.el
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		dohtml doc/global.html
-		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
-		[[ -f doc/global.pdf ]] && dodoc doc/global.pdf
-	fi
-
-	dodoc AUTHORS FAQ NEWS README THANKS
-
-	insinto /etc
-	doins gtags.conf
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins gtags.vim
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/global/global-6.5.7.ebuild b/dev-util/global/global-6.5.7.ebuild
deleted file mode 100644
index 3d6e4cfa2ed2..000000000000
--- a/dev-util/global/global-6.5.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune elisp-common
-
-DESCRIPTION="tag system to find an object location in various sources"
-HOMEPAGE="https://www.gnu.org/software/global/global.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc emacs vim"
-
-RDEPEND="
-	sys-libs/ncurses
-	emacs? ( virtual/emacs )
-	vim? ( || (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	|| (
-		dev-libs/libltdl:0
-		sys-devel/libtool:2
-	)"
-
-DEPEND="${DEPEND}
-	doc? (
-		app-text/texi2html
-		sys-apps/texinfo
-	)"
-
-SITEFILE="50gtags-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-6.2.9-tinfo.patch" )
-
-DOCS=( AUTHORS FAQ NEWS README THANKS )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
-}
-
-src_compile() {
-	if use doc; then
-		texi2pdf -q -o doc/global.pdf doc/global.texi
-		texi2html -o doc/global.html doc/global.texi
-	fi
-
-	if use emacs; then
-		elisp-compile *.el
-	fi
-
-	emake
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins gtags.conf
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins gtags.vim
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use doc; then
-		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
-		[[ -f doc/global.pdf ]] && DOCS+=( doc/global.pdf )
-	fi
-
-	einstalldocs
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
deleted file mode 100644
index b8ecaba5d8e0..000000000000
--- a/dev-util/global/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>naota@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>arfrever.fta@gmail.com</email> 
-	</maintainer>    
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>    
-	<use>
-		<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/glslang-6.2.2596 b/dev-util/glslang-6.2.2596
new file mode 100644
index 000000000000..fe566bfb2436
--- /dev/null
+++ b/dev-util/glslang-6.2.2596
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=6
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/glslang/archive/6.2.2596.tar.gz -> glslang-6.2.2596.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c333c4707ab0d100a191bb4d6aa2a18c
diff --git a/dev-util/glslang-9999 b/dev-util/glslang-9999
new file mode 100644
index 000000000000..dc8724cd8451
--- /dev/null
+++ b/dev-util/glslang-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=6
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=BSD
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9378b5f7e3da41762c0e09824c0bf9f
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
deleted file mode 100644
index 1c0975ca0938..000000000000
--- a/dev-util/glslang/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
-EBUILD glslang-6.2.2596.ebuild 500 BLAKE2B 8ab8168010867e61588f4c66987c4d9956f67a517355c8558c77be3643a1cd181a4687f4b639291219a01a44dd72a64bc4fea6c995d8445a3e97f2cf0c8478df SHA512 68a655dd11c81e1bde33cf637e0e7220278b7ec13310abff759d8c3b3529e82d2aeb49843074eddba22525dd6bcdcd46dba3251042d8a50c708932db9f026162
-EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
-MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-6.2.2596.ebuild b/dev-util/glslang/glslang-6.2.2596.ebuild
deleted file mode 100644
index 677174912af4..000000000000
--- a/dev-util/glslang/glslang-6.2.2596.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils vcs-snapshot
-
-SNAPSHOT_COMMIT="6.2.2596"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
deleted file mode 100644
index 172fe8252ca5..000000000000
--- a/dev-util/glslang/glslang-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils git-r3
-
-EGIT_REPO_URI="https://github.com/KhronosGroup/glslang.git"
-SRC_URI=""
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
deleted file mode 100644
index 241e7de59999..000000000000
--- a/dev-util/glslang/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KhronosGroup/glslang</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/gnome-builder-3.24.2-r1 b/dev-util/gnome-builder-3.24.2-r1
new file mode 100644
index 000000000000..5e121fbb8f04
--- /dev/null
+++ b/dev-util/gnome-builder-3.24.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.22.1:3[introspection] >=dev-libs/glib-2.50.0:2[dbus] >=x11-libs/gtksourceview-3.22.0:3.0[introspection] >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3 >=dev-libs/libxml2-2.9.0 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.18.0[python,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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/json-glib-1.2.0 >=app-text/gspell-1.2.0 >=app-text/enchant-1.6.0 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) clang? ( sys-devel/clang:= ) git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) >=x11-libs/vte-0.46:2.91 sysprof? ( >=dev-util/sysprof-3.23.91[gtk] ) dev-libs/libpcre:3 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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-libs/appstream-glib dev-util/desktop-file-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig !<sys-apps/sandbox-2.10-r3 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Builder attempts to be an IDE for writing software for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=clang +git sysprof vala webkit 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 test
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=x11-libs/gtk+-3.22.1:3[introspection] >=dev-libs/glib-2.50.0:2[dbus] >=x11-libs/gtksourceview-3.22.0:3.0[introspection] >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3 >=dev-libs/libxml2-2.9.0 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.18.0[python,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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/json-glib-1.2.0 >=app-text/gspell-1.2.0 >=app-text/enchant-1.6.0 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) clang? ( sys-devel/clang:= ) git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) >=x11-libs/vte-0.46:2.91 sysprof? ( >=dev-util/sysprof-3.23.91[gtk] ) dev-libs/libpcre:3 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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.24/gnome-builder-3.24.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3a9bc037c7308e89c57684c7028d8e9
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
deleted file mode 100644
index 953c8dd871bf..000000000000
--- a/dev-util/gnome-builder/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 3.24.2-jedi-fixes-1.patch 1224 BLAKE2B 4e3ea7702ddc69f892522596c9ff33495556b2d3cf1bcc2f09db7773d6f833b39e3a65f26813b1c75255c60ea5b0f0477439d25e7897f9d45baa84e6166f8d11 SHA512 f46e3a2e5128873bf8dc2ece5bca060d4d2dc936ce21127ce023f606c4841f888b5acaedf5500c1a5e2af634f12d1594e7dbb3480726ac871ca73e47c6fd0639
-AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a89314d1eafff37b11eb9f79c76b7bddb78899e9cf78215dd72e5da27e6f416757db40921f06904ec6a215ea1dd6 SHA512 e5b08a6ad2e182e9340d49876b0ee61f9a5e97abb8c31361ee5058647490894b741250c0850adfb18f93005ccebbbbff5c0ca6fe75f61d1895816f33e4801af0
-AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
-DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
-EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
-MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a
diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch
deleted file mode 100644
index 399811bb0eac..000000000000
--- a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 294920f6b932992e9da8864ca96ae35fe2402406 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Fri, 30 Jun 2017 21:19:41 -0700
-Subject: [PATCH] jedi: silence xml parser warning
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784327
----
-
-diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py
-index 7be46f2..d257680 100644
---- a/plugins/jedi/jedi_plugin.py
-+++ b/plugins/jedi/jedi_plugin.py
-@@ -298,7 +298,11 @@ class DocumentationDB(object):
-                         cursor.execute('UPDATE girfiles SET last_modified=? WHERE file=?', (mtime, filename))
-                 parser = lxml.etree.XMLParser(recover=True)
-                 tree = lxml.etree.parse(filename, parser=parser)
--                namespace = tree.find('core:namespace', namespaces=ns)
-+                try:
-+                    namespace = tree.find('core:namespace', namespaces=ns)
-+                except:
-+                    print("Failed to parse", filename)
-+                    continue
-                 library_version = namespace.attrib['version']
-                 for node in namespace.findall('core:class', namespaces=ns):
-                     doc = node.find('core:doc', namespaces=ns)
---
-libgit2 0.26.0
-
diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch
deleted file mode 100644
index de8397a57a00..000000000000
--- a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1d7c6fa60faf9e81f2fa0f93898f8e1cc68da6d4 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Thu, 6 Jul 2017 14:32:52 -0700
-Subject: [PATCH] jedi: ignore non-gir files
-
-The rnc file is now shipped here, so ignore that when going
-through the directory contents.
----
-
-diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py
-index d257680..25ade14 100644
---- a/plugins/jedi/jedi_plugin.py
-+++ b/plugins/jedi/jedi_plugin.py
-@@ -280,6 +280,8 @@ class DocumentationDB(object):
-         # I would use scandir for better performance, but it requires newer Python
-         for gir_path in GIR_PATH_LIST:
-             for gir_file in os.listdir(gir_path):
-+                if not gir_file.endswith('.gir'):
-+                    continue
-                 if gir_file in processed_gir_files:
-                     continue
-                 processed_gir_files[gir_file] = None
---
-libgit2 0.26.0
-
diff --git a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch b/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch
deleted file mode 100644
index 484341ad1155..000000000000
--- a/dev-util/gnome-builder/files/3.24.2-jedi-fixes-3.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 8bf74c787af082102958de7498a9b4f4248788cc Mon Sep 17 00:00:00 2001
-From: Elad Alfassa <elad@fedoraproject.org>
-Date: Wed, 9 Aug 2017 17:39:07 +0300
-Subject: [PATCH] jedi: adapt to jedi 0.10.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=778708
----
-
-diff --git a/plugins/jedi/jedi_plugin.py b/plugins/jedi/jedi_plugin.py
-index 25ade14..8898b69 100644
---- a/plugins/jedi/jedi_plugin.py
-+++ b/plugins/jedi/jedi_plugin.py
-@@ -55,7 +55,6 @@ from gi.repository import GtkSource
- from gi.repository import Ide
- from gi.types import GObjectMeta
- from gi.types import StructMeta
--
- _ = Ide.gettext
- 
- gi_importer = DynamicImporter('gi.repository')
-@@ -91,22 +90,31 @@ _ICONS = {
- try:
-     import jedi
-     from jedi.evaluate.compiled import CompiledObject
-+    from jedi.evaluate.compiled import get_special_object
-     from jedi.evaluate.compiled import _create_from_name
--    from jedi.evaluate.compiled import builtin
-+    from jedi.evaluate.context import Context
-     from jedi.evaluate.docstrings import _evaluate_for_statement_string
-     from jedi.evaluate.imports import Importer
- 
-     class PatchedJediCompiledObject(CompiledObject):
-         "A modified version of Jedi CompiledObject to work with GObject Introspection modules"
-+
-+        def __init__(self, evaluator, obj, parent_context=None, faked_class=None):
-+            # we have to override __init__ to change super(CompiledObject, self)
-+            # to Context, in order to prevent an infinite recursion
-+            Context.__init__(self, evaluator, parent_context)
-+            self.obj = obj
-+            self.tree_node = faked_class
-+
-         def _cls(self):
-             if self.obj.__class__ == IntrospectionModule:
-                 return self
-             else:
--                return super()._cls()
-+                return super()._cls(self)
- 
-         @property
-         def py__call__(self):
--            def actual(evaluator, params):
-+            def actual(params):
-                 # Parse the docstring to find the return type:
-                 ret_type = ''
-                 if '->' in self.obj.__doc__:
-@@ -115,18 +123,21 @@ try:
-                 if ret_type.startswith('iter:'):
-                     ret_type = ret_type[len('iter:'):]  # we don't care if it's an iterator
- 
--                if ret_type in __builtins__:
-+                if hasattr(__builtins__, ret_type):
-                     # The function we're inspecting returns a builtin python type, that's easy
--                    obj = _create_from_name(builtin, builtin, ret_type)
--                    return evaluator.execute(obj, params)
-+                    # (see test/test_evaluate/test_compiled.py in the jedi source code for usage)
-+                    builtins = get_special_object(self.evaluator, 'BUILTINS')
-+                    builtin_obj = builtins.py__getattribute__(ret_type)
-+                    obj = _create_from_name(self.evaluator, builtins, builtin_obj, "")
-+                    return self.evaluator.execute(obj, params)
-                 else:
-                     # The function we're inspecting returns a GObject type
--                    parent = self.parent.obj.__name__
-+                    parent = self.parent_context.obj.__name__
-                     if parent.startswith('gi.repository'):
-                         parent = parent[len('gi.repository.'):]
-                     else:
-                         # a module with overrides, such as Gtk, behaves differently
--                        parent_module = self.parent.obj.__module__
-+                        parent_module = self.parent_context.obj.__module__
-                         if parent_module.startswith('gi.overrides'):
-                             parent_module = parent_module[len('gi.overrides.'):]
-                             parent = '%s.%s' % (parent_module, parent)
-@@ -138,22 +149,28 @@ try:
-                         # A pygobject type in a different module
-                         return_type_parent = ret_type.split('.', 1)[0]
-                         ret_type = 'from gi.repository import %s\n%s' % (return_type_parent, ret_type)
--                    result = _evaluate_for_statement_string(evaluator, ret_type, self.parent)
--                    return result
-+                    result = _evaluate_for_statement_string(self.parent_context, ret_type)
-+                    return set(result)
-             if type(self.obj) == FunctionInfo:
-                 return actual
-             return super().py__call__
- 
-+    # we need to override CompiledBoundMethod without changing it much,
-+    # just so it'll not get confused due to our overriden CompiledObject
-+    class PatchedCompiledBoundMethod(PatchedJediCompiledObject):
-+        def __init__(self, func):
-+            super().__init__(func.evaluator, func.obj, func.parent_context, func.tree_node)
-+
-     class PatchedJediImporter(Importer):
-         "A modified version of Jedi Importer to work with GObject Introspection modules"
-         def follow(self):
-             module_list = super().follow()
--            if module_list == []:
-+            if not module_list:
-                 import_path = '.'.join([str(i) for i in self.import_path])
-                 if import_path.startswith('gi.repository'):
-                     try:
-                         module = gi_importer.load_module(import_path)
--                        module_list = [PatchedJediCompiledObject(module)]
-+                        module_list = [PatchedJediCompiledObject(self._evaluator, module)]
-                     except ImportError:
-                         pass
-             return module_list
-@@ -169,9 +186,9 @@ try:
-                 return original_jedi_get_module('gi._gobject')
- 
-     jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module
--
--    jedi.evaluate.imports.Importer = PatchedJediImporter
-     jedi.evaluate.compiled.CompiledObject = PatchedJediCompiledObject
-+    jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
-+    jedi.evaluate.imports.Importer = PatchedJediImporter
-     HAS_JEDI = True
- except ImportError:
-     print("jedi not found, python auto-completion not possible.")
-@@ -331,7 +348,6 @@ def update_doc_db_on_startup():
- 
- update_doc_db_on_startup()
- 
--
- class JediCompletionProvider(Ide.Object, GtkSource.CompletionProvider, Ide.CompletionProvider):
-     context = None
-     current_word = None
-@@ -600,6 +616,15 @@ class JediCompletionRequest:
-         script = jedi.Script(self.content, self.line + 1, self.column, self.filename)
- 
-         db = DocumentationDB()
-+
-+        def get_gi_obj(info):
-+            """ Get a GObject Introspection object from a jedi Completion, or None if the completion is not GObject Introspection related """
-+            if (type(info._module) == PatchedJediCompiledObject and
-+               info._module.obj.__class__ == IntrospectionModule):
-+                return next(info._name.infer()).obj
-+            else:
-+                return None
-+
-         for info in script.completions():
-             if self.cancelled:
-                 return
-@@ -608,10 +633,9 @@ class JediCompletionRequest:
- 
-             # we have to use custom names here because .type and .params can't
-             # be overridden (they are properties)
--            if type(info._definition) == PatchedJediCompiledObject and \
--               type(info._definition.obj) == FunctionInfo:
-+            obj = get_gi_obj(info)
-+            if type(obj) == FunctionInfo:
-                     info.real_type = 'function'
--                    obj = info._definition.obj
-                     params = [arg_info.get_name() for arg_info in obj.get_arguments()]
-             else:
-                 info.real_type = info.type
-@@ -626,8 +650,8 @@ class JediCompletionRequest:
-                             params.append(param.name)
- 
-             doc = info.docstring()
--            if hasattr(info._definition, 'obj'):
--                obj = info._definition.obj
-+            if obj is not None:
-+                # get documentation for this GObject Introspection object
-                 symbol = None
-                 namespace = None
- 
-@@ -640,17 +664,7 @@ class JediCompletionRequest:
-                     namespace = obj.get_namespace()
- 
-                 if symbol is not None:
--                    # we need to walk down the path to find the module so we can get the version
--                    parent = info._definition.parent
--                    found = False
--                    while not found:
--                        new_parent = parent.parent
--                        if new_parent is None:
--                            found = True
--                        else:
--                            parent = new_parent
--                    version = parent.obj._version
--                    result = db.query(symbol, version)
-+                    result = db.query(symbol, info._module.obj._version)
-                     if result is not None:
-                         doc = result
- 
---
-libgit2 0.26.0
-
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
deleted file mode 100644
index 296e94b87677..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
+++ /dev/null
@@ -1,133 +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} )
-VALA_MIN_API_VERSION="0.30"
-VALA_USE_DEPEND="vapigen"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1
-
-DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang +git sysprof vala webkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within.
-# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic).
-# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection.
-# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin
-# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte?
-# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc
-# FIXME: --with-sanitizer configure option
-# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER?
-# Editorconfig needs pcre.h, with vte migrating away, might want it optional?
-# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins
-# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal.
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4
-RDEPEND="
-	>=x11-libs/gtk+-3.22.1:3[introspection]
-	>=dev-libs/glib-2.50.0:2[dbus]
-	>=x11-libs/gtksourceview-3.22.0:3.0[introspection]
-	>=dev-libs/gobject-introspection-1.48.0:=
-	>=dev-python/pygobject-3.22.0:3
-	>=dev-libs/libxml2-2.9.0
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/json-glib-1.2.0
-	>=app-text/gspell-1.2.0
-	>=app-text/enchant-1.6.0
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-	clang? ( sys-devel/clang:= )
-	git? (
-		dev-libs/libgit2[ssh,threads]
-		>=dev-libs/libgit2-glib-0.25.0[ssh] )
-	>=x11-libs/vte-0.46:2.91
-	sysprof? ( >=dev-util/sysprof-3.23.91[gtk] )
-	dev-libs/libpcre:3
-	${PYTHON_DEPS}
-	vala? ( $(vala_depend) )
-"
-# desktop-file-utils for desktop-file-validate check in configure for 3.22.4
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	!<sys-apps/sandbox-2.10-r3
-"
-
-# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more)
-RESTRICT="test"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi-0.10.x and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files
-# jhbuild support
-# rust language server via rls
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# mono/PHPize stuff
-
-PATCHES=( "${FILESDIR}"/${PV}-jedi-fixes-{1,2,3}.patch ) # jedi-0.10+ compatibility from 3.25.9x; remove 0.10 specific mention from DOC_CONTENTS once compat with 0.11+
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-channel=distro \
-		--enable-editorconfig \
-		--enable-introspection \
-		$(use_enable vala vala-pack-plugin) \
-		$(use_enable webkit) \
-		$(use_enable webkit html-preview-plugin) \
-		$(use_enable clang clang-plugin) \
-		$(use_enable git git-plugin) \
-		$(use_enable sysprof sysprof-plugin) \
-		--disable-flatpak-plugin \
-		--enable-terminal-plugin \
-		--enable-gettext-plugin \
-		--disable-static
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
-
-	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check
-}
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
deleted file mode 100644
index 78c212429a5c..000000000000
--- a/dev-util/gnome-builder/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
-	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
-		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
-	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
-	<flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag>
-	<flag name="webkit">Enable <pkg>net-libs/webkit-gtk</pkg> using plugins support and the HTML/Markdown previewer plugin</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/gnome-devel-docs-3.22.1 b/dev-util/gnome-devel-docs-3.22.1
new file mode 100644
index 000000000000..51a253d5b144
--- /dev/null
+++ b/dev-util/gnome-devel-docs-3.22.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/yelp-tools dev-libs/libxslt sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation for developing for the GNOME desktop environment
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/
+KEYWORDS=amd64 ~ppc x86
+LICENSE=FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=748fbce61e06c84206defa8dd5dce132
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
deleted file mode 100644
index 9d072f7bce95..000000000000
--- a/dev-util/gnome-devel-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-devel-docs-3.22.1.tar.xz 9298224 BLAKE2B 844f9ca5c9b9eb5a4cfdbca19b1cad9f8f21142c33c7810c64cbb8d9625f3f71d284d520a2c528983ba8fcaa170e41aca5e6ca2636608a4b2b988cf9d06a7325 SHA512 9d1c740fa2580ac4e5265d24463bd292df5db3e3bdf0ae57b55b0f71067bb88e28d4d51aa246e7e43f86fa77f73ac7c475cfaa688e009956d253117e650bb63f
-EBUILD gnome-devel-docs-3.22.1.ebuild 662 BLAKE2B 451d56f57437dc11de4fb8ee60ab39868fc8c19ca6434ea18490b88ebe097b8a19f003bbf0e54f6cfef728d1e223b0f76810669f159d16d964d7edfd197e428a SHA512 0a7a65213a2bc531187a5a8693c185be93f93dd314319e0922122a9e8a6ce68f0f368133e4ab759a26bd496f3bc0a5e1f1daeef88b689fc2b59004144b7733b9
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild
deleted file mode 100644
index c6f7623f1cfc..000000000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.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
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# Wants to build demo samples
-	gnome2_src_configure ac_cv_path_CC=""
-}
diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/gnome-devel-docs/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gob-2.0.20 b/dev-util/gob-2.0.20
new file mode 100644
index 000000000000..cd40abab06e8
--- /dev/null
+++ b/dev-util/gob-2.0.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.4:2 sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Preprocessor for making GTK+ objects with inline C code
+EAPI=5
+HOMEPAGE=http://www.jirka.org/gob.html
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.4:2
+SLOT=2
+SRC_URI=mirror://gnome/sources/gob2/2.0/gob2-2.0.20.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9ed3772bd265d449be6ae12f6966675
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
deleted file mode 100644
index b5f331649479..000000000000
--- a/dev-util/gob/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20.ebuild 540 BLAKE2B 6f04db1fa19cf04d8ced56ca5c71fefcd20e7b6b98e4b4086faaaa4315ea5391f7da51303ad22f04588f7de04da0cfb99c54809a0d11c0e3715f9fc0e56d0cdb SHA512 c36d47eba0509337c6d0056e8e190388c99d203a8e404544ba876591d2d3c71c1ff49b3663aced6cc6d4008a3d64a631a515bcbc83436bfb9e65b9963ad382ef
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
deleted file mode 100644
index 27f6942ffb25..000000000000
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="gob2"
-
-inherit gnome2
-
-DESCRIPTION="Preprocessor for making GTK+ objects with inline C code"
-HOMEPAGE="http://www.jirka.org/gob.html"
-
-LICENSE="GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.4:2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
diff --git a/dev-util/gob/metadata.xml b/dev-util/gob/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/gob/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/goland-2018.1.3 b/dev-util/goland-2018.1.3
new file mode 100644
index 000000000000..7e2396d364eb
--- /dev/null
+++ b/dev-util/goland-2018.1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2018.1.3.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_=1f72eda1cd7399299df19a090f81bafa
diff --git a/dev-util/goland-2018.1.4 b/dev-util/goland-2018.1.4
new file mode 100644
index 000000000000..3e659dc1c7fe
--- /dev/null
+++ b/dev-util/goland-2018.1.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2018.1.4.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_=1f72eda1cd7399299df19a090f81bafa
diff --git a/dev-util/goland-2018.1.5 b/dev-util/goland-2018.1.5
new file mode 100644
index 000000000000..c2daff3b6951
--- /dev/null
+++ b/dev-util/goland-2018.1.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2018.1.5.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_=1f72eda1cd7399299df19a090f81bafa
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
deleted file mode 100644
index fdb38183e6c2..000000000000
--- a/dev-util/goland/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST goland-2018.1.3.tar.gz 221579069 BLAKE2B 16ead14bc3401fe7b031576eb9581613cac1352b42933acc83af77946376017b6658fb04b556b028a6f89f86a65b60290e1f6f9b5febe2dc10c85b5c6004879f SHA512 24f1c384139276301a27a9df1056560f3ee89ef9817690c00626eb0522fed8a58ded3bd3632aeac8f25855dd2c031c40f937761625f6545504eb2f3e7d0d509b
-DIST goland-2018.1.4.tar.gz 217585781 BLAKE2B f4bdd554003b2397911cb767ffba558fcf06ab9cfd20c0017579cf82c6af93681e16c23db82c3cf0b47c4bb6a2c37c564be5ee9d6400cf91cb3a0938309166d5 SHA512 972c15d6636728e214b355ce4ce7174d08e0e842c6ca4e4385fbc4330930a2fae3a964b1b3753c38fe77ac2b8073fd7366fd0085d00fcf05b832c985d6243325
-DIST goland-2018.1.5.tar.gz 217591227 BLAKE2B 7a45497f8706c77bb8e729b1e6affc88e1b9230a396738bad235d55bb40ed5a728bc674d210b04eedcc4b144f60ac91f6216ed010940257227cefcb167b81aaf SHA512 cf861bed38f0678f9734632d988c37cc1bd5c596fb23dfd3f9d60642f82c5f356809de116a138888638ebd7f464201d0ea780e694f9f5c5c66d3245a2b15f484
-EBUILD goland-2018.1.3.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
-EBUILD goland-2018.1.4.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
-EBUILD goland-2018.1.5.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/goland/goland-2018.1.3.ebuild b/dev-util/goland/goland-2018.1.3.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.3.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
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2018.1.4.ebuild b/dev-util/goland/goland-2018.1.4.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.4.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
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2018.1.5.ebuild b/dev-util/goland/goland-2018.1.5.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.5.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
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/metadata.xml b/dev-util/goland/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/goland/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/dev-util/google-perftools-2.0-r2 b/dev-util/google-perftools-2.0-r2
new file mode 100644
index 000000000000..4ea9bd78b6e5
--- /dev/null
+++ b/dev-util/google-perftools-2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/libunwind >=app-portage/elt-patches-20170422
+DESCRIPTION=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=5
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal test static-libs
+KEYWORDS=-* amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c1b8c5b208911b119727b03ea69decf
diff --git a/dev-util/google-perftools-2.4 b/dev-util/google-perftools-2.4
new file mode 100644
index 000000000000..bef2ca0d230e
--- /dev/null
+++ b/dev-util/google-perftools-2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/libunwind >=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=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=6
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.4 -> gperftools-2.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=41d391b072b5b737a3c12a8563a5d9e6
diff --git a/dev-util/google-perftools-2.6.2 b/dev-util/google-perftools-2.6.2
new file mode 100644
index 000000000000..74821416b754
--- /dev/null
+++ b/dev-util/google-perftools-2.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/libunwind >=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=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=6
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.2 -> gperftools-2.6.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=f3f002ec505cd6a5b52c29a89e6483e2
diff --git a/dev-util/google-perftools-2.6.3 b/dev-util/google-perftools-2.6.3
new file mode 100644
index 000000000000..97239135a008
--- /dev/null
+++ b/dev-util/google-perftools-2.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/libunwind >=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=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=6
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.3 -> gperftools-2.6.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=fad3549bc582155ab552bb6efd85463d
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
deleted file mode 100644
index 9f675d110be0..000000000000
--- a/dev-util/google-perftools/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX gperftools-2.0+glibc-2.16.patch 604 BLAKE2B c7f18515f32a2bcb4d8a0a7217f7d42df8224fd357af43ea691c8a5861318861f26cbc00a3c79225d641504ea8459803e563aefc57384ff4ed99e8cc5ef271a4 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964
-AUX gperftools-2.0-32bit-barrier.patch 792 BLAKE2B 8efea587a96f4796d55809714ebf2b2a7058f0161431b7b3b404e0709e338f0a981525f74691b923354b622bbd2295ee001b2a2975da0e12a94cdc07ed207c1d SHA512 a39fd183d76a76e5c4cb3915f966e008250b4c72098bd2a9d13f10e01efd8dd1e36a51e0d4ef5f712d20398fa8605aa40e2529af085e80f918a1e227d7c92def
-DIST gperftools-2.0.tar.gz 1261243 BLAKE2B a37c62f6f3c27a29036955c37a58c480e5cc628bd49036e20fe616e610d45b6727b0782605892a543cb477c388093feb5527e6557c5bc8446aaf874e946884f6 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926
-DIST gperftools-2.4.tar.gz 890402 BLAKE2B f4893d7c9bbd3a8dc5b4d8a25837039261fa32782e13653991002ab666d6e81de637932a8b46c66df219336adcc395a217a4ce32332e8e1558beeb140ea642f2 SHA512 77198c150ee26579adc8f190be0c4ba90a9e3854b006c3aa9252b5863b1fce317fd690c6aa0ed202c81f0bbcfbe2d5f8a182263e77b7fb4fbc6b3e8bfffc9fb0
-DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
-DIST gperftools-2.6.3.tar.gz 911813 BLAKE2B dae223927835f65b819836b25595df2943a0762ac3b6346e3d0186dab486cfa3e4eabc1f5a2ec43314f53ea96a68acb75991b76055591395bc52e78f655630d3 SHA512 6418c382760c8870ef42a535fcb65a623c1a9fd3ab58fcb7cfe2dd5048b2268b434427da36bc0c76beef2c28e13a6926d32d67084d8ca6675b78650a62de77a7
-EBUILD google-perftools-2.0-r2.ebuild 1803 BLAKE2B b81145202e20964c9c5784aa1b7b7afb1bef69659339654375a2019732d7696b2bd6fe0bf0347c7f559146b7c64e4c203ec7ad7626ccd68d3f030b488005a92e SHA512 7fe925ddae89c431f7177c4bc97dc2e5a663452e9fde34d16f28fd5dbfa8e584b961362cc1f65ee726478b54a2d000b15ef3bf81ce4e10c11aee2a78990e3a58
-EBUILD google-perftools-2.4.ebuild 2297 BLAKE2B 7c0dd1e856d745ecf215d3974f1bc2dd057f7ca3381bcc5ca7b8d2ce800b029c831934d27a938056aaa724a500f5799ef792155c2e371ea9fe2be4f0cdec0995 SHA512 026a68d5920847c00fd1af24397ce45575dab9e16f569c9d55b7b0424511cab365be429e33bb7d74ef70a57c38eacc825d3809d44c204678b046c9a76302a460
-EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
-EBUILD google-perftools-2.6.3.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
-MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
deleted file mode 100644
index b17e0d57f5fb..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gperftools-2.0/src/base/linuxthreads.cc
-===================================================================
---- gperftools-2.0.orig/src/base/linuxthreads.cc
-+++ gperftools-2.0/src/base/linuxthreads.cc
-@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
- /* Signal handler to help us recover from dying while we are attached to
-  * other threads.
-  */
--static void SignalHandler(int signum, siginfo_t *si, void *data) {
-+static void SignalHandler(int signum, struct siginfo *si, void *data) {
-   if (sig_pids != NULL) {
-     if (signum == SIGABRT) {
-       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
deleted file mode 100644
index df89a92ed010..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Atomic64 not available on all architectures.
-Use AtomicWord instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar gperftools-2.0.orig/src/base/spinlock_internal.cc gperftools-2.0/src/base/spinlock_internal.cc
---- gperftools-2.0.orig/src/base/spinlock_internal.cc	2012-02-02 21:36:23.000000000 +0000
-+++ gperftools-2.0/src/base/spinlock_internal.cc	2013-01-20 23:44:01.629077919 +0000
-@@ -80,7 +80,7 @@
- static int SuggestedDelayNS(int loop) {
-   // Weak pseudo-random number generator to get some spread between threads
-   // when many are spinning.
--  static base::subtle::Atomic64 rand;
-+  static AtomicWord rand;
-   uint64 r = base::subtle::NoBarrier_Load(&rand);
-   r = 0x5deece66dLL * r + 0xb;   // numbers from nrand48()
-   base::subtle::NoBarrier_Store(&rand, r);
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
deleted file mode 100644
index c0b175dcf38d..000000000000
--- a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs eutils flag-o-matic autotools-utils
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="doc"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
-	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	local myeconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable debug debugalloc)
-		$(use_enable minimal)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sanbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	autotools-utils_src_test
-}
diff --git a/dev-util/google-perftools/google-perftools-2.4.ebuild b/dev-util/google-perftools/google-perftools-2.4.ebuild
deleted file mode 100644
index a2986988f31c..000000000000
--- a/dev-util/google-perftools/google-perftools-2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="doc"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
deleted file mode 100644
index cdbf549f9647..000000000000
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="docs"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
diff --git a/dev-util/google-perftools/google-perftools-2.6.3.ebuild b/dev-util/google-perftools/google-perftools-2.6.3.ebuild
deleted file mode 100644
index 708d67991674..000000000000
--- a/dev-util/google-perftools/google-perftools-2.6.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="docs"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
deleted file mode 100644
index e6791a60364b..000000000000
--- a/dev-util/google-perftools/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="largepages">
-      Use (experimental) larger pages for tcmalloc, this increases
-      memory usage, but should speed up the allocation/free
-      operations.
-    </flag>
-    <flag name="debug">
-      Build a set of libraries with debug support (so-called
-      debugalloc). These are available by default but are not needed
-      unless you're actually developing using tcmalloc.
-    </flag>
-    <flag name="minimal">
-      Only build the tcmalloc_minimal library, ignoring the heap
-      checker and the profilers.
-    </flag>
-    <flag name="optimisememory">
-        To build libtcmalloc with smaller internal caches.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">gperftools/gperftools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/gource-0.48 b/dev-util/gource-0.48
new file mode 100644
index 000000000000..f63557128984
--- /dev/null
+++ b/dev-util/gource-0.48
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 virtual/pkgconfig >=media-libs/glm-0.9.3
+DESCRIPTION=A software version control visualization tool
+EAPI=6
+HOMEPAGE=http://gource.io/
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 media-fonts/freefont
+SLOT=0
+SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.48/gource-0.48.tar.gz
+_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_=8b045cfbfca6a6a427b7719cb9fb29d9
diff --git a/dev-util/gource-0.49 b/dev-util/gource-0.49
new file mode 100644
index 000000000000..fed2f398fc09
--- /dev/null
+++ b/dev-util/gource-0.49
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 virtual/pkgconfig >=media-libs/glm-0.9.3
+DESCRIPTION=A software version control visualization tool
+EAPI=6
+HOMEPAGE=http://gource.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 media-fonts/freefont
+SLOT=0
+SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.49/gource-0.49.tar.gz
+_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_=85c1efa3f4c79c41f6cb390f9b9bce43
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
deleted file mode 100644
index ba264a7796b5..000000000000
--- a/dev-util/gource/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gource-0.48.tar.gz 873333 BLAKE2B 95b876b486f0215f7516cb2bb940dd00771f67659cb2d10ad23e9da0732a51e3f2030d8f7599a8be901f0211bf1c484964f1fb66696be01c990a7b99d1123084 SHA512 5b638cac9b464c0d8f0df87ae0115c36d314cce9cd0ce269b05e0a635ff6f23e62d06d0def484b796267299041e4de675cb13a0381b19d9144bbdc1d3b7f1b16
-DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
-EBUILD gource-0.48.ebuild 1060 BLAKE2B 5b3e6c4c560bdbef5c052b275b31c28f05bf2fb37bcfba7000efc24fc88b0987d03c22fbbb59e063a4314fc61f0758936a42cea0fe651bdef27ecc0f7d37bed5 SHA512 a2b87b1e273fe48737aefebbbef8f0c01616dc1b74eb430149c21bf0f51f94290944f8b2c7c325e27a0b00100ab06e4e8c71a1ac8ba49ff6bf0bf7d66356d660
-EBUILD gource-0.49.ebuild 1062 BLAKE2B cc5904ad53ef11df22c22b5547a6fa3b07234c640aca6c96de1e7fe9c7ac44ac053c8955c62bf91bb92345952cbf7c5aaa4dc46ca6f0ff0ec65720718830d8de SHA512 6709d71956fcbb491e279f7180c166e871ef7fca7bfe96fa84b54b83df2480ed69fa14881dd779d6f8515b2c9f4cd78b401584116356968811a17c7dc7e6c985
-MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.48.ebuild b/dev-util/gource/gource-0.48.ebuild
deleted file mode 100644
index 34639205e93e..000000000000
--- a/dev-util/gource/gource-0.48.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.46:=[threads(+)]
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
deleted file mode 100644
index cd54b4eb2266..000000000000
--- a/dev-util/gource/gource-0.49.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.46:=[threads(+)]
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
deleted file mode 100644
index fb193a154430..000000000000
--- a/dev-util/gource/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>kensington@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">gource</remote-id>
-		<remote-id type="github">acaudwell/Gource</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gperf-3.0.4 b/dev-util/gperf-3.0.4
new file mode 100644
index 000000000000..c4a3e25b1f31
--- /dev/null
+++ b/dev-util/gperf-3.0.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A perfect hash function generator
+EAPI=4
+HOMEPAGE=https://www.gnu.org/software/gperf/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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
+SLOT=0
+SRC_URI=mirror://gnu/gperf/gperf-3.0.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9229fc76674f3a25cff83c49c928996e
diff --git a/dev-util/gperf-3.1 b/dev-util/gperf-3.1
new file mode 100644
index 000000000000..3e0f778db32d
--- /dev/null
+++ b/dev-util/gperf-3.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A perfect hash function generator
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gperf/
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~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
+SLOT=0
+SRC_URI=mirror://gnu/gperf/gperf-3.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d8038934347c43e3a4fd4f00582e0cc1
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
deleted file mode 100644
index 9ad30eb909b4..000000000000
--- a/dev-util/gperf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gperf-3.0.4.tar.gz 983500 BLAKE2B b83bb45fb88143f2847405efd769472c5b3ea9277af88568bf8860ae653563ff3c23a9705651eac50949fdfad3efd957856f712f7810b21cc6dd32dcf40adb12 SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad
-DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.0.4.ebuild 755 BLAKE2B 9ce77ac7852ef68d13f526b34cd8294dbd50d281ea6e73cf70d3e0da899b10d4868edad16894ab868df44e9ebd1ceaef68716b776b470a208820dd55913b03df SHA512 a3780b8647c196f856564753935978d8a80fa0849dbf804fd8822c83b64087376ab80376ecfd22102898fb7339974e4e4ce4090b91e8c7b8055d4a3159978950
-EBUILD gperf-3.1.ebuild 737 BLAKE2B b3d13d77ee4c9bb01daa3e9596b1cd5bcddbf4435b043b838c250f742130915e19d7c5983599d07cce646bc3462656baaab129b90263c380e2a088d961359e18 SHA512 a6c0443f8f2e8b31fe767ecd634429ee57a57eb92aa7b1c3d93189ed6d3e4bbfabb10398ed1077e7d57f8d55500f398c4cdca34a7547c66f96a4febf3d047a43
-MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
deleted file mode 100644
index f10a26e67e5e..000000000000
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A perfect hash function generator"
-HOMEPAGE="https://www.gnu.org/software/gperf/"
-SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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=""
-
-src_prepare() {
-	sed -i \
-		-e "/^AR /s:=.*:= $(tc-getAR):" \
-		-e "/^CPPFLAGS /s:=:+=:" \
-		*/Makefile.in || die #444078
-}
-
-src_configure() {
-	econf --htmldir='$(datarootdir)/doc/'"${PF}/html"
-}
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
deleted file mode 100644
index 028df12b3669..000000000000
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A perfect hash function generator"
-HOMEPAGE="https://www.gnu.org/software/gperf/"
-SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~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=""
-
-src_prepare() {
-	sed -i \
-		-e "/^CPPFLAGS /s:=:+=:" \
-		*/Makefile.in || die #444078
-
-	eapply_user
-}
-
-src_configure() {
-	econf --htmldir='$(datarootdir)/doc/'"${PF}/html"
-}
diff --git a/dev-util/gperf/metadata.xml b/dev-util/gperf/metadata.xml
deleted file mode 100644
index 971fcb152d3f..000000000000
--- a/dev-util/gperf/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>blueness@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gprof2dot-2013.05.17 b/dev-util/gprof2dot-2013.05.17
new file mode 100644
index 000000000000..f808aa3f847d
--- /dev/null
+++ b/dev-util/gprof2dot-2013.05.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+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=Converts profiling output to dot graphs
+EAPI=5
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+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] ) 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=http://www.hartwork.org/public/gprof2dot-0_p20130517.tar.xz
+_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_=cf4d97fd876a66469908035069d50284
diff --git a/dev-util/gprof2dot-2016.10.13 b/dev-util/gprof2dot-2016.10.13
new file mode 100644
index 000000000000..4fe8cd4b00ee
--- /dev/null
+++ b/dev-util/gprof2dot-2016.10.13
@@ -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(-)] 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=Converts profiling output to dot graphs
+EAPI=6
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+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] ) 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(-)] 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 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2016.10.13.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_=98268bdd3555c0c10502babf74893789
diff --git a/dev-util/gprof2dot-2017.09.19 b/dev-util/gprof2dot-2017.09.19
new file mode 100644
index 000000000000..831f114fc6a6
--- /dev/null
+++ b/dev-util/gprof2dot-2017.09.19
@@ -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(-)] 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=Converts profiling output to dot graphs
+EAPI=6
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+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] ) 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(-)] 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 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2017.9.19.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_=7f183955615b218bd3d9709ce126db8c
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
deleted file mode 100644
index 226cd148435b..000000000000
--- a/dev-util/gprof2dot/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gprof2dot-0_p20130517-py3-xrange.patch 431 BLAKE2B 634ad067782bc67ee0dfe89af8831037ec93d905ea37debfb79640b372370375f9969b84d213a9d914b643580418b068107b4f667213189136ab35d74a47d4db SHA512 d855f0c0736f984360c48dc5a26e50502ae06e8b3450624e3e67efbf6659e67891cc78e4419aeaad8a85b2a94c09090f2b6cd04048913b1c971be8d874c50bfe
-DIST gprof2dot-0_p20130517.tar.xz 1080464 BLAKE2B 49fdcc79bc91505cc1d2b8233099766c0b305af145e8f668011429743777b965084baa713664d9fe0c0d17d2ee741b13101c5162baf07c609d1b0b7dd04de6c5 SHA512 1907cb889d1776723ca944d588fa4185afdeee11cc85ec40c03832568d91612bab708160c69036fc45fef05bca62c5bc8f6ef19cbb45c6bfd1952dda94c54a4b
-DIST gprof2dot-2016.10.13.tar.gz 22264 BLAKE2B 612cdaf8491e40223cf856104e49554675f2f83f8fc4ca9932f5b36167408ea51c2020c7c958a014b25010002230b0a6e4d5c70d6791fc445182fc61a9ff7eab SHA512 0568f1afb4e5c9da9e6c3c58d9a3613c90110c338c573e2c088a99f1db4d076a287d1209a132b86334a01404701d6ca0d9b0553e7ce850278956ea79acc2c388
-DIST gprof2dot-2017.9.19.tar.gz 23558 BLAKE2B 3de2a0e7c9731987a1382df9d67badcb19514983fa83af432bb83b5e59762c12fe865af9cb7778ccd37015992384e87b71b53211c33555039ee3f7dffc4e7c9c SHA512 652b38c6cbee47795d866a539e69ff4b2e67e221c8c082c6ecf480a15c24fe6d77e80b7daa5d24e76d27a4ff90836f80e716cb4d51d48d41aea5f661e3ac3598
-EBUILD gprof2dot-2013.05.17.ebuild 1118 BLAKE2B d5c10ab63e52f67a38ba41f308d062bc36d23296f19a32c6d91e0604de0f1f6fa4377388b1893a3aecad792adc1618fbc3f4f1690d523bcf87fb4d9b8af11771 SHA512 6ed2fa61539c3a8c94f343e469655c96e451018143ec359f8de595b6aa34caa874bd4c5c4ad0c2c5284cb2d6455be8c15193a52caf2b4d4534d0fd80a2197e2e
-EBUILD gprof2dot-2016.10.13.ebuild 503 BLAKE2B c2152ff306c97a5f5b78a15389d17318be9e98a172b1a5a01fd9189e250e0f2403fdd080565b5299796238c0ea039b56cb2852359a37ca9ea4aecf0dae121aa2 SHA512 758aef8a94cf85b61ac47528b39fd6de3efee4d27aa433531355dc7a52386957e48dbc34fb287afb99dbc2fbcf443f2cd1e764b065095f5e2ec3b61ea49b4d02
-EBUILD gprof2dot-2017.09.19.ebuild 566 BLAKE2B 362057dcfb4504c1a79af72e146b650b9746500ffc88d85ed702cff949e9ab46d4c0ac6fd23ccf45361b145cdac0e1a993ef8ca69b259411cd11fbe3e04d4645 SHA512 3ae1aa53ca9f696d8b7640b87b212adb54a94c650e8a76f35fe3839dfcc2e2525ec3e4c4a2dcf02300d5e5a35f81f218d822461a960d73655c5c9064e2247453
-MISC metadata.xml 333 BLAKE2B d1735f6673a0258eadd2d185548fba581c8613d4c8709e388bab630e81d9e835aa1fac22495b400a8db3e9895ba655e273657bd9329c9a9a8022c5bd7ada2f3e SHA512 503d8f740b27ef37b79be92c4652c60f49087634451e0d418da990c7b1f9c911aca461f2578e66e3e09f7db0588e57e304949a04b279fe782ead8222e1324a28
diff --git a/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch b/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
deleted file mode 100644
index 228b1d8230d7..000000000000
--- a/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gprof2dot.py	2013-05-29 19:18:46.217823810 +0300
-+++ gprof2dot.py	2013-06-16 12:12:28.095478734 +0300
-@@ -39,6 +39,7 @@
-     def compat_keys(x): return list(x.keys())  # keys() is a generator in Python 3
-     basestring = str  # No class basestring in Python 3
-     unichr = chr # No unichr in Python 3
-+    xrange = range # No xrange in Python 3
- else:
-     PYTHON_3 = False
-     def compat_iteritems(x): return x.iteritems()
diff --git a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
deleted file mode 100644
index 8edb2a36308e..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
+++ /dev/null
@@ -1,54 +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 python-r1
-
-MY_PV=0_p${PV//./}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="http://www.hartwork.org/public/${MY_P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-py3-xrange.patch
-}
-
-_make_call_script() {
-	cat <<-EOF >"${ED}/$1"
-	#! /usr/bin/env python
-	from gprof2dot import Main
-	Main().main()
-	EOF
-
-	fperms a+x "$1" || die
-}
-
-src_install() {
-	abi_specific_install() {
-		local sitedir="$(python_get_sitedir)"
-		insinto ${sitedir#"${EPREFIX}"}
-		doins ${PN}.py || die
-		python_optimize || die
-	}
-	python_foreach_impl abi_specific_install
-
-	dodir /usr/bin || die
-	_make_call_script /usr/bin/${PN} || die
-	python_replicate_script "${ED}"/usr/bin/${PN} || die
-}
diff --git a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
deleted file mode 100644
index c58ed8ea47fa..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
+++ /dev/null
@@ -1,22 +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} )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
deleted file mode 100644
index b113da87a395..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
+++ /dev/null
@@ -1,26 +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} )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-MY_PV=${PV//.0/.}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/gprof2dot/metadata.xml b/dev-util/gprof2dot/metadata.xml
deleted file mode 100644
index 8edef79c17e5..000000000000
--- a/dev-util/gprof2dot/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">jrfonseca/gprof2dot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gquilt-0.25-r1 b/dev-util/gquilt-0.25-r1
new file mode 100644
index 000000000000..f987b1c03f56
--- /dev/null
+++ b/dev-util/gquilt-0.25-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( dev-util/quilt dev-vcs/mercurial ) 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A Python/GTK wrapper for quilt
+EAPI=5
+HOMEPAGE=http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( dev-util/quilt dev-vcs/mercurial ) 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/gquilt/gquilt-0.25.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eaa8473bf86e6d7d8f504275b1f20bf0
diff --git a/dev-util/gquilt/Manifest b/dev-util/gquilt/Manifest
deleted file mode 100644
index 809a7358f7d9..000000000000
--- a/dev-util/gquilt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gquilt-0.25-desktopfile.patch 402 BLAKE2B 3ea9944012cd638bdf5d182daf4d2a7ce83751b77e448bd4771c8197ff9df9076b967188f61d46e0389bfb0ed79007d4b543bf888f9ee8e20f116c745e35f6f6 SHA512 194fbe15da3a7c89c9fc534d7fc57e8248f004ebbcb9a39298a53561e6bbb18956f9a287ee1f56074ad6d1846eccd4ff06be06b06c388c385e776b754577d6bc
-DIST gquilt-0.25.tar.gz 124957 BLAKE2B a8b293c51511d80ee99b8d0898dd8c9b6f71988a855bf67c4743d745d3c02ecb55d1b6dbdf93e82352a19af8fabe29fa624aead33feca7d73b3cc080bcf85b19 SHA512 fd1b98e87b3bc8438620a7105664c487a5fcfed50ade3e144802fc080dfe3a7d94c76f7ff7274d5a98003cffd8305cf9f193b2f799f4846d59e60233f1782f0d
-EBUILD gquilt-0.25-r1.ebuild 789 BLAKE2B 815e857445b645b611b067e03e3aa6e8d3c1ae29a904a06407cc797ea1e5c0c5ab7bfb3430155794b0c656828a9ab46f347de1116d5a449f331c448bce004166 SHA512 fd7d690284bb809ffaf9311543e3eb341701bda0e6341660c99052a139869d1de5df92cb8c957cbfb122dc9c846ad109f0d954a4368eae040b4e6870e2895f66
-MISC metadata.xml 243 BLAKE2B 17a642a344b88fae8d8900450079e8af46c64bf782bbe91cde98b92eae1103cecc69b3afb16e24888748d86cd5a4e752ca44920d6c8801f5ac4ab891459b1eeb SHA512 409f547397c4745ced5764a70f2d57ee1b71ce617116f5adbfa07556d97019a63e1a2ff309544cc52991a4859bd70f63c4920ecb917853f7c95c981281df25e1
diff --git a/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch b/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
deleted file mode 100644
index e5134a6caa91..000000000000
--- a/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Dec  2 13:22:44 UTC 2012
-Subject: match fd.o spec
-
---- gquilt.desktop
-+++ gquilt.desktop
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=gquilt Patch Manager
- GenericName=Quilt Patch Manager
- Exec=gquilt
- Terminal=false
- Type=Application
- Icon=gquilt
--Categories=GNOME;Application;Development;X-Fedora;
-+Categories=GNOME;Development;X-Fedora;
diff --git a/dev-util/gquilt/gquilt-0.25-r1.ebuild b/dev-util/gquilt/gquilt-0.25-r1.ebuild
deleted file mode 100644
index ce0e5f51b9c6..000000000000
--- a/dev-util/gquilt/gquilt-0.25-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A Python/GTK wrapper for quilt"
-HOMEPAGE="http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/"
-SRC_URI="mirror://sourceforge/gquilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
-	|| ( dev-util/quilt dev-vcs/mercurial )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu ${PN}.desktop
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
diff --git a/dev-util/gquilt/metadata.xml b/dev-util/gquilt/metadata.xml
deleted file mode 100644
index 621b99e9b1ec..000000000000
--- a/dev-util/gquilt/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gquilt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gtk-builder-convert-2.24.31-r1 b/dev-util/gtk-builder-convert-2.24.31-r1
new file mode 100644
index 000000000000..16a4895c4f10
--- /dev/null
+++ b/dev-util/gtk-builder-convert-2.24.31-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt app-arch/xz-utils
+DESCRIPTION=Converts Glade files to GtkBuilder XML format
+EAPI=6
+HOMEPAGE=https://www.gtk.org/
+IUSE=python_targets_python2_7
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<x11-libs/gtk+-2.24.31-r1:2
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.31.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7fe788c6e5a092fd5bceb088b507b9c6
diff --git a/dev-util/gtk-builder-convert-2.24.32 b/dev-util/gtk-builder-convert-2.24.32
new file mode 100644
index 000000000000..aa197d0236e3
--- /dev/null
+++ b/dev-util/gtk-builder-convert-2.24.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt app-arch/xz-utils
+DESCRIPTION=Converts Glade files to GtkBuilder XML format
+EAPI=6
+HOMEPAGE=https://www.gtk.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<x11-libs/gtk+-2.24.31-r1:2
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca456f7b6139474f0849d4e5737c9fe7
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
deleted file mode 100644
index 062d4b5805f1..000000000000
--- a/dev-util/gtk-builder-convert/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
-DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1154 BLAKE2B 6f23d8b14d7b86023a5db01e36951d7fa222b690bf3d225f042254fd68e039995f0243a6edf085a2f83420be2204b35888e7eca81243f127b3bf8f167f230a61 SHA512 1b2d8ee90718a47e79b1063efe19e2ba35a4595a3f253a7d6061379b6fcecfdbbd1dd98cca2d08b5eddb1a52abc7a6002edb19398ce9e925aeb41775f828aa76
-EBUILD gtk-builder-convert-2.24.32.ebuild 1159 BLAKE2B 930dc6b5758e74c9f3a7396f25507c80f7f0c030f388a48d13e4549f45bec0c955d0e0b3f2cfc22c6444c14634d42e7d8c614d88efd5a072a318aeda3676d5bf SHA512 6e6a7108f689bdec90a867757437f162c0763a3b4728c16140249846878a403fa69240def9baae48b8bf0784b10db80f0078376f505b2a2eab6773bd344da0f7
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
deleted file mode 100644
index 9fce626aeb6e..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
deleted file mode 100644
index c1e64dc5e034..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.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
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/gtk-builder-convert/metadata.xml b/dev-util/gtk-builder-convert/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/gtk-builder-convert/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gtk-doc-1.25-r1 b/dev-util/gtk-doc-1.25-r1
new file mode 100644
index 000000000000..8915d85d8890
--- /dev/null
+++ b/dev-util/gtk-doc-1.25-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.6:2 >=dev-lang/perl-5.18 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( virtual/emacs ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) ) ~dev-util/gtk-doc-am-1.25 app-text/yelp-tools virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK+ Documentation Generator
+EAPI=6
+HOMEPAGE=https://www.gtk.org/gtk-doc/
+IUSE=debug doc emacs highlight vim python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2 FDL-1.1
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.6:2 >=dev-lang/perl-5.18 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( virtual/emacs ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc252ffc6ada84a03403b33a8421850
diff --git a/dev-util/gtk-doc-am-1.25-r1 b/dev-util/gtk-doc-am-1.25-r1
new file mode 100644
index 000000000000..26e3d401b5bf
--- /dev/null
+++ b/dev-util/gtk-doc-am-1.25-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/perl-5.18 virtual/pkgconfig !<dev-util/gtk-doc-1.25 app-arch/xz-utils
+DESCRIPTION=Automake files from gtk-doc
+EAPI=6
+HOMEPAGE=https://www.gtk.org/gtk-doc/
+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 FDL-1.1
+RDEPEND=>=dev-lang/perl-5.18
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=78d2d000dafd6abc7b59c0a5185a813b
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
deleted file mode 100644
index 383f73f9b2a3..000000000000
--- a/dev-util/gtk-doc-am/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-am-1.25-r1.ebuild 1256 BLAKE2B 2882c5fcc53a55dd662f98b1113f68d9a5e46bb932cfaee4e752cdf16ee4d442db4898d2cc3574d2e7297e624edaeb1f189eb292dfb9add20e4e2cd0ca145dc2 SHA512 1182846602f295e36ee5995d33434d83eee8d68ea19eaa34fa0b26047b5f66cbf704ed7a9cb574a08482b48894ef818756a09d3679dfcbfa867c00a575e8f1ae
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
deleted file mode 100644
index 0c69ec3a3bd6..000000000000
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-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
-GNOME_ORG_MODULE="gtk-doc"
-
-inherit gnome.org
-
-DESCRIPTION="Automake files from gtk-doc"
-HOMEPAGE="https://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
-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"
-
-RDEPEND=">=dev-lang/perl-5.18"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
-"
-# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
-RESTRICT="test"
-
-src_configure() {
-	# Duplicate autoconf checks so we don't have to call configure
-	local PERL=$(type -P perl)
-
-	test -n "${PERL}" || die "Perl not found!"
-	"${PERL}" -e "require v5.18.0" || die "perl >= 5.18.0 is required for gtk-doc"
-
-	# Replicate AC_SUBST
-	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
-		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin gtkdoc-rebase
-
-	insinto /usr/share/aclocal
-	doins gtk-doc.m4
-}
diff --git a/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/gtk-doc-am/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
deleted file mode 100644
index dfec8b299d66..000000000000
--- a/dev-util/gtk-doc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
-AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
-DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2577 BLAKE2B 110bf184a66013282cfaa51032a161eb9ae5ccf19acf42024de136c20921475e6e439fa5c5ac0750e86b6b40d4ac0b70dc09a7b9a2a5bedcf7038a236c14734e SHA512 668b64a119f6895c8f03940155a01ce0fc95e1fc8c7504eb7b2b459b8b29dde8b2696ae619005214a0c29c5ce1dbb4a614cc7a5137553e37ff5d98e9e1ebbb43
-MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/files/61gtk-doc-gentoo.el b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
deleted file mode 100644
index 488a57c02555..000000000000
--- a/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
+++ /dev/null
@@ -1,9 +0,0 @@
-
-;;; gtk-doc site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'gtk-doc-insert "gtk-doc"
-  "Add a documentation header to the current function." t)
-(autoload 'gtk-doc-insert-section "gtk-doc"
-  "Add a section documentation header at the current position." t)
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
deleted file mode 100644
index bbc989afb2b7..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gtk-doc-1.8-orig/tools/gtk-doc.el	2007-01-03 16:04:14.000000000 +0100
-+++ gtk-doc-1.8/tools/gtk-doc.el	2007-07-29 21:56:45.000000000 +0200
-@@ -262,7 +262,7 @@
- 
- ;; set global binding for this key (follows the format for
- ;;   creating a changelog entry ...)
--(global-set-key "\C-x4h"  'gtk-doc-insert)
-+;;(global-set-key "\C-x4h"  'gtk-doc-insert)
- 
- 
- ;; Define another function for inserting a section header.
-@@ -280,4 +280,4 @@
- 	  " */\n"))
- 
- ;; Set the key binding.
--(global-set-key "\C-x4s" 'gtk-doc-insert-section)
-+;;(global-set-key "\C-x4s" 'gtk-doc-insert-section)
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
deleted file mode 100644
index 155f1f6a02f9..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.25-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
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="GTK+ Documentation Generator"
-HOMEPAGE="https://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-
-IUSE="debug doc emacs highlight vim"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.6:2
-	>=dev-lang/perl-5.18
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6:2
-	~app-text/docbook-xml-dtd-4.3
-	app-text/docbook-xsl-stylesheets
-	~app-text/docbook-sgml-dtd-3.0
-	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( virtual/emacs )
-	highlight? (
-		vim? ( || ( app-editors/vim app-editors/gvim ) )
-		!vim? ( dev-util/source-highlight )
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/gtk-doc-am-${PV}
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
-		You may set your own key bindings for \"gtk-doc-insert\" and
-		\"gtk-doc-insert-section\" in your ~/.emacs file."
-	SITEFILE=61${PN}-gentoo.el
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove global Emacs keybindings, bug #184588
-	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	if use vim; then
-		myconf="${myconf} $(use_with highlight highlight vim)"
-	else
-		myconf="${myconf} $(use_with highlight highlight source-highlight)"
-	fi
-
-	gnome2_src_configure \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		$(use_enable debug) \
-		${myconf}
-}
-
-src_compile() {
-	gnome2_src_compile
-	use emacs && elisp-compile tools/gtk-doc.el
-}
-
-src_install() {
-	gnome2_src_install
-
-	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
-
-	# Don't install those files, they are in gtk-doc-am now
-	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
-	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		docinto examples
-		dodoc examples/*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/gtk-doc.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-		readme.gentoo_print_elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
deleted file mode 100644
index 1a3871ad27fb..000000000000
--- a/dev-util/gtk-doc/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="highlight">Enable source code highlighting</flag>
-	<flag name="vim">Enable source code highlighting through
-	<pkg>app-editors/vim</pkg></flag>
-</use>
-<longdescription lang="en">
-	GTK-Doc is used to document C code.
-	It is typically used to document the public API of libraries,
-	such as the GTK+ and GNOME libraries, but it can also be used
-	to document application code.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache-3.22.19 b/dev-util/gtk-update-icon-cache-3.22.19
new file mode 100644
index 000000000000..4fe3bd9bcc5a
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache-3.22.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK update icon cache
+EAPI=6
+HOMEPAGE=https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~eva/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6488f108a3780f84f9b1f95988e2109d
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
deleted file mode 100644
index b18deb91e757..000000000000
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 BLAKE2B be3fb3785776052eed0f102e9665628aec1bec93953de1cdb795af8db458cedd07fa717abee4dc9e6d8c4c8f45209371ac130fa29e8a77622290524b771b5c89 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 966 BLAKE2B f403203df0c0774818f3e00c23122fb1fe466aaffc59a083d56cb2b614afb6157fdc6c4067406409c597a5fde7e506e92419bfa171ece0108490468f3a9a32c2 SHA512 f08a2be5aeb4f835c9ba482b0af79717d5d0c505d4782fdfe461b82237e67a52958e68b10936cc70f6cec18982b0386f64c37e91610c611bec9424baf81feab1
-MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
deleted file mode 100644
index 58130e916b64..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.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
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.49.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# man pages are shipped in tarball
-	gnome2_src_configure --disable-man
-}
-
-src_install() {
-	gnome2_src_install
-	doman docs/${PN}.1
-}
diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
deleted file mode 100644
index 3695848b8d2f..000000000000
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription lang="en">
-    gtk-update-icon-cache is a tool from GTK+ to update icons and themes
-    caches.
-
-    It is split from the GTK+ sources by the Gentoo Gnome team to help
-    GTK+ 2 and 3 to co-exist better by extracting the single conflicting
-    tool.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">EvaSDK/gtk-update-icon-cache</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/gyp-20170904022846 b/dev-util/gyp-20170904022846
new file mode 100644
index 000000000000..da2ebd349f65
--- /dev/null
+++ b/dev-util/gyp-20170904022846
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=GYP (Generate Your Projects) meta-build system
+EAPI=6
+HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=BSD
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
+SLOT=0
+SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20170904022846.tar.xz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c8372bb33c756a98e3b0861eda970dc
diff --git a/dev-util/gyp-99999999999999 b/dev-util/gyp-99999999999999
new file mode 100644
index 000000000000..124fc7f54c52
--- /dev/null
+++ b/dev-util/gyp-99999999999999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=GYP (Generate Your Projects) meta-build system
+EAPI=6
+HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
+IUSE=python_targets_python2_7
+LICENSE=BSD
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
+SLOT=0
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5717456e8197bfe8d6c1a01489c56813
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
deleted file mode 100644
index dd17b82640f3..000000000000
--- a/dev-util/gyp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846.ebuild 908 BLAKE2B de2be8153c0b4b133f18027a44b203f5e1e9e7ece1737df0afb506f58f53366593e80b99d916436de25543484023a69896a42342f06bfc7ed7df06edbb327400 SHA512 a3051093de1d80548199710fbdd8e9858ea06d094ebfabfcd0542f219a758264afe392226240ac9378822ee31a1649cb7c5a82831483a9920dc580916b80a4ee
-EBUILD gyp-99999999999999.ebuild 892 BLAKE2B bc7cd85cf2fe9f1f6262bd7d1e064853dff7a4f97b9fcf1d9cda47e6caed487117ea389eb26ed5d25af0c6aa4d51b2db4ede47343906ca6c0ed4ef77b2dcb0a5 SHA512 7df9e1d53c73e3e256b4abf9ae71f91ac9105102e41a8f5bec5ef2921f96b4f88c0a2264a7727a55d4de95ea81d84150ecd0aa456cfef02200703fa3392ac6c6
-MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
deleted file mode 100644
index d5f888d0b40b..000000000000
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "99999999999999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp"
-fi
-
-DESCRIPTION="GYP (Generate Your Projects) meta-build system"
-HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp"
-if [[ "${PV}" == "99999999999999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# More errors when DeprecationWarnings enabled.
-	local -x PYTHONWARNINGS=""
-
-	"${PYTHON}" gyptest.py --all --verbose
-}
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
deleted file mode 100644
index 0c933a99edc5..000000000000
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "99999999999999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp"
-fi
-
-DESCRIPTION="GYP (Generate Your Projects) meta-build system"
-HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp"
-if [[ "${PV}" == "99999999999999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# More errors when DeprecationWarnings enabled.
-	local -x PYTHONWARNINGS=""
-
-	"${PYTHON}" gyptest.py --all --verbose
-}
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
deleted file mode 100644
index 7b9c409fca7e..000000000000
--- a/dev-util/gyp/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>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/hadolint-1.10.2 b/dev-util/hadolint-1.10.2
new file mode 100644
index 000000000000..e002b6ea7d7f
--- /dev/null
+++ b/dev-util/hadolint-1.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile Linter JavaScript API
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/hadolint
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?]
+SLOT=0/1.10.2
+SRC_URI=mirror://hackage/packages/archive/hadolint/1.10.2/hadolint-1.10.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_=bdb211b1c3e2ba4fa7e0d369cfc967bb
diff --git a/dev-util/hadolint-1.7.4 b/dev-util/hadolint-1.7.4
new file mode 100644
index 000000000000..218f49db57fb
--- /dev/null
+++ b/dev-util/hadolint-1.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile Linter JavaScript API
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/hadolint
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?]
+SLOT=0/1.7.4
+SRC_URI=mirror://hackage/packages/archive/hadolint/1.7.4/hadolint-1.7.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_=d5089bdca25ee073adca1f1af1831e06
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
deleted file mode 100644
index 9b2e2e3d6f9d..000000000000
--- a/dev-util/hadolint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hadolint-1.10.2.tar.gz 39009 BLAKE2B 84552ce978d6f53b6e2e769da402585777ce7ef5bd7b66cc538b4f22d73a54b0d07246c1d68b9628f9e2d17d9db2bb472e1902cf017f13344b9277b27658b652 SHA512 2104cb588bdb9620d6a5831ab0f38e6fbd45ab19ba6dbd38e6ced43995f2dd6509d7f9d0180d59a828bbe8de46738f7ff2f3ba9859d9ac4a04b1ba9015071fd9
-DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
-EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9803e6a11b39c0553c1354a523e3f18316e8a21b610fe18604471557f779825ca4b0b27cd3e4d46f9747c4680305 SHA512 9aae19d11f1b502599a8c4279729da7d63b50dbf7877e95eb2dccb32640edeae7c78d484bbfd4605dacbbbc24d0c4ceff7a485c898d570a64efb0da17806e148
-EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
-MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.10.2.ebuild b/dev-util/hadolint/hadolint-1.10.2.ebuild
deleted file mode 100644
index 51581f0faaa0..000000000000
--- a/dev-util/hadolint/hadolint-1.10.2.ebuild
+++ /dev/null
@@ -1,42 +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.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.5.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/hadolint-1.7.4.ebuild b/dev-util/hadolint/hadolint-1.7.4.ebuild
deleted file mode 100644
index 7e0e70f87627..000000000000
--- a/dev-util/hadolint/hadolint-1.7.4.ebuild
+++ /dev/null
@@ -1,42 +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.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.5.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/metadata.xml b/dev-util/hadolint/metadata.xml
deleted file mode 100644
index 1eacbb097674..000000000000
--- a/dev-util/hadolint/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<longdescription>
-		A smarter Dockerfile linter that helps you build best practice Docker images.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/heaptrack-9999 b/dev-util/heaptrack-9999
new file mode 100644
index 000000000000..b57c85bb5fd1
--- /dev/null
+++ b/dev-util/heaptrack-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kitemmodels-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/threadweaver-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) >=kde-frameworks/extra-cmake-modules-5.46.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] test? ( >=dev-qt/qttest-5.9.4:5 ) dev-util/desktop-file-utils
+DESCRIPTION=A fast heap memory profiler
+EAPI=6
+HOMEPAGE=http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux
+IUSE=+qt5 zstd debug test
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kconfigwidgets-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kitemmodels-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/threadweaver-5.46.0 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) qt5? ( >=kde-frameworks/kf-env-4 )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b856227d68d1ca4b6b116ba46d936a2
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
deleted file mode 100644
index 277e5c607970..000000000000
--- a/dev-util/heaptrack/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD heaptrack-9999.ebuild 1113 BLAKE2B c686273439df3c958822a2f8e324080d9df31fc3dbcb7a92f85708d1f3066e7ca315062f0c04176b7b9f5098bbc166d6160ff4cb978d9abc93362bf47c39038b SHA512 769ff6ff8ada4f22d4dea0d63d543f83fe56c8a00b9e09362c69591f09e2073924fa817a1a05b55449529260d51a3cc21526c5ca8493b90592744c1154696ff9
-MISC metadata.xml 362 BLAKE2B b810739db5ac019dac18f6bf1bcc5f1cc2a26ef076545b96572a3c9c304f115bfa3250293596aaabe56719cafcb1693e63e95dc70caadd9306d64f134fee864a SHA512 0b6416c3084a693617745c2faaa8af4f72540de549d52e719413ae90e467a95912044099705d6bd39517abb56a569870b4ea92201a98dc76d25da013e3774c27
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
deleted file mode 100644
index cfcb4fc58229..000000000000
--- a/dev-util/heaptrack/heaptrack-9999.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
-
-KDE_AUTODEPS="false"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="A fast heap memory profiler"
-HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="+qt5 zstd"
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	sys-libs/libunwind
-	sys-libs/zlib
-	qt5? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemmodels)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtcore)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtwidgets)
-		dev-libs/kdiagram:5
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-RDEPEND="${COMMON_DEPEND}
-	qt5? ( >=kde-frameworks/kf-env-4 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEAPTRACK_BUILD_GUI=$(usex qt5)
-		$(cmake-utils_use_find_package zstd Zstd)
-	)
-
-	kde5_src_configure
-}
diff --git a/dev-util/heaptrack/metadata.xml b/dev-util/heaptrack/metadata.xml
deleted file mode 100644
index afa56cb84284..000000000000
--- a/dev-util/heaptrack/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>asturm@gentoo.org</email>
-		<name>Andreas Sturmlechner</name>
-	</maintainer>
-	<use>
-		<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/herdtools7-7.47 b/dev-util/herdtools7-7.47
new file mode 100644
index 000000000000..728b9cc7d1dc
--- /dev/null
+++ b/dev-util/herdtools7-7.47
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=The Herd toolsuite to deal with .cat memory models
+EAPI=6
+HOMEPAGE=http://diy.inria.fr/sources/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-B
+RDEPEND=>=dev-lang/ocaml-4.02.0 >=dev-lang/ocaml-4:=
+SLOT=0
+SRC_URI=https://github.com/herd/herdtools7/archive/7.47.tar.gz -> herdtools7-7.47.tar.gz
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=676ce5a4ed692d83908c517610d6cf8a
diff --git a/dev-util/herdtools7/Manifest b/dev-util/herdtools7/Manifest
deleted file mode 100644
index 49dbef2dd5d3..000000000000
--- a/dev-util/herdtools7/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX herdtools7-7.47-mkdir.patch 318 BLAKE2B ae22c24b4d9c4ea6ecb7b862ca73df1f5ed09a53bff1bb1e2e520131dad92e0f98c1fbbfef159ffe23670d019f90b7af7482a9f594eff86b64dc8ef237fc3350 SHA512 de4556ef77eec10e4b9800289d27e27fb306a8801754dd210801c1113bf005bb29a0dc1d9ce9a8bcd2db32fbe589c8b77c4a57cb8ac41bab6932894a35726dcc
-DIST herdtools7-7.47.tar.gz 763045 BLAKE2B 983411c9c383fabba70598a5b6891f8c1cbc6ff803c2c5b855834cc17f560085e4db03adc193e8f132568f2468164ba84563b8cfae539c27e6877582a0e374b5 SHA512 85295815fb725b78e7015f597cdad10c3a52db2e40b179efb314f6750c7e5ec09393fac4038dafe0b7eb3f5db74d10a032384a384adf3c97bf846cb016f5180c
-EBUILD herdtools7-7.47.ebuild 620 BLAKE2B 7a90ac83d7aa7eb9f2d944807751d73af6e9ab23282202c6e85a6df91d2e84be26d2797f8f91714393ce769876739331d29f65b233035a63818311996e71ed5e SHA512 1241971eb805151c01893df0d385a1a07113039659f014663e6e0e4f6c2af2330ba6b88e1a19b016ef227492ac8e0d2815bc2f96f4afc10bfde7349658e0d8e4
-MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-util/herdtools7/files/herdtools7-7.47-mkdir.patch b/dev-util/herdtools7/files/herdtools7-7.47-mkdir.patch
deleted file mode 100644
index 5c45f880ea1a..000000000000
--- a/dev-util/herdtools7/files/herdtools7-7.47-mkdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/install.sh b/install.sh
-index 72f6163..e84c645 100755
---- a/install.sh
-+++ b/install.sh
-@@ -17,6 +17,16 @@ fi
- BINDIR=$PREFIX/bin
- LIBDIR=$PREFIX/share/herdtools7
- 
-+if ! [ -d $BINDIR ]
-+then
-+	mkdir -p $BINDIR
-+fi
-+
-+if ! [ -d $LIBDIR ]
-+then
-+	mkdir -p $LIBDIR
-+fi
-+
- cpbin () {
-   SUB=$1
-   EXECS="$2"
diff --git a/dev-util/herdtools7/herdtools7-7.47.ebuild b/dev-util/herdtools7/herdtools7-7.47.ebuild
deleted file mode 100644
index b30623969e84..000000000000
--- a/dev-util/herdtools7/herdtools7-7.47.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="The Herd toolsuite to deal with .cat memory models"
-HOMEPAGE="http://diy.inria.fr/sources/index.html"
-SRC_URI="https://github.com/herd/herdtools7/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-B"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-ml/ocamlbuild"
-RDEPEND=">=dev-lang/ocaml-4.02.0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-mkdir.patch"
-)
-
-src_compile() {
-	./build.sh /usr || die "Build failed"
-}
-
-src_install() {
-	./install.sh "${ED}/usr" || die "Install failed"
-}
diff --git a/dev-util/herdtools7/metadata.xml b/dev-util/herdtools7/metadata.xml
deleted file mode 100644
index cee379b15409..000000000000
--- a/dev-util/herdtools7/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>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/howdoi-1.1.12 b/dev-util/howdoi-1.1.12
new file mode 100644
index 000000000000..72bb3173ae1e
--- /dev/null
+++ b/dev-util/howdoi-1.1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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=A code search tool
+EAPI=6
+HOMEPAGE=https://pypi.org/project/howdoi/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-python/pygments[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/pyquery[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(-)] dev-python/requests-cache[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=mirror://pypi/h/howdoi/howdoi-1.1.12.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_=c168262135aabb3b098c42c8ce33973d
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
deleted file mode 100644
index a7da0dd13a4a..000000000000
--- a/dev-util/howdoi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
-EBUILD howdoi-1.1.12.ebuild 585 BLAKE2B 72315818c287c651e9f2d5e01aaa5f5e8631a755f0af650c3dfa7acbd1f7a466c1efeb34efd25d834a27c952a50b565f50bdcb740f6664bab7f7154a00ba53a9 SHA512 6ceb5ccbca17eda545787e77b1d2dacea24923102283837a2acc0c067e02e949940acfaa893bc1621e73ff96825a89eac1f5c93c267ac67ca0942e05cb0e3ac2
-MISC metadata.xml 290 BLAKE2B 49911a26acd9402378242b6d656e33951b594e09cd64ea6115460fb13f1c2a4026644cdaab5fd343790be4122df5426949ca0b2945240216f497542278ab427b SHA512 ede22af6bd7ec77ad0b831c42c0169dc8e43719d4f7c5d7df37e6abb79136d1699a923a587a056210c0cccc33aa887856a46f73baf476ff2c074351880299471
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
deleted file mode 100644
index 931649d5871c..000000000000
--- a/dev-util/howdoi/howdoi-1.1.12.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyquery[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-cache[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/metadata.xml b/dev-util/howdoi/metadata.xml
deleted file mode 100644
index 4230aede62d0..000000000000
--- a/dev-util/howdoi/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>kensington@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">howdoi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/huc-0.1-r1 b/dev-util/huc-0.1-r1
new file mode 100644
index 000000000000..1a4c5508ccd5
--- /dev/null
+++ b/dev-util/huc-0.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=HTML umlaut conversion tool
+EAPI=6
+HOMEPAGE=http://www.int21.de/huc
+KEYWORDS=amd64 ppc sparc x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.int21.de/huc/huc-0.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=438230f1327fc369fc00cf4027de322b
diff --git a/dev-util/huc/Manifest b/dev-util/huc/Manifest
deleted file mode 100644
index 9268e53f6994..000000000000
--- a/dev-util/huc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST huc-0.1.tar.bz2 8367 BLAKE2B d29c4414849d9f0ad23ec8ecc235833a301631755dc1d0a27fc96fdf28f2899595de92f30c0895fa70136f1ddb5ce8ab3e8cda309686708b4493640c0a31bc79 SHA512 711266edfdec572aad877230653248b02cc0b989f1cf2766bf6cc4e196dcd02ba4bf148849d360457fc396de18f0bd0b6f7a26ba3c13a159cf26ece7c356c225
-EBUILD huc-0.1-r1.ebuild 500 BLAKE2B dae3bf70b6aaf890d43f12c1c3fb0ac998d08a651a90d02fffb14b3facb1fdeb55879b0ed1c25d4de097d5255925d7ac6b78713494254a6d62cdb579650a1fdd SHA512 199ecec9820c2d4881874acc4c174a26f2720245a9225a0def861d6196247fa5f3e972ca3e234f524d704cb9299d92bb5682be7903ec9f8877e7d0550eebfe33
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/huc/huc-0.1-r1.ebuild b/dev-util/huc/huc-0.1-r1.ebuild
deleted file mode 100644
index c2261b0ddc2d..000000000000
--- a/dev-util/huc/huc-0.1-r1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="HTML umlaut conversion tool"
-SRC_URI="http://www.int21.de/huc/${P}.tar.bz2"
-HOMEPAGE="http://www.int21.de/huc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86 ~x86-linux ~ppc-macos"
-
-src_compile() {
-	$(tc-getCXX) \
-		${LDFLAGS} ${CXXFLAGS} \
-		-o ${PN} ${PN}.cpp || die "compile failed"
-}
-
-src_install () {
-	dobin "${PN}"
-	einstalldocs
-}
diff --git a/dev-util/huc/metadata.xml b/dev-util/huc/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/huc/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/dev-util/hxd-0.70.02-r2 b/dev-util/hxd-0.70.02-r2
new file mode 100644
index 000000000000..0f14ec5b188c
--- /dev/null
+++ b/dev-util/hxd-0.70.02-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Binary to hexadecimal converter
+EAPI=6
+HOMEPAGE=http://www-tet.ee.tu-berlin.de/solyga/linux/
+KEYWORDS=~amd64 ~x86 ~sparc ~mips ~ppc
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://linux.xulin.de/c/hxd-0.70.02.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_=ead7880c2d6631b53a35bfe625c03baf
diff --git a/dev-util/hxd/Manifest b/dev-util/hxd/Manifest
deleted file mode 100644
index 780bdd77ae4c..000000000000
--- a/dev-util/hxd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX hxd-0.70.02-llong-redef.patch 677 BLAKE2B ffd58ae3a71b2a81aac44ae2cbb70cfa6983a41f9c377a06306ccddc2c3967637f971aca183f70115a42e058413a0799936471b2be9b22e30079407719a905eb SHA512 1bb2e1db48fdc804ee7b7600f27d0290d546f84c85f5e577afadcda35c8df93bbeb2e9f0ed8e4110cd26f40f76c54ebbf83d21c3a2b31101140900ee8b92a78d
-AUX hxd-0.70.02-prll-flags.patch 2241 BLAKE2B b64848b606c0bbf4e31b46bbf98b0ee44e929bc5f1bc1ee33bd118d6020dbc2540696cad2a0f89e1221a11eae0ab702a0eeab1742d3680e1b00c0114c789e108 SHA512 d83ddb0a9e595d4d5f39d0d8772e3a00c3fe2f25d418a6bb3c618f04fe66a71426d527e3dcb55d2a11ac0d7bc6b2bd262065eae94fc103b3f5ab7f34dc528d35
-DIST hxd-0.70.02.tar.gz 17469 BLAKE2B 9dd5ee7cf4949de5b732b14200c9fc3e8076c4e452416d4dc8201e2490459e31b02ffb30c4eaf6cc99a2a04a87380f8e842d40e23e93b5ebf46c73f0130d826d SHA512 631b3ea74a7f831984abb1bb0c1a32d38ff2980063321fa1e85fc594fe23407cddf5d61fd1005ec154aecf6be8344e070600faf90d176061f195e6a39d8991af
-EBUILD hxd-0.70.02-r2.ebuild 602 BLAKE2B 72a1daa0355cb3a19e52bd4af8b24dc3a1b534064d73cfb737073aa05708a43ffbdce12274042130e181dec1c394f1c0283b44b1aa8d038a43b8d9c74b1320ff SHA512 cc16b8330c9cb85e606c9f836917bc3f17595115d2e408b43772b5625d06626ab59b3861a72096750ac727929a76e93d48873c296850cbc6774ee76d9228064c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch b/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
deleted file mode 100644
index e9e230c867ac..000000000000
--- a/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- general.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/general.h b/general.h
-index 0a2ebe7..b749945 100644
---- a/general.h
-+++ b/general.h
-@@ -56,7 +56,7 @@
- 
- #ifdef	HAVE_LONGLONG
- loff_t	lseek64( int fd, loff_t offset, int whence );
--#define	LLONG_MAX	0x7fffffffffffffffll
-+#define	L_LONG_MAX	0x7fffffffffffffffll
- #undef	LSEEK
- #define	LSEEK(A,B,C)	lseek64((A),(B),(C))
- #undef  STRTOL
-@@ -64,7 +64,7 @@ loff_t	lseek64( int fd, loff_t offset, int whence );
- #undef	SIZE_MIN
- #define	SIZE_MIN	( (loff_t) 0 )
- #undef	SIZE_MAX
--#define	SIZE_MAX	( LLONG_MAX - 1 )
-+#define	SIZE_MAX	( L_LONG_MAX - 1 )
- #undef	OFF_T
- #define	OFF_T		loff_t
- #endif
diff --git a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
deleted file mode 100644
index f08f2eb18063..000000000000
--- a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
- Makefile.Linux |   23 +++++++++++++++--------
- 1 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.Linux b/Makefile.Linux
-index e3711cd..d5b00cb 100644
---- a/Makefile.Linux
-+++ b/Makefile.Linux
-@@ -1,6 +1,6 @@
--CC=gcc
--CFLAGS=-Wall -Wstrict-prototypes -fomit-frame-pointer -pipe -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
--LDFLAGS=-Wl,-warn-common -s -L$(LIBDIR)
-+CC ?=gcc
-+CFLAGS+=-Wall -Wstrict-prototypes -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
-+LDFLAGS+=-Wl,-warn-common  -L$(LIBDIR)
- 
- LDLIBS = 
- HDDIR = ./
-@@ -32,26 +32,33 @@ $(PRG_UNDUMP):	$(PRG_UNDUMP).c $(PRG_UNDUMP).h general.h
- 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) $(LDFLAGS) $(PRG_UNDUMP).c -o $@
- 
- 
--$(MAN_DUMP):	$(PRG_DUMP).man
-+mkmkman: $(PRG_DUMP)
- 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
-+
-+mkman.c:	mkmkman $(PRG_DUMP).man
- 		cat $(PRG_DUMP).man | ./mkmkman > mkman.c
- 		ln -sf $(PRG_DUMP).h header.h
-+
-+$(MAN_DUMP): mkman.c
- 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkman.c -o mkman
- 		./mkman > $@
- 
--
--$(MAN_UNDUMP):	$(PRG_UNDUMP).man
-+mkmkman_u: $(MAN_DUMP) $(PRG_UNDUMP)
- 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
-+
-+mkman_u.c:	$(PRG_UNDUMP).man mkmkman_u
- 		cat $(PRG_UNDUMP).man | ./mkmkman > mkman.c
- 		ln -sf $(PRG_UNDUMP).h header.h
-+
-+$(MAN_UNDUMP): $(MAN_UNDUMP) mkman_u.c
- 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkman.c -o mkman
- 		./mkman > $@
- 
- 
- install:	all
--		install -s -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
-+		install -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
- 		install    -m 0644 -o root -g root $(MAN_DUMP) $(INSTALLDIR_MAN_DUMP)
--		install -s -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
-+		install -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
- 		install    -m 0644 -o root -g root $(MAN_UNDUMP) $(INSTALLDIR_MAN_UNDUMP)
- 
- clean:
diff --git a/dev-util/hxd/hxd-0.70.02-r2.ebuild b/dev-util/hxd/hxd-0.70.02-r2.ebuild
deleted file mode 100644
index ad8dc60558e7..000000000000
--- a/dev-util/hxd/hxd-0.70.02-r2.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
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Binary to hexadecimal converter"
-HOMEPAGE="http://www-tet.ee.tu-berlin.de/solyga/linux/"
-SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~mips ~ppc"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-prll-flags.patch
-	"${FILESDIR}"/${P}-llong-redef.patch
-)
-
-DOCS=( README TODO )
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	dobin "${PN}" "un${PN}"
-	doman "${PN}.1" "un${PN}.1"
-	einstalldocs
-}
diff --git a/dev-util/hxd/metadata.xml b/dev-util/hxd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/hxd/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/dev-util/hxtools-20121125-r1 b/dev-util/hxtools-20121125-r1
new file mode 100644
index 000000000000..f66e533eb3bd
--- /dev/null
+++ b/dev-util/hxtools-20121125-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl sys-libs/libcap >=sys-libs/libhx-3.12.1 sys-apps/pciutils
+DESCRIPTION=A collection of tools and scripts
+EAPI=5
+HOMEPAGE=http://inai.de/projects/hxtools/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl sys-libs/libcap >=sys-libs/libhx-3.12.1 sys-apps/pciutils
+SLOT=0
+SRC_URI=http://jftp.inai.de/hxtools/hxtools-20121125.tar.xz
+_md5_=eb1001d509fecaa9522b2473d80dfd44
diff --git a/dev-util/hxtools-20180301 b/dev-util/hxtools-20180301
new file mode 100644
index 000000000000..7e688c9d7ab4
--- /dev/null
+++ b/dev-util/hxtools-20180301
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl >=sys-apps/util-linux-2.19 sys-libs/libcap >=sys-libs/libhx-3.12.1 >=sys-apps/pciutils-3 x11-libs/libxcb:0=
+DESCRIPTION=A collection of tools and scripts
+EAPI=6
+HOMEPAGE=http://inai.de/projects/hxtools/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl >=sys-apps/util-linux-2.19 sys-libs/libcap >=sys-libs/libhx-3.12.1 >=sys-apps/pciutils-3 x11-libs/libxcb:0=
+SLOT=0
+SRC_URI=http://jftp.inai.de/hxtools/hxtools-20180301.tar.xz
+_md5_=f8e4fcb8af19b0b907517e5587046b81
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
deleted file mode 100644
index ee696102b839..000000000000
--- a/dev-util/hxtools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hxtools-20121125.tar.xz 287716 BLAKE2B 66c125e4db14b6a6adb49e0d45944969f6c4a4a238d58a03a2d678eda3e5f8bec002c3fa401c1c9458b4840816a0cc3c357e9e5c8c5ed6a062309785c51ec1a7 SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915
-DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
-EBUILD hxtools-20121125-r1.ebuild 565 BLAKE2B 62d9727f59390c97157e8685cd9be53d1883d52739bdd76a5c171fe4c3c7af3ffdef772700ec45922cc10f1b9b5d8d1eb3cfd658eaca84ea679afe484f25789b SHA512 4f886b9deb4741ce55c83ebeadadf0225444f8809fb3d07ede72e9125d4e840506a0798cce98e8bf1cad55f68673c8a8cbd57da868c71f871706b22847683f91
-EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/hxtools/hxtools-20121125-r1.ebuild b/dev-util/hxtools/hxtools-20121125-r1.ebuild
deleted file mode 100644
index 6f624335e2d0..000000000000
--- a/dev-util/hxtools/hxtools-20121125-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	sys-libs/libcap
-	>=sys-libs/libhx-3.12.1
-	sys-apps/pciutils
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# man2html is provided by man
-	rm -rf "${ED}"/usr/bin/man2html
-	rm -rf "${ED}"/usr/share/man/man1/man2html*
-}
diff --git a/dev-util/hxtools/hxtools-20180301.ebuild b/dev-util/hxtools/hxtools-20180301.ebuild
deleted file mode 100644
index 38fb9a949d55..000000000000
--- a/dev-util/hxtools/hxtools-20180301.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	>=sys-apps/util-linux-2.19
-	sys-libs/libcap
-	>=sys-libs/libhx-3.12.1
-	>=sys-apps/pciutils-3
-	x11-libs/libxcb:0=
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# man2html is provided by man
-	rm -rf "${ED}"/usr/bin/man2html
-	rm -rf "${ED}"/usr/share/man/man1/man2html*
-
-	# Don't collide with dev-util/cwdiff
-	mv "${ED}"/usr/bin/cwdiff "${ED}"/usr/bin/cwdiff.hx || die
-	mv "${ED}"/usr/share/man/man1/cwdiff.1 "${ED}"/usr/share/man/man1/cwdiff.hx.1 || die
-}
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/hxtools/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/icemon-3.1.0 b/dev-util/icemon-3.1.0
new file mode 100644
index 000000000000..6076f65b6817
--- /dev/null
+++ b/dev-util/icemon-3.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/icecream app-text/docbook2X sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Monitor program for use with Icecream compile clusters based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://en.opensuse.org/Icecream https://github.com/icecc/icemon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/icecream
+SLOT=0
+SRC_URI=https://github.com/icecc/icemon/archive/v3.1.0.tar.gz -> icemon-3.1.0.tar.gz
+_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_=483bf574f79f3c580b395e60e3d77471
diff --git a/dev-util/icemon/Manifest b/dev-util/icemon/Manifest
deleted file mode 100644
index 226646c48cf8..000000000000
--- a/dev-util/icemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST icemon-3.1.0.tar.gz 111139 BLAKE2B b37f17a34237e76cd3f7aaad88de903d1a3ac4aec9478613dbfbaab950eac36af33f49b97330a7c7d0ca06ab9bc56d25960142f7149a198acc2c5d35b32faf09 SHA512 43b5c959cd66fa65cac25994e5b8f26646b49b57405bd80d6ddb12cc7ed5bfeb5f91f5816900883078075685c25159f5a19b3198594027b3a1b8b0c489237b39
-EBUILD icemon-3.1.0.ebuild 683 BLAKE2B 049ad4d9b302a93263225cf8d7ce177fa821bd146e64a82d4d59792c4f3ec7af539b74c7be976e9ae9cacd9ac22005ccfbb72a331aae2632ba6490891b24873d SHA512 dd6c787bf92df7fb1028478882e2c3ca6603fae7dbce35bd3a952122e155607f1928f106b88c4d4398df2432b91df664086b01c56aabc8013aebab79d1f0d934
-MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-util/icemon/icemon-3.1.0.ebuild b/dev-util/icemon/icemon-3.1.0.ebuild
deleted file mode 100644
index bdf10ab714f8..000000000000
--- a/dev-util/icemon/icemon-3.1.0.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
-
-inherit cmake-utils
-
-DESCRIPTION="Monitor program for use with Icecream compile clusters based on KDE Frameworks"
-HOMEPAGE="https://en.opensuse.org/Icecream https://github.com/icecc/icemon"
-SRC_URI="https://github.com/icecc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-devel/icecream
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/dev-util/icemon/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>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/icmake-9.02.07 b/dev-util/icmake-9.02.07
new file mode 100644
index 000000000000..af57376a08b8
--- /dev/null
+++ b/dev-util/icmake-9.02.07
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Hybrid between a make utility and a shell scripting language
+EAPI=6
+HOMEPAGE=https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/fbb-git/icmake/archive/9.02.07.tar.gz -> icmake-9.02.07.tar.gz
+_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_=1f44272222690abfa3cb60d7f186ad7e
diff --git a/dev-util/icmake-9.02.08 b/dev-util/icmake-9.02.08
new file mode 100644
index 000000000000..838852d1a026
--- /dev/null
+++ b/dev-util/icmake-9.02.08
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Hybrid between a make utility and a shell scripting language
+EAPI=6
+HOMEPAGE=http://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://gitlab.com/fbb-git/icmake/-/archive/9.02.08/icmake-9.02.08.tar.gz
+_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_=f69cfd611802466db6fa8acd741dc578
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
deleted file mode 100644
index 63d29d040723..000000000000
--- a/dev-util/icmake/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
-AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
-DIST icmake-9.02.07.tar.gz 372605 BLAKE2B 942edf17214d2646aa7146d19eff36e4c2035925d7279555ae660c96cec595ac83f32b658346d0c22ce0bfcba434b0022f10a55287a9e1efbefd07ca560b71c6 SHA512 9723dc9707e91fbd7cf075b461b0e6d9993891b6776be4b55265b5dce2359ae8232e9936ef6e0a9517783e652617851e7f9d5a9e58325b56da31239721054495
-DIST icmake-9.02.08.tar.gz 372630 BLAKE2B 0c0437bd44c102a866eb85649df36badc52d0215f76d986bab818c6ad9ca28bcd9dff246f91e03ce623adc860ce434f37c4d1d00f74c8cf11200fb77aede9fe1 SHA512 8c4debbe236b2112f1a3bce6b4bd5f12f156067094af73bfec9f746b59d4fe218aeb9b3d5c82da99301d0f18e7a40cd46c76ec055d6887a72fbd3242c70cfcf4
-EBUILD icmake-9.02.07.ebuild 992 BLAKE2B 611dc92316f33d3a782db08572c031cd303157af8bb3639d134629ae7e53793bfef55fc0f3952eca352b969e3d51e554eec4f274f09c96f097aa6b4fcdb5cc6c SHA512 6ac8896ab4859deb89103abcbc1c5f9bf0b505acd8b7ab4a2b7c4a15c45fcc0d0cbbe4e7557c3af317a26d48fb9e7e8b5347dd21f2a5d9ce5574e99c4b2f69f9
-EBUILD icmake-9.02.08.ebuild 983 BLAKE2B fe2e8d6a0cf5a423393ef4897f04311602c22b89e4f659c9b369fbe3b5eabcf707cb98de0b758c82d861fadab980ab31c4a79ffaeab47a5c025a6872a334d744 SHA512 4f4bb4b1e37a3e07638b43e1b74977a38ad29a7923667c9f105bc270438dcb5fb43e8f39799944c9b43f1821e636bac8976e932227fedc09f3078082a19ea8c0
-MISC metadata.xml 325 BLAKE2B cd3bf70f9f274288418fa1dc6bd8bc33d5b9ffaf69e4f2f923b1973a018783065c382d029888f2878ad80ad70bcc33931c59facbebb04f1c9f7a382d688d0cae SHA512 c8178bab59e46cd69df5f6078941429bc8b3fbe36eed4dfe1d73323a2ccc3154ee6702279c250278a700b18f70eb15f4646017002b548568feaa364bef68deab
diff --git a/dev-util/icmake/files/icmake-9.00.00-ar.patch b/dev-util/icmake/files/icmake-9.00.00-ar.patch
deleted file mode 100644
index 0eff669f8e39..000000000000
--- a/dev-util/icmake/files/icmake-9.00.00-ar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- icmake/bootstrap/flags
-+++ icmake/bootstrap/flags
-@@ -14,3 +14,7 @@
- if [ "${CC}" == "" ] ; then 
-     CC="gcc"
- fi
-+
-+if [ "${AR}" == "" ] ; then 
-+    CC="ar"
-+fi
---- icmake/bootstrap/functions
-+++ icmake/bootstrap/functions
-@@ -35,7 +35,7 @@
- 
-     echo -n .
- 
--    try ar crs ../tmp/lib${program}.a */*.o
-+    try ${AR} crs ../tmp/lib${program}.a */*.o
- 
-     echo -n .
- 
---- icmake/rss/icm_bootstrap
-+++ icmake/rss/icm_bootstrap
-@@ -8,7 +8,7 @@
- echo -n .
- try ${CC} -c ${CFLAGS} *.c
- echo -n .
--try ar rs ../tmp/libicrss.a *.o
-+try ${AR} rs ../tmp/libicrss.a *.o
- echo -n .
- rm *.o
- echo .
diff --git a/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch b/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch
deleted file mode 100644
index dde1af395152..000000000000
--- a/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icmake/bootstrap/functions
-+++ icmake/bootstrap/functions
-@@ -2,7 +2,7 @@
- 
- try()
- {
--    # echo $*
-+    echo $*
-     $* || exit 1
- }
- 
diff --git a/dev-util/icmake/icmake-9.02.07.ebuild b/dev-util/icmake/icmake-9.02.07.ebuild
deleted file mode 100644
index bab99eab6fa4..000000000000
--- a/dev-util/icmake/icmake-9.02.07.ebuild
+++ /dev/null
@@ -1,47 +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="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.00.00-ar.patch
-	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	# fix build issues (bug #589896)
-	append-cflags -std=gnu99
-
-	tc-export AR CC
-}
-
-src_configure() {
-	./icm_prepare "${EROOT}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/icmake-9.02.08.ebuild b/dev-util/icmake/icmake-9.02.08.ebuild
deleted file mode 100644
index 31991a073eab..000000000000
--- a/dev-util/icmake/icmake-9.02.08.ebuild
+++ /dev/null
@@ -1,47 +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="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="http://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.00.00-ar.patch
-	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	# fix build issues (bug #589896)
-	append-cflags -std=gnu99
-
-	tc-export AR CC
-}
-
-src_configure() {
-	./icm_prepare "${EROOT}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/metadata.xml b/dev-util/icmake/metadata.xml
deleted file mode 100644
index ed7dbdc927e0..000000000000
--- a/dev-util/icmake/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="gitlab">fbb-git/icmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/idea-community-2017.2.2.172.3757.52 b/dev-util/idea-community-2017.2.2.172.3757.52
new file mode 100644
index 000000000000..097b927ee4e8
--- /dev/null
+++ b/dev-util/idea-community-2017.2.2.172.3757.52
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=5
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2017.2.2.tar.gz -> ideaIC-172.3757.52.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87c7079d92947de173a9d6007422b758
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
deleted file mode 100644
index b45bf6c3a6a0..000000000000
--- a/dev-util/idea-community/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ideaIC-172.3757.52.tar.gz 442963100 BLAKE2B e44f924e279a5b8f2bddbe65cffa24306920fa0f5b85e23b823b1e51fd49e2de2c8953a010b66ea325c4b70ae60268639293b67cd6116f4315ded5e5f6130da1 SHA512 a0178c5ef10aeab527bb8064840c53fff97bf9be468a4e5248b83dba96c5114878f5ff1e20436a67ee488580affa3fb3a2ea627407ed57b87949f64fc1a215d2
-EBUILD idea-community-2017.2.2.172.3757.52.ebuild 1918 BLAKE2B b7fc3cb59edf859c51d9fa674ebfcbbcf3f88399f3f041f792930b98978edb0caaf59c576333bfa9eed5b5735666cbfea6562c1464f96d597658c04685cbb8e5 SHA512 53ff12fab08f75925e1627e8400c27a7868e0dfb2a157b0f10b0feea34222f3e71e0eb3af274db1e3aa4a24ee96e15a8e11adc4bf083ac8fe4cf1673a8272dca
-MISC metadata.xml 533 BLAKE2B 1c711c1c3f3527e91ac205b74abb70a8c163abe5a289837ed2a70dd7a37f510c3dae3e37d8540dad6bfa5d7fb7c82d7070df3dfd7e9ea0b1c85745d3eb66bd75 SHA512 b14bce0b72eb777929138e64a53b0069faf51ec4f1d8b3dbb24a9f2d7f9baf68d5e495e784c83c34c1190d52aea16de52485a815786de235091b75f2778d5e23
diff --git a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild
deleted file mode 100644
index a4f2eb0c7987..000000000000
--- a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
deleted file mode 100644
index 695fd92bb182..000000000000
--- a/dev-util/idea-community/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>alicef@gentoo.org</email>
-	<name>Ferrazzi Alice</name>
-</maintainer>
-<longdescription lang="en">
-	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
-</longdescription>
-<use>
-	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/idea-ultimate-2017.3.1.173.3942.27 b/dev-util/idea-ultimate-2017.3.1.173.3942.27
new file mode 100644
index 000000000000..54a3266b488b
--- /dev/null
+++ b/dev-util/idea-ultimate-2017.3.1.173.3942.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=6
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=!custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-2017.3.1-no-jdk.tar.gz -> ideaIU-173.3942.27-no-jdk.tar.gz ) custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-2017.3.1.tar.gz -> ideaIU-173.3942.27.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=718931f01440950eac849127b2f55d99
diff --git a/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre b/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre
new file mode 100644
index 000000000000..a86b9da64aa2
--- /dev/null
+++ b/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=6
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=!custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-173.4127.17-no-jdk.tar.gz ) custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-173.4127.17.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=718931f01440950eac849127b2f55d99
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
deleted file mode 100644
index 49e359df5f3d..000000000000
--- a/dev-util/idea-ultimate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
-DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
-DIST ideaIU-173.4127.17-no-jdk.tar.gz 562765679 BLAKE2B 7d287c2723646b4fa541c314099cee96242c058cd67811ec1633737ce33e90678504d0d0b9af1cf1279dbf7281fb87ec9c2723bdb926d554f5a1f0793e13867c SHA512 a3c0afa388705158f431064223f42a7b0daacaa928ef9bc68df1cd5ace542f22c3648620d56478896f663688ea1bf773dc04d8d0ab962d195ace7b057708a272
-DIST ideaIU-173.4127.17.tar.gz 636265697 BLAKE2B b01efe844375b009c03474df362d2a208008a47e14696e816ded1573f591a777e23db393838c8592277d68817b3d7ebd714bb79445cd0cf0653da3d575af5bf2 SHA512 e05dd3986f77d39bb48f12ac6af5ab76d9c67b3502772c2bc16c16f922c90a3e6b8adb24537eb37defea2e3488968a6dff343eeabf4c6c78740895c8ec7c93fd
-EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
-EBUILD idea-ultimate-2017.3.2.173.4127.17_pre.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
-MISC metadata.xml 535 BLAKE2B 60d09c4839b751d9c6a7ea683ea541ca962d6360bb96526075ff4cc941796cb5ca082834dc81926133533c96b791ba57257c09c4caead13775079242df717b54 SHA512 a01da16279cb79d0b6a0b806bdf78f1030877ab491de95461c5d27ee6c1c8565a580cba03dcbed836e438be9c7a94ea5958c91383cce1e40398622435f86bfe8
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
deleted file mode 100644
index 6a53389fc5c9..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	eapply_user
-	if ! use amd64; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
-	fi
-	if ! use ppc; then
-		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
-	fi
-	if ! use x86; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-	rm -r plugins/tfsIntegration/lib/native/solaris || die
-	rm -r plugins/tfsIntegration/lib/native/hpux || die
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
deleted file mode 100644
index 6a53389fc5c9..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	eapply_user
-	if ! use amd64; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
-	fi
-	if ! use ppc; then
-		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
-	fi
-	if ! use x86; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-	rm -r plugins/tfsIntegration/lib/native/solaris || die
-	rm -r plugins/tfsIntegration/lib/native/hpux || die
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
deleted file mode 100644
index a6968e806582..000000000000
--- a/dev-util/idea-ultimate/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>alicef@gentoo.org</email>
-	<name>Ferrazzi Alice</name>
-</maintainer>		
-<longdescription lang="en">
-	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
-</longdescription>
-<use>
-	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/idutils-4.6 b/dev-util/idutils-4.6
new file mode 100644
index 000000000000..6df3fdbd7c58
--- /dev/null
+++ b/dev-util/idutils-4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Fast, high-capacity, identifier database tool
+EAPI=4
+HOMEPAGE=https://www.gnu.org/software/idutils/
+IUSE=emacs nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=emacs? ( virtual/emacs ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/idutils/idutils-4.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f650ab63181092bec9ae706be2555c8b
diff --git a/dev-util/idutils/Manifest b/dev-util/idutils/Manifest
deleted file mode 100644
index 5a1f97c3a545..000000000000
--- a/dev-util/idutils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX idutils-4.6-glibc-2.16.patch 523 BLAKE2B 271c68c3ceb61a28330d33ff1e07beb9790cfddc51aa347a27303a06e58e1645d5e8d4ea5146f403d50947eba4999449e6252edce5919f95dec7cba0bee7770f SHA512 de4bcdaf2f871de5eeaa026ec578f80dcae73695c65fd5bc7d16a8f377a3e1781805937407fa6e9b50f8ea22a9d1a4575eeea789aa5d5fdfd05456cdbf75896b
-DIST idutils-4.6.tar.xz 1001496 BLAKE2B bbb06fd0c1e585c8022ae46f2c721aef60becd512da91fc4191977cd46ecf2df86e7bc65481182881c434de6e9c740853b916e31dacedb75c1f14ae8d94967ea SHA512 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e
-EBUILD idutils-4.6.ebuild 720 BLAKE2B 51a9d40987fff4f15d50335b5c817b6b3097620a5cc8e95efff7efd93e5be1bbf23d550843eb748f13cae6d106f4094ac2d0d9ec01a3be69b94ae0f4cbc2e557 SHA512 0f35d7b81bc9b06df314b40666bc728316ad36f468f5d8cee602798beee5f960bafc1a8a151a67efa9ba50dbfd1b9b5a4ff1ad0a6786a6e9416b9eadce959072
-MISC metadata.xml 591 BLAKE2B 91443111daa5642e9fdac540aec9f5d406ddec96a3ba68b31c6f282018dd463cec8cf9a9c46c1a882bf6907780f7ac4703f088acfadd2162c845777150049967 SHA512 593591a9d4a0d3303f6b96f06a59bae0983abca6b9d0ad9e0df691d3c192cc442a39bd18bac3b87257057ebde50315dd5d6c1be74ebfaa7f21b5ee0c690e9f25
diff --git a/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch b/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
deleted file mode 100644
index c8659f071e26..000000000000
--- a/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- idutils-4.6_O/lib/stdio.in.h	2012-01-28 17:26:05.000000000 +0100
-+++ idutils-4.6/lib/stdio.in.h	2013-06-13 18:38:29.787232848 +0200
-@@ -712,10 +712,12 @@
- #  undef gets
- # endif
- _GL_CXXALIASWARN (gets);
-+# if HAVE_RAW_DECL_GETS
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+# endif
- #endif
- 
- 
diff --git a/dev-util/idutils/idutils-4.6.ebuild b/dev-util/idutils/idutils-4.6.ebuild
deleted file mode 100644
index 31f8419d488a..000000000000
--- a/dev-util/idutils/idutils-4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit elisp-common eutils
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-	 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.6-glibc-2.16.patch"
-}
-
-src_configure() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		$(use_with emacs lispdir "${SITELISP}/${PN}")
-}
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
deleted file mode 100644
index be1a52884a34..000000000000
--- a/dev-util/idutils/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>robbat2@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Fast, high-capacity, identifier database tool.
-		Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
-		they program identifiers of any form, literal numbers, or words of
-		human-readable text. Database queries can be issued from the command-line,
-		or from within emacs, serving as an augmented tags facility.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/ignition-cmake-0.2.0 b/dev-util/ignition-cmake-0.2.0
new file mode 100644
index 000000000000..f1144df048c2
--- /dev/null
+++ b/dev-util/ignition-cmake-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=CMake modules to be used by the Ignition projects.
+EAPI=6
+HOMEPAGE=https://bitbucket.org/ignitionrobotics/ign-cmake
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake-0.2.0.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1a57037bbc779008f86219a96780df6c
diff --git a/dev-util/ignition-cmake-0.4.0 b/dev-util/ignition-cmake-0.4.0
new file mode 100644
index 000000000000..0c296527d40a
--- /dev/null
+++ b/dev-util/ignition-cmake-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=CMake modules to be used by the Ignition projects.
+EAPI=6
+HOMEPAGE=https://bitbucket.org/ignitionrobotics/ign-cmake
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake-0.4.0.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1a57037bbc779008f86219a96780df6c
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
deleted file mode 100644
index 523e88a77cc2..000000000000
--- a/dev-util/ignition-cmake/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ignition-cmake-0.2.0.tar.bz2 69508 BLAKE2B df51c53f2e09af260cc4ce245400f821ed29c83791a088cc3e059caf5e08f073f0d297bdc66947f77e81742c6c2a8f15a177cc082b2fb20c5f12daf59d3cf851 SHA512 fa9ada51a6cb88a1bdba5ee5732402abeb63e8f6dc044b73c9b0ccb180492f570ddf4a6f9ef891aef6be83b4fcce50ac509c724f5b8a3c99d5a30fc8d0433ca0
-DIST ignition-cmake-0.4.0.tar.bz2 119136 BLAKE2B 8e7891d71fdb605b3f9d81f4dc79d99abf531f6492d4e511868c0d88472f97732ed3f5a4d10c364fd32c637332c51136b6270934538d2f04e437044a70a0d4ef SHA512 04781babcc09ff70b503dc2085e0c050b88260986f63fd68171878f92edb975a4d8c57848407600e132bc338158365c6c1802fce16bb89ae3a83b553a77bb8ac
-EBUILD ignition-cmake-0.2.0.ebuild 439 BLAKE2B 3ad5cb7e810c2f44a170e152eadb91ccbdd4d8e83cd680ee08967fd2331376fc3321da60a8b03f1937fb062d3ce036f55ba22e1cd2f3cab435be5e55bc5157c2 SHA512 d6b9aea2003fdf8e45c9a19ed75346fea237d004e341f0e010a7d5e8c542722170c8bb8e54e168ec1c56240c0ab429b0a669a6dea83fea8695b31636c5ac6d5d
-EBUILD ignition-cmake-0.4.0.ebuild 439 BLAKE2B 3ad5cb7e810c2f44a170e152eadb91ccbdd4d8e83cd680ee08967fd2331376fc3321da60a8b03f1937fb062d3ce036f55ba22e1cd2f3cab435be5e55bc5157c2 SHA512 d6b9aea2003fdf8e45c9a19ed75346fea237d004e341f0e010a7d5e8c542722170c8bb8e54e168ec1c56240c0ab429b0a669a6dea83fea8695b31636c5ac6d5d
-MISC metadata.xml 343 BLAKE2B 536ab78631c87736b53a743176498918523743a53aba4ef92acda61a623962309d0a76618158ec211cc33c6cfbc0ce02bc8342539bc5696fe04d5654db87ce84 SHA512 82518150642d903e8f9b18e1b175bc4a694a90d02877e4d5af83b0a8bdbba1ce2063ca27a6e6161211df3c82588d9f2c28b7aa0e0e84326c1ea63242bc34e739
diff --git a/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
deleted file mode 100644
index 0f9105de8c1a..000000000000
--- a/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="CMake modules to be used by the Ignition projects."
-HOMEPAGE="https://bitbucket.org/ignitionrobotics/ign-cmake"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/ignition-cmake/ignition-cmake-0.4.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-0.4.0.ebuild
deleted file mode 100644
index 0f9105de8c1a..000000000000
--- a/dev-util/ignition-cmake/ignition-cmake-0.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="CMake modules to be used by the Ignition projects."
-HOMEPAGE="https://bitbucket.org/ignitionrobotics/ign-cmake"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/ignition-cmake/metadata.xml b/dev-util/ignition-cmake/metadata.xml
deleted file mode 100644
index 78befc813835..000000000000
--- a/dev-util/ignition-cmake/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>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">ignitionrobotics/ign-cmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/igprof-5.9.11 b/dev-util/igprof-5.9.11
new file mode 100644
index 000000000000..21b596e081f8
--- /dev/null
+++ b/dev-util/igprof-5.9.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libpcre sys-libs/libunwind sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Ignominous Profiler for analysing application memory and performance
+EAPI=5
+HOMEPAGE=http://igprof.org
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre sys-libs/libunwind
+SLOT=0
+SRC_URI=https://github.com/ktf/igprof/archive/v5.9.11.tar.gz -> igprof-5.9.11.tar.gz
+_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_=a7ba20399daffa91067452579381dba6
diff --git a/dev-util/igprof/Manifest b/dev-util/igprof/Manifest
deleted file mode 100644
index e8d2f00096fc..000000000000
--- a/dev-util/igprof/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST igprof-5.9.11.tar.gz 174304 BLAKE2B 80e392622d928cfac1352a7c5b65c85b05511c8d10f8067195bd19ee74b0ce42d453a8999378726a52c156b815f69078a76c4d24771cfdf8b657674b0c699bb0 SHA512 1c6a16e286243a997b9ce798f2403597e1d8178a7b4652e38e9afbcd48c84d868dc83ddee7eb76243096f21b9cd9c0337641bba840008c24429e60454cff1444
-EBUILD igprof-5.9.11.ebuild 673 BLAKE2B cd6207f9ce0398f48a0b7dff9ac5b2ecaaff3e44255046b39e4e4dd824b12baca03a303a4ee5b8ba517015a00fc089493f9d003436f5cc8bad9ac78b578b9912 SHA512 a087bb121802b03d459a07106c571371929c0deea8c58a12bb48dc7d05d217a7f54ad2d803bf30f7d7edd9bbbd3d684ae93b295bedd145af7c920913a86ef8ab
-MISC metadata.xml 295 BLAKE2B 04f8d4b0effb517c88011d1be87858d4c877fdd73299438dcd3f870bb44334a1bc29ba7cbed5ab2aa11f7ffac5b1d4a964efea3578131d9ff3ec9c93ae36ebe6 SHA512 da6b377b85e03955329c76f8f05d5933e63fdb826848635b7f6f2df07bfd66dad1592f3b4786556551ebf69fccc7e09475216389a1fda68a00da80a0e8966ae5
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
deleted file mode 100644
index 14f8ced68fcd..000000000000
--- a/dev-util/igprof/igprof-5.9.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Ignominous Profiler for analysing application memory and performance"
-HOMEPAGE="http://igprof.org"
-SRC_URI="https://github.com/ktf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# pcre is automagic dependency, let's make it unoptional
-# libatomic_ops is listed as dependency, but isn't actually used by package
-DEPEND="dev-libs/libpcre
-		sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/-Werror//g' -i CMakeLists.txt
-	cmake-utils_src_prepare
-}
diff --git a/dev-util/igprof/metadata.xml b/dev-util/igprof/metadata.xml
deleted file mode 100644
index 38187d691182..000000000000
--- a/dev-util/igprof/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>maksbotan@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ktf/igprof</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/imediff2-1.1.2-r5 b/dev-util/imediff2-1.1.2-r5
new file mode 100644
index 000000000000..330bed818d22
--- /dev/null
+++ b/dev-util/imediff2-1.1.2-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_single_target_python3_5? ( dev-lang/python:3.5[ncurses] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DESCRIPTION=An interactive, user friendly 2-way merge tool in text mode
+EAPI=6
+HOMEPAGE=https://elonen.iki.fi/code/imediff/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_single_target_python3_5? ( dev-lang/python:3.5[ncurses] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/i/imediff2/imediff2_1.1.2.orig.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c3c300c2495620fbfe5d6e6dadd28861
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
deleted file mode 100644
index 3a4b6e3e07f7..000000000000
--- a/dev-util/imediff2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
-DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r5.ebuild 814 BLAKE2B 95c325c3a197088b415fa739553a7e0be0fd60389f4f0e2b3af82caa097adfdd3b4e751b5393282cdf2422353463d546a6d6623fe165175c9f39ab73a952afa3 SHA512 6cd0c1a6014f058ed575f5492c593b97b2472294b71e558a210601f293172a1d5a323b6b9917d93a7504d668c57a568d02454f9dee6e01cdff465026c5b7b819
-MISC metadata.xml 357 BLAKE2B fd7b99a53b06a9ed310039486dd9c631d70ae5af05b47b42009e92b6134e52ee13e520066b8170f70b000a8eca1ca6c3c670478e393a4e36f3fe6c21187f090e SHA512 2c36e9355ac79bb027b25c63e0487299cfdf226217ea891349c4665107f6e7fb2931e56386ff1d88f16ad9e573041fc94658f61e8658d234b04bfa49c5fe902b
diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch b/dev-util/imediff2/files/1.1.2-python-3.patch
deleted file mode 100644
index 811f41583129..000000000000
--- a/dev-util/imediff2/files/1.1.2-python-3.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- a/imediff2	2017-11-14 09:28:57.007929569 -0500
-+++ b/imediff2	2017-11-14 10:11:12.618496692 -0500
-@@ -18,20 +18,20 @@
- # License along with the program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--VERSION = '1.1.1'
-+VERSION = '1.1.2'
- PACKAGE = 'imediff2'
- 
--import curses.wrapper
-+import sys
-+if sys.version_info<(3,0,0):
-+  import curses.wrapper
- import curses
- import tempfile
- import gettext
- import difflib
- import getopt
--import string
- import types
- import time
- import pty
--import sys
- import os
- import errno
- 
-@@ -121,19 +122,19 @@
- def read_lines( filename ):
-   global assume_empty
-   try:
--    fp = file( filename )
-+    fp = open( filename )
-     l = fp.readlines()
-     fp.close()
-     return l
--  except IOError, (error, message):
--    if error == errno.ENOENT and assume_empty:
-+  except IOError as e:
-+    if e.errno == errno.ENOENT and assume_empty:
-       return ""
-     else:
--      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message))
-+      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.strerror))
-       sys.exit(3)
- 
- def strip_end_lines( txt ):
--  return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"")
-+  return txt.replace("%c"%10,"").replace("%c"%13,"")
- 
- def main(stdscr, lines_a, lines_b, start_mode):
-   global sel, active_chunks, x,y, lines, textpad, contw,conth
-@@ -237,7 +238,7 @@
-         active_chunks.append( [j, j+len(line_list), i] )
- 
-       for l in line_list:
--        lines.append( [string.expandtabs(strip_end_lines(l)),
-+        lines.append( [strip_end_lines(l).expandtabs(),
-           decor, color_pair] )
-         j+=1
- 
-@@ -287,9 +287,9 @@
-   def sel_next( dir ):
-     global sel, active_chunks
-     if dir == 'up':
--      rng = range(sel-1, -1, -1)
-+      rng = list(range(sel-1, -1, -1))
-     else:
--      rng = range(sel+1, len(active_chunks))
-+      rng = list(range(sel+1, len(active_chunks)))
-     for j in rng:
-       if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
-         sel = j
-@@ -442,7 +441,7 @@
-     elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
-       helpw = 0
-       helph = 0
--      for l in string.split(helptext(), "%c"%10):
-+      for l in helptext().split("%c"%10):
-         helpw = max(helpw, len(l))
-         helph += 1
-       helppad = curses.newpad(helph+2, helpw+2)
-@@ -512,21 +513,21 @@
- try:
-   opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNV",
-     ["help","mono","unresolved","output=", "version", "new-file"])
--except getopt.GetoptError, e:
--  print _("Error: ") + str(e)
--  print usagetext()
-+except getopt.GetoptError as e:
-+  print((_("Error: ") + str(e)))
-+  print((usagetext()))
-   sys.exit(2)
- 
- for o, a in opts:
-   if o in ("-h", "--help"):
--    print usagetext()
-+    print((usagetext()))
-     sys.exit()
-   elif o in ("-V", "--version"):
--    print "%s %s" % (PACKAGE, VERSION)
-+    print(("%s %s" % (PACKAGE, VERSION)))
-     sys.exit()
- 
- if len(args)<2:
--  print usagetext()
-+  print((usagetext()))
-   sys.exit(2)
- 
- for o, a in opts:
-@@ -592,15 +592,15 @@
-   if launch_editor:
-     assert( not editor is None )
-     try:
-       (of, of_name) = tempfile.mkstemp(prefix='imediff2')
--      os.write( of, output )
-+      os.write( of, output.encode() )
-       os.close(of)
-       time.sleep(0.1) # make the change visible - many editor look a lot like imediff2
-       editor_ret = os.system('%s %s' % (editor, of_name))
-       time.sleep(0.1)
-       if editor_ret == 0:
-         new_b_lines = read_lines(of_name)
--        if string.join(new_b_lines, '') == output:
-+        if ''.join(new_b_lines) == output:
-           chunk_mode = 'old'
-         elif new_b_lines != lines_a:
-           lines_b = new_b_lines
-@@ -607,8 +608,8 @@
-         else:
-           chunks = 'old'
-       os.unlink(of_name)
--    except IOError, (error, message):
--      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message));
-+    except IOError as e:
-+      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.strerror));
- 
-   if not launch_editor:
-     break
-@@ -619,11 +620,11 @@
- else:
-   try:
-     if ofile is not None:
--      of = file(ofile, 'wb')
-+      of = open(ofile, 'wb')
--      of.write( output )
-+      of.write( output.encode() )
-       of.close()
-     sys.exit(0)
--  except IOError, (error, message):
--    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message));
-+  except IOError as e:
-+    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.strerror));
- 
- sys.exit(3)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
deleted file mode 100644
index 22d3fb364d12..000000000000
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ /dev/null
@@ -1,39 +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_5 python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1 versionator
-
-MY_P=${PN}_$(replace_version_separator 3 -)
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
-	# Otherwise the docs get regenerated :)
-	:
-}
-
-src_install() {
-	python_doscript imediff2
-	dodoc AUTHORS README
-	doman imediff2.1
-}
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
deleted file mode 100644
index b01015a7e56c..000000000000
--- a/dev-util/imediff2/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>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>grknight@gentoo.org</email>
-		<name>Brian Evans</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/include-what-you-use-4.0-r2 b/dev-util/include-what-you-use-4.0-r2
new file mode 100644
index 000000000000..212d64784709
--- /dev/null
+++ b/dev-util/include-what-you-use-4.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:4 sys-devel/clang:4 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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=6
+HOMEPAGE=https://include-what-you-use.org/
+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 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/llvm:4 sys-devel/clang:4 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(+)?]
+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/include-what-you-use/include-what-you-use/archive/clang_4.0.tar.gz -> include-what-you-use-4.0.src.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93deb33f18785acb801103f5c80c1028
diff --git a/dev-util/include-what-you-use-5.0 b/dev-util/include-what-you-use-5.0
new file mode 100644
index 000000000000..db957776a61e
--- /dev/null
+++ b/dev-util/include-what-you-use-5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:5 sys-devel/clang:5 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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=6
+HOMEPAGE=https://include-what-you-use.org/
+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 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/llvm:5 sys-devel/clang:5 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(+)?]
+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/include-what-you-use/include-what-you-use/archive/clang_5.0.tar.gz -> include-what-you-use-5.0.src.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=72c2b4b2168ee979155293abef911a1b
diff --git a/dev-util/include-what-you-use-6.0 b/dev-util/include-what-you-use-6.0
new file mode 100644
index 000000000000..53869e6de6a5
--- /dev/null
+++ b/dev-util/include-what-you-use-6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:6 sys-devel/clang:6 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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=6
+HOMEPAGE=https://include-what-you-use.org/
+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 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/llvm:6 sys-devel/clang:6 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(+)?]
+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/include-what-you-use/include-what-you-use/archive/clang_6.0.tar.gz -> include-what-you-use-6.0.src.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=612f760abb7438b5d522275095eeb8fa
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
deleted file mode 100644
index c1962da9b4ba..000000000000
--- a/dev-util/include-what-you-use/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
-DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
-DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
-EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
-EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
-EBUILD include-what-you-use-6.0.ebuild 1324 BLAKE2B b95d2bb55b44cd36657051c58a7c0272881ccacd8ead2e212458100d558bed579b83cf2dce03955ab82cdce1190257e26cb70313333ec572f469fe4e36e8adf5 SHA512 5a831edfd6dcb48621f2ea89531da736667b0d79a6e9f434e6eab1fa4c75626f2251a84fef8f76950414220b3b835521de242d32952a7b485be199d57b252f45
-MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
deleted file mode 100644
index f278652a524e..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-4.0-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=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
deleted file mode 100644
index 92dc8c8d1911..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-5.0.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=5
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
deleted file mode 100644
index 7cfe58259cc7..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-6.0.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=6
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
deleted file mode 100644
index 06df0e17b2df..000000000000
--- a/dev-util/include-what-you-use/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">include-what-you-use/include-what-you-use</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/indent-2.2.11-r1 b/dev-util/indent-2.2.11-r1
new file mode 100644
index 000000000000..5b7ed94658e5
--- /dev/null
+++ b/dev-util/indent-2.2.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html >=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=Indent program source files
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/
+IUSE=nls
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/indent-2.2.11.tar.gz
+_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_=9552093b19f0a7ae389b4087172c3dd3
diff --git a/dev-util/indent-2.2.11_p5 b/dev-util/indent-2.2.11_p5
new file mode 100644
index 000000000000..b1a0dab36861
--- /dev/null
+++ b/dev-util/indent-2.2.11_p5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html >=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=Indent program source files
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/indent-2.2.11.tar.gz http://http.debian.net/debian/pool/main/i/indent/indent_2.2.11-5.debian.tar.xz
+_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_=6e6c4d81999b12ea61dbadb039c0cd8e
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
deleted file mode 100644
index 1e52cb5d94c7..000000000000
--- a/dev-util/indent/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX indent-2.2.11-ac_config_headers.patch 228 BLAKE2B 2a55287753ba50c9ad48a3a1b7ccb2cd95f309a5a861cb9a2492a30c5c400f0e73d062497b570f1d1093623847d1258727ffd9119d8e325221eac4211324a3e6 SHA512 9efd632d596e7b768f56c757fcb15ee49f287542d00e75c2a2f2a5c915b76cb8fd4e07836a85e0b1fefd8658e147454ace3d73dd6555b5a42d1399baf4a2c542
-AUX indent-2.2.11-linguas.patch 185 BLAKE2B cb63a2846640ad4b5801481ceef537024135607f729b6bfff49c2e7013f91db0378b59d278e69ab9cb04a3b68da25a52669f2f1cba9cc0ff85f3da97baa89f35 SHA512 66a29effc9ec5a3a4ade4a5b6a527ac1fe48624d1e92170ee930867ea106ce9397b5aa82822e734949b79609b6255a656af0e491a07df5db769c974d9d096f91
-AUX indent-2.2.11-segfault.patch 369 BLAKE2B 210e2b5b1b46aa15418d6a30ae79ab423a68d8a6e7c528905afe48b2bd72fb013ce6dcade1d9580e7a38b2df2da2f6932b380bc96d0913ecbd7fced3db5686a5 SHA512 342600d476849d936d022e54ea0b6b244a956b11b99cc94dc9084f224d42ea2829640cde7a98e43efd0ee1fd88eb7147ba960af8075d290cd14a9d549abec022
-AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c0228ccd6b37c6c6682325a1445296a6d5593a357ed51050fe2cb2d04a76b1665ed199b0ffd6d07c45b0774805452078c83cd SHA512 0356443bf7f9fd066113ddb7f59b8126f4b32f7dd8be9fa661ecfd4436ed0652d9229ac867365486f04bc7cb3623e3e8792549de4678f03e4f2bd582e4ee2d67
-DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
-DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
-EBUILD indent-2.2.11-r1.ebuild 1218 BLAKE2B 7127d515b0f633c6b071a2fbff01d78fff8fa8af5c501511b4e8e74c6b0dba57a2416ed5c7846d4c5d95037ed0f029d25ab9cdc31b70614302f1aef0c3fdd49e SHA512 5e229883fe09c8168f88834f98d92caa1d4460c8be8f91541d3824973b45d1723c989bc81bb66832d996916b414db488ecce814315ab471cc8f8778cec8a38d1
-EBUILD indent-2.2.11_p5.ebuild 1382 BLAKE2B 47c045271db8ee765f5516b8b333c81d6bfbe1847c06904244759aaadd730f3bd94c6101df1d8607a3f8f2ab309be4a143a1478700f5d558df921d9524de35ea SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d
-MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
deleted file mode 100644
index 8728a26a8254..000000000000
--- a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@
- AC_CONFIG_SRCDIR(src/indent.c)
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE(indent, 2.2.11)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AM_MAINTAINER_MODE
- 
diff --git a/dev-util/indent/files/indent-2.2.11-linguas.patch b/dev-util/indent/files/indent-2.2.11-linguas.patch
deleted file mode 100644
index d540219b7cd2..000000000000
--- a/dev-util/indent/files/indent-2.2.11-linguas.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1 +1 @@
--ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
-+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
diff --git a/dev-util/indent/files/indent-2.2.11-segfault.patch b/dev-util/indent/files/indent-2.2.11-segfault.patch
deleted file mode 100644
index e91922480951..000000000000
--- a/dev-util/indent/files/indent-2.2.11-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/man/texinfo2man.c
-+++ b/man/texinfo2man.c
-@@ -287,6 +287,13 @@
-    char buf[1024];
-    int line_no = 0;
- 
-+   if (argc != 3)
-+   {
-+      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
-+      fprintf(stderr, "  The man page will be written to stdout.\n");
-+      return -1;
-+   }
-+
-    texinfoname = argv[2];
- 
-    in = fopen (argv[2], "r");
diff --git a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
deleted file mode 100644
index 5bad3da2867b..000000000000
--- a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -34,14 +34,14 @@
- html-split: @PACKAGE@_toc.html
- 
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
--	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
- 
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- 	case "$(TEXI2HTML)" in \
- 	  *"/missing texi2html") \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- 	  *) $(RM) @PACKAGE@_*.html ; \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- 	esac
- 
- install-html-monolithic: @PACKAGE@.html
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -663,14 +663,14 @@
- html-split: @PACKAGE@_toc.html
- 
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
--	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
- 
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- 	case "$(TEXI2HTML)" in \
- 	  *"/missing texi2html") \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- 	  *) $(RM) @PACKAGE@_*.html ; \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- 	esac
- 
- install-html-monolithic: @PACKAGE@.html
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
deleted file mode 100644
index 864253061b4a..000000000000
--- a/dev-util/indent/indent-2.2.11-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
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	app-text/texi2html
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-
-src_prepare() {
-	# Fix bug #94837
-	local pofile
-	for pofile in po/zh_TW*; do
-		mv ${pofile} ${pofile/.Big5} || die
-	done
-	sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
-
-	epatch \
-		"${FILESDIR}"/${P}-segfault.patch \
-		"${FILESDIR}"/${P}-texi2html-5.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_test() {
-	emake -C regression/
-}
-
-src_install() {
-	# htmldir as set in configure is ignored in doc/Makefile*
-	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
deleted file mode 100644
index 3a8feffd428d..000000000000
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
-	http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	app-text/texi2html
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-segfault.patch
-	"${FILESDIR}"/${P/_p*/}-texi2html-5.patch
-	"${FILESDIR}"/${P/_p*/}-ac_config_headers.patch
-	"${FILESDIR}"/${P/_p*/}-linguas.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/debian/patches/*.patch
-
-	local pofile
-	for pofile in po/zh_TW*; do
-		mv ${pofile} ${pofile/.Big5} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas -i po/
-
-	econf $(use_enable nls)
-}
-
-src_test() {
-	emake -C regression/
-}
-
-src_install() {
-	# htmldir as set in configure is ignored in doc/Makefile*
-	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
deleted file mode 100644
index 88f8d1f6a593..000000000000
--- a/dev-util/indent/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>
-<longdescription lang="en">
-Indent is the GNU indenting program. It is used to beautify C program source
-files.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/intel-ocl-sdk-2.0.31360 b/dev-util/intel-ocl-sdk-2.0.31360
new file mode 100644
index 000000000000..d59c387e1bff
--- /dev/null
+++ b/dev-util/intel-ocl-sdk-2.0.31360
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Intel's implementation of the OpenCL standard optimized for Intel processors
+EAPI=4
+HOMEPAGE=http://software.intel.com/en-us/articles/opencl-sdk/
+IUSE=tools
+KEYWORDS=amd64 -x86
+LICENSE=Intel-SDP
+RDEPEND=app-eselect/eselect-opencl dev-cpp/tbb sys-process/numactl tools? ( sys-devel/llvm >=virtual/jre-1.6 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8b084ce3cf2145466e4c0fa1e64fb946
diff --git a/dev-util/intel-ocl-sdk-4.4.0.117-r1 b/dev-util/intel-ocl-sdk-4.4.0.117-r1
new file mode 100644
index 000000000000..f494d95a29d1
--- /dev/null
+++ b/dev-util/intel-ocl-sdk-4.4.0.117-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Intel's implementation of the OpenCL standard
+EAPI=5
+HOMEPAGE=http://software.intel.com/en-us/articles/opencl-sdk/
+IUSE=android +system-tbb system-clang +system-boost
+KEYWORDS=-* ~amd64
+LICENSE=Intel-SDP
+RDEPEND=app-eselect/eselect-opencl sys-process/numactl system-tbb? ( >=dev-cpp/tbb-4.2.20131118 ) system-clang? ( =sys-devel/clang-3.4* ) system-boost? ( >=dev-libs/boost-1.52.0:= )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=777604a290230cbf8682206832c425f0
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
deleted file mode 100644
index ab0a4210ca1f..000000000000
--- a/dev-util/intel-ocl-sdk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0ce572db9bb6856141eedf8e3ba1b1d6f50e5ef9166047d610bbef49e72e44618d3761dc5cb828537a14dc7b66256968943238808a620a8533ef SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd
-DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
-EBUILD intel-ocl-sdk-2.0.31360.ebuild 1444 BLAKE2B 840ce46bd4e9cf54e91a58e2f4385ec7940fa62991342969970431f0d7cb015bb8f08eaebf2e8f96ab996fa544113f4cf2e9b60952a3732870221cbf8dd5362f SHA512 a5c5875f45bc572131cf9b6b4fa0b5f819fac2795a60a8ebcf459c0735337752f7ed367efabbe7a95b7744b97a8766c03bbdcd7a813c6a8d9b6d491bbf3ea36d
-EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2189 BLAKE2B 5be44e0d2491f98cb8cf4aae5b07a9976ad5c2d1b4d650f3a76184e51480ee5c18a7bba2b919f9f6d812e358245c73aa95b3ec377ac831b871f594679486c432 SHA512 695252305d781e6b61250096a8e84fc04a82d154472b90571d3a3609a64219825bd0a7723afbe6929342825f397099a82a571f68758ec0d0d6432312ea9d648d
-MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
deleted file mode 100644
index fdf2132e3533..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P=${PN//-/_}_2012_x64
-
-inherit rpm multilib
-
-INTEL_CL=usr/$(get_libdir)/OpenCL/vendors/intel/
-
-DESCRIPTION="Intel's implementation of the OpenCL standard optimized for Intel processors"
-HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE="tools"
-KEYWORDS="amd64 -x86"
-
-RDEPEND="app-eselect/eselect-opencl
-	dev-cpp/tbb
-	sys-process/numactl
-	tools? (
-		sys-devel/llvm
-		>=virtual/jre-1.6
-	)"
-DEPEND=""
-
-RESTRICT="mirror"
-QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
-	${INTEL_CL/\//}libOclCpuBackEnd.so
-	${INTEL_CL/\//}libtask_executor.so"
-QA_PREBUILT="${INTEL_CL}*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rpm_unpack ./${MY_P}.rpm
-}
-
-src_prepare() {
-	# Remove unnecessary and bundled stuff
-	rm -rf ${INTEL_CL}/{docs,version.txt,llc}
-	rm -f ${INTEL_CL}/libboost*.so
-	rm -f ${INTEL_CL}/libtbb*
-	if ! use tools; then
-		rm -rf usr/bin
-		rm -f ${INTEL_CL}/{ioc64,ioc.jar}
-		rm -f ${INTEL_CL}/libboost*
-	fi
-}
-
-src_install() {
-	doins -r etc
-
-	insinto ${INTEL_CL}
-	doins -r usr/include
-
-	insopts -m 755
-	newins usr/$(get_libdir)/libOpenCL.so libOpenCL.so.1
-	dosym libOpenCL.so.1 ${INTEL_CL}/libOpenCL.so
-
-	doins ${INTEL_CL}/*
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
deleted file mode 100644
index 9310497d34a5..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm multilib
-
-DESCRIPTION="Intel's implementation of the OpenCL standard"
-HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE="android +system-tbb system-clang +system-boost"
-KEYWORDS="-* ~amd64"
-RESTRICT="mirror"
-
-RDEPEND="app-eselect/eselect-opencl
-	sys-process/numactl
-	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
-	system-clang? ( =sys-devel/clang-3.4* )
-	system-boost? ( >=dev-libs/boost-1.52.0:= )
-"
-DEPEND=""
-
-S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
-INTEL_CL=opt/intel/opencl-1.2-${PV}
-INTEL_VENDOR_DIR=usr/$(get_libdir)/OpenCL/vendors/intel/
-
-QA_PREBUILT="${INTEL_OCL}/*"
-
-src_unpack() {
-	default
-
-	PKGS="base devel intel-cpu intel-devel"
-
-	use android && PKGS="$PKGS intel-devel-android"
-
-	for PKG in ${PKGS}; do
-		FILENAME="opencl-1.2-${PKG}-4.4.0.117-1.x86_64.deb"
-		einfo "Extracting \"${FILENAME}\"..."
-		ar x "${S}/$FILENAME" || die
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	# Remove bundled stuff
-	if use system-boost; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
-	fi
-	if use system-clang; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
-	fi
-	if use system-tbb; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
-	fi
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins "${WORKDIR}/${INTEL_CL}"/etc/intel64.icd
-
-	insinto /"${INTEL_CL}"/lib64
-	insopts -m 755
-	doins "${WORKDIR}/${INTEL_CL}"/lib64/*
-
-	insinto /"${INTEL_CL}"/bin
-	doins "${WORKDIR}"/"${INTEL_CL}"/bin/*
-
-	# TODO put this somewhere
-	# doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar
-
-	dodir "${INTEL_VENDOR_DIR}"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
deleted file mode 100644
index 2b3e89f60bca..000000000000
--- a/dev-util/intel-ocl-sdk/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>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<use>
-		<flag name="android">Install android related files</flag>
-		<flag name="tools">Install Intel Offline Compiler</flag>
-		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
-		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
-		<flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/intltool-0.51.0-r2 b/dev-util/intltool-0.51.0-r2
new file mode 100644
index 000000000000..4d44d4c90150
--- /dev/null
+++ b/dev-util/intltool-0.51.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-lang/perl dev-perl/XML-Parser
+DESCRIPTION=Internationalization Tool Collection
+EAPI=6
+HOMEPAGE=https://launchpad.net/intltool/
+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-lang/perl dev-perl/XML-Parser sys-devel/gettext
+SLOT=0
+SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+_md5_=dc4ad885459905730b86cfe43e83d164
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
deleted file mode 100644
index 4198263ec722..000000000000
--- a/dev-util/intltool/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d558cdb7bc2a87c8211c88cc7defe41faacca6a5acf52c4cc47dde6aa8378d269b9c8ae42a0ae3d5b74c8257c2d5829b1de296e SHA512 f4fe5452b81d448d19ec58196ecb1a0fa619daedd67c86fc16dcd8f45b4fa449890a0fed14d6fdb259f7c6b13cf8a1ffe064d540305913a0d9df80bb5042aa17
-AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
-AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
-DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r2.ebuild 997 BLAKE2B a9bff97f430cbdec2805e1be36eb7d3e4ea2007e8f57601807571056852c6f8f95beaed8d002fbffeaecb5064f6a9e593d74bcd46dd9b0e49ef7e7146e806c01 SHA512 19cd0a94029c03cc8a4b9d59a57908c139c5a8f8409244a1ba67605fbb7764d8d245cb2588754ccf2a2e60829b6af8accbe8035279c1e8721b361bed00eab22c
-MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
deleted file mode 100644
index 117f4a30c29b..000000000000
--- a/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 14 Apr 2013 20:41:41 +0200
-Subject: [PATCH] Fix handling absolute paths in single file key output.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
-Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
----
- intltool-merge.in | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/intltool-merge.in b/intltool-merge.in
-index 1afa2a4..47dbbdf 100644
---- a/intltool-merge.in
-+++ b/intltool-merge.in
-@@ -1108,13 +1108,20 @@ sub keys_merge_translation
- {
-     my ($lang) = @_;
- 
--    if ( ! -d $lang && $MULTIPLE_OUTPUT)
-+    my $outpath = "$OUTFILE";
-+
-+    if ($MULTIPLE_OUTPUT)
-     {
--        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-+        $outpath = "$lang/$outpath";
-+
-+        if ( ! -d $lang )
-+        {
-+            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-+        }
-     }
- 
-     open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
--    open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-+    open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
-     binmode (OUTPUT) if $^O eq 'MSWin32';
- 
-     while (<INPUT>)
-@@ -1159,7 +1166,7 @@ sub keys_merge_translation
-     close OUTPUT;
-     close INPUT;
- 
--    print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-+    print "CREATED $outpath\n" unless $QUIET_ARG;
- }
- 
- sub keys_merge_translations
-@@ -1174,7 +1181,7 @@ sub keys_merge_translations
-     }
-     else
-     {
--        keys_merge_translation (".");
-+        keys_merge_translation ();
-     }
- }
- 
--- 
-1.8.1.5
-
diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch
deleted file mode 100644
index 097c511ce18d..000000000000
--- a/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.launchpad.net/intltool/+bug/1490906
-
-fix warnings w/newer perl:
-Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065.
-
---- a/intltool-update.in
-+++ b/intltool-update.in
-@@ -1062,7 +1062,7 @@
- 	}
-     }
- 
--    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
-     {
- 	my $rest = $3;
- 	my $untouched = $1;
-@@ -1190,10 +1190,10 @@
- 	$name    =~ s/\(+$//g;
- 	$version =~ s/\(+$//g;
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-     }
- 
-     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@
- 	$version =~ s/\(+$//g;
-         $bugurl  =~ s/\(+$//g if (defined $bugurl);
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
--        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
-     }
- 
-     # \s makes this not work, why?
diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch
deleted file mode 100644
index 4af2ed8647e9..000000000000
--- a/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
---- intltool-0.51.0.orig/intltool-update.in	2017-06-28 00:47:20.889269294 +0200
-+++ intltool-0.51.0/intltool-update.in	2017-06-28 00:48:14.592271529 +0200
-@@ -1068,7 +1068,7 @@
- 	my $untouched = $1;
- 	my $sub = "";
-         # Ignore recursive definitions of variables
--        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
-+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
- 
- 	return SubstituteVariable ("$untouched$sub$rest");
-     }
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
deleted file mode 100644
index ed23a567ce19..000000000000
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Internationalization Tool Collection"
-HOMEPAGE="https://launchpad.net/intltool/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${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 ~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=""
-
-DEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-"
-RDEPEND="${DEPEND}
-	sys-devel/gettext
-"
-DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
-
-PATCHES=(
-	# Fix handling absolute paths in single file key output, bug #470040
-	# https://bugs.launchpad.net/intltool/+bug/1168941
-	"${FILESDIR}"/${PN}-0.50.2-absolute-paths.patch
-	"${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch
-	"${FILESDIR}"/${PN}-0.51.0-perl-5.26.patch
-)
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
deleted file mode 100644
index 525c1a60b10b..000000000000
--- a/dev-util/intltool/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>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">intltool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/its4-1.1.1 b/dev-util/its4-1.1.1
new file mode 100644
index 000000000000..5b9da69771d8
--- /dev/null
+++ b/dev-util/its4-1.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=sys-devel/gcc
+DESCRIPTION=ITS4: Software Security Tool
+EAPI=0
+HOMEPAGE=http://www.cigital.com/its4/
+KEYWORDS=x86 ppc
+LICENSE=ITS4
+RDEPEND=sys-devel/gcc
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
+_md5_=2b01c958953a6648ae6e202658eba9b3
diff --git a/dev-util/its4-1.1.1-r1 b/dev-util/its4-1.1.1-r1
new file mode 100644
index 000000000000..0059c5fcb90f
--- /dev/null
+++ b/dev-util/its4-1.1.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=ITS4: Software Security Tool
+EAPI=5
+HOMEPAGE=http://www.cigital.com/its4/
+KEYWORDS=~x86 ~ppc ~amd64
+LICENSE=ITS4
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dc6a5f66a29bdd61ae8e276ad1ea14db
diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest
deleted file mode 100644
index d5a20ce399da..000000000000
--- a/dev-util/its4/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST its4-1.1.1.tgz 59759 BLAKE2B 87c616dd7e2a5d3519f8827932c4d17d50dc7646097ba3aa6a8ebf29434671e560c0ba9949f370de8b26da9af9855a1fa16117d0a5a64b6098945e4292c8a33f SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6
-EBUILD its4-1.1.1-r1.ebuild 1084 BLAKE2B 7dbf0259667fb26958f5c250c3ccc1605dd719a1a75827b92414720ee88d85391adbbfed4f66fd928a714a1e34039f117797c61869a990c4ad0e46ac0e0a4134 SHA512 6f3a6660d487611f77a7bc9a3e31d231c021df19476f4fd114ccba301ed9695200dc32c830747aa29147f4589b37f45a7a6590d1ec8a4033c55f55b112c40639
-EBUILD its4-1.1.1.ebuild 933 BLAKE2B f88272743d439b4cfeb0a33a34c9c82d06cdcfc5971f79317c906cb51d2ee4f7f2be4e59c5755d49bef8ba0bd3a3713a1c53f26111c3f6df307c0f933d2ab216 SHA512 819a8e783e85d6c22f8b194dabfef204a63c11aa5b1c3494a254d680ef77592052dc4e83caa3db6d3344e66868a58b25f40af6d02df0b3d299851abd6494263f
-MISC metadata.xml 570 BLAKE2B 79fe1782f1d7fc7700188ccd3af2874267cc0419fd910b47f1b102c4f6cee88085ea09d18f98dbe1e539334e7a17de22bc66f14363e453ea3cf6c16ba9928481 SHA512 3b626c494c1b00c1032825afcf19a4b6aadd233588ae59bd8bad858d21bce920a0a41de5b51db8d6b196d1b3781389aadae2fed6e25093be930c13a44c2f224a
diff --git a/dev-util/its4/its4-1.1.1-r1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild
deleted file mode 100644
index 0b5017ca8e43..000000000000
--- a/dev-util/its4/its4-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="ITS4: Software Security Tool"
-HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
-LICENSE="ITS4"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i \
-		-e 's,iostream.h,iostream,g'\
-		"${S}"/configure || die
-	sed -i \
-		-e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \
-		"${S}"/Makefile.in || die
-}
-
-src_configure() {
-	# WARNING
-	# non-standard configure
-	# do NOT use econf
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	# WARNING
-	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
-	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
-}
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
deleted file mode 100644
index 9ddd852df65d..000000000000
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="ITS4: Software Security Tool"
-HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
-LICENSE="ITS4"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-DEPEND="sys-devel/gcc"
-#RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's,iostream.h,iostream,g'\
-		"${S}"/configure
-}
-
-src_compile() {
-	# WARNING
-	# non-standard configure
-	# do NOT use econf
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-	emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# WARNING
-	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
-	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
-}
diff --git a/dev-util/its4/metadata.xml b/dev-util/its4/metadata.xml
deleted file mode 100644
index a2b4b8254df1..000000000000
--- a/dev-util/its4/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>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription>
-ITS4 scans source code, looking for function calls that are potentially
-dangerous. For some calls, ITS4 tries to perform some code analysis to
-determine how risky the call is. In each case, ITS4 provides a problem report,
-including a short description of the potential problem and suggestions on how
-to fix the code.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/itstool-2.0.2 b/dev-util/itstool-2.0.2
new file mode 100644
index 000000000000..ba8fd2dc9294
--- /dev/null
+++ b/dev-util/itstool-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS rules
+EAPI=5
+HOMEPAGE=http://itstool.org/
+IUSE=python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~arm-linux ~x86-linux
+LICENSE=GPL-3+ || ( HPND GPL-3+ )
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://files.itstool.org/itstool/itstool-2.0.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b434c0aaa83b8cbc4444ad2beef37797
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
deleted file mode 100644
index 8250f2fc315e..000000000000
--- a/dev-util/itstool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
-EBUILD itstool-2.0.2.ebuild 859 BLAKE2B 9d60ef92779de81e0662417880af27bfa31a8a9478a463ecfdccf66b21571dca51e6c35bbf5783d43ca843b058cd78dae9b67c1792231aad28d2b4d539b0c72b SHA512 71847839b23ebfdc42496969d5fc3db84d36de69a66d36a34a0846871a9a6d2cee481e36bdf3ca5e7aefbad7f9f44e5be36bc3afe6b413fb7699972792b9a5da
-MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
deleted file mode 100644
index adf8ad6b64c8..000000000000
--- a/dev-util/itstool/itstool-2.0.2.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 )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
-
-# files in /usr/share/itstool/its are HPND/as-is || GPL-3
-LICENSE="GPL-3+ || ( HPND GPL-3+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~arm-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-}
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
deleted file mode 100644
index 90e918d8d5dc..000000000000
--- a/dev-util/itstool/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>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription lang="en">ITS Tool allows you to translate your XML documents
-  with gettext PO files, using rules from the W3C Internationalization Tag Set
-  (ITS) to determine what to translate and how to separate it into PO file
-  messages.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/jarwizard-2.50 b/dev-util/jarwizard-2.50
new file mode 100644
index 000000000000..b3a46cc66bf1
--- /dev/null
+++ b/dev-util/jarwizard-2.50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst setup unpack
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Takes the hassle out of creating executable JAR files for your Java programs
+EAPI=0
+HOMEPAGE=https://sourceforge.net/projects/jarwizard/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
+SLOT=0
+SRC_URI=mirror://sourceforge/jarwizard/jarwizard_250_src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=24de56f4bbda1e4397e2c46fd85757f2
diff --git a/dev-util/jarwizard/Manifest b/dev-util/jarwizard/Manifest
deleted file mode 100644
index fd13b67dc657..000000000000
--- a/dev-util/jarwizard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jarwizard_250_src.zip 169540 BLAKE2B b4fe55b2f9ef8e1ed05a2823b9a2fa5849f241b7a41f921aecb2aad43297e1d2a47fc1a33897813e8078d438b11a16b5c7242a1acbef4e08c8cb82d03ab04a5c SHA512 8d40cecd339e8e50b58c2c78a3c53b712275d95393d8ace4799b55a7f66f6e2a4bfd3348f92d6022d1d48c6edf17117c2b1bb1defc55e73fbdcf541907eeef1f
-EBUILD jarwizard-2.50.ebuild 680 BLAKE2B 521492d61ce21dff8a7f46a7568b8c990c95da769214ba647418a410366bad98708c5e8981e47b22aa11c4d805ae78a07ea6df54e73d75543fa2bb30bdfc082f SHA512 7de3157c1a8e63850034c68ace875f6afafee973821480a30d48e92d7ff9a68f186a95da9e140618c2a22c175ff375b810eee4d5bcc16cc6c283ad23296914b0
-MISC metadata.xml 315 BLAKE2B 7f29647cc44b98eff26b0fa5b83e2b23c9090dcfd0664b39ea83d455ff11227461ce57720c32a82f6e12fa3d337edd01ecf0e415ec311c40f3064fee281f0f66 SHA512 91e4126398b25c29af33c39af19f08f2eb8069c7595dcd752b347b4db0d232e4315708d2baf92f31f6ad7805f279a96b10891b73de53c0cc9331a0e9a404f82d
diff --git a/dev-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
deleted file mode 100644
index 2539b1a46102..000000000000
--- a/dev-util/jarwizard/jarwizard-2.50.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Takes the hassle out of creating executable JAR files for your Java programs"
-SRC_URI="mirror://sourceforge/jarwizard/${PN}_${PV/./}_src.zip"
-HOMEPAGE="https://sourceforge.net/projects/jarwizard/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	java-ant_bsfix_one "${S}/nbproject/build-impl.xml"
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-	java-pkg_dolauncher ${PN} --main JarWizard
-}
diff --git a/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
deleted file mode 100644
index 6c9274348332..000000000000
--- a/dev-util/jarwizard/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jarwizard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/jconfig-2.8.5 b/dev-util/jconfig-2.8.5
new file mode 100644
index 000000000000..7fc309a1baf7
--- /dev/null
+++ b/dev-util/jconfig-2.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst setup unpack
+DEPEND=>=virtual/jdk-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Utility that provides a simple API for the management of properties
+EAPI=0
+HOMEPAGE=http://www.jconfig.org/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=70b5903d37aa0d9b895448dbc8e7157f
diff --git a/dev-util/jconfig-2.9 b/dev-util/jconfig-2.9
new file mode 100644
index 000000000000..0d193ae64188
--- /dev/null
+++ b/dev-util/jconfig-2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Utility that provides a simple API for the management of properties
+EAPI=5
+HOMEPAGE=http://www.jconfig.org/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=45bf6322487ba3dfa28e4500ecbaa393
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
deleted file mode 100644
index 27c81b5f0fd6..000000000000
--- a/dev-util/jconfig/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST jconfig-src-v2.8.5.tar.gz 1171848 BLAKE2B 579074196d538a6e5d38c777344d646c1ed9c9bb76554421cfe7f1772fcfbcc7343f0aa444dbb5dc4a07ad9056178990f337e7dd710549ede0450c136c74db59 SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff
-DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.8.5.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
-EBUILD jconfig-2.9.ebuild 842 BLAKE2B 904129fc6bcbd7bb550131c61ed91fbe5626616f7f8c8a879cde4c8c0d0b5e8cc61fe185f9ba73ab0367955aacaffecb324bb1177c6ab7f2ea75536981a340a7 SHA512 589751320dde2e2ee74acac1545a7afd3430f8808de2edf5a641dd25e78390630c66978e290cc61355aa9ad08514ce75254ded91be1933b38d9978a7c58c1067
-MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
deleted file mode 100644
index 1b86b444357a..000000000000
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
deleted file mode 100644
index ba1c8d27d47a..000000000000
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-java_prepare() {
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
deleted file mode 100644
index 3e77b353bc2c..000000000000
--- a/dev-util/jconfig/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jconfig</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/jenkins-bin-2.107.2 b/dev-util/jenkins-bin-2.107.2
new file mode 100644
index 000000000000..f5386037611d
--- /dev/null
+++ b/dev-util/jenkins-bin-2.107.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.107.2/jenkins.war -> jenkins-bin-2.107.2.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=73722204c34b6321353338ae930563c1
diff --git a/dev-util/jenkins-bin-2.107.3 b/dev-util/jenkins-bin-2.107.3
new file mode 100644
index 000000000000..ec882b749bed
--- /dev/null
+++ b/dev-util/jenkins-bin-2.107.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.107.3/jenkins.war -> jenkins-bin-2.107.3.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=73722204c34b6321353338ae930563c1
diff --git a/dev-util/jenkins-bin-2.116 b/dev-util/jenkins-bin-2.116
new file mode 100644
index 000000000000..71e4da45330c
--- /dev/null
+++ b/dev-util/jenkins-bin-2.116
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.116/jenkins.war -> jenkins-bin-2.116.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=159ffe109a2f5e178fedc19fa2a54c14
diff --git a/dev-util/jenkins-bin-2.121 b/dev-util/jenkins-bin-2.121
new file mode 100644
index 000000000000..51c32ff04595
--- /dev/null
+++ b/dev-util/jenkins-bin-2.121
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.121/jenkins.war -> jenkins-bin-2.121.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=159ffe109a2f5e178fedc19fa2a54c14
diff --git a/dev-util/jenkins-bin-2.121.1 b/dev-util/jenkins-bin-2.121.1
new file mode 100644
index 000000000000..13e2b44db3d6
--- /dev/null
+++ b/dev-util/jenkins-bin-2.121.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.121.1/jenkins.war -> jenkins-bin-2.121.1.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=73722204c34b6321353338ae930563c1
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
deleted file mode 100644
index d4a603fd70ab..000000000000
--- a/dev-util/jenkins-bin/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c012832081544540cee12afc9b9a184238973fd1fe1b566677caa0bd721624fbb60fc91adb953d5af42ee1eeb29a SHA512 74423d3c66e2312eb3a1590e0582ccd82fc01b410d3bfc0627bef56fe6f4e7f4ea01a7a2d92a7a0c4870a1a1c48e911fe7eab3073e14db4910b52158182e5856
-AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
-AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.107.2.war 74568464 BLAKE2B b506199d2e56c3f88bdd295dd88b8644869c59e93689768376752b1bd54a5f5ccb8a56b32d9556a592b5567dc884cfa6d0049810f6a23304f5c1fa9026b31804 SHA512 c5abc515ac646904c44d06a31e253c5824096abb40af415357f47610354a793bd571310fed9e5596103c399a495a7b229a731509873a99795471459410db6411
-DIST jenkins-bin-2.107.3.war 74576216 BLAKE2B 2791f6fce3c6c331c47e55b72777c90c2323e6c53629ee92ccd6987c4557a713759f1a2fe2f6e882cec5536c6e1783c1fb9b740174e1ab3f89d56e97460ad4ef SHA512 29209b7359439f55c27127a946dbfcdc318407ee21de447b8f4864209e2076f0a16083dd501e3ead054b086af78f319e25979b7fd25847135d76deeb10a99fad
-DIST jenkins-bin-2.116.war 74606954 BLAKE2B 15d1a665eeb35694bc03bc54c8b5b623fc3ad40c492c5e8541a271396fb48fe9a67eefaa25665a2658dff0f3ce1bea51de23902a3f7297dc0621750c7c7d5f8f SHA512 ab2a41f848dae9bfcb3fc3a8dea2da4957cb919aa1cf0609bea238ef6670a973226e5da817f582e8d718700cd8e57c05384f6ef6cf9ad80e94c87813a5199373
-DIST jenkins-bin-2.121.1.war 74736772 BLAKE2B a5972bfd0a049065eec7f842482754de838e72db73eb846f4742273d356a0ad52adaf01dbf1c617d88d133502f78657488341b81aee42746b16e82a3250b143a SHA512 b87c8458a5db9e8a1b1a67cc8e36d224719d8460987a8b95f563619c5d662e6af8a3fc276d420f5520e541a0bee7211d2fe414caf11b4116c57ba214c687faa8
-DIST jenkins-bin-2.121.war 74737297 BLAKE2B 20d53c5869655331036ef5e18f94f71a0bda46f651b706bc61ae24083df72db285291478575662c52c661bc15c79e00e3f10e503f430aa5d23107f251f12d338 SHA512 4df05ad4abf0dd4fc40fbcb9dd8cdad985f6c3970ac4b777aeb5766a1ae45718b70929b71288e245f5e90541aa886c31c589dfdd006623759b7c6b5326e44118
-EBUILD jenkins-bin-2.107.2.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.107.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.116.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
-EBUILD jenkins-bin-2.121.1.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.121.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
-MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
deleted file mode 100644
index 33b16600452e..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
-    compress
-    dateext
-    maxage 365
-    rotate 99
-    size=+4096k
-    notifempty
-    missingok
-    create 644
-    postrotate
-        [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins
-        if [ -s /var/run/jenkins.pid ]; then
-            JPID=$(cat /var/run/jenkins.pid)
-            test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || :
-        fi
-    endscript
-}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin.confd
deleted file mode 100644
index f84e3463e359..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.confd
+++ /dev/null
@@ -1,62 +0,0 @@
-# Config file for /etc/init.d/jenkins
-
-#
-# Directory where Jenkins store its configuration and working
-# files (checkouts, build reports, artifacts, ...).
-#
-JENKINS_HOME="/var/lib/jenkins/home"
-
-#
-# Options to pass to java when running Jenkins.
-#
-JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
-
-#
-# Port Jenkins is listening on.
-#
-JENKINS_PORT="8080"
-
-#
-# Debug level for logs -- the higher the value, the more verbose.
-# 5 is INFO.
-#
-JENKINS_DEBUG_LEVEL="5"
-
-#
-# Whether to enable access logging or not.
-#
-JENKINS_ENABLE_ACCESS_LOG="no"
-
-#
-# Maximum number of HTTP worker threads.
-#
-JENKINS_HANDLER_MAX="100"
-
-#
-# Maximum number of idle HTTP worker threads.
-#
-JENKINS_HANDLER_IDLE="20"
-
-#
-# Pass arbitrary arguments to Jenkins.
-# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
-# Full option list: java -jar jenkins.war --help
-#
-JENKINS_ARGS=""
-
-#
-# User
-#
-JENKINS_USER=jenkins
-
-
-
-#
-# Pid File 
-#
-JENKINS_PIDFILE="/var/run/jenkins.pid"
-
-#
-# War File
-#
-JENKINS_WAR="/opt/jenkins/jenkins.war"
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init2 b/dev-util/jenkins-bin/files/jenkins-bin.init2
deleted file mode 100644
index 93d4d5f7e687..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.init2
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-    need net
-    use dns logger mysql postgresql
-}
-
-checkconfig() {
-    if [ ! -n "$JENKINS_HOME" ] ; then
-        eerror "JENKINS_HOME not configured"
-        return 1
-    fi
-    if [ ! -d "$JENKINS_HOME" ] ; then
-        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return 1
-
-    JAVA_HOME=`java-config --jre-home`
-    COMMAND=$JAVA_HOME/bin/java
-
-    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
-
-    # Don't use --daemon here, because in this case stop will not work
-    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
-    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
-    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
-    [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
-    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
-    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
-
-    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
-        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
-    fi
-
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet --background \
-        --make-pidfile --pidfile $JENKINS_PIDFILE \
-        --user ${JENKINS_USER} \
-        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
-    eend $?
-}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service b/dev-util/jenkins-bin/files/jenkins-bin.service
deleted file mode 100644
index 5edaac7da40a..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Jenkins Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/java -Djava.awt.headless=true -DJENKINS_HOME=/var/lib/jenkins/home -jar /opt/jenkins/jenkins.war --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=8080 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log
-User=jenkins
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.107.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.107.2.ebuild
deleted file mode 100644
index 95d08ad47b24..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.107.2.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.107.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.107.3.ebuild
deleted file mode 100644
index 95d08ad47b24..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.107.3.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.116.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.116.ebuild
deleted file mode 100644
index 4f30f3987712..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.116.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild
deleted file mode 100644
index 95d08ad47b24..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.1.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.ebuild
deleted file mode 100644
index 4f30f3987712..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/metadata.xml b/dev-util/jenkins-bin/metadata.xml
deleted file mode 100644
index 26b75d373ed4..000000000000
--- a/dev-util/jenkins-bin/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>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-		<name>Hans de Graaff</name>
-		<description>lts versions</description>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kbuild-0.1.9998.3127 b/dev-util/kbuild-0.1.9998.3127
new file mode 100644
index 000000000000..4edfd4fc4513
--- /dev/null
+++ b/dev-util/kbuild-0.1.9998.3127
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=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 makefile framework for writing simple makefiles for complex tasks
+EAPI=6
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3127-src.tar.xz
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=63d55f240ab98e921cb6d7df71d41091
diff --git a/dev-util/kbuild-0.1.9998.3149 b/dev-util/kbuild-0.1.9998.3149
new file mode 100644
index 000000000000..ab4bd27e89ac
--- /dev/null
+++ b/dev-util/kbuild-0.1.9998.3149
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=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 makefile framework for writing simple makefiles for complex tasks
+EAPI=7
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3149-src.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=963502c3a05c94efe479335d95ac59d8
diff --git a/dev-util/kbuild-0.1.9998_pre20131130-r1 b/dev-util/kbuild-0.1.9998_pre20131130-r1
new file mode 100644
index 000000000000..1e8b2dbd3ed4
--- /dev/null
+++ b/dev-util/kbuild-0.1.9998_pre20131130-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/yacc >=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 makefile framework for writing simple makefiles for complex tasks
+EAPI=6
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/kBuild-0.1.9998-pre20131130-src.tar.xz https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz
+_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_=569571b9d3704ea7cfe8aca480ee8fb2
diff --git a/dev-util/kbuild-9999 b/dev-util/kbuild-9999
new file mode 100644
index 000000000000..fe95ec4c4287
--- /dev/null
+++ b/dev-util/kbuild-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install preinst prepare unpack
+DEPEND=sys-devel/gettext virtual/yacc >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
+EAPI=6
+HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+LICENSE=GPL-3
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3b8f11940c87f38dc25b9ea83b22cb41
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
deleted file mode 100644
index e0bd11c7766e..000000000000
--- a/dev-util/kbuild/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c72f297e24187d2681ff7aaa2b09fa0fed35ce780884bf1cf0b0ea4428a16402c20b14fcc0e918d7175b98f04e94ba74449 SHA512 468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020
-AUX kbuild-0.1.9998_pre20110817-gcc-4.7.patch 315 BLAKE2B b2b9b85b01500b326b66d7186e4ffb25ec21d4acfe962dc3e798c4b2bc076cad2730c30995c40c77a5239f4b3c895e2f2f00c4734a96f81d6dda07cdf6d40ee4 SHA512 843a90f52dc6163936a3bff5d11aedb92642baf66ec4adacf0705b484b4a2d624995ffa59dfbfde3218e0e2e763f64338a03ebf935ec23fdad66093824ced7e1
-AUX kbuild-0.1.9998_pre20110817-gold.patch 795 BLAKE2B 1615408f2f6f669ce05b88e703df18f9ca935a63347bf5c5b5e4c7e4803aeb83a6562c4d620235a0d07ec1102ccbc2766c1b39895660ffaf46773d7fc4b3978e SHA512 6ea5d896fdd632355985bdaa69e36aa091fdddc925049dfcb7eab37472c88fde954c6b987a0e647e65832cec5c91ccad7ad8270376a112af95df90d4a60687f9
-AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
-AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
-AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
-AUX kbuild-glibc-2.10.patch 756 BLAKE2B 50f0f90daad8f4b93cde4e1ca458ae79c6cfa876a0e92138a557461d5e22d1a1f40152d454bbf12936a17ae2a0cd7738813ce65f81b3f8bd98390e1e089d4314 SHA512 dd8a9464c7014205bbed655a42325653618ad902493d7c73d714f7504a539159771d64b7e0d82aaaf76fadf3eb46dd663e62b5960c17077b8c80ac5f414555ce
-AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
-DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
-DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
-DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
-DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
-EBUILD kbuild-0.1.9998.3127.ebuild 1723 BLAKE2B e4ca9b4b61807247d39cb7216f8eb2fbb17c45c18e241791403393474ec0e58774c7c8e03a50f03fc9dbf51beed9639b37a8646f356b1d34176dd7c05e599c16 SHA512 e0943bb0d315e6673332639031c4ed0e45e8ba3b94bb5de62918bf2de96bdb14c21b6f75012f18b2cab5d90ac10b3be5a38e40457e2012a08cc068f9a2d8bf7b
-EBUILD kbuild-0.1.9998.3149.ebuild 1797 BLAKE2B 77af90d7312b90240f3ff3f03a7c16bf181b6aabb0a19c87f7618f495c7b11cc0f9d10a308da81563e58e5f46176756c8dd6510319afba5826cb5ea354ac1074 SHA512 11add83b15c24aafb276617a596a6e329eab3aed0c35b32c6da9540cada1e89e2e64d3da2f042573a2058ba680c4d3bea99ad18da65f25d46710f5760b8a93f9
-EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 BLAKE2B ce3518b0ab413a1a4aa3150d6fa3f13050cf49cae8fab1603da6912beba290135574570acb25fd2d7dffcfe65e54d8c9122ec1071cd589e7d5c46ec0de369805 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b
-EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
-MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
deleted file mode 100644
index b074a984af4c..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -147,7 +147,7 @@
-   MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/
-  endif
-  ifndef MY_INST_DOC
--  MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/
-+  MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/
-  endif
-  if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE)
-   MY_INST_BIN_MODE := $(MY_INST_MODE),a+x
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
deleted file mode 100644
index eb71fb02f4f0..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-@@ -781,7 +781,7 @@
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
deleted file mode 100644
index 8ad2ab3269cf..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/kmk/Makefile.kmk |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
-index fe2cd43..135431e 100644
---- a/src/kmk/Makefile.kmk
-+++ b/src/kmk/Makefile.kmk
-@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
- TEMPLATE_BIN-KMK_INCS.freebsd = glob
- TEMPLATE_BIN-KMK_INCS.openbsd = glob
- TEMPLATE_BIN-KMK_INCS.solaris = glob
--TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
-+TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
- ifeq ($(KBUILD_TARGET),win)
-  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
deleted file mode 100644
index d2b20176ca82..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
-+++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
-@@ -59,6 +59,7 @@
- if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win"
- kash_CFLAGS += -std=gnu99
- endif
-+kash_LIBS += pthread
- kash_CFLAGS.win.amd64 = -GS-
- kash_SOURCES = \
- 	main.c \
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
deleted file mode 100644
index 9b0df4204e35..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
-+++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
-@@ -35,6 +35,10 @@
- # include <stdlib.h>
- #endif /* HAVE_STDLIB_H */
- 
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif /* HAVE_UNISTD_H */
-+
- #include "utils.h"
- 
- const char *myname;
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
deleted file mode 100644
index 4c98942c0f3a..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
-+++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
-@@ -57,7 +57,7 @@
- ifneq ($(KBUILD_TARGET),os2)
-  TEMPLATE_BIN-KMK_INCS += glob
- endif
--TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
-+TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
- ifeq ($(KBUILD_TARGET),win)
-  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
deleted file mode 100644
index d24a8f7439dc..000000000000
--- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kBuild-0.1.5/src/ash/output.c
-+++ kBuild-0.1.5/src/ash/output.c
-@@ -230,6 +230,7 @@
- 	va_end(ap);
- }
- 
-+#if 0
- void
- dprintf(const char *fmt, ...)
- {
-@@ -240,6 +241,7 @@
- 	va_end(ap);
- 	flushout(out2);
- }
-+#endif
- 
- void
- fmtstr(char *outbuf, size_t length, const char *fmt, ...)
---- kBuild-0.1.5/src/ash/output.h
-+++ kBuild-0.1.5/src/ash/output.h
-@@ -65,8 +65,10 @@
-     __attribute__((__format__(__printf__,2,3)));
- void out1fmt(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#if 0
- void dprintf(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#endif
- void fmtstr(char *, size_t, const char *, ...)
-     __attribute__((__format__(__printf__,3,4)));
- void doformat(struct output *, const char *, va_list);
diff --git a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
deleted file mode 100644
index 36cabae2b138..000000000000
--- a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bootstrap.gmk
-+++ b/bootstrap.gmk
-@@ -179,7 +179,7 @@
- 	echo done > $@
- 
- $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
--	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
-+	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
- 	echo done > $@
- 
- $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
deleted file mode 100644
index 6a36842f7560..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998.3127.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
-
-inherit eutils autotools toolchain-funcs versionator
-
-MY_P="${P}-src"
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	mv src/kmk/configure.{in,ac} || die
-
-	# Add a file with the svn revision this package was pulled from
-	printf '%s\n' "KBUILD_SVN_REV := $(get_version_component_range 4)" \
-		> SvnInfo.kmk || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
deleted file mode 100644
index 457775ebe06b..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P="${P}-src"
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	# Add a file with the svn revision this package was pulled from
-	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
-		> SvnInfo.kmk || die
-
-	# bootstrapping breaks because of missing po/Makefile.in.in (r3149)
-	sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
-		-i src/kmk/configure.ac || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
deleted file mode 100644
index b4fd8a1a4f0c..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.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
-
-inherit eutils autotools toolchain-funcs
-
-MY_P=kBuild-${PV/_/-}-src
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/${P}-tools_and_units_updates.patch.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-src}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-glibc-2.10.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
-	"${WORKDIR}/${P}-tools_and_units_updates.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	mv src/kmk/configure.{in,ac} || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
deleted file mode 100644
index 5df4852ffb28..000000000000
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils subversion
-
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="sys-devel/gettext
-	virtual/yacc"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P/-src}"
-
-src_prepare() {
-		default
-		rm -rf "${S}/kBuild/bin" || die
-
-		cd "${S}/src/kmk" || die
-		eautoreconf
-		cd "${S}/src/sed" || die
-		eautoreconf
-}
-
-src_compile() {
-		kBuild/env.sh --full \
-		make -f bootstrap.gmk AUTORECONF=true \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-		kBuild/env.sh kmk \
-		NIX_INSTALL_DIR=/usr \
-		PATH_INS="${D}" \
-		install || die "install failed"
-}
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
deleted file mode 100644
index 95aa13f6c5ef..000000000000
--- a/dev-util/kbuild/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kcov-33 b/dev-util/kcov-33
new file mode 100644
index 000000000000..ce048f378186
--- /dev/null
+++ b/dev-util/kcov-33
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kcov is a code coverage tester for compiled languages, Python and Bash
+EAPI=6
+HOMEPAGE=https://github.com/SimonKagstrom/kcov
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/SimonKagstrom/kcov/archive/v33.tar.gz -> kcov-33.tar.gz
+_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_=29e968dc11671ec1328a5142b238bff9
diff --git a/dev-util/kcov-34 b/dev-util/kcov-34
new file mode 100644
index 000000000000..4ab1a28edec6
--- /dev/null
+++ b/dev-util/kcov-34
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kcov is a code coverage tester for compiled languages, Python and Bash
+EAPI=6
+HOMEPAGE=https://github.com/SimonKagstrom/kcov
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/SimonKagstrom/kcov/archive/v34.tar.gz -> kcov-34.tar.gz
+_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_=29e968dc11671ec1328a5142b238bff9
diff --git a/dev-util/kcov-9999 b/dev-util/kcov-9999
new file mode 100644
index 000000000000..ff1d66cfc55c
--- /dev/null
+++ b/dev-util/kcov-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Kcov is a code coverage tester for compiled languages, Python and Bash
+EAPI=6
+HOMEPAGE=https://github.com/SimonKagstrom/kcov
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=95788b962de66ef230e94e0de7269a1b
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
deleted file mode 100644
index 11e48da0806c..000000000000
--- a/dev-util/kcov/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST kcov-33.tar.gz 276028 BLAKE2B bed7f2b2feb3ecb1a861928306626b44904af52f30d5721cd0e6ba9ad5db5edb1ffb51fd64ab0fba5f99fc0329bbe87949b901bc73e2299c2075817f606113aa SHA512 e35ba3c4dc320cef0cde097cfa2c4067ec6bf86a5ee797d3ec111facffa036da4fc4d403e63bd3767d03eac511987592e77ed61810605f8e2da77c26570e245c
-DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346
-EBUILD kcov-33.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
-EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
-EBUILD kcov-9999.ebuild 638 BLAKE2B fdd240a4bf38de8939b29ba7c04c1f29fe8977a074fb2c35bf23c80ac34539da1a0f39d60073a785d2850194e92d03f8618e6169ab00706cb0b686dd458ba5ce SHA512 cec899ac8769080dfa88b1d34d9f4a0b2da654da9712a4236cc343533e3bc33815159ef84074c843eba3053ee672f034ac2c439e9431ae2e0a0b4eac5f584eca
-MISC metadata.xml 334 BLAKE2B 49f7a7004704c8531accf4ab5979f0823e400f8bb8e79c987091b02e8abf7f288bdeb6eb9c65953605bf95a8eb07fdf9952c1c905a8f588225780d3ddef3b3aa SHA512 1a6d96440ff3def1c7fd765dac9c4f8240b36ce918c6c8d0803b2d2a465be5b571e31a2bdc4540cffc485eefb78e65f7ec5b30300918571e1d641112a078c7b3
diff --git a/dev-util/kcov/kcov-33.ebuild b/dev-util/kcov/kcov-33.ebuild
deleted file mode 100644
index 7f1e7488e3b2..000000000000
--- a/dev-util/kcov/kcov-33.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
-
-inherit cmake-utils
-
-DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/elfutils
-	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/kcov/kcov-34.ebuild b/dev-util/kcov/kcov-34.ebuild
deleted file mode 100644
index 7f1e7488e3b2..000000000000
--- a/dev-util/kcov/kcov-34.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
-
-inherit cmake-utils
-
-DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/elfutils
-	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
deleted file mode 100644
index eec056058ef3..000000000000
--- a/dev-util/kcov/kcov-9999.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 cmake-utils
-
-DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [ "${PV}" -eq 9999 ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	dev-libs/elfutils
-	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml
deleted file mode 100644
index bbb53844e2b2..000000000000
--- a/dev-util/kcov/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>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">SimonKagstrom/kcov</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/kdbg-3.0.0 b/dev-util/kdbg-3.0.0
new file mode 100644
index 000000000000..44f5dc6d4fe0
--- /dev/null
+++ b/dev-util/kdbg-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Graphical debugger interface
+EAPI=6
+HOMEPAGE=http://www.kdbg.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6c9e90d0910fc1b871655af1cba7cc8
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
deleted file mode 100644
index e516e7ffae85..000000000000
--- a/dev-util/kdbg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdbg-3.0.0.tar.gz 430150 BLAKE2B 62411f95f1d109d95647e83defc2f5a84f9f7d7dc715f5a2f84eb6ecd18c7e1d02da0d68bf5bc8bb37216f98edbac11c24286f03ffc2ab9ad9fc7203ccd498dd SHA512 6398a7bbb9c744a837dd73645b497ab00eeaca9a326d61b135dc9040c616b4a2bdc0cf1da59c101dc68a159e12bc3b4a994a9d1dbf33f7d152e5c3003abb498a
-EBUILD kdbg-3.0.0.ebuild 943 BLAKE2B 247456ef0ea77b1e1661bda4f22398f336da707930070866bba8fb3c78110e85ce212da6fc03fb609eaefdf787191227d3ddd5696155af1b00a3f045d47bec13 SHA512 e7cf8c8c24c15169ee843ef9c0adee4f72a89ca929fccd0d37e5de0ede024986140958050e8c2aa233160e16aa5d871db765cc1f594bc51dfac6953e86c57dd8
-MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/kdbg-3.0.0.ebuild b/dev-util/kdbg/kdbg-3.0.0.ebuild
deleted file mode 100644
index ecb39833107d..000000000000
--- a/dev-util/kdbg/kdbg-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Graphical debugger interface"
-HOMEPAGE="http://www.kdbg.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!dev-util/kdbg:4
-	sys-devel/gdb
-"
-
-src_prepare() {
-	# allow documentation to be handled by eclass
-	mv kdbg/doc . || die
-	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
-	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
-
-	kde5_src_prepare
-}
diff --git a/dev-util/kdbg/metadata.xml b/dev-util/kdbg/metadata.xml
deleted file mode 100644
index d2b641f04810..000000000000
--- a/dev-util/kdbg/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">j6t/kdbg</remote-id>
-		<remote-id type="sourceforge">kdbg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/kdevelop-5.2.3 b/dev-util/kdevelop-5.2.3
new file mode 100644
index 000000000000..de0fe26fc5f3
--- /dev/null
+++ b/dev-util/kdevelop-5.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage test debug +handbook test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-17.12.3:5 >=kde-apps/kio-extras-17.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-17.12.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=test? ( welcomepage )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdevelop-5.2.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1b614e912e6978ecf00a2d806419e20
diff --git a/dev-util/kdevelop-pg-qt-2.1.0 b/dev-util/kdevelop-pg-qt-2.1.0
new file mode 100644
index 000000000000..72cadde56e2a
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=LL(1) parser generator used mainly by KDevelop language plugins
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.1.0/src/kdevelop-pg-qt-2.1.0.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c335e45dfeb97d6c7f311c8d7454a57
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
deleted file mode 100644
index 9361d705f2bb..000000000000
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
-EBUILD kdevelop-pg-qt-2.1.0.ebuild 489 BLAKE2B db137e6e9e0afca0484c28ddda0a309c31b7e3cc4a81a6307580001a755cd286ec183c6f87714c882d2d4fe4e1f5b5a385c6cb2b62909ba2288074e81f63e349 SHA512 2a715a11b24881f1829b717c46d4cdaf74a569f60056be30a7d8a6acb06f54ddddfbf72b2bed11daf6df93beff88999e300d17824030758b3a1fa1bbfedaf09e
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
deleted file mode 100644
index ee86aa1a4186..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-LICENSE="LGPL-2+ LGPL-2.1+"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="
-	!dev-util/kdevelop-pg-qt:4
-"
diff --git a/dev-util/kdevelop-pg-qt/metadata.xml b/dev-util/kdevelop-pg-qt/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/kdevelop-pg-qt/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kdevelop-php-5.2.3 b/dev-util/kdevelop-php-5.2.3
new file mode 100644
index 000000000000..a4e3a5976536
--- /dev/null
+++ b/dev-util/kdevelop-php-5.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 test? ( dev-util/kdevelop:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=PHP plugin for KDevelop
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=test debug +handbook test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-php-5.2.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=612fb440ef06b9ce58f2aea560655ad9
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
deleted file mode 100644
index 48da5d526cde..000000000000
--- a/dev-util/kdevelop-php/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692
-EBUILD kdevelop-php-5.2.3.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild
deleted file mode 100644
index f7fc8d608f48..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.3.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
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/kdevelop-php-docs
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-RESTRICT+=" test"
diff --git a/dev-util/kdevelop-php/metadata.xml b/dev-util/kdevelop-php/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/kdevelop-php/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kdevelop-python-5.2.3 b/dev-util/kdevelop-python-5.2.3
new file mode 100644
index 000000000000..458e1a33dfa1
--- /dev/null
+++ b/dev-util/kdevelop-python-5.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Python plugin for KDevelop
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test 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
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=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_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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 dev-python/pycodestyle[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-python-5.2.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4a6cdd4ae0cc3c0f1e60dfdcd0dff4f
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
deleted file mode 100644
index 450fe2076d33..000000000000
--- a/dev-util/kdevelop-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
-EBUILD kdevelop-python-5.2.3.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
deleted file mode 100644
index ba7fd2bc14f1..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_TEST="forceoptional"
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/kdevelop-python/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
deleted file mode 100644
index 18dceb8d93b8..000000000000
--- a/dev-util/kdevelop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
-EBUILD kdevelop-5.2.3.ebuild 3801 BLAKE2B a7f01ea69e0652bd2f92819a829b29a20d29da1b9c43abee542a8550fc4aeb89245a7be9b7dc0cc42a26c0d899f8307ad796f955300b84488de6c9a2641efecf SHA512 e85d654094752e2b1fd9a348bf9374447681df93dee668464304b91cdc2aae962847535aa0138afe11b63ea8a5fdf3120213dd340b92e6e80845b6c1a0efd2a2
-MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
deleted file mode 100644
index c8c5c9567be5..000000000000
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( kde-frameworks/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
deleted file mode 100644
index 9b8c92eb6da3..000000000000
--- a/dev-util/kdevelop/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag>
-		<flag name="qmake">Enable support for QMake build system</flag>
-		<flag name="reviewboard">Enable reviewboard support</flag>
-		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/kdstatemachineeditor-1.2.3 b/dev-util/kdstatemachineeditor-1.2.3
new file mode 100644
index 000000000000..1b3775cc7202
--- /dev/null
+++ b/dev-util/kdstatemachineeditor-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 doc? ( >=dev-qt/qthelp-5.9.4:5 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 ) media-gfx/graphviz sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Framework for creating Qt State Machine metacode using graphical user interfaces
+EAPI=6
+HOMEPAGE=https://github.com/KDAB/KDStateMachineEditor
+IUSE=doc test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
+SLOT=0
+SRC_URI=https://github.com/KDAB/KDStateMachineEditor/releases/download/v1.2.3/kdstatemachineeditor-1.2.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=16e80ca7855fb5cfdde295eb67573867
diff --git a/dev-util/kdstatemachineeditor-9999 b/dev-util/kdstatemachineeditor-9999
new file mode 100644
index 000000000000..3be8ba3186bb
--- /dev/null
+++ b/dev-util/kdstatemachineeditor-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 doc? ( >=dev-qt/qthelp-5.9.4:5 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 ) media-gfx/graphviz sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Framework for creating Qt State Machine metacode using graphical user interfaces
+EAPI=6
+HOMEPAGE=https://github.com/KDAB/KDStateMachineEditor
+IUSE=doc test
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=990ed621d1169f8fdf9f8e6ad805bdd5
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
deleted file mode 100644
index 67ad1ed115d4..000000000000
--- a/dev-util/kdstatemachineeditor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kdstatemachineeditor-1.2.3-qt-5.11.patch 590 BLAKE2B 144a8c7624e18cd606d14cbc624cb492a162f9adb74b8ba209718f30e5c16004c7540c881462a988705451f5e1588af0c80c070ea195b775254300df5182d8ac SHA512 3edec760b30ef84f77f0494b11b0b9156790d7468e2b108aea19244a4879b4a6aaf78f23135fe1b39cd8ac0b8ee24b5cbab4567a63a5105155c938c39832ae9c
-DIST kdstatemachineeditor-1.2.3.tar.gz 222134 BLAKE2B 3a6360331f314cfe2e57abb2e909a886f4613dc86bf7f542feabf218e2f623366679a339b5ebc941e015fca35c617152ad9ca7e3cb492d01b48f791a39d38ec1 SHA512 1a2cbe980da5e1634abc842834fbb8883fa8919dc3246436f36bb232a29c57255235df1c041353d3e6d2ee82fc8d688cefa7ecec1a7750aae3fe6f13627d0850
-EBUILD kdstatemachineeditor-1.2.3.ebuild 1082 BLAKE2B 6a61691a29ff0e3496c57af5feaead523cf369bfd9f7357410d6aff1e53016df3d0bb3abfe9c9ca106e6b388fd95b14ea1065829055df7fb66837ccbfbd14fa6 SHA512 e209ececcebb8c3bff176f2c6fa755f45ceff409660677b4612655e46b84719f44950c27fd51c85f1a5db3bd12be170aca9e82a77823af41d72a11cf10fe130a
-EBUILD kdstatemachineeditor-9999.ebuild 1036 BLAKE2B 4f40b1751b7373759f72ccdb609e35f8af04f5f54ad0a0b9565c9f9d6b24a3ee190e277bec2831a49a0b4d83c808711cd86439e52bb0c77526ec33e3d90a1c0b SHA512 885c12113c7bd45ac691055f92e46ccd6db010a82b6d52a35efc9c88e8212d2f9a3e89326f8b34d256489f6ad43f93d16f4ea373c81eec3572ef280aa2f15a38
-MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch b/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
deleted file mode 100644
index 04a9ac9306b6..000000000000
--- a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63ca52af50f94b396182638224fe2c50b4cb7043 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 5 Apr 2018 10:07:01 -0400
-Subject: [PATCH] src/core/model/element.h - fix compile on with XCode (include QPointF)
-
----
- src/core/model/element.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/model/element.h b/src/core/model/element.h
-index ec32cfc..c20ac6f 100644
---- a/src/core/model/element.h
-+++ b/src/core/model/element.h
-@@ -30,6 +30,7 @@
- 
- #include <QObject>
- #include <QMetaType>
-+#include <QPointF>
- 
- QT_BEGIN_NAMESPACE
- class QPainterPath;
\ No newline at end of file
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild
deleted file mode 100644
index 70c5c471dd00..000000000000
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.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=6
-
-inherit cmake-utils kde5-functions
-
-DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
-HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
-else
-	SRC_URI="https://github.com/KDAB/KDStateMachineEditor/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-IUSE="doc test"
-SLOT="0"
-
-RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-
-DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
-	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
-	)
-	media-gfx/graphviz
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
deleted file mode 100644
index 5711b07e35a0..000000000000
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kde5-functions
-
-DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
-HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/KDAB/KDStateMachineEditor.git"
-else
-	SRC_URI="https://github.com/KDAB/KDStateMachineEditor/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-IUSE="doc test"
-SLOT="0"
-
-RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-
-DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
-	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
-	)
-	media-gfx/graphviz
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/kdstatemachineeditor/metadata.xml b/dev-util/kdstatemachineeditor/metadata.xml
deleted file mode 100644
index 141fbb795002..000000000000
--- a/dev-util/kdstatemachineeditor/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>petross404@gmail.com</email>
-		<name>Petros S</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/kelbt-0.15 b/dev-util/kelbt-0.15
new file mode 100644
index 000000000000..6a431eb299f8
--- /dev/null
+++ b/dev-util/kelbt-0.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=A backtracking LR parser by the author of Ragel
+EAPI=4
+HOMEPAGE=http://www.complang.org/kelbt/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.complang.org/kelbt/kelbt-0.15.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_=000a49808d0c95a07cf538168bfcbfb9
diff --git a/dev-util/kelbt/Manifest b/dev-util/kelbt/Manifest
deleted file mode 100644
index 91b0867ba605..000000000000
--- a/dev-util/kelbt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
-DIST kelbt-0.15.tar.gz 232537 BLAKE2B 1e22baa26256fc77f42b499849525d62a2e46f9167c3e0176ade32943db1912ea71aae6bbb8fa28cb04d0a4e39dc7f8786a2926b44d45823b957476bee4f447b SHA512 2f203d3c3a12cc03d96a4d650dde3902d6815a3978af6f78f759b8dfce7971e2799e1325dc043cbc8a5b1fedaf9553a8f1693a159afa4f3601b3bdbc844df647
-EBUILD kelbt-0.15.ebuild 823 BLAKE2B ddaaf92e02276e2e02bf56c6809d41a3c09addec90557997e2870b24600f4104b4c421d9a21fdc77fe2ca2dfb71679f326143ee6665b467f0622be7cbcc0c07c SHA512 7f5b4d2b0c115deee7d925fd7c95a12cdf1efb20776ee79c197d37c35aa8c95c4db0a31d29d9397c9d7b24697e9d0ad85d06b72a07924b1eba7f9e0b9dd585cb
-MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f05..000000000000
--- a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-
----
-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aapl/avlcommon.h  |   12 ++++++------
- aapl/bstcommon.h  |   16 ++++++++--------
- aapl/bubblesort.h |    2 +-
- aapl/mergesort.h  |    2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
---- a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()),
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
-index 888717f..7c53ff3 100644
---- a/aapl/bstcommon.h
-+++ b/aapl/bstcommon.h
-@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
-index bcc2fb6..f0f4ce5 100644
---- a/aapl/bubblesort.h
-+++ b/aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
-diff --git a/aapl/mergesort.h b/aapl/mergesort.h
-index 68b8426..8cefa73 100644
---- a/aapl/mergesort.h
-+++ b/aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
--- 
-1.7.8.6
-
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
deleted file mode 100644
index b724f138a4cf..000000000000
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A backtracking LR parser by the author of Ragel"
-HOMEPAGE="http://www.complang.org/kelbt/"
-SRC_URI="http://www.complang.org/kelbt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
-IUSE="vim-syntax"
-
-RDEPEND=""
-
-src_prepare() {
-	find "${S}" -iname "Makefile*" -exec sed -i \
-		-e '/\$(CXX)/s:CFLAGS:CXXFLAGS:' \
-		{} \;
-
-	epatch "${FILESDIR}"/ragel-6.7+gcc-4.7.patch
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests || die "tests failed"
-}
-
-src_install() {
-	dobin kelbt/kelbt
-	dodoc TODO CREDITS ChangeLog
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ${PN}.vim
-	fi
-}
diff --git a/dev-util/kelbt/metadata.xml b/dev-util/kelbt/metadata.xml
deleted file mode 100644
index 71e948fffb95..000000000000
--- a/dev-util/kelbt/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>lu_zero@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/kup-0.3.4-r1 b/dev-util/kup-0.3.4-r1
new file mode 100644
index 000000000000..067c546e2010
--- /dev/null
+++ b/dev-util/kup-0.3.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=kernel.org uploader tool
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/software/network/kup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/BSD-Resource dev-perl/Config-Simple
+SLOT=0
+SRC_URI=mirror://kernel/software/network/kup/kup-0.3.4.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_=51453d997d5c2d1b1f297d8a482eab5e
diff --git a/dev-util/kup/Manifest b/dev-util/kup/Manifest
deleted file mode 100644
index 5557e6e115f2..000000000000
--- a/dev-util/kup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kup-0.3.4.tar.gz 45996 BLAKE2B 37c4738df71491b3661dcb4f780f1b24a46c28bedca32669625dfd82e309b51ef72304d41ee8c695c99b761679fca9c6eaa1a4fcf00365f92a6c754029139d86 SHA512 fde61de2978f8ba76c4b89a84313aa8b8651cc2610b1512ba1d662fbd0675f269959dd66ef5e1e0ce216ba66e12f5735e58bb36f4ba1a14d90269da1a6fcee46
-EBUILD kup-0.3.4-r1.ebuild 523 BLAKE2B ad4d0211819618d46c3839326730712a965bec3cbb3bd82af004588ec6542749e631aafa647a24ca66eb4fe395e5e5d64f1fabec37e3398e157b9c2260634cdb SHA512 ba60bc80430a22b7419defee12354ed8eae157fe59d97447b5dd074f0805c82db1070a762590431439b15e2a57c18a1e5b07b86e8a667d8a4208ab1e5ab1a3a1
-MISC metadata.xml 224 BLAKE2B a715d46de4f645f6060e89cf1da2da19fadc26cb5899b4bab2d73bb1b951d9bbb1f63b01fe4117e03645ce4a4a65cf61c890d7259f63922657b7e2deb38fc810 SHA512 50fd033081cbd709e8dbd3441700c8301309ccfbf81200ea387916a3e95d88b231748df77c3f6ec62207d02fc268d4841679374e06abee36bf196eeecfac64e5
diff --git a/dev-util/kup/kup-0.3.4-r1.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild
deleted file mode 100644
index 54b8b1a1e82a..000000000000
--- a/dev-util/kup/kup-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="kernel.org uploader tool"
-HOMEPAGE="https://www.kernel.org/pub/software/network/kup"
-SRC_URI="mirror://kernel/software/network/kup/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/BSD-Resource
-	dev-perl/Config-Simple
-"
-
-DOCS=( README )
-
-src_install() {
-	dobin "${PN}" "${PN}-server" gpg-sign-all
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/dev-util/kup/metadata.xml b/dev-util/kup/metadata.xml
deleted file mode 100644
index 0ae91bddd943..000000000000
--- a/dev-util/kup/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>monsieurp@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/kyua-0.13-r1 b/dev-util/kyua-0.13-r1
new file mode 100644
index 000000000000..7f14730a6b0a
--- /dev/null
+++ b/dev-util/kyua-0.13-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=-
+DEPEND=dev-db/sqlite:3 dev-lua/lutok virtual/pkgconfig test? ( dev-libs/atf )
+DESCRIPTION=Testing framework for infrastructure software
+EAPI=6
+HOMEPAGE=https://github.com/jmmv/kyua
+IUSE=test
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-db/sqlite:3 dev-lua/lutok
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz
+_md5_=8f5f5e9111fd5ad10e3dee5ebe52f235
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
deleted file mode 100644
index aa822c298cd4..000000000000
--- a/dev-util/kyua/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r1.ebuild 535 BLAKE2B da2b48adf0b79edb4bb6315879f03cb154062cb01034068293c68667b625c0bb630d1b91e6cef3ef290f8eea35cf3709a7b37d63fd9e2db59f08e1998fe8a016 SHA512 605cd2f43edeaebe995585d46ad77f83ed3d592b80479986b5d22d3535229d4c64aadce6f4d7d77cb055029939aaca55e6685a66490a4a5f4e163553d65c2937
-MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r1.ebuild b/dev-util/kyua/kyua-0.13-r1.ebuild
deleted file mode 100644
index 54f077c90561..000000000000
--- a/dev-util/kyua/kyua-0.13-r1.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
-
-DESCRIPTION="Testing framework for infrastructure software"
-HOMEPAGE="https://github.com/jmmv/kyua"
-SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-
-# Tests fail
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-lua/lutok
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/atf )
-"
diff --git a/dev-util/kyua/metadata.xml b/dev-util/kyua/metadata.xml
deleted file mode 100644
index de09ffd8b089..000000000000
--- a/dev-util/kyua/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>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/lcov-1.11 b/dev-util/lcov-1.11
new file mode 100644
index 000000000000..f6536586edb5
--- /dev/null
+++ b/dev-util/lcov-1.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
+EAPI=4
+HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
+SLOT=0
+SRC_URI=mirror://sourceforge/ltp/lcov-1.11.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_=a05a7951589fd1fed85988cac3a39e10
diff --git a/dev-util/lcov-1.13-r1 b/dev-util/lcov-1.13-r1
new file mode 100644
index 000000000000..4fab7c0fb559
--- /dev/null
+++ b/dev-util/lcov-1.13-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
+EAPI=6
+HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/GD[png]
+SLOT=0
+SRC_URI=mirror://sourceforge/ltp/lcov-1.13.tar.gz
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=350ea8eafed48a952481670d5f6671a2
diff --git a/dev-util/lcov-1.9-r1 b/dev-util/lcov-1.9-r1
new file mode 100644
index 000000000000..83e34b21d8bf
--- /dev/null
+++ b/dev-util/lcov-1.9-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
+EAPI=4
+HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
+KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
+SLOT=0
+SRC_URI=mirror://sourceforge/ltp/lcov-1.9.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_=442b8898adb2b7c8d5f56ae1c934b462
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
deleted file mode 100644
index 778a5929fb0a..000000000000
--- a/dev-util/lcov/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307
-DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd22a6ee52035115d84e7f05d7593168ffee9c5925937a509e3be64cebaad6e4694004ee2808817d6df19da SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe
-DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
-DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
-EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb
-EBUILD lcov-1.13-r1.ebuild 683 BLAKE2B 1f30b7d233031078f27b25789c2e6cbd9ec72339ed45e90d9082cf014fc4c8f002148db98fe8078b09201f597f2d11e18bb1cc9220a9d75a43e09e85128ad54e SHA512 6d4ab75878d5e603fa615abd4160c92eb8b686a48ad7f6a64bc85d7009adf5188dd83b564eb187c73e542e6af03c5f5bff58f143acf7ac0c383abcfe27c856a4
-EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
-MISC metadata.xml 440 BLAKE2B ba4141809aea82e4fdb57c1c216dcef2c12f1edc3c4ee2405552a74a24d8c53cc22febc8994fe824c41a17f88c7f22dcd383b6a9f59c9f51b81fd83b0f30f4f3 SHA512 8c0066aad63765a2fc18d80de9028aba7e303619fea5efa41a8db1138b3b87434c84b4cadbb0f2961aef42c9262d3265bcee1786f38184d2daa2f369f99377ce
diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
deleted file mode 100644
index 1b9d6ac0ff21..000000000000
--- a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream to work with gcc-4.7
-
-Index: bin/geninfo
-===================================================================
-RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -p -r1.95 -r1.96
---- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
-+++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
-@@ -61,6 +61,7 @@ if( $^O eq "msys" )
- our $gcov_tool		= "gcov";
- our $tool_name		= basename($0);
- 
-+our $GCOV_VERSION_4_7_0	= 0x40700;
- our $GCOV_VERSION_3_4_0	= 0x30400;
- our $GCOV_VERSION_3_3_0	= 0x30300;
- our $GCNO_FUNCTION_TAG	= 0x01000000;
-@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
- 	graph_expect("function record");
- 	# Skip ident and checksum
- 	graph_skip($handle, 8, "function ident and checksum") or return undef;
-+	if ($gcov_version >= $GCOV_VERSION_4_7_0) {
-+		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
-+		# toolchains.
-+		graph_skip($handle, 4, "function extra checksum");
-+	}
- 	# Read function name
- 	graph_expect("function name");
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
deleted file mode 100644
index 83edb27798aa..000000000000
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5
-	dev-perl/GD[png]"
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}" install
-}
diff --git a/dev-util/lcov/lcov-1.13-r1.ebuild b/dev-util/lcov/lcov-1.13-r1.ebuild
deleted file mode 100644
index ee07971279d3..000000000000
--- a/dev-util/lcov/lcov-1.13-r1.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
-
-inherit prefix
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-SRC_URI="mirror://sourceforge/ltp/${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-linux ~x64-macos"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/GD[png]"
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
-}
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
deleted file mode 100644
index b1a3a8e89060..000000000000
--- a/dev-util/lcov/lcov-1.9-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5
-	dev-perl/GD[png]"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${ED}" install
-}
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
deleted file mode 100644
index 3073388aefc6..000000000000
--- a/dev-util/lcov/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>marbacz@gmail.com</email>
-		<name>Marcin Baczyński</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ltp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/leaktracer-2.4-r3 b/dev-util/leaktracer-2.4-r3
new file mode 100644
index 000000000000..94134068fc66
--- /dev/null
+++ b/dev-util/leaktracer-2.4-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=dev-lang/perl sys-devel/gdb
+DESCRIPTION=trace and analyze memory leaks in C++ programs
+EAPI=6
+HOMEPAGE=http://www.andreasen.org/LeakTracer/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=dev-lang/perl sys-devel/gdb
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gentoo/leaktracer-2.4-gentoo_p2.tbz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ea1e2f1463df9bcb931aa1dd42d80259
diff --git a/dev-util/leaktracer/Manifest b/dev-util/leaktracer/Manifest
deleted file mode 100644
index a6206b5fdbce..000000000000
--- a/dev-util/leaktracer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST leaktracer-2.4-gentoo_p2.tbz2 11957 BLAKE2B 0af20e7a43c88a16027e859779924ef3fc86af5fb8324a96721f190db4ef59d78681ea4b91ef9843ed467541c9ca3a9b1618339174fdc1901a13b5221acc5479 SHA512 12f348564933c8cf372208f846bb21b175f041e7687811e9c6ce8062e7f285b9d2395e7853a20df11d9b0d5b8fff89efc76ccbac9f8b7c0bc4fd4ea25d476718
-EBUILD leaktracer-2.4-r3.ebuild 1386 BLAKE2B fee3816896db6341384016dd300e66d4c3a09368d89ce4b1e1480ca62311176223a18824b164034ff65d8efe1fa57b6d22e5628ddbd0f56f48b3d0ae51318785 SHA512 63bd2edad6fbdd6c710c0bac526b386a787c72aec151f6470ea11081f807c771d4bd797c3ecfcf71493380e35893a9bb279f6d13473a9a02fc1d6a54889df992
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild b/dev-util/leaktracer/leaktracer-2.4-r3.ebuild
deleted file mode 100644
index 9312217fb988..000000000000
--- a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-# Upstream-package has no version in it's name.
-# We therefore repackage it directly, together with the patches.
-PATCH_LEVEL="2"
-
-DESCRIPTION="trace and analyze memory leaks in C++ programs"
-HOMEPAGE="http://www.andreasen.org/LeakTracer/"
-SRC_URI="mirror://gentoo/${P}-gentoo_p${PATCH_LEVEL}.tbz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl
-	sys-devel/gdb"
-RDEPEND="${DEPEND}"
-
-# leaktracer is being realized using LD_PRELOAD and segfaults
-# when being run in the sandbox and the library is _not_ in
-# /usr/$(get_libdir) which is not possible before installation
-RESTRICT="test"
-
-src_prepare() {
-	eapply -p1 "${WORKDIR}/patches/01_all_gcc-cflags.patch"
-	eapply -p0 "${WORKDIR}/patches/05_all_libdir.patch"
-	eapply -p1 "${WORKDIR}/patches/15_all_printf.patch"
-
-	sed -i \
-		-e "s|%LIBDIR%|$(get_libdir)|" \
-		LeakCheck || die "sed for setting lib path failed"
-
-	eapply_user
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX)
-}
-
-src_install() {
-	dobin LeakCheck leak-analyze
-	dolib.so LeakTracer.so
-	dodoc README test.cc
-	docinto html
-	dodoc README.html
-}
-
-pkg_postinst() {
-	elog "To use LeakTracer, run LeakCheck my_prog and then leak-analyze my_prog leak.out"
-	elog "Please refer to README file for more info."
-}
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
deleted file mode 100644
index 41cd682e0ecf..000000000000
--- a/dev-util/leaktracer/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>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/linklint-2.3.5 b/dev-util/linklint-2.3.5
new file mode 100644
index 000000000000..d5fcad771a62
--- /dev/null
+++ b/dev-util/linklint-2.3.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A Perl program that checks links on web sites
+EAPI=5
+HOMEPAGE=http://www.linklint.org/
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://www.linklint.org/download/linklint-2.3.5.tar.gz
+_md5_=3c53d0ee5dd6d492bef9619273105405
diff --git a/dev-util/linklint/Manifest b/dev-util/linklint/Manifest
deleted file mode 100644
index 43fe5f9dc38d..000000000000
--- a/dev-util/linklint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linklint-2.3.5.tar.gz 113256 BLAKE2B d4213c6649d7ec49f1ac754576113377208f5108042d46b23e21036689c005bd47f803c05016d9004900611a3059d505c95a52b9a7ab2d0a82ffe3514cea8578 SHA512 723aa5be27c563755ef488bb586eabcd8ef92569f5391be988b19317da6fc93983ad1231d650a07728face0af01c80ada4b1867de81be9cd27952a762dc41e73
-EBUILD linklint-2.3.5.ebuild 522 BLAKE2B c7a3cd76702fedbc896942e50197267f16dab24ada0c269b2b893a980f824bf9b048dbfd93f8f53fe0074b923508e7c7e05e6b9dadac2680c2b83a737231991e SHA512 f2783bdaccb54790ebee97c3caa4a2fa71600a5f0984f75d8b1b394e368799d412b158850ce0b6dcc82eb2ebb74be8d51050f48c7ef50495ac11e677bbc70ee1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/linklint/linklint-2.3.5.ebuild b/dev-util/linklint/linklint-2.3.5.ebuild
deleted file mode 100644
index b2b7b1a9e14d..000000000000
--- a/dev-util/linklint/linklint-2.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A Perl program that checks links on web sites"
-HOMEPAGE="http://www.linklint.org/"
-SRC_URI="http://www.linklint.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-src_install() {
-	newbin ${P} ${PN}
-	dodoc INSTALL.unix INSTALL.windows READ_ME.txt CHANGES.txt
-	dohtml -r doc/*
-}
diff --git a/dev-util/linklint/metadata.xml b/dev-util/linklint/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/linklint/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/dev-util/lldb-5.0.1 b/dev-util/lldb-5.0.1
new file mode 100644
index 000000000000..4a678d530c22
--- /dev/null
+++ b/dev-util/lldb-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.1[xml] ~sys-devel/llvm-5.0.1 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-5.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.1[xml] ~sys-devel/llvm-5.0.1 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://releases.llvm.org/5.0.1/lldb-5.0.1.src.tar.xz test? ( https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=699673acd534d7f9e1e8dd3e9efaae7e
diff --git a/dev-util/lldb-5.0.2 b/dev-util/lldb-5.0.2
new file mode 100644
index 000000000000..af8f314ec383
--- /dev/null
+++ b/dev-util/lldb-5.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.2[xml] ~sys-devel/llvm-5.0.2 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-5.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.2[xml] ~sys-devel/llvm-5.0.2 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://releases.llvm.org/5.0.2/lldb-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=699673acd534d7f9e1e8dd3e9efaae7e
diff --git a/dev-util/lldb-6.0.0 b/dev-util/lldb-6.0.0
new file mode 100644
index 000000000000..28a3b4032f36
--- /dev/null
+++ b/dev-util/lldb-6.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.0[xml] ~sys-devel/llvm-6.0.0 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-6.0.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.0[xml] ~sys-devel/llvm-6.0.0 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://releases.llvm.org/6.0.0/lldb-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=074f1403711868ef371b3e96a814cc11
diff --git a/dev-util/lldb-6.0.1 b/dev-util/lldb-6.0.1
new file mode 100644
index 000000000000..77660340832a
--- /dev/null
+++ b/dev-util/lldb-6.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.1[xml] ~sys-devel/llvm-6.0.1 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-6.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.1[xml] ~sys-devel/llvm-6.0.1 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://releases.llvm.org/6.0.1/lldb-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=074f1403711868ef371b3e96a814cc11
diff --git a/dev-util/lldb-6.0.9999 b/dev-util/lldb-6.0.9999
new file mode 100644
index 000000000000..e790a71f3eb5
--- /dev/null
+++ b/dev-util/lldb-6.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.9999[xml] ~sys-devel/llvm-6.0.9999 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-6.0.9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-6.0.9999[xml] ~sys-devel/llvm-6.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=234f31fc8c8f640eff7647e3add9e6ff
diff --git a/dev-util/lldb-9999 b/dev-util/lldb-9999
new file mode 100644
index 000000000000..609b48888576
--- /dev/null
+++ b/dev-util/lldb-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-9999[xml] ~sys-devel/llvm-9999 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-9999[xml] ~sys-devel/llvm-9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0daadd40c2f0938b938240736f4c5bb6
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
deleted file mode 100644
index 73c3ec904b39..000000000000
--- a/dev-util/lldb/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
-DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
-DIST lldb-6.0.0.src.tar.xz 19317956 BLAKE2B e9ebdd61c5116d3e6be3542674b1e3eebba19b4a2107da153565fd95ed24a97248fb80ce5220b4dce2b6e3ac5b61fcdb594e34d6af25e7737575c3f31cd45fbe SHA512 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
-DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
-DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
-DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
-DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-EBUILD lldb-5.0.1.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
-EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
-EBUILD lldb-6.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
-EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
-EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f
-EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
-MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.1.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild
deleted file mode 100644
index e3be91f0a816..000000000000
--- a/dev-util/lldb/lldb-5.0.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-single-r1 toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-5.0.2.ebuild b/dev-util/lldb/lldb-5.0.2.ebuild
deleted file mode 100644
index e3be91f0a816..000000000000
--- a/dev-util/lldb/lldb-5.0.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-single-r1 toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-6.0.0.ebuild b/dev-util/lldb/lldb-6.0.0.ebuild
deleted file mode 100644
index 466d0ecf42e1..000000000000
--- a/dev-util/lldb/lldb-6.0.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-6.0.1.ebuild b/dev-util/lldb/lldb-6.0.1.ebuild
deleted file mode 100644
index 466d0ecf42e1..000000000000
--- a/dev-util/lldb/lldb-6.0.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild
deleted file mode 100644
index 3713e043cb9f..000000000000
--- a/dev-util/lldb/lldb-6.0.9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
-EGIT_BRANCH="release_60"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
-	fi
-	git-r3_checkout
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
deleted file mode 100644
index 983a4d03efe7..000000000000
--- a/dev-util/lldb/lldb-9999.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
-	fi
-	git-r3_checkout
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/metadata.xml b/dev-util/lldb/metadata.xml
deleted file mode 100644
index 89c4bdb96049..000000000000
--- a/dev-util/lldb/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>llvm@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/lockrun-20120508-r1 b/dev-util/lockrun-20120508-r1
new file mode 100644
index 000000000000..08e9e559027a
--- /dev/null
+++ b/dev-util/lockrun-20120508-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Lockrun - runs cronjobs with overrun protection
+EAPI=6
+HOMEPAGE=http://www.unixwiz.net/tools/lockrun.html
+KEYWORDS=amd64 ~hppa x86
+LICENSE=public-domain
+SLOT=0
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4ee4a62f54540d576850086b13c2d1f1
diff --git a/dev-util/lockrun/Manifest b/dev-util/lockrun/Manifest
deleted file mode 100644
index 17bdaccb5d13..000000000000
--- a/dev-util/lockrun/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX lockrun.c-20120508 7025 BLAKE2B fe577a1e360c0595a2448ed03f7af1a049327e21b6f4caba6d69659e557a527c16f07e80b2591d4dfa1633e1a77a78bb1cd9f231ca4fec3ef261cbadf284c4ca SHA512 f800e96d41d11c9b6f7e28c5bd1f2b59b824ccba5f093574d8f4df8e737f2df47c3f8e89a08eee81b9c3fb46377e62be9c5ddf83df253fd0ab3a25a85a8bee0b
-EBUILD lockrun-20120508-r1.ebuild 599 BLAKE2B 8c25e4eeb05110a23a76132c681a48e2003a4623343050d8f2b681e42f3b2b656ad332115ea2d25c0c72fb5909007a0993cc9b3260e6cb2496d3d19f5890242b SHA512 45706c14e51631261c1c9ea22eb626c847eea47686f66ddc9b5d463607f5bfe073eca56e2ab5d6668367cc7c91c2e5730d2308515a62f109bdc6ec5db5118d0c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/lockrun/files/lockrun.c-20120508 b/dev-util/lockrun/files/lockrun.c-20120508
deleted file mode 100644
index 51da6c71fa4a..000000000000
--- a/dev-util/lockrun/files/lockrun.c-20120508
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * $Id: //websites/unixwiz/unixwiz.net/webroot/tools/lockrun.c#5 $
- *
- * written by :	Stephen J. Friedl
- *              Software Consultant
- *              steve@unixwiz.net
- *		http://www.unixwiz.net/tools/
- *
- *	===================================================================
- *	======== This software is in the public domain, and can be ========
- *	======== used by anybody for any purpose                   ========
- *	===================================================================
- *
- *	Lockrun: This program is used to launch a program out with a lockout
- *	so that only one can run at a time. It's mainly intended for use out
- *	of cron so that our five-minute running jobs which run long don't get
- *	walked on. We find this a *lot* with Cacti jobs which just get hung
- *	up: it's better to miss a polling period than to stack them up and
- *	slow each other down.
- *
- *	So we use a file which is used for locking: this program attempts to
- *	lock the file, and if the lock exists, we have to either exit with
- *	an error, or wait for it to release.
- *
- *		lockrun --lockfile=FILE -- my command here
- *
- * COMMAND LINE
- * ------------
- *
- * --lockfile=F
- *
- *	Specify the name of a file which is used for locking. The file is
- *	created if necessary (with mode 0666), and no I/O of any kind is
- *	done. The file is never removed.
- *
- * --maxtime=N
- *
- *	The script being controlled should run for no more than <N> seconds,
- *	and if it's beyond that time, we should report it to the standard
- *	error (which probably gets routed to the user via cron's email).
- *
- * --wait
- *
- *	When a lock is hit, we normally exit with error, but --wait causes
- *	it to loop until the lock is released.
- *
- * --verbose
- *
- *	Show a bit more runtime debugging.
- *
- * --quiet
- *
- *	Don't show "run is locked" error if things are busy; keeps cron from
- *	overwhelming you with messages if lockrun overlap is not uncommon.
- *
- * --
- *
- *	Mark the end of the options: the command to run follows.
- *	
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/file.h>
-
-#ifndef __GNUC__
-# define __attribute__(x)	/* nothing */
-#endif
-
-
-#define STRMATCH(a,b)		(strcmp((a),(b)) == 0)
-
-#define UNUSED_PARAMETER(v)	((void)(v))
-
-#define	TRUE	1
-#define	FALSE	0
-
-static const char	*lockfile = 0;
-static int		wait_for_lock = FALSE;
-static mode_t		openmode = 0666;
-static int		sleeptime = 10;		/* seconds */
-static int		Verbose = FALSE;
-static int		Maxtime  = 0;
-static int		Quiet = FALSE;
-
-static char *getarg(char *opt, char ***pargv);
-
-static void die(const char *format, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
-
-#ifdef __sun
-# define WAIT_AND_LOCK(fd) lockf(fd, F_TLOCK,0)
-#else
-# define WAIT_AND_LOCK(fd) flock(fd, LOCK_EX | LOCK_NB)
-#endif
-
-int main(int argc, char **argv)
-{
-	char	*Argv0 = *argv;
-	int	rc;
-	int	lfd;
-	pid_t	childpid;
-	time_t	starttime;
-
-	UNUSED_PARAMETER(argc);
-
-	time(&starttime);
-
-	for ( argv++ ; *argv ; argv++ )
-	{
-		char    *arg = *argv;
-		char	*opt = strchr(arg, '=');
-
-		/* the -- token marks the end of the list */
-
-		if ( strcmp(*argv, "--") == 0 )
-		{
-			argv++;
-			break;
-		}
-
-		if (opt) *opt++ = '\0'; /* pick off the =VALUE part */
-
-		if ( STRMATCH(arg, "-L") || STRMATCH(arg, "--lockfile"))
-		{
-			lockfile = getarg(opt, &argv);
-		}
-
-		else if ( STRMATCH(arg, "-W") || STRMATCH(arg, "--wait"))
-		{
-			wait_for_lock = TRUE;
-		}
-
-		else if ( STRMATCH(arg, "-S") || STRMATCH(arg, "--sleep"))
-		{
-			sleeptime = atoi(getarg(opt, &argv));
-		}
-
-		else if ( STRMATCH(arg, "-T") || STRMATCH(arg, "--maxtime"))
-		{
-			Maxtime = atoi(getarg(opt, &argv));
-		}
-
-		else if ( STRMATCH(arg, "-V") || STRMATCH(arg, "--verbose"))
-		{
-			Verbose++;
-		}
-
-		else if ( STRMATCH(arg, "-q") || STRMATCH(arg, "--quiet"))
-		{
-			Quiet = TRUE;
-		}
-
-		else
-		{
-			die("ERROR: \"%s\" is an invalid cmdline param", arg);
-		}
-	}
-
-	/*----------------------------------------------------------------
-	 * SANITY CHECKING
-	 *
-	 * Make sure that we have all the parameters we require
-	 */
-	if (*argv == 0)
-		die("ERROR: missing command to %s (must follow \"--\" marker) ", Argv0);
-
-	if (lockfile == 0)
-		die("ERROR: missing --lockfile=F parameter");
-
-	/*----------------------------------------------------------------
-	 * Open or create the lockfile, then try to acquire the lock. If
-	 * the lock is acquired immediately (==0), then we're done, but
-	 * if the lock is not available, we have to wait for it.
-	 *
-	 * We can either loop trying for the lock (for --wait), or exit
-	 * with error.
-	 */
-
-	if ( (lfd = open(lockfile, O_RDWR|O_CREAT, openmode)) < 0)
-		die("ERROR: cannot open(%s) [err=%s]", lockfile, strerror(errno));
-
-	while ( WAIT_AND_LOCK(lfd) != 0 )
-	{
-		if ( ! wait_for_lock )
-		{
-			if ( Quiet)
-				exit(EXIT_SUCCESS);
-			else
-				die("ERROR: cannot launch %s - run is locked", argv[0]);
-		}
-
-		/* waiting */
-		if ( Verbose ) printf("(locked: sleeping %d secs)\n", sleeptime);
-
-		sleep(sleeptime);
-	}
-
-	fflush(stdout);
-
-	/* run the child */
-
-
-	if ( (childpid = fork()) == 0 )
-	{
-		close(lfd);		// don't need the lock file
-
-		execvp(argv[0], argv);
-	}
-	else if ( childpid > 0 )
-	{
-		time_t endtime;
-		pid_t  pid;
-
-		if ( Verbose )
-		    printf("Waiting for process %ld\n", (long) childpid);
-
-		pid = waitpid(childpid, &rc, 0);
-
-		time(&endtime);
-
-		endtime -= starttime;
-
-		if ( Verbose || (Maxtime > 0  &&  endtime > Maxtime) )
-		    printf("pid %d exited with status %d (time=%ld sec)\n", pid, rc, endtime);
-	}
-	else
-	{
-		die("ERROR: cannot fork [%s]", strerror(errno));
-	}
-
-	exit(rc);
-}
-
-
-/*! \fn static char *getarg(char *opt, char ***pargv)
- *  \brief A function to parse calling parameters
- *
- *	This is a helper for the main arg-processing loop: we work with
- *	options which are either of the form "-X=FOO" or "-X FOO"; we
- *	want an easy way to handle either one.
- *
- *	The idea is that if the parameter has an = sign, we use the rest
- *	of that same argv[X] string, otherwise we have to get the *next*
- *	argv[X] string. But it's an error if an option-requiring param
- *	is at the end of the list with no argument to follow.
- *
- *	The option name could be of the form "-C" or "--conf", but we
- *	grab it from the existing argv[] so we can report it well.
- *
- * \return character pointer to the argument
- *
- */
-static char *getarg(char *opt, char ***pargv)
-{
-	const char *const optname = **pargv;
-
-	/* option already set? */
-	if (opt) return opt;
-
-	/* advance to next argv[] and try that one */
-	if ((opt = *++(*pargv)) == 0)
-		die("ERROR: option %s requires a parameter", optname);
-
-	return opt;
-}
-
-/*
- * die()
- *
- *	Given a printf-style argument list, format it to the standard error,
- *	append a newline, then exit with error status.
- */
-
-static void die(const char *format, ...)
-{
-va_list	args;
-
-	va_start(args, format);
-	vfprintf(stderr, format, args);
-	putc('\n', stderr);
-	va_end(args);
-
-	exit(EXIT_FAILURE);
-}
diff --git a/dev-util/lockrun/lockrun-20120508-r1.ebuild b/dev-util/lockrun/lockrun-20120508-r1.ebuild
deleted file mode 100644
index f062acca8481..000000000000
--- a/dev-util/lockrun/lockrun-20120508-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lockrun - runs cronjobs with overrun protection"
-HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${FILESDIR}"/${PN}.c-${PV} "${S}"/${PN}.c || die
-	cp -v "${FILESDIR}"/${PN}.c-${PV} "${S}"/README || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) ${PN}
-	sed -i README -e '60q;s|^ \*||g' || die
-}
-
-src_install () {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/dev-util/lockrun/metadata.xml b/dev-util/lockrun/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/lockrun/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/dev-util/lsuio-0.2.0 b/dev-util/lsuio-0.2.0
new file mode 100644
index 000000000000..2a21d7697a0a
--- /dev/null
+++ b/dev-util/lsuio-0.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=list available userspace I/O (UIO) devices
+EAPI=0
+HOMEPAGE=http://www.osadl.org/UIO.uio.0.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.osadl.org/projects/downloads/UIO/user/lsuio-0.2.0.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_=541740ee952bc573e5b879f2ebc608b7
diff --git a/dev-util/lsuio/Manifest b/dev-util/lsuio/Manifest
deleted file mode 100644
index cb4ee62cd80b..000000000000
--- a/dev-util/lsuio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lsuio-0.2.0-build.patch 259 BLAKE2B 8a7614e37eddc318406434379bfe555dc7beefc33f7256d32e0f73fa16367dc1c62bf6576e923e2915919f8bd83827a8c6ce45e0cd85cde44ac9126142294a1d SHA512 6ef2f67dea8cecb0ee94e2b24e7b68c9b769db0196c0d31f24d2031f2f6a994748a5b0bbbd43da8552664d1379d32bee30f9406d63ba9ee79f65edfbc648f199
-DIST lsuio-0.2.0.tar.gz 202584 BLAKE2B 2d1c889c36c45d516e132a4b5e0f7e14a5b242cc8be7ee6df61c61805792296a43b82e8961d78f42aac80f51e0264c095563cde4deece4ce93c019ed88106d31 SHA512 55567b9028a22ae3058439135117d1537c972e875d864a1d7f6611f815461e17ecd6d953cc6abc129208241c1ba7fbeb9a2a62b5b9102a8429ccf270a93741f3
-EBUILD lsuio-0.2.0.ebuild 528 BLAKE2B 1c7a7644c8ceec85f65c90342bd9c8608f6b084f5041b2813ea33f28129be105f2daa45807725ef44c977f393532cdbf199a116e8fe1c33d487feb1fd3dd1a48 SHA512 a0e3606cf44d80dc68ab8af801ee35eea329bf907642588392bce842d01cfc70cdfb5c08466792d0623eac75f5e9ac03d0835bccef3f272144202a84642d2a9c
-MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/lsuio/files/lsuio-0.2.0-build.patch b/dev-util/lsuio/files/lsuio-0.2.0-build.patch
deleted file mode 100644
index cef204c786f5..000000000000
--- a/dev-util/lsuio/files/lsuio-0.2.0-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- uio_helper.h
-+++ uio_helper.h
-@@ -68,5 +68,6 @@
- void uio_free_dev_attrs(struct uio_info_t* info);
- void uio_free_info(struct uio_info_t* info);
- struct uio_info_t* uio_find_devices(int filter_num);
-+void uio_mmap_test(struct uio_info_t* info);
- 
- #endif
diff --git a/dev-util/lsuio/lsuio-0.2.0.ebuild b/dev-util/lsuio/lsuio-0.2.0.ebuild
deleted file mode 100644
index ea5a97bf0fe2..000000000000
--- a/dev-util/lsuio/lsuio-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="list available userspace I/O (UIO) devices"
-HOMEPAGE="http://www.osadl.org/UIO.uio.0.html"
-SRC_URI="http://www.osadl.org/projects/downloads/UIO/user/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/dev-util/lsuio/metadata.xml b/dev-util/lsuio/metadata.xml
deleted file mode 100644
index b4a27e94fc24..000000000000
--- a/dev-util/lsuio/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/ltrace-0.7.2 b/dev-util/ltrace-0.7.2
new file mode 100644
index 000000000000..eed9d56df441
--- /dev/null
+++ b/dev-util/ltrace-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind ) test? ( dev-util/dejagnu ) >=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=trace library calls made at runtime
+EAPI=5
+HOMEPAGE=https://www.ltrace.org/
+IUSE=debug selinux test unwind
+KEYWORDS=-alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/3848/ltrace-0.7.2.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_=1494b279bed7c6f4ea33d237a3f557b6
diff --git a/dev-util/ltrace-0.7.3 b/dev-util/ltrace-0.7.3
new file mode 100644
index 000000000000..720bb6ce320c
--- /dev/null
+++ b/dev-util/ltrace-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind ) test? ( dev-util/dejagnu ) >=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=trace library calls made at runtime
+EAPI=5
+HOMEPAGE=https://www.ltrace.org/
+IUSE=debug selinux test unwind
+KEYWORDS=-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/file/3947/ltrace-0.7.3.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_=10aa72ee384b3305ed1b479a497cc44f
diff --git a/dev-util/ltrace-0.7.3_p4 b/dev-util/ltrace-0.7.3_p4
new file mode 100644
index 000000000000..c7dd71785ba9
--- /dev/null
+++ b/dev-util/ltrace-0.7.3_p4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind ) sys-libs/binutils-libs test? ( dev-util/dejagnu ) >=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=trace library calls made at runtime
+EAPI=5
+HOMEPAGE=https://www.ltrace.org/
+IUSE=debug selinux test unwind
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2 mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-4.debian.tar.gz
+_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_=7b2d82944d5e53cd7c35bfda37c4d362
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
deleted file mode 100644
index 5f7b6dd96edc..000000000000
--- a/dev-util/ltrace/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX ltrace-0.7.3-alpha-protos.patch 849 BLAKE2B 694ebae21ebb658d87455d01cb82376d2a1f4854961d1bd04c351955259f1ae99cf436a8f885b9e1aaad8e842b021dc5818ad5f37667276589d9651d04a4deeb SHA512 014660bf48b7e5bf43b17fd3f82fb8a01f3855c16dc2fed76f6a9e4f348ec28beca0e7429ee10dc3aba3bd0bba143d21ee5b67ccc7057cb006ef694a6d38aa72
-AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
-AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
-DIST ltrace-0.7.2.tar.bz2 483806 BLAKE2B 4d635385c1a2ab24ee52c205fd1dfcdab8addc1121cb0d1adb5c4091d87bfdf3687e930246481fb4ff6de0fd787527b1b9dd66054f18619c4878eed6048da8a4 SHA512 ec86f08d0c18579ff05f8be23ef3c7309c76c647a0d952fbc627e8095b6ce52b2552e152dc0ec9c6098039c2d50d549a1d218f56a13f75f28bc7b03eb39e94e0
-DIST ltrace-0.7.3.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
-DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.2.ebuild 870 BLAKE2B d54ab07bc77f0123e1c45045cfdac7211871299520eaa945083febb3e4efddab68450257beb0882467ff3b488c588d03f371bc775575d9270edc20d529765d3d SHA512 4ee1d65ecfd2b2d69a06c4f09e32715b6c4ffd242834bcc683053de28932d6fc94a8a6b176890bac2c5013478c3db29405680b05e51bda9b919f71083e1337a1
-EBUILD ltrace-0.7.3.ebuild 878 BLAKE2B 63d0fc0e772670082d1ee5b36922db061d3bcd13c1d94093c1a520992a13d28fe19d06f88d3774f36075a9a39d6a7d907d7366ed7a0d3bd54847a8b921756fbd SHA512 675739c0dd96d879fe87d66b7711217e7d4070a0d6b5fc2bb3f0b4667e1e27ad521a373bb0030b6bf62344da4db3af0f674a3a5fdd3f1542cc34c5e486d16ad3
-EBUILD ltrace-0.7.3_p4.ebuild 1245 BLAKE2B f5ce1cc28ebc803cc4813899c3c253fe994d75471fa7a002e566a5ac90c8dfea7f3916bba0d360c10111836c79f703fe469f7cc28192dec43c8e47305d5a13e7 SHA512 69a3af00f9c91061ee92b821013706b323fdda715002f3a8b1975d821ac4c5583c3c632293b9a286f58d2ca3e99d4846efffd0f4a31496f8865c2af5ca980db3
-MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
deleted file mode 100644
index 659952bdf148..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build failure on alpha:
-  plt.c:32:12: error: dereferencing pointer to incomplete type ‘struct library_symbol’
-    return sym->enter_addr;
-            ^
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c     2012-11-10 13:43:55.000000000 +0100
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200
-@@ -23,0 +24 @@
-+#include "library.h"
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c   2016-06-27 23:30:08.000000000 +0200
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c       2016-06-27 23:25:20.000000000 +0200
-@@ -29,0 +30 @@
-+#include "backend.h"
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch
deleted file mode 100644
index 4fb1c4eba734..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix build fauilure on ia64.
-
-Build fails due to bitrot: some definitions
-moved off from <sys/pthrace.h> to <asm/ptrace.h>
-(similar to other arches).
-
-fetch.c:39:26: error: field 'regs' has incomplete type
-  struct pt_all_user_regs regs;
-                          ^~~~
-fetch.c:209:25: warning: 'struct ia64_fpreg' declared inside parameter list will not be visible outside of this definition or declaration
- fpreg_to_double (struct ia64_fpreg *fp) {
-                         ^~~~~~~~~~
-fetch.c: In function 'fpreg_to_double':
-fetch.c:211:45: error: dereferencing pointer to incomplete type 'struct ia64_fpreg'
-  asm ("ldf.fill %0=%1" : "=f"(result) : "m"(*fp));
-                                             ^~~
-
-diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c
-index 54dc5b8..b3b9a9a 100644
---- a/sysdeps/linux-gnu/ia64/fetch.c
-+++ b/sysdeps/linux-gnu/ia64/fetch.c
-@@ -134,9 +134,4 @@ allocate_reg(struct fetch_context *ctx, struct Process *proc,
- 		return 0;
- 
--	/* This would normally be brought over from asm/ptrace.h, but
--	 * when we do, we get namespace conflicts between asm/fpu.h
--	 * and libunwind.  */
--	enum { PT_AUR_BSP = 17 };
--
- 	union cfm_t cfm = { .value = ctx->regs.cfm };
- 	unsigned long *bsp = (unsigned long *)ctx->regs.ar[PT_AUR_BSP];
-diff --git a/sysdeps/linux-gnu/ia64/ptrace.h b/sysdeps/linux-gnu/ia64/ptrace.h
-index ef63b4f..8b131f1 100644
---- a/sysdeps/linux-gnu/ia64/ptrace.h
-+++ b/sysdeps/linux-gnu/ia64/ptrace.h
-@@ -20,2 +20,3 @@
- 
- #include <sys/ptrace.h>
-+#include <asm/ptrace.h>
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
deleted file mode 100644
index caafff4b2637..000000000000
--- a/dev-util/ltrace/files/ltrace-0.7.3-test-protos.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://bugs.gentoo.org/421649
-
-For some reason testsuite does not handle warnings well:
-  /tmp/lt-cZI2cFo0z7.c:2:24: warning: inplicit function declaration «puts» [-Wimplicit-function-declaration]
-       void func2(void) { puts("func2"); }
-                          ^
-and abandons problematic tests:
-  Testcase compile failed, so all tests in this file will automatically fail.
-diff --git a/testsuite/ltrace.main/filters.exp b/testsuite/ltrace.main/filters.exp
-index 988346f..f7f4140 100644
---- a/testsuite/ltrace.main/filters.exp
-+++ b/testsuite/ltrace.main/filters.exp
-@@ -24,2 +24,3 @@ set libfilt1 [ltraceCompile libfilt1.so [ltraceSource c {
- set libfilt2 [ltraceCompile libfilt2.so [ltraceSource c {
-+    #include <stdio.h>
-     void func2(void) { puts("func2"); }
-diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
-index ff24a38..9569dbe 100644
---- a/testsuite/ltrace.main/parameters.c
-+++ b/testsuite/ltrace.main/parameters.c
-@@ -19,2 +19,3 @@ void func_strfixed(char*);
- void func_ppp(int***);
-+void func_string(char*);
- void func_stringp(char**);
-diff --git a/testsuite/ltrace.main/signals.c b/testsuite/ltrace.main/signals.c
-index a02e795..fda4ab9 100644
---- a/testsuite/ltrace.main/signals.c
-+++ b/testsuite/ltrace.main/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/time-record.c b/testsuite/ltrace.minor/time-record.c
-index a66b838..7d5e5e3 100644
---- a/testsuite/ltrace.minor/time-record.c
-+++ b/testsuite/ltrace.minor/time-record.c
-@@ -7,2 +7,3 @@
- #include <time.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-clone.c b/testsuite/ltrace.minor/trace-clone.c
-index db1936d..c68b128 100644
---- a/testsuite/ltrace.minor/trace-clone.c
-+++ b/testsuite/ltrace.minor/trace-clone.c
-@@ -10,2 +10,3 @@
- #include <sched.h>
-+#include <unistd.h>
- 
-diff --git a/testsuite/ltrace.minor/trace-fork.c b/testsuite/ltrace.minor/trace-fork.c
-index c5f0c71..e1ab17f 100644
---- a/testsuite/ltrace.minor/trace-fork.c
-+++ b/testsuite/ltrace.minor/trace-fork.c
-@@ -8,2 +8,4 @@
- #include <sys/types.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
- 
-@@ -29,3 +31,4 @@ main ()
-       printf("My child pid is %d\n",pid);
--      wait(); 
-+      int status;
-+      wait(&status);
-     }
-diff --git a/testsuite/ltrace.torture/signals.c b/testsuite/ltrace.torture/signals.c
-index b786c81..86e2dba 100644
---- a/testsuite/ltrace.torture/signals.c
-+++ b/testsuite/ltrace.torture/signals.c
-@@ -7,2 +7,3 @@
- #include <sys/types.h>
-+#include <unistd.h>
- 
diff --git a/dev-util/ltrace/ltrace-0.7.2.ebuild b/dev-util/ltrace/ltrace-0.7.2.ebuild
deleted file mode 100644
index 0b9d0854b682..000000000000
--- a/dev-util/ltrace/ltrace-0.7.2.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
-
-inherit eutils autotools
-
-NUM="3848"
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/${NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/ltrace/ltrace-0.7.3.ebuild b/dev-util/ltrace/ltrace-0.7.3.ebuild
deleted file mode 100644
index 7b48efa94cdc..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3.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
-
-inherit eutils autotools
-
-NUM="3947"
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
deleted file mode 100644
index b8d3442e1c11..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-LTRACE_V=${PV/_p*/}
-DB_V=${PV/*_p/}
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
-SRC_URI="
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs
-	test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-${LTRACE_V}
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/[0-9]*
-	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
deleted file mode 100644
index e3ce665bb25c..000000000000
--- a/dev-util/ltrace/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<use>
-		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/lttng-modules-2.6.4 b/dev-util/lttng-modules-2.6.4
new file mode 100644
index 000000000000..49791cbcd303
--- /dev/null
+++ b/dev-util/lttng-modules-2.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0/2.6
+SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.6.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=91e4f225dda39079dc4bdf8741eced76
diff --git a/dev-util/lttng-modules-2.7.1 b/dev-util/lttng-modules-2.7.1
new file mode 100644
index 000000000000..18a3095abfec
--- /dev/null
+++ b/dev-util/lttng-modules-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=kernel_linux kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.7.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=94879e5932c4bbe7a73c93f9fd464676
diff --git a/dev-util/lttng-modules-2.7.4 b/dev-util/lttng-modules-2.7.4
new file mode 100644
index 000000000000..4940f7656ae9
--- /dev/null
+++ b/dev-util/lttng-modules-2.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.7.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=91e4f225dda39079dc4bdf8741eced76
diff --git a/dev-util/lttng-modules-2.8.0 b/dev-util/lttng-modules-2.8.0
new file mode 100644
index 000000000000..5a7afe61c34b
--- /dev/null
+++ b/dev-util/lttng-modules-2.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0/2.8
+SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.8.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=91e4f225dda39079dc4bdf8741eced76
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
deleted file mode 100644
index c7be061311c6..000000000000
--- a/dev-util/lttng-modules/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST lttng-modules-2.6.4.tar.bz2 295609 BLAKE2B dcc0d46c57b53abaf65f499a889d6fa32d062f47b589450d5d8d65f7a50b9870340ea8670fa69c8eaf86239c86a1f299db8378a562e3afc2b00d3a582dde9eae SHA512 ec93456829b04964d0c9befd1071e220bc047e3bf57978bf9e6a666d0be418c5825873746604e0758cd8fcd47f70f4471e0b190ad87f53b79d7efa94febeef03
-DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
-DIST lttng-modules-2.7.4.tar.bz2 302329 BLAKE2B 32526361d3814ff834b3dc152833f610f64189a573e171102b45ef730b5ade57e382f70bbce1a5b5462c7e18e04ac1157f404f2cae260e29a69aceff0a8ed956 SHA512 bdec56c59f282be9a7d191f7799db5b66577f231f92e8fffbc1dad059706fe07c4dd288e74b516e8f6c13cc0da8a54f5e5dd913ae39639489b8eb1507ede08a8
-DIST lttng-modules-2.8.0.tar.bz2 315529 BLAKE2B 17ebcbb9b01b90e276e61e1af5a97719ab26dbf4a20f3bc18891279450e09af393ac3f82761ae67c85ded46e8a61fbdf813f67807d113412f0a9456f979d372d SHA512 760a4417ca6113501f99177eded3dfdf39477a8978894d414c3e2f49c1e86716dc7a076d43f67b3fffb52e1f05ef1bc2671c0e30cfe0cead41c97a8ac1488d8c
-EBUILD lttng-modules-2.6.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
-EBUILD lttng-modules-2.7.1.ebuild 964 BLAKE2B e17b9f21fdcf4044f9644573d65e05397c80605b1dc12bae60c5a6cee1e7d16278fc91e0e4562314354795a5109e0b08b9ceacfd0cb2a232f13af3c5e4da0192 SHA512 ae8b58e4d351c9d85b7371a571f4e700e3c9c6ed74ea977ca388cd24e559ea135be96a518eb42bf02bcdffdca1089b2caedebc8b35ba4d7e7135bfc245023d5d
-EBUILD lttng-modules-2.7.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
-EBUILD lttng-modules-2.8.0.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
-MISC metadata.xml 695 BLAKE2B 958048b1eb1c07437cc982fd344eda9eb0928ebb4f136517838caa934383480d7ade6f6f000c10b36ebdca33c4ca0879644806a522ef3a991cf2fe0d3635a6bb SHA512 04c53b397e1a57634fca43761c76031f4c19299c15a0e639964de526691ad90c81326f7bfcf42afe1073830c66600b653165a752381c983a021478e112f8b6f8
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
deleted file mode 100644
index d7f32b7b99d1..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
deleted file mode 100644
index 816b24592955..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
deleted file mode 100644
index d7f32b7b99d1..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild
deleted file mode 100644
index d7f32b7b99d1..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/metadata.xml b/dev-util/lttng-modules/metadata.xml
deleted file mode 100644
index 26a5660b7e94..000000000000
--- a/dev-util/lttng-modules/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>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-
-	<longdescription>
-		Use the kernel tracer if you are debugging a system-wide performance problem or a kernel problem. This tracer comes with an instrumentation patch for most kernel subsystems, which is enough to debug many problems. This includes system calls, IRQs, traps, memory management, softIRQs, scheduling and many others. Of course, the kernel tracer allows you to add your own instrumentation anywhere in the kernel code.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/lttng-tools-2.6.1 b/dev-util/lttng-tools-2.6.1
new file mode 100644
index 000000000000..d423103f5b24
--- /dev/null
+++ b/dev-util/lttng-tools-2.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure pretend setup
+DEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=+ust kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+SLOT=0/2.6
+SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.6.1.tar.bz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f93586f8017ba3eaf578c5c3f988b64d
diff --git a/dev-util/lttng-tools-2.7.1 b/dev-util/lttng-tools-2.7.1
new file mode 100644
index 000000000000..9c571e5ee32d
--- /dev/null
+++ b/dev-util/lttng-tools-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure pretend setup
+DEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=+ust kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.7.1.tar.bz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a352400f658ac98607bed49b5d175dc
diff --git a/dev-util/lttng-tools-2.7.3 b/dev-util/lttng-tools-2.7.3
new file mode 100644
index 000000000000..9fc759196c88
--- /dev/null
+++ b/dev-util/lttng-tools-2.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure pretend setup
+DEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=+ust kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.7.3.tar.bz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f93586f8017ba3eaf578c5c3f988b64d
diff --git a/dev-util/lttng-tools-2.8.0 b/dev-util/lttng-tools-2.8.0
new file mode 100644
index 000000000000..90ba7bb309bf
--- /dev/null
+++ b/dev-util/lttng-tools-2.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure pretend setup
+DEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=+ust kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
+SLOT=0/2.8
+SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.8.0.tar.bz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f93586f8017ba3eaf578c5c3f988b64d
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
deleted file mode 100644
index 1ff7ad414aa5..000000000000
--- a/dev-util/lttng-tools/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST lttng-tools-2.6.1.tar.bz2 956120 BLAKE2B 2d0b641ae11989a90f54fc9955c18c26faeda621ce44c304ca88262329c2e048a839fb24c6cf59bfb0021cb0d43d5f7fb38f5aba8c9769ac7d1f0ac0c6196671 SHA512 7b2de0a42975e3c8ced67ed877417684892322c477a35a310c13ddbf84fcf125ee87156bae56b802eacec7757a927388d764e917ce8da8e57bfd33fdae3da469
-DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
-DIST lttng-tools-2.7.3.tar.bz2 986692 BLAKE2B 4632781abe699a4cec6c311ade314d8c1dd5264fe46b6ee14a4e982a52a6bfc738bcceb42c2d58f93052088b1c9a5cd3b024cbfa85418782e75ca25f9c7a6d0c SHA512 17568232b24028757b623c63bf40fc2929e700ecafe3e759d891373fc7342458c3d26c2199fcbbde6deeb1746b6bc8e7e95b7c19bb33c40f4c97339c4c04c459
-DIST lttng-tools-2.8.0.tar.bz2 1118863 BLAKE2B 96eb5f8fd43851ad39f0e51bd66fd7c5b7a53e52c4a50e2e22d44abd2a4407912a4b71b0eeae707502e7f0590f08038eb0fc1344e5b5119b8b5df994f0eb8cb5 SHA512 2a49b9f83b2a53dda653d8bf7cf35cbc67173912a38d9d52e2eb9313deb8a64ec9b5f7751055dc56cd972aaf412694088a7cc63297338448418872da5791d7a2
-EBUILD lttng-tools-2.6.1.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
-EBUILD lttng-tools-2.7.1.ebuild 859 BLAKE2B e72ae0bffd7ed7707be89848dd799deecd2de98636bef179fcb0ab9072729095660ae74163b12cc673d2342833434d73a4ac077820e3b6c448b5c11972c69bf4 SHA512 c08fa1100598dddca0178170658fe1879362e2d8a8f474f7fa314a9599e03c8ec98399104b509c0fd34b590f33c2ee76a8c6ea0fe629c9b222fb9d81cf408fe0
-EBUILD lttng-tools-2.7.3.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
-EBUILD lttng-tools-2.8.0.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
-MISC metadata.xml 493 BLAKE2B 3b627bbc8927620ca6fd13d49c5cdf57999a84ad849d32c0303bd1d4409b9bbb511330b814e29fb626f85754c07ce0d08e9a8343d724650f2ff21f5d7462c81c SHA512 39a5a7c28b3471efe353af48d001726df67d061cf89a11c1a7f8f80309c9d591f594787968570af1af86d2f5ac2ddfcb9d81bd84604d2836d28b184c414af252
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
deleted file mode 100644
index 9f1c5e6a680d..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
deleted file mode 100644
index 37b1fe1b01d6..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
deleted file mode 100644
index 9f1c5e6a680d..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
deleted file mode 100644
index 9f1c5e6a680d..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
deleted file mode 100644
index 94dfadace4f4..000000000000
--- a/dev-util/lttng-tools/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>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-
-	<longdescription>
-		LTTng, the Linux Trace Toolkit Next Generation, is a project that aims at producing a highly efficient full system tracing solution
-	</longdescription>
-	<use>
-		<flag name="ust">Support LTTng-UST (Userspace Tracing)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/lttng-ust-2.6.5 b/dev-util/lttng-ust-2.6.5
new file mode 100644
index 000000000000..bec1946138dc
--- /dev/null
+++ b/dev-util/lttng-ust-2.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/userspace-rcu >=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=Linux Trace Toolkit - UST library
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu
+SLOT=0/2.6
+SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.6.5.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb72251967dc006a464b025863980be4
diff --git a/dev-util/lttng-ust-2.7.1 b/dev-util/lttng-ust-2.7.1
new file mode 100644
index 000000000000..975ecb2ecb99
--- /dev/null
+++ b/dev-util/lttng-ust-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/userspace-rcu >=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=Linux Trace Toolkit - UST library
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=examples
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a90ee49ad9bf44135a222fc02fe3c6ac
diff --git a/dev-util/lttng-ust-2.7.4 b/dev-util/lttng-ust-2.7.4
new file mode 100644
index 000000000000..7d81290bf799
--- /dev/null
+++ b/dev-util/lttng-ust-2.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/userspace-rcu >=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=Linux Trace Toolkit - UST library
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu
+SLOT=0/2.7
+SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.7.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb72251967dc006a464b025863980be4
diff --git a/dev-util/lttng-ust-2.8.1 b/dev-util/lttng-ust-2.8.1
new file mode 100644
index 000000000000..ecc2773c5de7
--- /dev/null
+++ b/dev-util/lttng-ust-2.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/userspace-rcu >=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=Linux Trace Toolkit - UST library
+EAPI=5
+HOMEPAGE=http://lttng.org
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu
+SLOT=0/2.8
+SRC_URI=http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f6f614b6efb680d8157e7f5e8927a905
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
deleted file mode 100644
index 712177db5372..000000000000
--- a/dev-util/lttng-ust/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST lttng-ust-2.6.5.tar.bz2 619053 BLAKE2B babe2d0b8df6ca1d1942415d613a05d774714a9cffdfd7c5ff7d7c88540d78e4c6eb8b9c00a253dc2718255c9b3061f5b4a72d08393f7e515e128aa6be9047f8 SHA512 bf144c987b7ff62f70551db51a5605bc006b1d8a0e7f4197e1a2c7a7d79a1e4e786a658d0ec885f7d56c4d4f405da23717137c8b0d2be6289fc16ca84f06a230
-DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
-DIST lttng-ust-2.7.4.tar.bz2 648002 BLAKE2B aaacf4da1c1ff7c4909d9a8ba17b3d108175e8669dfcba151e2e73d094fa68096a0ec2c0bbaf89bec8370566e9b25147a0bbe7bfb0965b0e9fd70704e7a226df SHA512 f3164fd72724065d23b2b21aaa037b6e90f4eeb9dad75f16af4766374cd8a0a7a6eb2c815d93c17950a1048c5a32e6b334fa31b3d4b0f8314e352a9ddc8d4395
-DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.6.5.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.7.1.ebuild 632 BLAKE2B f7a3577e36025dd620dc9a29f8e35f90a4d4baa3fd3d214013a81987c73c366fe6f8e0c8fd764a3614706a5bf9c64f77920e72f8f6d0868cea1093d4e0142fe6 SHA512 7848f28030dd7ede00ed14d0924af46d589d549dbd73d5afb83b0a06fd2600ddd01c2e32eebe5ed7aa243225d63fbc1648e2d66f38794c0f85a4e6e9fdadabe7
-EBUILD lttng-ust-2.7.4.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.8.1.ebuild 647 BLAKE2B 6d361ffa352b8deddcfd1269b2289bf89dd56b657c39f3e20422fe707d60abdfddc329c940f5012104d6d7e1758b58bb1a08828508b7382ec33e9ab362f2ba8e SHA512 f805a0e19c98088d55700c62aaf8576f26850d760521a9f21f9b28abf0c3158f12358dd2d4e575ddde92c466b958f45a9ab93ec5819227d792e7b7f7a368fad8
-MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
deleted file mode 100644
index b5983a546e8b..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
deleted file mode 100644
index dc493ad0c9d3..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
deleted file mode 100644
index b5983a546e8b..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
deleted file mode 100644
index 281408c771c8..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
deleted file mode 100644
index 6c50e4708494..000000000000
--- a/dev-util/lttng-ust/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>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-
-	<longdescription>
-		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/lxqt-build-tools-0.2.0 b/dev-util/lxqt-build-tools-0.2.0
new file mode 100644
index 000000000000..ef12704c8822
--- /dev/null
+++ b/dev-util/lxqt-build-tools-0.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=LXQt Build tools
+EAPI=6
+HOMEPAGE=https://lxqt.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.2.0/lxqt-build-tools-0.2.0.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_=567da0e474ef98a83a60e4d93759dfd7
diff --git a/dev-util/lxqt-build-tools-0.5.0 b/dev-util/lxqt-build-tools-0.5.0
new file mode 100644
index 000000000000..180f91546cc0
--- /dev/null
+++ b/dev-util/lxqt-build-tools-0.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=LXQt Build tools
+EAPI=6
+HOMEPAGE=https://lxqt.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.5.0/lxqt-build-tools-0.5.0.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_=e117978ca7998be569a5eebac5fd8e0a
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
deleted file mode 100644
index 79b32a72b8c3..000000000000
--- a/dev-util/lxqt-build-tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST lxqt-build-tools-0.2.0.tar.xz 15552 BLAKE2B 558e1c9f43e09e51a720460592309f3f52fb7832a121ae40c8d9945ed135d6220190182a6d2311bfb9e9971f68a60f0ab7d5dcf2055301fa683dfc483170b3c6 SHA512 40349710a20d3f06761c57b5d40aa05cb194fa4b50d1e41e4bd7e6adf1beb5c7209f3d4965869a301369df17ec1d75f55aede7ab0fe88a55d692cd56d72121de
-DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
-EBUILD lxqt-build-tools-0.2.0.ebuild 503 BLAKE2B ce32303742984b29eca6a481df6f1a04e459c73661a6f7432404b5dff43fa83619dd2042ad690b03b333a2731e27e909e3d21c6668983e380d75f0ba4ae7ab30 SHA512 3d19db5002e4c194d0802226b617aee5901580286b298075fd563d9d38c76e83e9364900d8c82e6112939b1f8ea81efb2e050a2758f0b5935a862664311cd3d3
-EBUILD lxqt-build-tools-0.5.0.ebuild 508 BLAKE2B a1dda5bf87ffdeec4218646bc379483205aa5d471bf4c493079ee292297b38253cbdbf0bfae2703cc508a037c62e84e73edcc8d51083901c413887ffb450fb57 SHA512 3149c16f1b24e610e8223c5bc25480dd82ab222ba3ff06d856fbf0feb7b40eae95c55e0e9e27962e2e28477f2ca5eef8f3e0a6c717b8757bb7f1f923881677ee
-MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
deleted file mode 100644
index a28ed1dceef5..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.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
-inherit cmake-utils
-
-DESCRIPTION="LXQt Build tools"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="dev-qt/qtcore:5"
-
-src_configure() {
-	cmake-utils_src_configure
-}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
deleted file mode 100644
index 97c50c2b4af0..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.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
-inherit cmake-utils
-
-DESCRIPTION="LXQt Build tools"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/glib-2.50.0
-	dev-qt/qtcore:5
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/lxqt-build-tools/metadata.xml b/dev-util/lxqt-build-tools/metadata.xml
deleted file mode 100644
index aa0b3609e965..000000000000
--- a/dev-util/lxqt-build-tools/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>lxqt@gentoo.org</email>
-		<name>LXQt</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lxqt/lxqt-build-tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/makeheaders-0_p4 b/dev-util/makeheaders-0_p4
new file mode 100644
index 000000000000..ad67a857d447
--- /dev/null
+++ b/dev-util/makeheaders-0_p4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=simple utility that will automatically generate header files
+EAPI=6
+HOMEPAGE=http://www.hwaci.com/sw/mkhdr/
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://www.hwaci.com/sw/mkhdr/makeheaders.c -> makeheaders-0_p4.c http://www.hwaci.com/sw/mkhdr/makeheaders.html -> makeheaders-0_p4.html
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2f7cf0c64c8492ab06e2b6533c6b54ca
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
deleted file mode 100644
index 4cd3682ccdea..000000000000
--- a/dev-util/makeheaders/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST makeheaders-0_p4.c 99253 BLAKE2B 103d4b1d75fb3cb38fdf97dcf051f263c1ee7c08f8d2b4b791994948f0323cbf69fc66840464591ea8596c7ab6857eaf9ddd56bb69f2f035f57d99fbf5444992 SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35
-DIST makeheaders-0_p4.html 35481 BLAKE2B a5e4e4804b612eb164f46cb8ef664952b3f1819a2915e2e905b58e6719cbc7480e4fd2f81f1d1d91b2029b15ed0c9b2c799ae99538b8ad77d49d3606d91b50d5 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597
-EBUILD makeheaders-0_p4.ebuild 658 BLAKE2B 4262d895536f636a1037d784ce6ee55b28582f94820a6651e57e4bed44cf4827883483472501313139f515068015a949e6c1df641431bbda51a0448f57e8210a SHA512 3119779bde55879cc88056259db02233ac57e55f7c8b6d1fd7b6ec348b30f5677df0370987c66b9738cd2cdb3ddb3d8250366318482d80a3530f5bffdcbf7465
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/makeheaders/makeheaders-0_p4.ebuild b/dev-util/makeheaders/makeheaders-0_p4.ebuild
deleted file mode 100644
index 0d4b0aa383c8..000000000000
--- a/dev-util/makeheaders/makeheaders-0_p4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple utility that will automatically generate header files"
-HOMEPAGE="http://www.hwaci.com/sw/mkhdr/"
-SRC_URI="
-	http://www.hwaci.com/sw/mkhdr/makeheaders.c -> ${P}.c
-	http://www.hwaci.com/sw/mkhdr/makeheaders.html -> ${P}.html"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	local HTML_DOCS=( "${DISTDIR}"/${P}.html )
-	einstalldocs
-}
diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/makeheaders/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/makepp-1.18 b/dev-util/makepp-1.18
new file mode 100644
index 000000000000..7cbce0df01df
--- /dev/null
+++ b/dev-util/makepp-1.18
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/perl-5.6.0
+DESCRIPTION=GNU make replacement
+EAPI=0
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~x86 ~ppc ~sparc alpha
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6.0
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/makepp-1.18.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_=308aa3c6d6d8622c70ec378936796e3f
diff --git a/dev-util/makepp-1.40.1a b/dev-util/makepp-1.40.1a
new file mode 100644
index 000000000000..d7d38171fb38
--- /dev/null
+++ b/dev-util/makepp-1.40.1a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/perl-5.6.0
+DESCRIPTION=GNU make replacement
+EAPI=0
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6.0
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/makepp-1.40.1a.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_=6f4380ffd6c61858f019ccdf2c5069b8
diff --git a/dev-util/makepp-2.0-r1 b/dev-util/makepp-2.0-r1
new file mode 100644
index 000000000000..cc5d50d8085e
--- /dev/null
+++ b/dev-util/makepp-2.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare test unpack
+DEPEND=>=dev-lang/perl-5.6.0
+DESCRIPTION=GNU make replacement
+EAPI=4
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.0/makepp-2.0.txz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3c1e89aefa119ad4a26607439e198da1
diff --git a/dev-util/makepp-2.0.98.4 b/dev-util/makepp-2.0.98.4
new file mode 100644
index 000000000000..e97cd1d10c0d
--- /dev/null
+++ b/dev-util/makepp-2.0.98.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare test unpack
+DEPEND=>=dev-lang/perl-5.6.0
+DESCRIPTION=GNU make replacement
+EAPI=4
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.1/makepp-2.0.98.4.txz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=24edc3773df5ff8313df7b46295e29e8
diff --git a/dev-util/makepp-2.0.98.5 b/dev-util/makepp-2.0.98.5
new file mode 100644
index 000000000000..d4d99ce9d394
--- /dev/null
+++ b/dev-util/makepp-2.0.98.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare test unpack
+DEPEND=>=dev-lang/perl-5.6.0
+DESCRIPTION=GNU make replacement
+EAPI=4
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.1/makepp-2.0.98.5.txz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=24edc3773df5ff8313df7b46295e29e8
diff --git a/dev-util/makepp-2.0.98.5-r1 b/dev-util/makepp-2.0.98.5-r1
new file mode 100644
index 000000000000..5fc21badc317
--- /dev/null
+++ b/dev-util/makepp-2.0.98.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=GNU make replacement
+EAPI=6
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.1/makepp-2.0.98.5.txz
+_md5_=fc74f2ac3be657b9a25a5dd979eaa2ca
diff --git a/dev-util/makepp-2.0.99.1 b/dev-util/makepp-2.0.99.1
new file mode 100644
index 000000000000..5baf79d0e89e
--- /dev/null
+++ b/dev-util/makepp-2.0.99.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=GNU make replacement
+EAPI=6
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.1/makepp-2.0.99.1.txz
+_md5_=3442ee917c8cf2fe4f991c49faa3f378
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
deleted file mode 100644
index 7be164255d3f..000000000000
--- a/dev-util/makepp/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
-AUX makepp-1.40.1a-install.patch 426 BLAKE2B 2d71ea3f9e6d452c6be0d7553616ab76d25d5bebdd4cf6dafa0dcf1aceccc6be990695e0c32de907379634dc62f2830561d2ae11a53ea612b2f11994f4c8330f SHA512 af78ac75655103177fdfaf6a3e28b35052b29ede4385f8e8f29c50ed8386da157e0b2fb114591ad004dc4aa605077706df54f17eb068f765e14624b90365d706
-AUX makepp-2.0-destdir.patch 254 BLAKE2B ecaa18802ac0e0585b58d48a48503b94724c20ae72810c6b728c235b9656cb86b0264d9f84a26cbbb59d239b899c7ff29f2e694df56af401c2005b8aaa4d67b8 SHA512 8bd13910c03d86e32f6713f733ad2a0079f4befa257efb9f5abcdf3cb578270483fcd59cdba97e24ea95f3801ccc0b7edec8161c80ca56eb81556a43efd989f2
-AUX makepp-2.0.98.5-perl526.patch 964 BLAKE2B 597194606fce15f997e6f9b5981c123e9b0921542925a257205398dfdce62c6e173bd526dc5c37dc087443a3c8b8bcc20a3d7b3eb26bbb76e7e8f6be5b5b59d7 SHA512 aec311f042c34018c31d8f3e7c4fdc5594eb14519c78b20c9498e1680728e1eba397aca3be68a720f1da49925e619be30b288acf1d83515aa5388a2f8ad72274
-DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
-DIST makepp-1.40.1a.tar.gz 278170 BLAKE2B ceac75583575c51f3da960368644259d414377694ec7e437b9aa8455a48ba37edf330131857d4ac255b7da5e55568cfc8f896064d40eb4ee46cb1a5c70d01b47 SHA512 554987f1ff51fd4d984d54a8bf1c36182418f57820899567aba8d961753ab4daa4f4fee9591557dac199c0a2e4ba33f5b2a789e237ae9684e5168201d0a152ef
-DIST makepp-2.0.98.4.txz 528092 BLAKE2B 8d315d5b00f08cf6455889f933315c8f2964db5c54c60892cc5aceaa8878e0503567b2b28cee6a03d950a890244dd012b295a929704b574b8f7a9e1f16c7693a SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38
-DIST makepp-2.0.98.5.txz 529556 BLAKE2B d3112efa4a8c5abc0ce845dff1e7a9785e6ab1fa98dd1312cf55b4f4d65cf14e5177d319629a26bcb5dd231308bfd0fb0944f089859ef95a02b0d1dfe5fd8c7f SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a
-DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
-DIST makepp-2.0.txz 534708 BLAKE2B 9ea57e64199aef3765e74d0b4fe37a4803163c45067bc130fc02f2c28925f2f1f925b7757c03b31634f15bc755077944fc6e6ec85c9e83a248ed6915550ca14a SHA512 b8327fe475cb323352c6b89f1dc5e4a3fbbc71ee8b53777340449f610e3276465680ba3bc3bba905bb00754ca52ca56b82b9b1184db7bf7b272a47822b86aa49
-EBUILD makepp-1.18.ebuild 915 BLAKE2B 6004b382b36f5cb21f3a00598b825be8f7b67d0392816b0af6930b5cd44370f1a74afb548c98914be18968ac71beaa984f9be4b3d67add283f11cdad5d12650f SHA512 2cec8d117ae97166a4d9c5164ad09fd2d3934a36db29464bf4c6ea75b821adabb5037bf0e83195f383d3ee9836b86ac7f1f85574fd3a744015324966ce911664
-EBUILD makepp-1.40.1a.ebuild 872 BLAKE2B 15e4727b0a787e2ea30d526e4f4995eeb7bac953aebee07cd9f0e3073515bc261a91e8bdb18afac3dbdf324735cb43c3ec5ec96d20bc96a05fa17682786f3386 SHA512 9de9e041e96f0fdf66e21c20193b1048f79264611b65004bf03ab5e20be844653d3ff4736e0d28e77313a54a04560c3baaf340938a0dc7c1442b8e419b556531
-EBUILD makepp-2.0-r1.ebuild 1101 BLAKE2B 05111d35ecc47db06abbefa56e654982e9eaaf895dd61e93cd8d9ed750905a8b45165a6e361d1684dffd0b7af7d377c9f0c0cdc6cdfee1e98a259844ff71864a SHA512 fd8000e9b800a0dbae39824ba3286252ee63e25f76b5229e0e42e026ea731172b8c500a85370eda51e26d616a9d2f652241a1fae563494ad6dd46a33d0cdf416
-EBUILD makepp-2.0.98.4.ebuild 1049 BLAKE2B 7bfdd2926dd06b5bfbd24d3917f8248a67b60bb8f2350850569d966c84393a0b048e8d95334b9dc4797c1fafce1485c32c8667e26f0bc3c701974248987bb4fc SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c
-EBUILD makepp-2.0.98.5-r1.ebuild 1003 BLAKE2B a0c255f4009525028feaf0a606e762697bfce0d601a4ac8ab27fb7a1cf3d75a32d05717657ae560ef0b38483163d36a572f8f3ccdb5ec3dd65d5ea8a7cb59c44 SHA512 8541e1a75f5c8867bb9e5320090496d6f2b4b59fce8745aa689657c98f3bc782487ad3b48e2e6a29d0784c718c921cfff879ffe8fb64ec8cc4e96138d9d5214f
-EBUILD makepp-2.0.98.5.ebuild 1049 BLAKE2B 7bfdd2926dd06b5bfbd24d3917f8248a67b60bb8f2350850569d966c84393a0b048e8d95334b9dc4797c1fafce1485c32c8667e26f0bc3c701974248987bb4fc SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c
-EBUILD makepp-2.0.99.1.ebuild 957 BLAKE2B c515df0a863109bbf5ccdb90bb110faed698517b33d3ce57a76686e8250c221576ef5ba4f33ed27225f9995b957d9e8da8b5dca6e8f7f51c001173febac8d1b0 SHA512 2172c34461777f3ecde95e01e6dbd53a9d20fd41eeb1bb1f3bed86f6fd08762e595a203c3158917d55acca04177eaf089ecfbb967f28bc14c43c00b95baeda62
-MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/files/makepp-1.18-install.patch b/dev-util/makepp/files/makepp-1.18-install.patch
deleted file mode 100644
index 7d90e2166223..000000000000
--- a/dev-util/makepp/files/makepp-1.18-install.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- install.pl.orig	2003-02-18 13:15:15.000000000 -0800
-+++ install.pl	2003-02-18 13:49:10.000000000 -0800
-@@ -31,9 +31,24 @@
- #
- # Now figure out where everything goes:
- #
--$prefix = "/usr/local";
-+$prefix = shift(@ARGV) ||
-+	read_with_prompt( "
-+You can specify a prefix directory that will simplify defaults for
-+further questions.
-+
-+What should be the prefix directory [$prefix]? ") ||
-+	"/usr/local";
-+
-+$inst_prefix = shift(@ARGV) ||
-+	read_with_prompt( "
-+You can specify an install prefix that is prefixed to the runtime
-+prefix for the install phase only.  This is useful when installing
-+into staging directories for packaging systems.
- 
--$bindir = shift(@_) ||
-+What should the install prefix be []? ") ||
-+	"";
-+
-+$bindir = shift(@ARGV) ||
-   read_with_prompt("
- Makepp needs to know where you want to install it and its data files.
- makepp is written in perl, but there is no particular reason to install
-@@ -43,10 +58,7 @@
- Where should the makepp executable be installed [$prefix/bin]? ") ||
-   "$prefix/bin";
- 
--$bindir =~ m@(.*)/bin@ and $prefix = $1;
--				# See if a prefix was specified.
--
--$datadir = shift @_ || read_with_prompt("
-+$datadir = shift @ARGV || read_with_prompt("
- Makepp has a number of library files that it needs to install somewhere.  Some
- of these are perl modules, but they can't be used by other perl programs, so
- there's no point in installing them in the perl modules hierarchy; they are
-@@ -55,14 +67,24 @@
- Where should the library files be installed [$prefix/share/makepp]? ") ||
-   "$prefix/share/makepp";
- 
--$htmldir = shift @_ || read_with_prompt("
-+$htmldir = shift @ARGV || read_with_prompt("
- Where should the HTML documentation be installed?
- Enter \"none\" if you do not want any documentation installed.
- HTML documentation directory [$prefix/share/makepp/html]: ") ||
-   "$prefix/share/makepp/html";
- 
--substitute_file("makepp", $bindir, 0755);
--substitute_file("recursive_makepp", $datadir, 0644);
-+substitute_file("makepp", "$inst_prefix/$bindir", 0755);
-+substitute_file("recursive_makepp", "$inst_prefix/$datadir", 0644);
-+
-+if( $inst_prefix ) {
-+	$bindir = join( '/', $inst_prefix, $bindir );
-+	$datadir = join( '/', $inst_prefix, $datadir );
-+	$htmldir = join( '/', $inst_prefix, $htmldir );
-+}
-+
-+print STDERR "bindir now $bindir\n";
-+print STDERR "datadir now $datadir\n";
-+print STDERR "htmldir now $htmldir\n";
- 
- make_dir("$datadir/Signature");
- foreach $module (qw(FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule
diff --git a/dev-util/makepp/files/makepp-1.40.1a-install.patch b/dev-util/makepp/files/makepp-1.40.1a-install.patch
deleted file mode 100644
index b1ee013add3e..000000000000
--- a/dev-util/makepp/files/makepp-1.40.1a-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- makepp-1.40/config.pl
-+++ makepp-1.40/config.pl
-@@ -34,7 +34,7 @@
- 	cd makepp-$(VERSION) && make test    # Make sure it all runs.
- 	rm -rf makepp-$(VERSION)
- 
--install: all
--	$(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN)
-+install:
-+	$(PERL) install.pl $(DESTDIR)$(BINDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(FINDBIN)
- 
- .PHONY: all distribution install test
diff --git a/dev-util/makepp/files/makepp-2.0-destdir.patch b/dev-util/makepp/files/makepp-2.0-destdir.patch
deleted file mode 100644
index 7d7950b2dff4..000000000000
--- a/dev-util/makepp/files/makepp-2.0-destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-don't break install paths when DESTDIR is set
-
---- a/install.pl
-+++ b/install.pl
-@@ -131,7 +131,7 @@
- 
- if( $destdir ) {
-   for( $bindir, $datadir, $mandir, $htmldir_val ) {
--    s/$prefix/$destdir/o if defined;
-+    s/^/$destdir/o if defined;
-   }
- }
- 
diff --git a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch b/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch
deleted file mode 100644
index b5ed875b4dcf..000000000000
--- a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN makepp-2.0.98.5.orig/config.pl makepp-2.0.98.5/config.pl
---- makepp-2.0.98.5.orig/config.pl	2017-07-08 21:35:18.257017457 +0200
-+++ makepp-2.0.98.5/config.pl	2017-07-08 21:39:06.087026936 +0200
-@@ -19,6 +19,8 @@
- you on?), get the latest from www.perl.org and install it.
- EOS
- 
-+use lib q[.];
-+
- BEGIN { eval { require Mpp::Utils } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic
- Please call this script in the directory where you unpacked it!
- EOS
-diff -ruN makepp-2.0.98.5.orig/install.pl makepp-2.0.98.5/install.pl
---- makepp-2.0.98.5.orig/install.pl	2013-07-05 23:02:38.000000000 +0200
-+++ makepp-2.0.98.5/install.pl	2017-07-08 21:38:48.441026202 +0200
-@@ -13,6 +13,8 @@
- #
- BEGIN { eval { require 5.008 } or exec $^X, 'config.pl' } # Dies with nice message.
- 
-+use lib q[.];
-+
- BEGIN { eval { require Mpp::Text } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic
- Please call this script in the directory where you unpacked it!
- EOS
diff --git a/dev-util/makepp/makepp-1.18.ebuild b/dev-util/makepp/makepp-1.18.ebuild
deleted file mode 100644
index 7fc917334048..000000000000
--- a/dev-util/makepp/makepp-1.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.6.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-	# There is a sandbox violation in this test.
-	# In future versions, this ebuild should try to find
-	# a better way of avoiding this, but the current version
-	# appears to have garbage NUL characters all over the test files,
-	# making them complicated to edit.
-	# Robert Coie <rac@gentoo.org> 2002.02.18
-	rm "${S}"/makepp_tests/include.test
-}
-
-src_compile() {
-	make test || die
-}
-
-src_install() {
-	perl install.pl /usr "${D}" /usr/bin /usr/share/makepp /usr/share/doc/makepp
-}
diff --git a/dev-util/makepp/makepp-1.40.1a.ebuild b/dev-util/makepp/makepp-1.40.1a.ebuild
deleted file mode 100644
index a46c2328ba7e..000000000000
--- a/dev-util/makepp/makepp-1.40.1a.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${P%.*}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-	# remove ones which cause sandbox violations
-	rm makepp_tests/wildcard_repositories.test
-}
-
-src_compile() {
-	# not an autoconf configure script
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/dev-util/makepp/makepp-2.0-r1.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
deleted file mode 100644
index a8d44bd7fca1..000000000000
--- a/dev-util/makepp/makepp-2.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0-destdir.patch
-
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.4.ebuild b/dev-util/makepp/makepp-2.0.98.4.ebuild
deleted file mode 100644
index 1ecf18f24d1f..000000000000
--- a/dev-util/makepp/makepp-2.0.98.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.5-r1.ebuild b/dev-util/makepp/makepp-2.0.98.5-r1.ebuild
deleted file mode 100644
index d6b300f282ee..000000000000
--- a/dev-util/makepp/makepp-2.0.98.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl:="
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-	default
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.5.ebuild b/dev-util/makepp/makepp-2.0.98.5.ebuild
deleted file mode 100644
index 1ecf18f24d1f..000000000000
--- a/dev-util/makepp/makepp-2.0.98.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.99.1.ebuild b/dev-util/makepp/makepp-2.0.99.1.ebuild
deleted file mode 100644
index 673b76c61cd9..000000000000
--- a/dev-util/makepp/makepp-2.0.99.1.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
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl:="
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-	default
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/metadata.xml b/dev-util/makepp/metadata.xml
deleted file mode 100644
index dabb537bfa74..000000000000
--- a/dev-util/makepp/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>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">makepp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/massif-visualizer-0.7.0 b/dev-util/massif-visualizer-0.7.0
new file mode 100644
index 000000000000..e3605e35c07b
--- /dev/null
+++ b/dev-util/massif-visualizer-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool visualising massif data
+EAPI=6
+HOMEPAGE=https://www.linux-apps.com/content/show.php/Massif+Visualizer?content=122409
+IUSE=+callgraph debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab153fd91110f43cc0d34f46fa749cfb
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
deleted file mode 100644
index be19dea5b467..000000000000
--- a/dev-util/massif-visualizer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0.ebuild 1111 BLAKE2B 141c0f6ef1200c2968483a6a11f9f1cba5332889e34f1d90c3ef3889d34b82e6003a96d77251859b946b700448aff5d40905618e865479741fee7879be5a93eb SHA512 53302d3a613bc323845a7a18c5fb3f2368eff015b5e6f7ee59466ef5bd50c0dfdf8e5a40654f2f596b182bd2f03dd976d1b7761acd0f9fa6933deea446ff67cf
-MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
deleted file mode 100644
index 3879dd8ec904..000000000000
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/Massif+Visualizer?content=122409"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64"
-IUSE="+callgraph"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-	callgraph? ( media-gfx/kgraphviewer:5 )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	x11-misc/shared-mime-info
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
-	)
-	kde5_src_configure
-}
diff --git a/dev-util/massif-visualizer/metadata.xml b/dev-util/massif-visualizer/metadata.xml
deleted file mode 100644
index a38f0ed5101b..000000000000
--- a/dev-util/massif-visualizer/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="callgraph">Enable detailed snapshot analysis using <pkg>media-gfx/kgraphviewer</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/mdds-1.3.1 b/dev-util/mdds-1.3.1
new file mode 100644
index 000000000000..220b1be752b9
--- /dev/null
+++ b/dev-util/mdds-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare test
+DEPEND=dev-libs/boost:= valgrind? ( dev-util/valgrind ) >=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 collection of multi-dimensional data structure and indexing algorithm
+EAPI=6
+HOMEPAGE=https://gitlab.com/mdds/mdds
+IUSE=valgrind
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=
+SLOT=1/1.2
+SRC_URI=https://kohei.us/files/mdds/src/mdds-1.3.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ae876f3c702d0421d44befc92c351ac
diff --git a/dev-util/mdds-9999 b/dev-util/mdds-9999
new file mode 100644
index 000000000000..204f28818026
--- /dev/null
+++ b/dev-util/mdds-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure prepare test unpack
+DEPEND=dev-libs/boost:= doc? ( app-doc/doxygen dev-python/sphinx ) valgrind? ( dev-util/valgrind ) >=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=A collection of multi-dimensional data structure and indexing algorithm
+EAPI=6
+HOMEPAGE=https://gitlab.com/mdds/mdds
+IUSE=doc valgrind
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=
+SLOT=1/9999
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=bfa21c15d4e80900b9a75fdbd1799046
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
deleted file mode 100644
index aa18392fc3c7..000000000000
--- a/dev-util/mdds/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
-DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
-EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-9999.ebuild 996 BLAKE2B e1ca3357c730601129ef9e698d6d200152dc29e99b1198e4e9b5de556e228e741829c0e8c25abbecc5bf8cb7fbf2b10e0d25a24ab6b25c0dcd2b88f42821daf9 SHA512 39a037513bffeeac8931380b00f46a151b930c50dedc81b5d27c960a0448e123505ae50d5e399bd514ac695af0187a4b93d826bc766bb608b53013e3b5291185
-MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
deleted file mode 100644
index 89b45d826e04..000000000000
--- a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We want to install (not all of) those files manually.
-
---- a/Makefile.am	2017-05-24 23:59:15.000000000 +0200
-+++ b/Makefile.am	2017-05-26 21:52:01.184258647 +0200
-@@ -4,16 +4,12 @@
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
--dist_doc_DATA = AUTHORS README.md
--nodist_doc_DATA = VERSION
- nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
- 
- DISTCLEANFILES = misc/mdds-@API_VERSION@.pc
- 
- EXTRA_DIST = \
- 	autogen.sh \
--	CHANGELOG \
--	LICENSE \
- 	doc/conf.py \
- 	doc/doxygen.conf \
- 	doc/flat_segment_tree.rst \
-@@ -151,14 +147,6 @@
- 	trie_map_test_mem.mem
- endif
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
--	$(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
--
--uninstall-local:
--	rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
--
- if BUILD_DOCS
- html-local:
- 	(cd doc && $(DOXYGEN) doxygen.conf)
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
deleted file mode 100644
index 1473b988ea99..000000000000
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1/1.2"
-IUSE="valgrind"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# docs require dev-python/breathe etc., bug #602026
-	econf \
-		--disable-docs \
-		$(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
deleted file mode 100644
index 8059254bb67f..000000000000
--- a/dev-util/mdds/mdds-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1/${PV%.*}"
-IUSE="doc valgrind"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
deleted file mode 100644
index c054dfb0bb86..000000000000
--- a/dev-util/mdds/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>office@gentoo.org</email>
-		<name>Gentoo Office project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">multidimalgorithm</remote-id>
-	</upstream>
-	<use>
-		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/meld-3.18.2 b/dev-util/meld-3.18.2
new file mode 100644
index 000000000000..6dc90f14f1e7
--- /dev/null
+++ b/dev-util/meld-3.18.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.14:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DESCRIPTION=A graphical diff and merge tool
+EAPI=6
+HOMEPAGE=http://meldmerge.org/
+IUSE=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
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.14:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[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_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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=mirror://gnome/sources/meld/3.18/meld-3.18.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c284dff2ab4501da74b70725569e8378
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
deleted file mode 100644
index 03d6ccebf713..000000000000
--- a/dev-util/meld/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
-EBUILD meld-3.18.2.ebuild 898 BLAKE2B 8e4fafffdc83112a8012662e3b26a3e506599fbcfcc385572939cbe8f33852acd5e6077beda2e186cc06174ed25a62099dfc1ec59122b229c1787442355a8d62 SHA512 78ce7d28f88129ae9b461c9bd6240f39beb68e9d472368042e37a77e3cb9a64bdd5e5fa6f7eb26677f107b8f67298ec253428e56b75987c5891644b5f6c0b0c9
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
deleted file mode 100644
index 85480ada6de4..000000000000
--- a/dev-util/meld/meld-3.18.2.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"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.14:3[introspection]
-	>=x11-libs/gtksourceview-3.14:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-util/meld/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/memprof-0.6.2-r1 b/dev-util/memprof-0.6.2-r1
new file mode 100644
index 000000000000..50665446da2a
--- /dev/null
+++ b/dev-util/memprof-0.6.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DESCRIPTION=Profiling and leak detection tool
+EAPI=5
+HOMEPAGE=http://www.secretlabs.de/projects/memprof/
+IUSE=nls
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://www.secretlabs.de/projects/memprof/releases/memprof-0.6.2.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_=2c529474a4d085e58a21c1ae23e2507d
diff --git a/dev-util/memprof/Manifest b/dev-util/memprof/Manifest
deleted file mode 100644
index 3044b59e1ca9..000000000000
--- a/dev-util/memprof/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX memprof-0.6.2-binutils.patch 212 BLAKE2B 0d96ae801a90044478219132d422f44d67f8362a8f44c76236d6c3fc5d98ae771842f45b1ebcd24d2e61b1b467a006bdc0d8645cb4407a74a1debe08595b2edb SHA512 f0b5d6ff79d04536f1b0f2e7275eb795c4fb816f973483970d9fcf01ef07e6216e89890d7a5a367004883b2a5b7d6eda344397641fbd7ae9c921a7f8674a7001
-AUX memprof-0.6.2-desktop.patch 754 BLAKE2B d6e57a85f552dff99fe62e5cecc69956a426fb988ee7f8e7e8c00b50e427a1f9dd7c29c5178d3003432708d473c2ef469290ec74908743801939e8d603d7529e SHA512 a9e96331aac0b5c1eb50ffc24d6e242479d8e3642fff762f529ec2d3ad97e50262109e15ac80ddbeea8bd87bd4c5ac9d5c7f27989a93422140e5edbe0087b375
-DIST memprof-0.6.2.tar.gz 534543 BLAKE2B bc4b98d13ac2a789540006c69b185c95ab9a8c059250e53d89e3baed8d80cffc506ab27e081fbab914390d77c4e67371f2632363a90e3a8d804799b00b5bb208 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7
-EBUILD memprof-0.6.2-r1.ebuild 825 BLAKE2B 021f56ef8b62f8081f0efe636a05c8be160223f6906571bd35f0070eeecc059bda3ffb0cf1bcb997d2c494f64d0d93f8fef874819df3101337316bb93fb9da03 SHA512 198bbbf95ac526eb0521ee2d9a020c75b7bd33c1ed70cd0566fe6f7361ccbc48beb5feef83bc2042784af4dd669e67ee8babe3fed56d5a902dffd87eba08789d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/memprof/files/memprof-0.6.2-binutils.patch b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
deleted file mode 100644
index 2a7f80993d5e..000000000000
--- a/dev-util/memprof/files/memprof-0.6.2-binutils.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/memprof.h
-+++ src/memprof.h
-@@ -24,6 +24,7 @@
- #include <gtk/gtkwidget.h>
- #include <stdio.h>
- #include <sys/types.h>
-+#include "config.h"
- #include "bfd.h"
- #include "stackstash.h"
- #include "binfile.h"
diff --git a/dev-util/memprof/files/memprof-0.6.2-desktop.patch b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
deleted file mode 100644
index a49b5697aaca..000000000000
--- a/dev-util/memprof/files/memprof-0.6.2-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- memprof.desktop
-+++ memprof.desktop
-@@ -11,17 +11,13 @@
- Name[uk]=MemProf
- Comment=Check a program for leaks and analyze its memory usage
- Comment[sl]=Orodje za profiliranje pomnilnika
--Comment[da]=V�rkt�j til hukommelsesprofilering
--Comment[el]=�������� ����������� ������
- Comment[fr]=Outil de profilage de memoire
- Comment[it]=Strumento di profilo della memoria
- Comment[nl]=Gereedschap voor geheugen profilering
--Comment[no]=Verkt�y for minneprofilering
- Comment[pt_BR]=Ferramenta de 
- Comment[sv]=Minnesprofileringsverktyg
--Comment[uk]=��Ӧ� ���Ʀ������� ���'�Ԧ
- Exec=memprof
--Terminal=0
-+Terminal=false
- Type=Application
--Icon=memprof.png
--Categories=Application;Development;
-\ No newline at end of file
-+Icon=memprof
-+Categories=Development;
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
deleted file mode 100644
index 99e0512870ef..000000000000
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Profiling and leak detection tool"
-HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
-SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="dev-libs/glib:2
-	>=gnome-base/libglade-2
-	>=x11-libs/gtk+-2.6:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-binutils.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/dev-util/memprof/metadata.xml b/dev-util/memprof/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/memprof/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/dev-util/meson-0.44.1 b/dev-util/meson-0.44.1
new file mode 100644
index 000000000000..d037d2261e67
--- /dev/null
+++ b/dev-util/meson-0.44.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] 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=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.44.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_=0496c7a246c5fb5daeb79d4863902a85
diff --git a/dev-util/meson-0.45.1 b/dev-util/meson-0.45.1
new file mode 100644
index 000000000000..f4b6fa48ca83
--- /dev/null
+++ b/dev-util/meson-0.45.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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_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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.45.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_=6f297964017d42a983a07cba924cc5cc
diff --git a/dev-util/meson-0.46.0 b/dev-util/meson-0.46.0
new file mode 100644
index 000000000000..61a5a33dd39f
--- /dev/null
+++ b/dev-util/meson-0.46.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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_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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.46.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_=e8d193a409872725bee064245d769abe
diff --git a/dev-util/meson-0.46.1 b/dev-util/meson-0.46.1
new file mode 100644
index 000000000000..5bfb0a0614cc
--- /dev/null
+++ b/dev-util/meson-0.46.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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_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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.46.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_=e6c422afdb9b99c4f1c701118b7e5b8d
diff --git a/dev-util/meson-0.47.0 b/dev-util/meson-0.47.0
new file mode 100644
index 000000000000..966816ec6107
--- /dev/null
+++ b/dev-util/meson-0.47.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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_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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.47.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_=e8d193a409872725bee064245d769abe
diff --git a/dev-util/meson-9999 b/dev-util/meson-9999
new file mode 100644
index 000000000000..4d1558baf5df
--- /dev/null
+++ b/dev-util/meson-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=python_targets_python3_5 python_targets_python3_6
+LICENSE=Apache-2.0
+RDEPEND=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_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 )
+RESTRICT=test
+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_=e8d193a409872725bee064245d769abe
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
deleted file mode 100644
index 025f0bc287da..000000000000
--- a/dev-util/meson/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
-DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
-DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72 SHA512 f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
-DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
-DIST meson-0.47.0.tar.gz 1246932 BLAKE2B 0191c383488132393fe3e3fb9e71ca0bb0906b8c856bfa72d6352b890246c14bacfe86f4f75c065b0d7197b30570dc63d53d0e7d6a0f25cafe0e85442e89c971 SHA512 02a9aa481c6cce011be9bd3ada523c45f503c70c1c6c8c826241c16a84c8ccbb06de2caced8c748850c24b7a696705c8c72847f935fd720edbd286235390fd94
-EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.46.0.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-EBUILD meson-0.46.1.ebuild 930 BLAKE2B 0a4fc99548ffbd679fff1f0f73ec2dafdc064193121530c35e4920a02028bce02bba87b98ae99dc00e80a22a9a42fba58921de504cb2e6492c32307fa2c89748 SHA512 7dac6a904163939d90b62f9c7f3664796612f20f078159b5c00900ada7c82db730f3cfeb01e31ef0f66d74eb96c0cf6c892cb408632116c4eab5a12fa5f1023f
-EBUILD meson-0.47.0.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-EBUILD meson-9999.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.44.1.ebuild b/dev-util/meson/meson-0.44.1.ebuild
deleted file mode 100644
index a645215fdf07..000000000000
--- a/dev-util/meson/meson-0.44.1.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=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64
-	~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
deleted file mode 100644
index cabc6b2b4e6d..000000000000
--- a/dev-util/meson/meson-0.45.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.46.0.ebuild b/dev-util/meson/meson-0.46.0.ebuild
deleted file mode 100644
index a02f93d684e4..000000000000
--- a/dev-util/meson/meson-0.46.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
deleted file mode 100644
index 6f8702115d6c..000000000000
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.47.0.ebuild b/dev-util/meson/meson-0.47.0.ebuild
deleted file mode 100644
index a02f93d684e4..000000000000
--- a/dev-util/meson/meson-0.47.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
deleted file mode 100644
index a02f93d684e4..000000000000
--- a/dev-util/meson/meson-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=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
deleted file mode 100644
index 301e400a3dec..000000000000
--- a/dev-util/meson/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>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">meson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/metadata.xml b/dev-util/metadata.xml
deleted file mode 100644
index b57240b4ca92..000000000000
--- a/dev-util/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The dev-util category contains various miscellaneous development
-		utilities.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie dev-util enthält verschiedene Programmierwerkzeuge.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría dev-util contiene varias utilidades de desarrollo mixtas.
-	</longdescription>
-	<longdescription lang="ja">
-		dev-util カテゴリーには多種多様な開発ユーティリティが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De dev-util categorie bevat verschillende hulpmiddelen voor gebruik
-		bij het programmeren.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm dev-util chứa các tiện ích phát triển khác nhau.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria dev-util contiene varie utilità di sviluppo software.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria dev-util contém vários utilitários de
-		desenvolvimento mistos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria dev-util zawiera różne dodatkowe narzędzia związane z
-		rozwijaniem programów.
-	</longdescription>
-	<longdescription lang="ru">
-		Категория dev-util содержит различные утилиты для разработки,
-		не попадающие в другие категории.
-	</longdescription>
-</catmetadata>
-
diff --git a/dev-util/min-cscope-16.1.0 b/dev-util/min-cscope-16.1.0
new file mode 100644
index 000000000000..1ceece9f892d
--- /dev/null
+++ b/dev-util/min-cscope-16.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Interactively examine a C program
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/kscope/
+IUSE=debug
+KEYWORDS=amd64 x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/kscope/min-cscope-16.1.0.tar.gz
+_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_=b326bfcdd82d4f9f946ded625884abb6
diff --git a/dev-util/min-cscope/Manifest b/dev-util/min-cscope/Manifest
deleted file mode 100644
index 74769ed96968..000000000000
--- a/dev-util/min-cscope/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST min-cscope-16.1.0.tar.gz 382326 BLAKE2B 7d45df20c5d2decd9ee5127893cb97506420a19b42b371fbcc6bfae1ada2726deaef1ddf2750ed7c1744e5d90f6c65fd99ad71f5609de04d1afa03795ebb61d7 SHA512 434d6333758dbf72c320e08b3b705bbff6c67de8a1380295fe5971af1a2c4659dd3201c726fd318d7715b90f8a693a76599a8659ac45c76568e5a29a399a9c0a
-EBUILD min-cscope-16.1.0.ebuild 620 BLAKE2B a77d97aa3332f47c653404e52a0f64e374fc173e3ce89622a550b37a1dd30934360d23a9502be94a76dc7f087831e905e4562fde571004f6370c39073722990c SHA512 9d3ac94ee192a2634a056c4f4642d4d5e8d954ae0b494848d8651329133a5cee0ab7b94ae017ab56a787d4909b71761ec879f2affc928cee5adafe33a4aef550
-MISC metadata.xml 248 BLAKE2B a828276821884acc6a27159241c05f16c4bcb4c913720c567c76df06ca520c37dff7aa596b7cd6fa37ba8715a59fd65d2f8b1ade6d6fabf675a672cdbfe948b9 SHA512 6f50ad3193cddb62d48b3e833f321299930b9755b7e92dd1fa7ac4adb54d08996a75f89225e3d5358e84c5a75480d5b2b54163c717f7df66ef5e779946d342b4
diff --git a/dev-util/min-cscope/metadata.xml b/dev-util/min-cscope/metadata.xml
deleted file mode 100644
index 8b2f09938be6..000000000000
--- a/dev-util/min-cscope/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-needed -->
-  <upstream>
-    <remote-id type="sourceforge">kscope</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
deleted file mode 100644
index 635ae50824d2..000000000000
--- a/dev-util/min-cscope/min-cscope-16.1.0.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 cmake-utils flag-o-matic
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="https://sourceforge.net/projects/kscope/"
-SRC_URI="mirror://sourceforge/kscope/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS README* TODO"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	echo 'INSTALL(TARGETS min-cscope RUNTIME DESTINATION bin)' \
-		>> src/CMakeLists.txt || die
-}
-
-src_configure() {
-	append-flags -I"${S}/sort"
-	cmake-utils_src_configure
-}
diff --git a/dev-util/mingw-runtime-3.18 b/dev-util/mingw-runtime-3.18
new file mode 100644
index 000000000000..8978a7cbcf48
--- /dev/null
+++ b/dev-util/mingw-runtime-3.18
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup unpack
+DESCRIPTION=Free Win32 runtime and import library definitions
+EAPI=0
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/mingwrt-3.18-mingw32-src.tar.gz
+_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_=0919f5d9557cb08c4fde5bd17aef97bf
diff --git a/dev-util/mingw-runtime-3.20 b/dev-util/mingw-runtime-3.20
new file mode 100644
index 000000000000..e8375d1c7d1f
--- /dev/null
+++ b/dev-util/mingw-runtime-3.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+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
+DESCRIPTION=Free Win32 runtime and import library definitions
+EAPI=4
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/mingwrt-3.20-mingw32-src.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c01364f2107d1b4a0bc31870e35234a4
diff --git a/dev-util/mingw-runtime-3.20.2 b/dev-util/mingw-runtime-3.20.2
new file mode 100644
index 000000000000..07afbcaa841a
--- /dev/null
+++ b/dev-util/mingw-runtime-3.20.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=app-arch/xz-utils >=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=Free Win32 runtime and import library definitions
+EAPI=4
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/mingwrt-3.20-2-mingw32-src.tar.lzma
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9251d917ab004e03928949685d34221
diff --git a/dev-util/mingw-runtime-4.0.3.1 b/dev-util/mingw-runtime-4.0.3.1
new file mode 100644
index 000000000000..4dd4eab1febb
--- /dev/null
+++ b/dev-util/mingw-runtime-4.0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Free Win32 runtime and import library definitions
+EAPI=4
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/mingwrt-4.0.3-1-mingw32-src.tar.lzma
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1f43da44f3681b716d17b548c8438c3a
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
deleted file mode 100644
index 5278bd0c3ee3..000000000000
--- a/dev-util/mingw-runtime/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX mingw-runtime-3.18-gcc-4.6.patch 861 BLAKE2B cdcfbfd48163f8a6df52508d9f1ec2410e1957bea5fb1f4521b61ccaae4f2d38572870776bc9674e64272744718bf377ee2c90d5ff1dd8e9315d5d5c8a4b32f5 SHA512 696469f42f03f79219d946ea046aa2cf419f3abd6664db60b477a3ea474a652f42521ab039f4e4ccbd2d0c15d6816d54b4ac3551fbea3d5539dfcda71e17139d
-AUX mingw-runtime-3.20-LDBL_MIN_EXP.patch 5806 BLAKE2B 2076564daebcead92b58f5845c2dfdea60c970add2b4cc3dd4ddf24d1caa620733439de4eb1ce4dcbeb82201e02f7e2e8a85881585c7f237e95f4da923e86979 SHA512 2013860ca92e5eeeaf94b5b78882a453d2f3312a51b6d8b37665e9d1f70aa80364355b5d3cb60a561adc6f2fb0001de41069548d715ffeb65793cdcc6c4b97ea
-DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1a80719fb91baf2898670dcaed868c95b224d7b6d947d0a1b0cd70b5a0360f7d26a10d0956ee778e7c8d489d621ae531b788b SHA512 87778f08469a806dda606b0945d00511fccd0f7e0d545a33e2b4685db2490ec6a3e5e4267090b79a88eb963f97035fe8149097892f1f4a6e85f3a4661eb5e977
-DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
-DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
-DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
-EBUILD mingw-runtime-3.18.ebuild 1741 BLAKE2B 9fdb3431ed214a0c2cef899bfba14f4d4fc77b62d1e82a88a504e3e0fad9c29b28c2a4d77cdddb15207f5cb4873368d1eab5889a19bd4ca6b7647fc5382598c0 SHA512 475dd9cf0da0eb3fee396930d03aa5b7bb703409feb468585c8a9aeaf19d19f9a2f47f76b388dd9e866df83c05d542a95e00713c5010509f6512bf8a1bda5b34
-EBUILD mingw-runtime-3.20.2.ebuild 1885 BLAKE2B 23c4e547442cd5fb45f4d20ed983fe1cdb47227f441bbd33fc5cf1889d63cb46ab43792e401b337f9fbfceac0c690e2338fbf29dba0d835d717098e5b110596d SHA512 acf010d890cdac866ecbc41336de4151ab1301755b64226afbdf9039f77b93d3799c33375c49ea2186bb37d46249a8ee4217b69bb297156c132b22668ca937be
-EBUILD mingw-runtime-3.20.ebuild 1813 BLAKE2B 87d775ccbfefcdfd6aadae32ba938ffda4a5ff771bf427b1cc192f42aa6aefbf7abce52259e30ebadb56d5848f753afcf8a92f87152e0869d79c10ad0c9d5645 SHA512 12ced00fc0e1ebd1837bc9105b5dd93158894301abde6e0db77e17316b48004ec4b577b9cb6af7052858824b915293f38b5985bc6e1832ab4836209b9eb19236
-EBUILD mingw-runtime-4.0.3.1.ebuild 1886 BLAKE2B 386b09ddab89cfd318edd224ccc827bb6a77a371b4186d5e39ec7a5a67ebc46f324810c0701d6e04a6c008afc6d9eb99945a12a1dedbf8870c00ae093fa38db5 SHA512 e0d87ea7eba4fa833c2b5bde35360dfd73aa6fa10140468a4654966e6e351ebe6c21b6c69dab94660544fde168239a76fa45905e286205c972a0b6668d9d74c6
-MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
deleted file mode 100644
index eff81002e624..000000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3446009&group_id=2435&atid=302435
-https://bugs.gentoo.org/419627
-
---- a/tlssup.c
-+++ b/tlssup.c
-@@ -84,6 +84,7 @@ BOOL WINAPI
- __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
- {
-   _PVFV *pfunc;
-+  int nfuncs, ifunc;
- 
-   /* We don't let us trick here.  */
-   if (_CRT_MT != 2)
-@@ -96,8 +97,12 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
-       return TRUE;
-     }
- 
--  for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc)
-+  /* Use the nfuncs variable to iterate the TLS functions instead of pfunc to
-+     avoid nasty compiler optimizations when comparing two global pointers. */
-+  nfuncs = &__xd_z - (&__xd_a + 1);
-+  for (ifunc=0; ifunc < nfuncs; ++ifunc)
-     {
-+      pfunc = (&__xd_a + 1) + ifunc;
-       if (*pfunc != NULL)
-         (*pfunc)();
-     }
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
deleted file mode 100644
index 49377fe2b099..000000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&atid=102435&aid=3441135&group_id=2435
-https://bugs.gentoo.org/395893
-
-????-??-??  Keith Marshall  <keithmarshall@...>
-
-	Support pragmatic identification for w32api source directory.
-
-	* aclocal.m4 (MINGW_AC_W32API_SRCDIR): New macro; implement it.
-	* configure.in (W32API_INCLUDE): Assign using MINGW_AC_W32API_SRCDIR.
-	* Makefile.in (W32API_INCLUDE): Prefix -I flag to AC_SUBST value.
-	* mingwex/Makefile.in (W32API_INCLUDE): Likewise.
-	* profile/Makefile.in (W32API_INCLUDE): Likewise.
-
-diff -r 62c176864807 Makefile.in
---- a/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -166,9 +166,9 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_
- # Various libraries.
- LIBM_A=@LIBM_A@
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I$(srcdir)/include \
--  -I$(srcdir)/../include \
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I $(srcdir)/include \
-+  -I $(srcdir)/../include \
-   -nostdinc \
-   -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-diff -r 62c176864807 aclocal.m4
---- a/aclocal.m4	Mon Nov 28 11:32:25 2011 +0000
-+++ b/aclocal.m4	Mon Nov 28 21:18:55 2011 +0000
-@@ -15,7 +15,65 @@ AC_DEFUN([MINGW_AC_CONFIG_SRCDIR],
-  AC_MSG_CHECKING([package version])
-  PACKAGE_VERSION=`awk '$[2] == "'"$1"'" { print $[3] }' ${srcdir}/$2`
-  AC_MSG_RESULT([$PACKAGE_VERSION])dnl
--]) #MINGW_AC_CONFIG_SRCDIR
-+])# MINGW_AC_CONFIG_SRCDIR
-+
-+# MINGW_AC_W32API_SRCDIR
-+# ----------------------
-+# Attempt to identify the location of the w32api sources.
-+# Accept an explicit location specified by to user, as argument
-+# to --with-w32api-srcdir; if unspecified, fall back to standard
-+# location relative to ${srcdir}.  Identification requires that
-+# include/windows.h is present within the nominated directory.
-+# This is naive, but AC_CHECK_HEADER cannot be used because
-+# the system's w32api headers will interfere.
-+#
-+AC_DEFUN([MINGW_AC_W32API_SRCDIR],
-+[AC_ARG_WITH([w32api-srcdir],
-+ [AS_HELP_STRING([--with-w32api-srcdir=DIR],
-+  [locate w32api sources in DIR [SRCDIR/../w32api]])
-+ ],[],[with_w32api_srcdir=NONE])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_CHECKING([include path for w32api headers])
-+  for with_w32api_srcdir in ${srcdir}/../w32api*; do
-+    test -f "${with_w32api_srcdir}/include/windows.h" && break
-+    with_w32api_srcdir=NONE
-+  done
-+  AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+  [AC_MSG_RESULT([none found])
-+   AC_MSG_RESULT
-+   AC_MSG_WARN([source directory containing include/windows.h not found])
-+   AC_MSG_WARN([ensure w32api sources are installed at \${top_srcdir}/../w32api*])
-+   AC_MSG_WARN([or use --with-w32api-srcdir=DIR to specify an alternative])
-+  ],
-+  [case "${with_w32api_srcdir}" in
-+     "${srcdir}/"*) with_w32api_srcdir="`echo "${with_w32api_srcdir}"dnl
-+       | sed s,"^${srcdir}/",'${top_srcdir}/',`" ;;
-+   esac
-+   AC_MSG_RESULT([${with_w32api_srcdir}/include])
-+  ])
-+ ],
-+ [AC_MSG_CHECKING([for windows.h in ${with_w32api_srcdir}/include])
-+  AS_IF([test -f "${with_w32api_srcdir}/include/windows.h"],
-+  [AC_MSG_RESULT([yes])
-+   case "${with_w32api_srcdir}" in /*) ;;
-+     *) with_w32api_srcdir='${top_builddir}/'"${with_w32api_srcdir}" ;;
-+   esac
-+  ],
-+  [AC_MSG_RESULT([no])
-+   AC_MSG_RESULT
-+   AC_MSG_WARN([the nominated directory, ${with_w32api_srcdir}])
-+   AC_MSG_WARN([does not appear to contain valid w32api source code])
-+   AC_MSG_WARN([(file '${with_w32api_srcdir}/include/windows.h' is not present)])
-+   with_w32api_srcdir=NONE
-+  ])
-+ ])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_WARN([please correct this omission and run configure again])
-+  AC_MSG_RESULT
-+  AC_MSG_ERROR([unable to continue until this issue is resolved])
-+ ])
-+ W32API_INCLUDE="${with_w32api_srcdir}/include"
-+])# MINGW_AC_W32API_SRCDIR
- 
- # The following is copied from `no-executables.m4', in the top
- # `src/config' directory.
-diff -r 62c176864807 configure.in
---- a/configure.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/configure.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -44,7 +44,7 @@ AC_CHECK_TOOL([WINDRES], [windres], [win
- 
- AC_SUBST([NO_CYGWIN])
- AC_SUBST([HEADER_SUBDIR])
--AC_SUBST([W32API_INCLUDE], ['-I ${top_srcdir}/../w32api/include'])
-+AC_SUBST([W32API_INCLUDE], [MINGW_AC_W32API_SRCDIR])
- 
- # The following are used by the GCC profiling hooks...
- #
-diff -r 62c176864807 mingwex/Makefile.in
---- a/mingwex/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/mingwex/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -126,10 +126,9 @@ ifdef NO_CYGWIN
- override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
- endif
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir} -I${top_srcdir}/include \
--  -nostdinc \
--  -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir} -I ${top_srcdir}/include \
-+  -nostdinc -isystem @W32API_INCLUDE@ -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
- 
-diff -r 62c176864807 profile/Makefile.in
---- a/profile/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/profile/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -65,10 +65,9 @@ THREAD_DLL = @THREAD_DLL@
- THREAD_DLL_VERSION = 10
- THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir}/include \
--  -nostdinc \
--  -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir}/include \
-+  -nostdinc -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
- 
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
deleted file mode 100644
index 6c377f90be9b..000000000000
--- a/dev-util/mingw-runtime/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>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mingw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
deleted file mode 100644
index fde71e0d98cb..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #419627
-	sed -i \
-		-e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
-		$(find -name configure) || die
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_compile() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf --host=${CTARGET} || die
-	emake || die
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${insdir}"/usr/doc
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
deleted file mode 100644
index cd21a8f2e9f8..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic autotools versionator eutils
-
-MY_P="mingwrt-$(version_format_string '$1.$2-$3')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
-	eautoconf
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
deleted file mode 100644
index e75340a8d33d..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic autotools eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
-	eautoconf
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
deleted file mode 100644
index 0a13e7773d86..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_P="mingwrt-$(version_format_string '$1.$2.$3-$4')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with w32api-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}-src
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	filter-flags -frecord-gcc-switches
-	tc-export AR
-	econf \
-		--host=${CTARGET} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/*
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake -j1 install DESTDIR="${insdir}"
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw64-runtime-3.0.0 b/dev-util/mingw64-runtime-3.0.0
new file mode 100644
index 000000000000..9fdcd33e8566
--- /dev/null
+++ b/dev-util/mingw64-runtime-3.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install setup
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v3.0.0.tar.bz2
+_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_=4ade351dc0f821df6c11573de61b19a0
diff --git a/dev-util/mingw64-runtime-3.1.0 b/dev-util/mingw64-runtime-3.1.0
new file mode 100644
index 000000000000..05bfa3d62096
--- /dev/null
+++ b/dev-util/mingw64-runtime-3.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install setup
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v3.1.0.tar.bz2
+_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_=4ade351dc0f821df6c11573de61b19a0
diff --git a/dev-util/mingw64-runtime-3.2.0-r1 b/dev-util/mingw64-runtime-3.2.0-r1
new file mode 100644
index 000000000000..faa013c0ea6c
--- /dev/null
+++ b/dev-util/mingw64-runtime-3.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install setup
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v3.2.0.tar.bz2
+_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_=4ade351dc0f821df6c11573de61b19a0
diff --git a/dev-util/mingw64-runtime-4.0.1 b/dev-util/mingw64-runtime-4.0.1
new file mode 100644
index 000000000000..62acfb25f0b3
--- /dev/null
+++ b/dev-util/mingw64-runtime-4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v4.0.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d6a7879ddbe0e6534900cdea271ab9bd
diff --git a/dev-util/mingw64-runtime-4.0.4 b/dev-util/mingw64-runtime-4.0.4
new file mode 100644
index 000000000000..ebcd2bfd7c7a
--- /dev/null
+++ b/dev-util/mingw64-runtime-4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v4.0.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e53ae24c11169dc5c0b50d7ab82f2585
diff --git a/dev-util/mingw64-runtime-4.0.6 b/dev-util/mingw64-runtime-4.0.6
new file mode 100644
index 000000000000..51c424928244
--- /dev/null
+++ b/dev-util/mingw64-runtime-4.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v4.0.6.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4ebb2d903fba5a82b93419d81c5aecad
diff --git a/dev-util/mingw64-runtime-5.0.1 b/dev-util/mingw64-runtime-5.0.1
new file mode 100644
index 000000000000..9ae75b646798
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=86a10f7e7a68338c35aff0ca57eba0c6
diff --git a/dev-util/mingw64-runtime-5.0.2 b/dev-util/mingw64-runtime-5.0.2
new file mode 100644
index 000000000000..345d778bbe75
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=86a10f7e7a68338c35aff0ca57eba0c6
diff --git a/dev-util/mingw64-runtime-5.0.2-r1 b/dev-util/mingw64-runtime-5.0.2-r1
new file mode 100644
index 000000000000..eb6f8a73dafc
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bb0487254d6ac7b27fe1c791afb2bc06
diff --git a/dev-util/mingw64-runtime-5.0.2-r2 b/dev-util/mingw64-runtime-5.0.2-r2
new file mode 100644
index 000000000000..5bc195565207
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1041407b868576f394b64336a133a26d
diff --git a/dev-util/mingw64-runtime-5.0.3 b/dev-util/mingw64-runtime-5.0.3
new file mode 100644
index 000000000000..9a99212430c9
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4c1b4e2dd7aea13d963270976321728c
diff --git a/dev-util/mingw64-runtime-5.0.3-r1 b/dev-util/mingw64-runtime-5.0.3-r1
new file mode 100644
index 000000000000..1cd9af63f6b3
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5a92e4b94efd4874f383eb81420c8af6
diff --git a/dev-util/mingw64-runtime-5.0.3-r2 b/dev-util/mingw64-runtime-5.0.3-r2
new file mode 100644
index 000000000000..4076e7006199
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1685cba60f82bacbceb988d48c2eae68
diff --git a/dev-util/mingw64-runtime-5.0.4 b/dev-util/mingw64-runtime-5.0.4
new file mode 100644
index 000000000000..35ebf37c89a3
--- /dev/null
+++ b/dev-util/mingw64-runtime-5.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v5.0.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8662016523ed42f9cc6f35fc6178926e
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
deleted file mode 100644
index 906d226b5c4e..000000000000
--- a/dev-util/mingw64-runtime/Manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-AUX mingw64-runtime-4.0.1-build.patch 2981 BLAKE2B 10d65cddf96527ef5909106526dc8a5e977ffb3c216b78fdccc55ed9f4178b78424ea455a2cd150c6f90fca62dab0fc4c434ebc9df5662156d795437a95daa9d SHA512 6495f898b736188800b1fc02956cfe021c7668a2d38d8acabc2d035e90aa1d72d761ae15141396f8d3dad8ac7111dcaac5fdb0c59c0d34bd2d820e54ab30c89d
-AUX mingw64-runtime-4.0.1-winpthreads.patch 3142 BLAKE2B 7e70e058aa3e96d638c0f617c912ea42edf3a696acc907b3aef4d39e8207fd60ff8260168136da651d396ab85a6139a02e763dbf176df1930ac0a9fc1282b6e9 SHA512 5a4e34257f0eb9f3f9b51677459111b08b389dbebf3f29d30d99dcccd06e41bf1b82d6d0a1ce01fbfa5c0833bff205679203a0146d77b5416ef277c4c047a492
-AUX mingw64-runtime-5.0.2-implicit-fallthrough.patch 1329 BLAKE2B 597fe524eb50da22f4f034301bba2287a290a0b3125f76943a892bdd65fcc2b319a52791a4adaed18b4ff25040f4f534a1fbfa2686e1e7d478a145bcfb6c3d01 SHA512 9de46f074d42fd7dcc7b9ce01343eae22d803a8f20662b57e309aad5c7f349552048fe2ab39983b5f7e4b7b703617e6e884ef2714c9a67ea47129d4ae6dd1f8b
-AUX mingw64-runtime-5.0.2-locale.patch 595 BLAKE2B 475bb6aef664821d7e1f94c1188774840ff93c00671b6f2ffc2a42c1eced5334f8805d9c718f82550926c50b5779020e57c181d43ec00d4452b48d1cd7d092a2 SHA512 82d1fc293be628f8e967a108001d0e04c53e6c4581be2aa954e05c07e52473a6ffb4cedffc1f27202ea607316e6d38e64997ccc8d3eaee44125ec795d9a30553
-AUX mingw64-runtime-5.0.3-build.patch 1116 BLAKE2B 18ac65c7c7dbc94ca9101f4221407f656702f178ce4d9bfe5647205fccde201d8945a282084e751aef041d37fd72ca041b7f491eb006177e18609b06db7a7b6a SHA512 5f3cebbb246e831617e020e240b8c700be0c31e7fe85a0da30ee36b2e5184fff4061ea205e4e7afa6105d8fcc79b8a956238a6342c314b8c3b38d2da6a8cc0ec
-DIST mingw-w64-v3.0.0.tar.bz2 7012419 BLAKE2B a1c7f4cb1b25bfb8e44ae782895a7f6fd9deb17bcdfae3a6184a8da562fc2f371df693b2a423a58c626a327b3b70b20ae9ba10db0936dbfcc1236d6cc4f2af0e SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989
-DIST mingw-w64-v3.1.0.tar.bz2 7021162 BLAKE2B d7e757911ebedb57c7ad9d4a7926e6fbadc171caad1ad9c3e6117538bffff65e07e3e732a697abc0925293079d863240efbae3d58180052dc33e2eb6346dfbd7 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8
-DIST mingw-w64-v3.2.0.tar.bz2 7053254 BLAKE2B 29ba4837f8bf970a76a1a7159f58fba1058d805d4a6c033ba5d13eebb506dd5ef3d4a8dc11a253fc7b10350a813012194c0fcea9eb234d556e6577fd3197f4cc SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593
-DIST mingw-w64-v4.0.1.tar.bz2 10803072 BLAKE2B 7863b388a9cb011e9ff6e4adec9ef0b3842c7bfabca8812287dc5dff7ba9f2cf35a097322ec8e117fd41a36b7b05d305abd8e7c45747b76ea8fda85f037c276e SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b
-DIST mingw-w64-v4.0.4.tar.bz2 10812375 BLAKE2B 59180d741e0b4325a4c02690a21f8a04304e46744c5a986ef79a13fe1d68a1d25a7ff7866232e4f09937a3cb8442cb2497c781dd5cab42e11a1bbe2c5b76ddfd SHA512 06de6b592f776676184a9c50c63eb105c82a912965dee5d8217f9b5b325e0258c188f5d7d5e28aaeacf7bad44ce5d36bd837b9f1cbb91358754787738fb15146
-DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38b9cfe436f4d0a55c7e8bca2708bd92c6cfe1be072fae428d88c682215d390ec1ff15b38485540adb2b77dd8724f1837 SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020
-DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
-DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
-DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
-DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
-EBUILD mingw64-runtime-3.0.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-3.1.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-3.2.0-r1.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-4.0.1.ebuild 2548 BLAKE2B aef0473dfc7211ac19ff4f57e080a881d1c0c7d282ac2432549f5a2ee425c529a419e25009352daa58188a6d4a07b79fb54b5b07ac9643bd9e170814fa60e1b1 SHA512 38c1ce7514a4fa35931d3fc8b97a0bd5f0e1027ee9d7b07326f7e7f2598fa747f94bfb6d750d98fc15841a2ccaa45a9f321e4ef0a2aecb4ba49e7598003c152b
-EBUILD mingw64-runtime-4.0.4.ebuild 2562 BLAKE2B fde901cf5ecbfb20c0cf94a847f41b6eaa4c2b12a308fc754b2f31808e611574168f80535a71ee8ab55a4ead555a109a944cb492f5fb6cd558ee644c4c2a9b65 SHA512 51bcd841320ca40b48453e4cf8832ca494751a5d5c9f7014b326eff92d3e16a2c11d8e8074aa9066cdbc44007c2914d5f3abeed2a0cc1c4f02434504e12b1149
-EBUILD mingw64-runtime-4.0.6.ebuild 2516 BLAKE2B eba545412da47c8d2adfab359c12071619a0f7b10fb925382dcc3ec09b4de52c51db3c633ef923c0dfcfc3cd55cf9c872216da4d6dc5f0fbb18d623c26f5b777 SHA512 a60f10631f26e8eb26aa7ad071af73115c2c7ec84ef39d73d228a4bc038cc2f10788401424d845264f09b0a74682f53d6bd8362005b8c8abc93e16681faf4392
-EBUILD mingw64-runtime-5.0.1.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
-EBUILD mingw64-runtime-5.0.2-r1.ebuild 2615 BLAKE2B fda70d33c5c91481a162f88e431996582fb0da14b6a6c725aa1879780a9b993fa18bd522a9808f71cdf6b2eda5205b073a5e24ff2f605e74327318cc5ccc88ad SHA512 9c6520b42eaa6f06ab03da66284a6648b6d787323367ebd6b0be57c116a7644f131492779023fd1a8708fd8711347247e199a0aee9783fe51b6d11ef76e33528
-EBUILD mingw64-runtime-5.0.2-r2.ebuild 2655 BLAKE2B 1b9cf748d095cc8c7d7683a07462b8c9ea8116418bd549a93d4392f8bfd61b60d70a50bf4d8102f7b271c56b86768f879a745140b29b7b7a2057feae85e44ce7 SHA512 38e16934a793b9c1fe05a4f611682fffbb336e509d49ada6c9bfacb97d55144815177986b892e9650e3842a47699229efc154ff842f4db034bf91f3e21c86b2b
-EBUILD mingw64-runtime-5.0.2.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
-EBUILD mingw64-runtime-5.0.3-r1.ebuild 2572 BLAKE2B 9caca29d8aa7fdf54d3437a3801d7640bac7e4c9becd805b311a7247103d8772b8cfcef553db1175ed7b4973bd6667a5f7715b2179b1e66a0e44f90d366e9fae SHA512 c7b33d49e829790eaddd9739c5077a036a68ec0beae3e9d0a39687870028fc4a757878d6be89900ba56ac08cedfd5e7f90f4c1a26591902332de2b0a23dbde9f
-EBUILD mingw64-runtime-5.0.3-r2.ebuild 2683 BLAKE2B 92ccdb40cc2ebdc49bc903da98384f82a5fd7836f990b861662bdfb338478339702831b1e13c46301fd2329f2718e22357af0edc56dee238a75ff938207975bb SHA512 67946916dcc13cbae20ed39e8d90ad0905fd3179f3aed454e41dc48d417db33db61e374bbe00764ab373972cfd88a405a296950f5e13a4c4e34c73cb7d22f85c
-EBUILD mingw64-runtime-5.0.3.ebuild 2497 BLAKE2B ba30e069818937c620dc436e4a3c8d9e9bc0838620c80372f8e30153c2f3903dbfda3e0c6d157e9cccd94241bc3da47dec7ba3b92a39808b85771fc58dc2636d SHA512 8cf13af35caf3ceb2fc8bafdb6e3f980a0d63bc7795ef8bf12e2b6195bf1bb6e8fe0c0c0b5af45350c3e4a83a14ac4d7b98f1e4f9bf3c6807a29533f6eb1947e
-EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7
-MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
deleted file mode 100644
index 6461b98e5044..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 21:31:10 +0300
-Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
-
-this somewhat reduces the error checking, but makes code and usage nicer.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 55 ++++++++++++-------------------------------------------
- 1 file changed, 12 insertions(+), 43 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b1..1b59821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
-     [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
--AS_CASE([$with_libraries],
--  [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=yes
--    with_libraries_pseh=yes],
--  [libmangle],[
--    with_libraries="libmangle"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=yes
--    with_libraries_pseh=no],
--  [pseh],[
--    with_libraries="pseh"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=yes],
--  [winpthreads],[
--    with_libraries="winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [no],[
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [MW64_OPTION_ERROR([with-libraries])])
-+for l in winpthreads mangle pseh; do
-+  res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_libraries],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_libraries_$l], [res])
-+done
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
- AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
-@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
-     [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
-   [],
-   [with_tools=no])
--AS_CASE([$with_tools],
--  [yes|all],[
--    with_tools="gendef,genidl"
--    with_tools_gendef=yes
--    with_tools_genidl=yes],
--  [gendef],[
--    with_tools="gendef"
--    with_tools_gendef=yes
--    with_tools_genidl=no],
--  [genidl],[
--    with_tools="genidl"
--    with_tools_gendef=no
--    with_tools_genidl=yes],
--  [no],[
--    with_tools_gendef=no
--    with_tools_genidl=no],
--  [MW64_OPTION_ERROR([with-tools])])
-+for t in gendef genidl; do
-+  res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_tools],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_tools_$t], [res])
-+done
- AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
- AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
- AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
--- 
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
deleted file mode 100644
index 0d3e59dc9dd5..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 20:39:52 +0300
-Subject: [PATCH 1/2] build: autoconf: support winpthreads library
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile.am  |  6 +++++-
- configure.ac | 15 +++++++++++++--
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 26a7606..308b6fd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
-   MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
- endif
- 
-+if LIBRARIES_WINPTHREADS
-+  MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
-+endif
-+
- if TOOLS_GENDEF
-   MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
- endif
-@@ -22,7 +26,7 @@ if TOOLS_GENIDL
-   MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
- endif
- 
--SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
-+SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
- 
- DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
- 
-diff --git a/configure.ac b/configure.ac
-index 4bb3926..468d1b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
- AC_MSG_CHECKING([whether to build the optional libraries])
- AC_ARG_WITH([libraries],
-   [AS_HELP_STRING([--with-libraries=ARG],
--    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
-+    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh"
-+    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
-     with_libraries_pseh=yes],
-   [libmangle],[
-     with_libraries="libmangle"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=yes
-     with_libraries_pseh=no],
-   [pseh],[
-     with_libraries="pseh"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=yes],
-+  [winpthreads],[
-+    with_libraries="winpthreads"
-+    with_libraries_winpthreads=yes
-+    with_libraries_mangle=no
-+    with_libraries_pseh=no],
-   [no],[
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=no],
-   [MW64_OPTION_ERROR([with-libraries])])
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
-+AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
- AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
- AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
-+AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
- AC_MSG_RESULT([$with_libraries])
- 
- AC_MSG_CHECKING([whether to build the optional tools])
--- 
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
deleted file mode 100644
index 859e00243d33..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..cefdd8cb 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -1031,13 +1031,16 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
--  case c_lb:
--  case c_2: sz++;
--  case c_retn: case c_retf:
--  case c_iret: case c_int3:
--  case c_ad: case c_op:
-+  case c_4: sz++; // fallthrough
-+  case c_3: sz++; // fallthrough
-+  case c_lb: // fallthrough
-+  case c_2: sz++; // fallthrough
-+  case c_retn: // fallthrough
-+  case c_retf: // fallthrough
-+  case c_iret: // fallthrough
-+  case c_int3: // fallthrough
-+  case c_ad: // fallthrough
-+  case c_op: // fallthrough
-   case c_1: *aCode=tb1; return sz;
-   case c_lv:
-     if (oper_mode) sz+=4;
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..6a37b1a0 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
- 	  goto error_point;
- 	case 'h':
- 	  if (h[2] == 0)
--	    show_usage ();
-+	    show_usage (); // fallthrough
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
deleted file mode 100644
index a7a0a09dc162..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/mingw-w64-crt/lib32/msvcrt.def.in
-+++ b/mingw-w64-crt/lib32/msvcrt.def.in
-@@ -138,6 +138,7 @@ _copysign
- _cprintf
- _cputs
- _creat
-+_create_locale
- _cscanf
- _ctype DATA
- _cwait
-@@ -192,6 +193,7 @@ _fpieee_flt
- _fpreset DATA
- _fputchar
- _fputwchar
-+_free_locale
- _fsopen
- _fstat
- _fstat32 == _fstat
---- a/mingw-w64-crt/lib64/msvcrt.def.in
-+++ b/mingw-w64-crt/lib64/msvcrt.def.in
-@@ -240,6 +240,7 @@ _cprintf_p_l
- _cputs
- _cputws
- _creat
-+_create_locale
- _cscanf
- _cscanf_l
- _cscanf_s
-@@ -315,6 +316,7 @@ _fputchar
- _fputwchar
- _fscanf_l
- _fscanf_s_l
-+_free_locale
- _fsopen
- _fstat
- _fstat64
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
deleted file mode 100644
index 624a492338e3..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Nov 2017 21:58:10 +0200
-Subject: [PATCH] build: enable pseh only in x86
-
-pseh supports only x86, no point in enabling it when libraries are
-enabled. This enables downstream to enable libraries without failing.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b19..cfb07362 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries="libmangle,winpthreads"
-     with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
--    with_libraries_pseh=yes],
-+    AS_CASE([$host_cpu],
-+      [i?86], [
-+        with_libraries="$with_libraries,pseh"
-+        with_libraries_pseh=yes
-+      ])],
-   [libmangle],[
-     with_libraries="libmangle"
-     with_libraries_winpthreads=no
--- 
-2.13.6
-
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
deleted file mode 100644
index 5d6c0c23c0d6..000000000000
--- a/dev-util/mingw64-runtime/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="project">
-    <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <use>
-    <flag name="idl">
-    Install idl files.
-  </flag>
-    <flag name="libraries">
-    Build extra libraries.
-  </flag>
-    <flag name="tools">
-    Build extra tools.
-  </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">mingw-w64</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.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
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.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
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.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
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
deleted file mode 100644
index 3bb7305cf0f7..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-winpthreads.patch"
-	epatch "${FILESDIR}/${P}-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
deleted file mode 100644
index f279453e0e46..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
deleted file mode 100644
index 2a6523281428..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
deleted file mode 100644
index 25df5eae738c..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
deleted file mode 100644
index 5141174deb44..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-	"${FILESDIR}/${PN}-5.0.2-locale.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
deleted file mode 100644
index 68655a1ed3a5..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	is_crosscompile && use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix="${EPREFIX}"$(alt_prefix) \
-		--includedir="${EPREFIX}"$(alt_prefix)/usr/include \
-		--libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
deleted file mode 100644
index e52536087f3e..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
deleted file mode 100644
index 225bba7d7322..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
deleted file mode 100644
index 25722876100e..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/molecule-2 b/dev-util/molecule-2
new file mode 100644
index 000000000000..964af9d6a499
--- /dev/null
+++ b/dev-util/molecule-2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for dev-util/molecule-core and dev-util/molecule-plugins
+EAPI=6
+HOMEPAGE=http://www.sabayon.org
+IUSE=+plugins
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/molecule-core-1.0.2 plugins? ( >=dev-util/molecule-plugins-1.0.2 )
+SLOT=0
+_md5_=c2a60a36b125501c60a4e39b81a85f9d
diff --git a/dev-util/molecule-core-1.0.2-r1 b/dev-util/molecule-core-1.0.2-r1
new file mode 100644
index 000000000000..f1ddc53a2196
--- /dev/null
+++ b/dev-util/molecule-core-1.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=dev-util/intltool sys-devel/gettext
+DESCRIPTION=Sabayon distro-agnostic images build tool
+EAPI=6
+HOMEPAGE=http://www.sabayon.org
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<dev-util/molecule-1 sys-process/lsof 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=mirror://sabayon/dev-util/molecule-core-1.0.2.tar.bz2
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0b28c4b881246ca1e13a5236c21c5a82
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
deleted file mode 100644
index 3dd3c51f6edc..000000000000
--- a/dev-util/molecule-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 636 BLAKE2B 226407ff9b3daa3579cb4594b6a70083599554737324ed761432377f9f8334d9d01ff95b1e54aa0c693eb959638acc0a88b88f27b4185fed1cdfbbaf1f9098c0 SHA512 9798239f564bacbdd13243f3e3357a67419b0f8eb4977a2f8d761008ca8f8af5b7c3fc260d39dda18ea686e88a52865bb5b294d4ab199b9dd5fa49c8a2bb2ce3
-MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
deleted file mode 100644
index d531ba147a5e..000000000000
--- a/dev-util/molecule-core/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="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<longdescription lang="en">
-		Molecule is a build tool that can build, rebuild or extend Sabayon Linux or
-		Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
-		It doesn't contain any specific package manager bit and can work with
-		your favourite one. The philosophy of Molecule is simple: ease of use and
-		modularity.
-		Just like Catalyst, Molecule uses its own .spec file format and learning
-		how to write one is just about reading examples provided at
-		http://git.sabayon.org/molecules.git/.
-		You can tweak your ISO image or create one off your chroot (stage4) in no
-		time. Molecule uses a plugin-based system to implement support for new
-		execution patterns (like ISO to ISO, ISO to Tar, Chroot to ISO, etc).
-		Molecule is born inside Sabayon and is used in its release cycle for both
-		daily(live) and versioned ISO images.
-		Molecule developers are looking for help for writing user docs and HOWTOs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
deleted file mode 100644
index 5ce8515f2b95..000000000000
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +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_3,3_4,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="Sabayon distro-agnostic images build tool"
-HOMEPAGE="http://www.sabayon.org"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/intltool
-	sys-devel/gettext"
-RDEPEND="!<dev-util/molecule-1
-	sys-process/lsof
-	${PYTHON_DEPS}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
-		PREFIX="/usr" SYSCONFDIR="/etc" install
-}
diff --git a/dev-util/molecule-plugins-1.0.2-r1 b/dev-util/molecule-plugins-1.0.2-r1
new file mode 100644
index 000000000000..054f060a596b
--- /dev/null
+++ b/dev-util/molecule-plugins-1.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-util/molecule-core-1.0.1 !<dev-util/molecule-1
+DESCRIPTION=A set of base plugins for Molecule
+EAPI=6
+HOMEPAGE=http://www.sabayon.org
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/molecule-core-1.0.1 !<dev-util/molecule-1 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools 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=mirror://sabayon/dev-util/molecule-plugins-1.0.2.tar.bz2
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ec622592e812de7b8cecded9efc6325
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
deleted file mode 100644
index dc3ff611bc4a..000000000000
--- a/dev-util/molecule-plugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST molecule-plugins-1.0.2.tar.bz2 17428 BLAKE2B 60fac83a501bd8f0c05588dcace522c59093cd0fcebcc87d86c8b8301f775d4cb6367e2d83c3146b1514e53f800dd2a34185d48575636c401724dc4e471b230a SHA512 65b75c23f3c662812be2ab4fe0c92bd99aba48da6e05aad6175ba3fe1cd8106d9085ed53f27c738ef6af1b327ac8ac872ef7c3c48728366b510b7a82bb90c866
-EBUILD molecule-plugins-1.0.2-r1.ebuild 689 BLAKE2B 7ad76bb2095f639d2a4ca6a9129f6160310c14dd04bba605846f9a9adae94f7bab433c19cf6535a98dcdc255f80be912f7c6db50a38b194b9ae78026f3fe368c SHA512 aeebf6736c4727ea0c6e50d3fb86e504805cca32dbbba93c299474f69341dfed6b42eb2058f28eab4b756fcce83088ffc85cea886690024fb8e08846d411e650
-MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/molecule-plugins/metadata.xml
deleted file mode 100644
index d396d1b7e5a1..000000000000
--- a/dev-util/molecule-plugins/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>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
deleted file mode 100644
index 746d3b7fc28e..000000000000
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.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} )
-
-inherit python-r1
-
-DESCRIPTION="A set of base plugins for Molecule"
-HOMEPAGE="http://www.sabayon.org"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	>=dev-util/molecule-core-1.0.1
-	!<dev-util/molecule-1"
-RDEPEND="${DEPEND}
-	net-misc/rsync
-	sys-fs/squashfs-tools
-	sys-process/lsof
-	virtual/cdrtools
-	${PYTHON_DEPS}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
-		PREFIX="/usr" SYSCONFDIR="/etc" install
-}
diff --git a/dev-util/molecule/Manifest b/dev-util/molecule/Manifest
deleted file mode 100644
index 9ddf6fcca51d..000000000000
--- a/dev-util/molecule/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD molecule-2.ebuild 412 BLAKE2B db88d5bcca6b3b2958722af3bca51337bb835a3f840d8c18449ec236fde57507eb15c5a743ef79d4bf04ccd95d1281e30c24526f27a2f1134b0a414ea1d762b1 SHA512 c8151d3c5311d4684ac6407591666cf175d9007f7a9c9f7dd741104f48602c1ddc50262c139ab60aa4374d2688def5d711afe12c01a43cc1df68bc5099888ca0
-MISC metadata.xml 346 BLAKE2B 830af22619d9811dc4fe57284341e78745cadff972125d644a02453a2b4dda0ca787d7826a1f7b029b1b66f1242b49a561b1d9bca83b491ab4b1440904657761 SHA512 375fa961d0458d6e8ee556a76fcd9396b9b415880af196592b27aaffd02f5c68f8a8a8b2fe4a8346b2fb18aa94b2c0c2e806ff221f9f3a80fa8cc0700a8c4a5b
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
deleted file mode 100644
index e14a66af6247..000000000000
--- a/dev-util/molecule/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>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<use>
-		<flag name="plugins">Add plugins provided by dev-util/molecule-plugins</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/molecule/molecule-2.ebuild b/dev-util/molecule/molecule-2.ebuild
deleted file mode 100644
index d03edd9c576b..000000000000
--- a/dev-util/molecule/molecule-2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Meta package for dev-util/molecule-core and dev-util/molecule-plugins"
-HOMEPAGE="http://www.sabayon.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-DEPEND=""
-RDEPEND=">=dev-util/molecule-core-1.0.2
-	plugins? ( >=dev-util/molecule-plugins-1.0.2 )"
diff --git a/dev-util/mpatch-0.8-r1 b/dev-util/mpatch-0.8-r1
new file mode 100644
index 000000000000..d0ba8fbeecca
--- /dev/null
+++ b/dev-util/mpatch-0.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Patch-like tool which can resolve common causes of patch rejects when applying
+EAPI=5
+HOMEPAGE=http://oss.oracle.com/~mason/mpatch/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=519506b095888ca07b794196065fcd3e
diff --git a/dev-util/mpatch/Manifest b/dev-util/mpatch/Manifest
deleted file mode 100644
index 6d5957bcb4ad..000000000000
--- a/dev-util/mpatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mpatch-0.8.tar.bz2 115774 BLAKE2B 3fc3f14e3ee4e8506685b04fcaa434326f550d07f247a8fa2b8afacd7496566fad70a479049f6b65ae572ff77326eb4a506ec458b2c6b7ce73b7afb9f463e6eb SHA512 1a05d23c923e29cc87dcc0994affd87b9b0b9257f2d410fb28ed2fe5337676274e9c8548df286a81479afa231a80805ac09f3e0e9b6c8942ebef443fbc4f96f1
-EBUILD mpatch-0.8-r1.ebuild 586 BLAKE2B 03fd30f13ea7cd737eb918aa902b0d0ba9fffd60bd1e4dcdadae8e661f664f39bd8a325aa592feae2f9c928e0de7de44f29dbf0c18dbe1a6faef64c596e0c85e SHA512 7961a92e8eb93e0b777a2a21a59aa9db321ed34de1aa1d561143fca1f4684d956e5c4f2669bcbcf61ad09de134b1e6169e42cfa2ba4514001bcf0f65736b637d
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-util/mpatch/metadata.xml b/dev-util/mpatch/metadata.xml
deleted file mode 100644
index a4e0d354f696..000000000000
--- a/dev-util/mpatch/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>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
deleted file mode 100644
index 6bc96da215b0..000000000000
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Patch-like tool which can resolve common causes of patch rejects when applying"
-HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
-SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	dobin cmd/qp cmd/mp
-}
diff --git a/dev-util/mutrace-0.2-r1 b/dev-util/mutrace-0.2-r1
new file mode 100644
index 000000000000..2941c5efdcd7
--- /dev/null
+++ b/dev-util/mutrace-0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/binutils-libs:=
+DESCRIPTION=A mutex tracer/profiler
+EAPI=5
+HOMEPAGE=http://0pointer.de/blog/projects/mutrace.html
+KEYWORDS=~x86 ~amd64 ~arm
+LICENSE=GPL-2 LGPL-3
+RDEPEND=sys-libs/binutils-libs:=
+SLOT=0
+SRC_URI=http://0pointer.de/public/mutrace-0.2.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_=b195eb97a0a67b65564ae7cfd9430921
diff --git a/dev-util/mutrace/Manifest b/dev-util/mutrace/Manifest
deleted file mode 100644
index 558882cb2213..000000000000
--- a/dev-util/mutrace/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mutrace-0.2-missing-header.patch 285 BLAKE2B 74ee2150da797e9088c49b39e853feae67f2925feacd9c2198fbe35c23d07cd947a3a18ed25ccdd690a432f6d73a2e45202616c559227a525c07641af6c2dfeb SHA512 dcf2e9f0a1f6851a6d6820a7032cee9a622149ac3f99822cb1d925e3576ea05ce07e6d1816353c576623a4a64ea6ed4a296d29b3d1dfeec90fa0853aa829aac3
-DIST mutrace-0.2.tar.gz 358710 BLAKE2B 73941debfba7272aaae14cca7d5c52cc11ef8c2f0183b0ac8e21ef5fadccfa325503787fa77c22eaa5c414b7841302d83a5c154ce6d652d75c676e72b1a65adb SHA512 237ef478417a19d5967c80d285dcde68ee8ffce40af4967a3b055347272c66a6bbdfb55ed9bf36633fbaccc7c4fd9c2de09b705ab92b74eefc5e7a7170c0c545
-EBUILD mutrace-0.2-r1.ebuild 523 BLAKE2B 470d9f9d4629d790f951d80aba6764e662c61254edfb76b7d5fa918d9ab9c13d7be0f4fbbff7a96e895cc042941bc0e9cecf72dccb48415d4959c1b438c7caec SHA512 e8fbc404a07dae3f1afea856e4d9661900d1c2553fa9679dfe99643d51e295e07535a5dea425871ebcc60e5f366828b4612e58ff87c3df79445db8d6c2b8919d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/mutrace/files/mutrace-0.2-missing-header.patch b/dev-util/mutrace/files/mutrace-0.2-missing-header.patch
deleted file mode 100644
index aa2c32e79d5e..000000000000
--- a/dev-util/mutrace/files/mutrace-0.2-missing-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- backtrace-symbols.c	2009-09-30 00:30:08.000000000 +0300
-+++ backtrace-symbols.c	2013-10-20 19:54:47.273470222 +0300
-@@ -49,6 +49,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <execinfo.h>
-+#include "config.h"
- #include <bfd.h>
- #include <libiberty.h>
- #include <dlfcn.h>
diff --git a/dev-util/mutrace/metadata.xml b/dev-util/mutrace/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/mutrace/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/dev-util/mutrace/mutrace-0.2-r1.ebuild b/dev-util/mutrace/mutrace-0.2-r1.ebuild
deleted file mode 100644
index a9728aa1ec29..000000000000
--- a/dev-util/mutrace/mutrace-0.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A mutex tracer/profiler"
-HOMEPAGE="http://0pointer.de/blog/projects/mutrace.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-
-DEPEND="sys-libs/binutils-libs:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fails to build due to missing header, bug #430706
-	epatch "${FILESDIR}"/${PN}-0.2-missing-header.patch
-}
diff --git a/dev-util/nemiver-0.9.6 b/dev-util/nemiver-0.9.6
new file mode 100644
index 000000000000..809153282848
--- /dev/null
+++ b/dev-util/nemiver-0.9.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.16:2[dbus] >=dev-cpp/glibmm-2.30:2 >=dev-cpp/gtkmm-3:3.0 >=dev-cpp/gtksourceviewmm-3:3.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=gnome-base/libgtop-2.19 x11-libs/vte:2.91 >=dev-db/sqlite-3:3 sys-devel/gdb dev-libs/boost memoryview? ( >=app-editors/ghex-2.90:2 ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A gtkmm front end to the GNU Debugger (gdb)
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Nemiver
+IUSE=debug memoryview
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16:2[dbus] >=dev-cpp/glibmm-2.30:2 >=dev-cpp/gtkmm-3:3.0 >=dev-cpp/gtksourceviewmm-3:3.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=gnome-base/libgtop-2.19 x11-libs/vte:2.91 >=dev-db/sqlite-3:3 sys-devel/gdb dev-libs/boost memoryview? ( >=app-editors/ghex-2.90:2 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdacea6f313a6772418f831e89af7375
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
deleted file mode 100644
index bd6a90bfe3a9..000000000000
--- a/dev-util/nemiver/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nemiver-0.9.6-bool-build.patch 1672 BLAKE2B a92e7deb5934ced4ec2ffd6e491cce5f5aab0aa105b3220b1d67c03b6a59a1e12fd75f9c0f68ccb7df50d875cd558017e062e22c5a9d207e668aeacd98bc3b28 SHA512 28835958edbaf2fc7cd1a8eca47d118089a46a4e7a6046094092dd8c1d385db0407410b0df90057b601443c0e0b1202dc03276f4b046f565f57f7491b429f77a
-AUX nemiver-0.9.6-fix-build.patch 1123 BLAKE2B 739e42afdf466f23ec3fe3fae91f4040dae9ce6640dfe8b0ad42195785972fbd5a0d902e693246ab8cbabbece66f5e7560e5e83b214f2b4b35387cd3d5256ae7 SHA512 8a4041ea5609af8805da4fd0717cc2c3e38ef3201ca4c0ae5dc9ede193223bc47424bb0590bd90845e758f271c1001140af438b791a2b53c5ee0ec319e70ea9f
-AUX nemiver-0.9.6-gcc6-throw-in-dtors.patch 1734 BLAKE2B 4855d1d946c393815ddb5f54bd1cf74151c05c4fdf4a0a01ea50bc56109589b9fcef63a086edd4806c924ba0791ace37097cfbf1bbb6f3a6953b813c3c421052 SHA512 329c4ba78849fad8b20dba77cf66eca1994532946adb75583e19caa24da9360b50072d8ee9affac18aac65f245a96a911d783434d40ba23cee22a03dba3080cc
-DIST nemiver-0.9.6.tar.xz 1427660 BLAKE2B c7b9aeb7914498af540f664f435cb2e9c07f8b2845f8bc6f5bdc3ee2b2173346d964d44ce4a588665180670cca61581397f33bfc5ac8dd2b3501e8d951d8dec5 SHA512 6fd941975af6e9ba98d7100daf8205f8b61f75ccde4aaf30145a4e2beafe1b96b14ab70d22db7c258aabc7c1a71d4787aa121bc4e943b3fc310e00c13feb4f21
-EBUILD nemiver-0.9.6.ebuild 1407 BLAKE2B 5a61269a0909b47d02dc847afd90dde4279f93e36b101cd73885e462c02983b2135a2c976f17d3fb9453d2e2b0417d933d106f72a51a92a1a7cfc46691ecae59 SHA512 7d332099a32235f626e819ab70d81965ac202b0100e8cb7fa130d65b525257e6f28936640192e300544876482e2a1abb0ea9c44482cc6529eb85765b020ef3f8
-MISC metadata.xml 554 BLAKE2B d078ba85541e172dce9f1b39b8384838e02dd7154a5a204a527cd6a1ce6d30f3133ea071730653bc827d0563d629566493e00fb04472e3599f4e19785fd54e69 SHA512 494c5fc60239abe00af0f60f96a3170f997fc6ce76692b996c2ad38b3a854e305d6af6609e1fdd68a169abc4aa933969519fff04032582b286339ef58628fa09
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch
deleted file mode 100644
index dac65a8a4cc0..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-bool-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001
-From: Marcin Kolny <marcin.kolny@gmail.com>
-Date: Fri, 1 Jul 2016 19:45:05 +0200
-Subject: Use RefPtr::bool() operator in the conditions
-
-Since bool() operator in RefPtr class is explicit,
-comparision with integer doesn't compile.
----
- src/persp/dbgperspective/nmv-dbg-perspective.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-index be652db..ac207e4 100644
---- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
-+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
-@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info,
-     a_source_editor->clear_decorations ();
- 
-     Glib::RefPtr<Gsv::Buffer> asm_buf;
--    if ((asm_buf = a_source_editor->get_assembly_source_buffer ()) == 0) {
-+    if (!(asm_buf = a_source_editor->get_assembly_source_buffer ())) {
-         SourceEditor::setup_buffer_mime_and_lang (asm_buf, "text/x-asm");
-         a_source_editor->register_assembly_source_buffer (asm_buf);
-         asm_buf = a_source_editor->get_assembly_source_buffer ();
-@@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code ()
- 
-     Glib::RefPtr<Gsv::Buffer> source_buf;
-     UString source_path;
--    if ((source_buf = source_editor->get_non_assembly_source_buffer ()) == 0) {
-+    if (!(source_buf = source_editor->get_non_assembly_source_buffer ())) {
-         // Woops!
-         // We don't have any source code buffer. Let's try hard to get
-         // the source code corresponding to the current frame. For that,
--- 
-cgit v0.12
-
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch b/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch
deleted file mode 100644
index 59a893ad003a..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-fix-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001
-From: Ben Iofel <iofelben@gmail.com>
-Date: Thu, 17 Mar 2016 18:28:02 -0400
-Subject: Fix compiliation warnings & errors
-
----
- src/dbgengine/nmv-dbg-common.h        | 2 +-
- src/dbgengine/nmv-i-var-list-walker.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h
-index ad3cc00..0edac7c 100644
---- a/src/dbgengine/nmv-dbg-common.h
-+++ b/src/dbgengine/nmv-dbg-common.h
-@@ -171,7 +171,7 @@ public:
- 
-     bool has_slot () const
-     {
--        return m_slot;
-+        return static_cast<bool> (m_slot);
-     }
- 
-     template<class T>
-diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h
-index b719c0d..f2f3229 100644
---- a/src/dbgengine/nmv-i-var-list-walker.h
-+++ b/src/dbgengine/nmv-i-var-list-walker.h
-@@ -22,7 +22,7 @@
-  *
-  *See COPYRIGHT file copyright information.
-  */
--#ifndef __NMV_VAR_LIST_WALKER_H__
-+#ifndef __NMV_I_VAR_LIST_WALKER_H__
- #define __NMV_I_VAR_LIST_WALKER_H__
- 
- #include "nmv-i-var-walker.h"
--- 
-cgit v0.12
-
diff --git a/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch b/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch
deleted file mode 100644
index 91d90961cb4a..000000000000
--- a/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Bug: https://bugs.gentoo.org/602436
-Upstream PR: https://github.com/GNOME/nemiver/pull/3
-
---- a/src/common/nmv-api-macros.h
-+++ b/src/common/nmv-api-macros.h
-@@ -52,5 +52,12 @@
- #  define NEMIVER_PURE_IFACE
- #  define NEMIVER_API
- # endif //HAS_GCC_VISIBILITY_SUPPORT
-+
-+# if __cplusplus >= 201103L
-+#  define DTOR_NOEXCEPT noexcept(false)
-+# else
-+#  define DTOR_NOEXCEPT
-+# endif //__cplusplus >= 201103L
-+
- #endif
- 
---- a/src/common/nmv-log-stream.cc
-+++ b/src/common/nmv-log-stream.cc
-@@ -393,7 +393,7 @@
-     }
- }
- 
--LogStream::~LogStream ()
-+LogStream::~LogStream () DTOR_NOEXCEPT
- {
-     LOG_D ("delete", "destructor-domain");
-     if (!m_priv) throw runtime_error ("double free in LogStrea::~LogStream");
---- a/src/common/nmv-log-stream.h
-+++ b/src/common/nmv-log-stream.h
-@@ -151,7 +151,7 @@
-                const string &a_default_domain=NMV_GENERAL_DOMAIN);
- 
-     /// \brief destructor of the log stream class
--    virtual ~LogStream ();
-+    virtual ~LogStream () DTOR_NOEXCEPT;
- 
-     /// \brief enable or disable logging for a domain
-     /// \param a_domain the domain to enable logging for
---- a/src/common/nmv-object.cc
-+++ b/src/common/nmv-object.cc
-@@ -68,7 +68,7 @@
-     return *this;
- }
- 
--Object::~Object ()
-+Object::~Object () DTOR_NOEXCEPT
- {
- }
- 
---- a/src/common/nmv-object.h
-+++ b/src/common/nmv-object.h
-@@ -54,7 +54,7 @@
- 
-     Object& operator= (Object const&);
- 
--    virtual ~Object ();
-+    virtual ~Object () DTOR_NOEXCEPT;
- 
-     void ref ();
- 
---- a/src/common/nmv-transaction.h
-+++ b/src/common/nmv-transaction.h
-@@ -116,7 +116,7 @@
-         return m_trans;
-     }
- 
--    ~TransactionAutoHelper ()
-+    ~TransactionAutoHelper () DTOR_NOEXCEPT
-     {
-         if (m_ignore) {
-             return;
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
deleted file mode 100644
index 8ad7abb625a6..000000000000
--- a/dev-util/nemiver/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>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-		Nemiver is an on going effort to write an easy to use standalone C/C++
-		debugger that integrates well in the GNOME environment.
-	</longdescription>
-	<use>
-		<flag name="memoryview">Enable the optional hexadecimal memory inspection with <pkg>app-editors/ghex</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild
deleted file mode 100644
index b5d54807fe31..000000000000
--- a/dev-util/nemiver/nemiver-0.9.6.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
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nemiver"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug memoryview"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2[dbus]
-	>=dev-cpp/glibmm-2.30:2
-	>=dev-cpp/gtkmm-3:3.0
-	>=dev-cpp/gtksourceviewmm-3:3.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=gnome-base/libgtop-2.19
-	x11-libs/vte:2.91
-	>=dev-db/sqlite-3:3
-	sys-devel/gdb
-	dev-libs/boost
-	memoryview? ( >=app-editors/ghex-2.90:2 )
-"
-# FIXME: dynamiclayout needs unreleased stable gdlmm:3
-# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Use RefPtr::bool() operator in the conditions, fixed in next
-	# version
-	"${FILESDIR}/${P}-bool-build.patch"
-
-	# Fix compiliation warnings & errors, fixed in next version
-	"${FILESDIR}/${P}-fix-build.patch"
-
-	# Fix building with GCC-6 and CXXFLAGS="-Werror=terminate"
-	"${FILESDIR}/${P}-gcc6-throw-in-dtors.patch"
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-dynamiclayout \
-		--disable-static \
-		--disable-symsvis \
-		--enable-gsettings \
-		$(use_enable debug) \
-		$(use_enable memoryview)
-}
diff --git a/dev-util/netbeans-8.2 b/dev-util/netbeans-8.2
new file mode 100644
index 000000000000..e5ac0dd2e80c
--- /dev/null
+++ b/dev-util/netbeans-8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.8 app-arch/unzip dev-java/javahelp:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Netbeans IDE
+EAPI=6
+HOMEPAGE=https://netbeans.org/
+IUSE=doc +netbeans_modules_apisupport netbeans_modules_cnd netbeans_modules_dlight netbeans_modules_enterprise netbeans_modules_ergonomics netbeans_modules_extide netbeans_modules_groovy +netbeans_modules_java netbeans_modules_javacard +netbeans_modules_javafx netbeans_modules_mobility netbeans_modules_php +netbeans_modules_profiler netbeans_modules_webcommon +netbeans_modules_websvccommon l10n_af l10n_ar l10n_bg l10n_ca l10n_cs l10n_de l10n_el l10n_es l10n_fil l10n_fr l10n_gl l10n_hi l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_si l10n_sq l10n_sr l10n_sv l10n_ta l10n_tr l10n_vi l10n_zh-CN l10n_zh-TW elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=virtual/jdk:1.8 ~dev-java/netbeans-harness-8.2 ~dev-java/netbeans-ide-8.2 ~dev-java/netbeans-nb-8.2 ~dev-java/netbeans-platform-8.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-8.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-8.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-8.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-8.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-8.2 ) netbeans_modules_extide? ( ~dev-java/netbeans-extide-8.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-8.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-8.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-8.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-8.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-8.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-8.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-8.2 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-8.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-8.2 ) doc? ( ~dev-java/netbeans-javadoc-8.2 ) >=dev-java/java-config-2.2.0-r3
+SLOT=8.2
+SRC_URI=l10n_af? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ar? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_bg? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ca? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_cs? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_de? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_el? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_es? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_fil? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_fr? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_gl? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_hi? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_id? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_it? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ja? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ko? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_lt? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_nl? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pl? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pt-BR? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_pt-PT? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ro? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ru? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_si? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sq? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sr? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_sv? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_ta? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_tr? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_vi? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_zh-CN? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 ) l10n_zh-TW? ( https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c6b5e7df9280a4ce9b47d486a26d059c
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
deleted file mode 100644
index 444103244058..000000000000
--- a/dev-util/netbeans/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 BLAKE2B b87fc120d6dbb1207d70bbc3324c60c41c2ac8cae8af014ba47bc15c383f7fb821924d3337b25a0b59d0ef2ad641444ed5f85e46d02cd19b07b8913d9ddaf10d SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3
-EBUILD netbeans-8.2.ebuild 6155 BLAKE2B 2f8b34973c6edb42fa41cb0933c1c40a5584ae54e2f77355b40fffdead9b7427d8a0a326b11da45b8c3588314f13da7669822ad9e82d69abc3454971aad97648 SHA512 5591a6f66af08b14c4b44ae0e311c32fb4b70184a72e73ea6ef8c93e124d78e5380ba334345255404651662a3e40e415b551d0d6264601f0a8f6c4ec83c6455b
-MISC metadata.xml 1290 BLAKE2B 6244d6034061869e8129c8edc442fae9035749f0660204b0e3cdfc4a667643b370b26ad6d34c4a6e713fa060cfca5fbfcaa1ea87da7d451204e5de758e945c66 SHA512 10b6897bd10823d399937aaf3e09c1231a6c67072723cea8a9aff002b275b76d74a62260f8416e17cc53bc6a87fa0c19d00cb428ecff4052c1c8e278211ebe70
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
deleted file mode 100644
index 8834161921f2..000000000000
--- a/dev-util/netbeans/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>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
-of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
-where people from just about any country you can think of, have the ability ask questions, give advice, make a wide variety of
-contributions and ultimately share in the success of our products. You will find students on our mailing list, developers from top
-companies and individuals looking to sharpen their skills.
-
-In June of 2000 NetBeans was made Open Source by Sun Microsystems who remains the project sponsor. Today two products exist: the
-NetBeans IDE and NetBeans Platform. Both products are free for commercial and noncommercial use. The source code to both are available
-to anyone, to reuse as they see fit, under the terms of use.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
deleted file mode 100644
index 1fc9f826f55d..000000000000
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="https://netbeans.org/"
-SLOT="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		if use ${lingua} ; then
-			local lang=${lingua/l10n_/}
-			lang=${lang/-/_}
-
-			case ${lang} in
-				ar)  lang="ar_EG,ar_SA" ;;
-				es)  lang="es,es_CO"    ;;
-				fil) lang="fil_PH"	;;
-				gl)  lang="gl_ES"	;;
-				hi)  lang="hi_IN"	;;
-				id)  lang="in_ID"	;;
-				nl)  lang="nl_BE,nl_NL" ;;
-				ta)  lang="ta_IN"	;;
-			esac
-
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-8.2-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		eapply netbeans-8.2-build.xml.patch
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-
-		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
-
-		for lingua in ${IUSE_L10N}; do
-			if use ${lingua} ; then
-				local locales=${lingua/l10n_/}
-				locales=${locales/-/:}
-
-				case ${locales} in
-					ar)  lang="ar:EG ar:SA" ;;
-					es)  lang="es es:CO"    ;;
-					fil) lang="fil:PH"	;;
-					gl)  lang="gl:ES"	;;
-					hi)  lang="hi:IN"	;;
-					id)  lang="in:ID"	;;
-					nl)  lang="nl:BE nl:NL" ;;
-					ta)  lang="ta:IN"	;;
-				esac
-
-				for locale in ${locales}; do
-					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
-				done
-			fi
-		done
-	fi
-}
diff --git a/dev-util/ninja-1.7.2 b/dev-util/ninja-1.7.2
new file mode 100644
index 000000000000..e679c745e513
--- /dev/null
+++ b/dev-util/ninja-1.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DESCRIPTION=A small build system similar to make
+EAPI=6
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax zsh-completion
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
+SLOT=0
+SRC_URI=https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz -> ninja-1.7.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c76ee2cc48c21a17f4a0c0ccf83da961
diff --git a/dev-util/ninja-1.8.2 b/dev-util/ninja-1.8.2
new file mode 100644
index 000000000000..c905246ac0ec
--- /dev/null
+++ b/dev-util/ninja-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DESCRIPTION=A small build system similar to make
+EAPI=6
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax zsh-completion
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
+SLOT=0
+SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=793ee10ee6d54a1690530c51246b6d10
diff --git a/dev-util/ninja-9999 b/dev-util/ninja-9999
new file mode 100644
index 000000000000..a78d1703e3ab
--- /dev/null
+++ b/dev-util/ninja-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm setup test unpack
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A small build system similar to make
+EAPI=6
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax zsh-completion
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8178acf7e7a1d03572ce373a592b99d9
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
deleted file mode 100644
index 148c918b0ff4..000000000000
--- a/dev-util/ninja/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
-DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
-DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
-EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
-EBUILD ninja-9999.ebuild 2630 BLAKE2B fc04da58337a300929fe2394beef0b18d2e2633f5c94e508e4f0b8cbaf3999713bbd59ecf2cc65a5ad0860f379b68744ddba5a5c26338c1d1fbd3d87c96247ab SHA512 bacf92b4d5d5c569866b6af4284094e1ac92144c426c029cf3b4959b1a5b8dac73f8f584e5f1313c05716df0d830f90dd6cc64edff9f75e0ee623f6c822ab6a1
-MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/files/ninja-uclibc.patch b/dev-util/ninja/files/ninja-uclibc.patch
deleted file mode 100644
index e87eea842722..000000000000
--- a/dev-util/ninja/files/ninja-uclibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util.cc b/src/util.cc
-index e31fd1f..1caa1ce 100644
---- a/src/util.cc
-+++ b/src/util.cc
-@@ -585,6 +585,13 @@ double GetLoadAverage() {
-   // Calculation taken from comment in libperfstats.h
-   return double(cpu_stats.loadavg[0]) / double(1 << SBITS);
- }
-+#elif defined(__UCLIBC__)
-+double GetLoadAverage() {
-+  struct sysinfo si;
-+  if (sysinfo(&si) != 0)
-+    return -0.0f;
-+  return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
-+}
- #else
- double GetLoadAverage() {
-   double loadavg[3] = { 0.0f, 0.0f, 0.0f };
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
deleted file mode 100644
index 723d554b064c..000000000000
--- a/dev-util/ninja/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>chromium@gentoo.org</email>
-		<name>Chromium in Gentoo Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">martine/ninja</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
deleted file mode 100644
index a314bc0103f1..000000000000
--- a/dev-util/ninja/ninja-1.7.2.ebuild
+++ /dev/null
@@ -1,132 +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 bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax zsh-completion"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	zsh-completion? ( app-shells/zsh )
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
-
-PATCHES=(
-	"${FILESDIR}/${PN}-uclibc.patch"
-)
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
deleted file mode 100644
index f25829f0ec1b..000000000000
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ /dev/null
@@ -1,128 +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 bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax zsh-completion"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	zsh-completion? ( app-shells/zsh )
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
deleted file mode 100644
index 73fb8e30509b..000000000000
--- a/dev-util/ninja/ninja-9999.ebuild
+++ /dev/null
@@ -1,128 +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 bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax zsh-completion"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	zsh-completion? ( app-shells/zsh )
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/numdiff-5.9.0 b/dev-util/numdiff-5.9.0
new file mode 100644
index 000000000000..17ede237bfb5
--- /dev/null
+++ b/dev-util/numdiff-5.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext ) !dev-util/ndiff >=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=File comparision, ignoring small numeric differences and formats
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/numdiff/
+IUSE=+nls +gmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext ) !dev-util/ndiff
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/numdiff/numdiff-5.9.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=48c5e8d6cb0791a02bbb545f2d5bb4dd
diff --git a/dev-util/numdiff/Manifest b/dev-util/numdiff/Manifest
deleted file mode 100644
index 32f70e51195b..000000000000
--- a/dev-util/numdiff/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX numdiff-5.9.0-fix-build-system.patch 6824 BLAKE2B ab87d5f4df3df3077ccc182bcda77ab3c8eb707353d7365eaca391373bc371e2f15274eee2d2e82956a38e9d2bd61f15fee424b3a475a97d822f7ff041dce651 SHA512 4ae5dcb4534b11ed54d3ef8f44b48ec5a20b7c4eb747bd14be9c7ba078c1e3cfbd107a3c1da1dabc4aba5881e1b14e2decef41cce6d4a06e8e5c1a780ccf2818
-DIST numdiff-5.9.0.tar.gz 915117 BLAKE2B 3f1edda377f43a9658bb62de1bfc02c8ff26f93f934628d5ac815c68b30e8817b9e004821aaa8c741686af4641993defd20f48e241bbd91b1f8c1b6edb4502c4 SHA512 7be7aad30afbb2a964046815807be0d9149edd18364660443220ce7032248cf83bf840eaf89e19193c8c68ad075cfa81759301574ed73151526e4eea34d33f86
-EBUILD numdiff-5.9.0.ebuild 865 BLAKE2B 9dcfeaf4b95610b5231da7f97c08eb2eb8531855a054309841adc8624d7fd027b54e42bff742ff4e61764a74baa72a5fe8038a682e197fa730f32d9063b5c83d SHA512 03c04118f5e0e3f30b5cba27e0881646163e8ee62634519682a46446fa7f93df6a5f404328aeaecb9cbd6b2d86d320b07c0e98d161d0b4607fd32de5cbe6497c
-MISC metadata.xml 728 BLAKE2B b7459ab987baa5670b7ef5e050cf226ae89eb309887b1b950a3c363a231de229a594d8648aa6a32a9338a13a86025b43172c2c8e60a4c1b4c563a898e11e765a SHA512 f3480f48dd59ec51ae287c3a450fded09688865280f3b8e5d61b9b80d5565e75aee5ac9a5b945dd4e4ea00733709961f58e3ca09b793d3e3c1e4642f9bb0fd31
diff --git a/dev-util/numdiff/files/numdiff-5.9.0-fix-build-system.patch b/dev-util/numdiff/files/numdiff-5.9.0-fix-build-system.patch
deleted file mode 100644
index 5bbeba5f8f9d..000000000000
--- a/dev-util/numdiff/files/numdiff-5.9.0-fix-build-system.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,7 @@
- 
- AC_INIT(Numdiff, 5.9, <ivprimi at libero dot it>, numdiff)
- AC_CONFIG_SRCDIR(numdiff.h)
--AC_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl --------------------------------------
- dnl My own flags
-@@ -82,6 +82,7 @@
- 
- AC_ARG_ENABLE(nls, [  --enable-nls            turn on Natural Language Support  [default=yes]],
-                  , enable_nls=yes)
-+AC_SUBST([enable_nls])
- 
- AC_ARG_ENABLE(gmp, [  --enable-gmp            turn on use of GNU MP  [default=yes]],
-                  , enable_gmp=yes)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -19,18 +19,18 @@
- prefix          =@prefix@
- exec_prefix     =@exec_prefix@
- bindir          =@bindir@
--docdir		=@docdir@
--localedir	=@localedir@
--infodir		=@infodir@
-+datarootdir     =@datarootdir@
-+docdir          =@docdir@
-+localedir       =@localedir@
-+infodir         =@infodir@
-+htmldir         =@htmldir@
-+pdfdir          =@pdfdir@
- mandir          =@mandir@
-+man1dir         =$(mandir)/man1
- srcdir          =@srcdir@
- VPATH           =@srcdir@
- 
--BINDIR=$(bindir)
--DOCDIR=$(docdir)/$(PACKAGE)
--INFODIR=$(infodir)
--LOCALEDIR=$(localedir)
--MANDIR=$(mandir)/man1
-+enable_nls      =@enable_nls@
- 
- CC=@CC@
- @SET_MAKE@
-@@ -62,7 +62,7 @@
- HELP2MAN=help2man -s 1 -m "User Commands"
- 
- # flags for the preprocessor:
--CPPFLAGS        =-DPACKAGE="\"$(PACKAGE)\"" -DPACKAGE2="\"$(PACKAGETWO)\"" -DLOCALEDIR="\"$(LOCALEDIR)\"" -I$(srcdir) -I. @CPPFLAGS@
-+CPPFLAGS        =-DPACKAGE="\"$(PACKAGE)\"" -DPACKAGE2="\"$(PACKAGETWO)\"" -DLOCALEDIR="\"$(localedir)\"" -I$(srcdir) -I. @CPPFLAGS@
- # flags for the C compiler:
- CFLAGS          =@CFLAGS@
- 
-@@ -77,7 +77,7 @@
- SOURCESONE=$(srcdir)/analyze.c $(srcdir)/arith.c $(srcdir)/bitvector.c $(srcdir)/cmpbuf.c $(srcdir)/cmpfns.c $(srcdir)/error.c $(srcdir)/errors.c $(srcdir)/exitfail.c $(srcdir)/flags.c $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/inout.c $(srcdir)/io.c $(srcdir)/linesplit.c $(srcdir)/main.c $(srcdir)/new.c $(srcdir)/number.c $(srcdir)/numutil.c $(srcdir)/options.c $(srcdir)/read_line.c $(srcdir)/setmode.c $(srcdir)/side.c $(srcdir)/thrlist.c $(srcdir)/util.c $(srcdir)/xalloc-die.c $(srcdir)/xmalloc.c
- OBJECTSTWO=./bitvector.o ./getopt.o ./getopt1.o ./linesplit.o ./ndselect.o
- SOURCESTWO=$(srcdir)/bitvector.c $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/linesplit.c $(srcdir)/ndselect.c $(srcdir)/read_line.c
--DOCS=$(srcdir)/AUTHORS $(srcdir)/BUGS $(srcdir)/COPYING $(srcdir)/ChangeLog $(srcdir)/INSTALL $(srcdir)/NEWS $(srcdir)/README $(srcdir)/TODO 
-+DOCS=$(srcdir)/AUTHORS $(srcdir)/BUGS $(srcdir)/ChangeLog $(srcdir)/NEWS $(srcdir)/README $(srcdir)/TODO 
- TEXISRC=$(srcdir)/docs/numdiff.txi
- FDLTEXI=$(srcdir)/docs/fdl.texi
- HTMLFILE=$(srcdir)/docs/numdiff.html
-@@ -91,7 +91,7 @@
- PACKAGETWO_POT=$(srcdir)/po/$(PACKAGETWO)/$(PACKAGETWO).pot
- PACKAGE_IT=$(srcdir)/po/$(PACKAGE)/it
- PACKAGETWO_IT=$(srcdir)/po/$(PACKAGETWO)/it
--IT_LOC_DIR="$(DESTDIR)$(LOCALEDIR)/it/LC_MESSAGES"
-+IT_LOC_DIR="$(DESTDIR)$(localedir)/it/LC_MESSAGES"
- 
- GARBAGE=./numdiff.aux ./numdiff.cp ./numdiff.cps ./numdiff.fn ./numdiff.ky ./numdiff.log ./numdiff.pg ./numdiff.toc ./numdiff.tp ./numdiff.vr ./config.log ./config.status ./config.h.in.save ./config.h
- 
-@@ -193,48 +193,61 @@
- # Rules needed by the installation process.
- 
- installdirs: all
--	$(MKDIR) "$(DESTDIR)$(BINDIR)"
--	$(MKDIR) "$(DESTDIR)$(DOCDIR)"
--	$(MKDIR) "$(DESTDIR)$(INFODIR)"
--	$(MKDIR) "$(DESTDIR)$(MANDIR)"
--	$(MKDIR) $(IT_LOC_DIR)
--
--install: installdirs html info pdf txt
--	$(INSTALL_PROGRAM) $(PACKAGE) $(PACKAGETWO) "$(DESTDIR)$(BINDIR)"
--	$(INSTALL_DATA) $(DOCS) "$(DESTDIR)$(DOCDIR)"
--	$(INSTALL_DATA) $(MANFILE) "$(DESTDIR)$(MANDIR)"
--	$(INSTALL_DATA) $(MANFILETWO) "$(DESTDIR)$(MANDIR)"
--	$(INSTALL_DATA) $(HTMLFILE) "$(DESTDIR)$(DOCDIR)"
--	$(INSTALL_DATA) $(PDFFILE) "$(DESTDIR)$(DOCDIR)"
--	$(INSTALL_DATA) $(TXTFILE) "$(DESTDIR)$(DOCDIR)"
-+	$(MKDIR) "$(DESTDIR)$(bindir)"
-+	$(MKDIR) "$(DESTDIR)$(docdir)"
-+	$(MKDIR) "$(DESTDIR)$(htmldir)"
-+	$(MKDIR) "$(DESTDIR)$(pdfdir)"
-+	$(MKDIR) "$(DESTDIR)$(infodir)"
-+	$(MKDIR) "$(DESTDIR)$(mandir)"
-+	$(MKDIR) "$(DESTDIR)$(man1dir)"
-+	if [ $(enable_nls) == yes ]; then \
-+		$(MKDIR) "$(DESTDIR)$(localedir)"/it/LC_MESSAGES; \
-+	fi
-+
-+ifeq ($(enable_nls),yes)
-+opt_targets = install-nls
-+endif
-+install: installdirs html info pdf txt $(opt_targets)
-+	$(INSTALL_PROGRAM) $(PACKAGE) $(PACKAGETWO) "$(DESTDIR)$(bindir)"
-+	$(INSTALL_DATA) $(DOCS) "$(DESTDIR)$(docdir)"
-+	$(INSTALL_DATA) $(MANFILE) "$(DESTDIR)$(man1dir)"
-+	$(INSTALL_DATA) $(MANFILETWO) "$(DESTDIR)$(man1dir)"
-+	$(INSTALL_DATA) $(HTMLFILE) "$(DESTDIR)$(htmldir)"
-+	$(INSTALL_DATA) $(PDFFILE) "$(DESTDIR)$(pdfdir)"
-+	$(INSTALL_DATA) $(TXTFILE) "$(DESTDIR)$(docdir)"
- 	$(POST_INSTALL)
--	$(INSTALL_DATA) $(INFOFILE) "$(DESTDIR)$(INFODIR)"
--	$(INSTALL_DATA) $(INFOFILE).gz "$(DESTDIR)$(INFODIR)"
-+	$(INSTALL_DATA) $(INFOFILE) "$(DESTDIR)$(infodir)"
-+	$(INSTALL_DATA) $(INFOFILE).gz "$(DESTDIR)$(infodir)"
- 	if $(SHELL) -c "$(INSTINFO) --version" \
- 	>/dev/null 2>&1; then \
--	$(INSTINFO) --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/numdiff.info"; \
-+	$(INSTINFO) --dir-file="$(DESTDIR)$(infodir)/dir" "$(DESTDIR)$(infodir)/numdiff.info"; \
- 	else true; fi
- 
--install-nls: install
-+install-nls: installdirs
- 	$(INSTALL_DATA) $(PACKAGE_IT).mo $(IT_LOC_DIR)/$(PACKAGE).mo
- 	$(INSTALL_DATA) $(PACKAGETWO_IT).mo $(IT_LOC_DIR)/$(PACKAGETWO).mo
- 
- # Rules needed to removed the installed stuff
- 
- uninstall:
--	$(RM) "$(DESTDIR)$(BINDIR)/$(PACKAGE)"
--	$(RM) "$(DESTDIR)$(BINDIR)/$(PACKAGETWO)"
--	$(RM) "$(DESTDIR)$(DOCDIR)"/*
--	$(RMDIR) "$(DESTDIR)$(DOCDIR)"
--	$(INSTINFO) --delete "$(DESTDIR)$(INFODIR)/numdiff.info" "$(DESTDIR)$(INFODIR)/dir"
--	$(RM) "$(DESTDIR)$(INFODIR)/numdiff.info.gz"
--	$(RM) "$(DESTDIR)$(INFODIR)/numdiff.info"
--	$(RM) "$(DESTDIR)$(MANDIR)/$(PACKAGE).1"
--	$(RM) "$(DESTDIR)$(MANDIR)/$(PACKAGETWO).1"
-+	$(RM) "$(DESTDIR)$(bindir)/$(PACKAGE)"
-+	$(RM) "$(DESTDIR)$(bindir)/$(PACKAGETWO)"
-+	$(RM) "$(DESTDIR)$(docdir)"/*
-+	$(RMDIR) "$(DESTDIR)$(docdir)"
-+	$(RM) "$(DESTDIR)$(htmldir)"/*
-+	$(RMDIR) "$(DESTDIR)$(htmldir)"
-+	$(RM) "$(DESTDIR)$(pdfdir)"/*
-+	$(RMDIR) "$(DESTDIR)$(pdfdir)"
-+	$(INSTINFO) --delete "$(DESTDIR)$(infodir)/numdiff.info" "$(DESTDIR)$(infodir)/dir"
-+	$(RM) "$(DESTDIR)$(infodir)/numdiff.info.gz"
-+	$(RM) "$(DESTDIR)$(infodir)/numdiff.info"
-+	$(RM) "$(DESTDIR)$(man1dir)/$(PACKAGE).1"
-+	$(RM) "$(DESTDIR)$(man1dir)/$(PACKAGETWO).1"
-+	$(RMDIR) "$(DESTDIR)$(mandir)"
- 
- uninstall-nls: uninstall
--	$(FIND) "$(DESTDIR)$(LOCALEDIR)" -name '$(PACKAGE).mo' -exec $(RM) \{\} \;
--	$(FIND) "$(DESTDIR)$(LOCALEDIR)" -name '$(PACKAGETWO).mo' -exec $(RM) \{\} \;
-+	$(FIND) "$(DESTDIR)$(localedir)" -name '$(PACKAGE).mo' -exec $(RM) \{\} \;
-+	$(FIND) "$(DESTDIR)$(localedir)" -name '$(PACKAGETWO).mo' -exec $(RM) \{\} \;
- 
- # Cleaning rules
- 
diff --git a/dev-util/numdiff/metadata.xml b/dev-util/numdiff/metadata.xml
deleted file mode 100644
index 67838213dfc0..000000000000
--- a/dev-util/numdiff/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-  numdiff is a program that can be used to compare putatively similar files
-  line by line and field by field, ignoring small numeric differences
-  or/and different numeric formats. Equivalently, numdiff is a program with
-  the capability to appropriately compare files containing numerical fields
-  (and not only).
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/numdiff/numdiff-5.9.0.ebuild b/dev-util/numdiff/numdiff-5.9.0.ebuild
deleted file mode 100644
index 223601ad7bf7..000000000000
--- a/dev-util/numdiff/numdiff-5.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="File comparision, ignoring small numeric differences and formats"
-HOMEPAGE="http://www.nongnu.org/numdiff/"
-SRC_URI="http://savannah.nongnu.org/download/numdiff/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nls +gmp"
-
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-	nls? ( sys-devel/gettext )
-	!dev-util/ndiff"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.0-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	# yes, it really only needs eautoconf, due to the
-	# config.h being hand-written, which would be bulldozered
-	# when running eautoreconf (due to it invoking autoheader)
-	eautoconf
-}
-
-src_configure() {
-	econf \
-	    --enable-optimization \
-		$(use_enable gmp) \
-		$(use_enable nls)
-}
diff --git a/dev-util/nvidia-cuda-sdk-6.5.19 b/dev-util/nvidia-cuda-sdk-6.5.19
new file mode 100644
index 000000000000..af44088e5416
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-6.5.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-6.5.19 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= virtual/mpi >=x11-drivers/nvidia-drivers-340.32[uvm] x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debug +doc +examples opencl +cuda
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-6.5.19 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= virtual/mpi >=x11-drivers/nvidia-drivers-340.32[uvm] x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fc7295952ea8ba925d85ff40cb406931
diff --git a/dev-util/nvidia-cuda-sdk-7.5.18 b/dev-util/nvidia-cuda-sdk-7.5.18
new file mode 100644
index 000000000000..df36e18b8fc4
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-7.5.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-7.5.18 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= virtual/mpi >=x11-drivers/nvidia-drivers-352.39[uvm] )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=5
+HOMEPAGE=https://developer.nvidia.com/cuda-downloads
+IUSE=debug +doc +examples opencl +cuda
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-7.5.18 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= virtual/mpi >=x11-drivers/nvidia-drivers-352.39[uvm] )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=233b873990951382de1ad4c91f676b5a
diff --git a/dev-util/nvidia-cuda-sdk-8.0.44-r1 b/dev-util/nvidia-cuda-sdk-8.0.44-r1
new file mode 100644
index 000000000000..fb6c676b3c1e
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-8.0.44-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.44 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-367.44[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.44 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-367.44[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd5ff1d1a3f46ecf7d2500f4957064ea
diff --git a/dev-util/nvidia-cuda-sdk-8.0.61 b/dev-util/nvidia-cuda-sdk-8.0.61
new file mode 100644
index 000000000000..999667867c22
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-8.0.61
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-375.26[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=83ec1bd3dd5c1985da3918ce52fc0dc2
diff --git a/dev-util/nvidia-cuda-sdk-9.0.176 b/dev-util/nvidia-cuda-sdk-9.0.176
new file mode 100644
index 000000000000..01baaecd227f
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-9.0.176
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.0.176 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-384.81[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-9.0.176 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-384.81[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc9764c2a8eb75964c44f059cfa00ec2
diff --git a/dev-util/nvidia-cuda-sdk-9.1.85 b/dev-util/nvidia-cuda-sdk-9.1.85
new file mode 100644
index 000000000000..d451a0632a98
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-9.1.85
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-387.26[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-387.26[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod2/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f36aad04c20ab126f5f630e8801499b9
diff --git a/dev-util/nvidia-cuda-sdk-9.2.88 b/dev-util/nvidia-cuda-sdk-9.2.88
new file mode 100644
index 000000000000..34114c5b381d
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk-9.2.88
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm] mpi? ( virtual/mpi ) )
+DESCRIPTION=NVIDIA CUDA Software Development Kit
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=+cuda debug +doc +examples opencl mpi
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=CUDPP
+RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew:0= >=x11-drivers/nvidia-drivers-396.24[uvm] mpi? ( virtual/mpi ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ebf1ad155c983ccabb011b7cd850295
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
deleted file mode 100644
index 719a5ab22485..000000000000
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
-DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
-DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
-DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
-DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
-DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
-DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
-DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
-EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
-EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
-EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
-EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3802 BLAKE2B 721ae934544eec47b19fb1eaee6109fb9bd1ad8ee79a38ee4d9d28a6a00891badf8b2c24c11160c4803c0aa9ff375348fd897d3fb396355853013e03290b35c9 SHA512 ce2afcc297f62e9ef965ec0ad3344286a9df85ec84bc512872e5e7897c07993431ff21eb36e34aa2b5aed05f4a3f107f869e979bfa09cffda035de77c8d89983
-EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
-EBUILD nvidia-cuda-sdk-9.2.88.ebuild 3791 BLAKE2B bd1fb4d0c9cc42767ac113097f768fc0e944eab1fa4ee8384bb5925abdad0d29b878abdf205c68216b3612451f6e627c40722013be4749c3ac9cc33314290860 SHA512 4ad0d53e6a7c33f578e5e5daef71f3bed147bf2083ee641f72baf62718655b54066088c2c371eb493924d996edbfd522feea3b8497adccdcef50a845c4c8b77a
-MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
deleted file mode 100644
index f8631dbfe7a7..000000000000
--- a/dev-util/nvidia-cuda-sdk/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>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<use>
-		<flag name="opencl">Build OpenCL binaries</flag>
-		<flag name="cuda">Build CUDA binaries</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
deleted file mode 100644
index f48ac080ba5f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-340.32[uvm]
-		x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
deleted file mode 100644
index f3d256ec6cd5..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-352.39[uvm]
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
deleted file mode 100644
index 4015cff5dca8..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-367.44[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61.ebuild
deleted file mode 100644
index 0f301935641d..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="375.26"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-375.26[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
deleted file mode 100644
index d70ad3f42d8f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="384.81"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-384.81[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
deleted file mode 100644
index 1f648f706dc4..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="387.26"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
deleted file mode 100644
index c37d95782497..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="396.26"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew:0=
-		>=x11-drivers/nvidia-drivers-396.24[uvm]
-		mpi? ( virtual/mpi )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	# We first need to unpack the cuda_${PV}_linux.run file
-	# which includes the cuda-samples*run file.
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		sed \
-			-e 's:-O[23]::g' \
-			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-			-e "/CC/s:gcc:$(tc-getCC):g" \
-			-e "/GCC/s:g++:$(tc-getCXX):g" \
-			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-			-e 's:-Wimplicit::g' \
-			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
-			-i "${file}" || die
-			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	done < <(find . -type f -name 'Makefile' -print0)
-
-	rm -rf common/inc/GL || die
-	find . -type f -name '*.a' -delete || die
-
-	eapply_user
-}
-
-src_compile() {
-	use examples || return
-	local myopts=("verbose=1")
-	use debug && myopts+=("dbg=1")
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		"${myopts[@]}"
-}
-
-src_test() {
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	local i
-	for i in {0..9}*/*; do
-		emake -C "${i}" run
-	done
-}
-
-src_install() {
-	local f t crap=( *.txt Samples.htm* )
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
-			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
-			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
-		eend
-	fi
-
-	ebegin "Cleaning before installation..."
-		for f in "${crap[@]}"; do
-			rm -f "${f}" || die
-		done
-		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		while IFS="" read -d $'\0' -r f; do
-			t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/"${t}"
-				doexe "${f}"
-			else
-				insinto /opt/cuda/sdk/"${t}"
-				doins "${f}"
-			fi
-		done < <(find . -type f -print0)
-	eend
-}
diff --git a/dev-util/nvidia-cuda-toolkit-6.5.14 b/dev-util/nvidia-cuda-toolkit-6.5.14
new file mode 100644
index 000000000000..ee2ac72aea0d
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-6.5.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=5
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
+SLOT=0/6.5.14
+SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_32.run )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0129c6f12a00f6593a86b70ddc66699d
diff --git a/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/dev-util/nvidia-cuda-toolkit-6.5.19-r1
new file mode 100644
index 000000000000..7cc58db7e555
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=5
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
+SLOT=0/6.5.19
+SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da12f64f224219ce4744aca7d66d4b85
diff --git a/dev-util/nvidia-cuda-toolkit-7.5.18-r2 b/dev-util/nvidia-cuda-toolkit-7.5.18-r2
new file mode 100644
index 000000000000..3d580022a829
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-7.5.18-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=5
+HOMEPAGE=http://developer.nvidia.com/cuda
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-5[cxx] >=x11-drivers/nvidia-drivers-352.39[uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/7.5.18
+SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=705384d1f2d943f4f4d4d6ef757f511c
diff --git a/dev-util/nvidia-cuda-toolkit-8.0.44 b/dev-util/nvidia-cuda-toolkit-8.0.44
new file mode 100644
index 000000000000..ea131112988b
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-8.0.44
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-drivers-367.44[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/8.0.44
+SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=500ff3f5322bee83ddaa8d11781f3548
diff --git a/dev-util/nvidia-cuda-toolkit-8.0.61 b/dev-util/nvidia-cuda-toolkit-8.0.61
new file mode 100644
index 000000000000..1451c7d2ebb8
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-8.0.61
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-drivers-375.26[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/8.0.61
+SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=703d947dc1b4d81cc6e47bb2536ec074
diff --git a/dev-util/nvidia-cuda-toolkit-9.0.176 b/dev-util/nvidia-cuda-toolkit-9.0.176
new file mode 100644
index 000000000000..322c9859d608
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-9.0.176
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-384.81[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/9.0.176
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=82040173f5fa3d1dc0f0ce6d78472388
diff --git a/dev-util/nvidia-cuda-toolkit-9.1.85 b/dev-util/nvidia-cuda-toolkit-9.1.85
new file mode 100644
index 000000000000..9554f46c8c29
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-9.1.85
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-387.26[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/9.1.85
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7bc6974df7767af036c0c79301e865ca
diff --git a/dev-util/nvidia-cuda-toolkit-9.2.88 b/dev-util/nvidia-cuda-toolkit-9.2.88
new file mode 100644
index 000000000000..a6ee782e8409
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit-9.2.88
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=6
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+IUSE=debugger doc eclipse profiler
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
+SLOT=0/9.2.88
+SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc97ac8fcc42be993bb3b418c9f4a306
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
deleted file mode 100644
index 1f82dad5e612..000000000000
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
-DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
-DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
-DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
-DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
-DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
-DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
-DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
-DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
-DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
-DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
-EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
-EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
-EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b3213babb2d4f4c5991c8fb343563728e4b3bd2ebe0ca53f97f867c493d67e7a15f33683aa6dabb7fe13b2832dd12a617dd26948c SHA512 807ac67b141dd390d78ec4e764dc939e993aa3b23c6469dde9e29c62a0ac7bbbd3be4d2425e3a1a9863a813c88c5fe0da37f07d1bb2fc91c0593cab99f8e8a8b
-EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
-EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
-EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3345 BLAKE2B af1bdce7f452973e1addfd4881abf937dbb17e8ac946e496148805dd8407b3f3485ced3487334779d6d536fedb294a3eb9241f90920bce4529256bb94f4987ab SHA512 9adef55be28117a0875704cbffb4975ac99674b3dc608909e7c5978b53f558c21049454589a5e8624ca12d6ffe4308cdf1839380ad1569955902659d0ffab7a9
-EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3347 BLAKE2B 8b438d0b64b91ad20d293662e7fc1eea788155d7e90bec0746d4a4369cfb5311eb5692c2cf77c24f49d90a6d759ee8a0681635b5de385bfe7543724eb3ba203b SHA512 6a5f413ceee79a2d1a0fbe58bf697e6f6b27bc41608f66155462efc55e139cb5356c28894c7f24cb52c98b47161e8f023b713d32306183d3fcccc14452ec89e4
-MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
deleted file mode 100644
index ca0d1d77e107..000000000000
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
-
-_print_help() {
-	cat <<- EOF
-	Usage:
-		$(basename $0) [options]
-	
-		-s | --supported   Returns by current CUDA supported gcc versions
-		-h | --help        Shows this help
-	EOF
-}
-
-case ${1} in
-	-s|--supported)
-		echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
-		exit 0
-		;;
-	-h|--help)
-		_print_help
-		exit -1
-		;;
-	*)
-		_print_help
-		exit 1
-		;;
-esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
deleted file mode 100644
index 4b8ba09a6653..000000000000
--- a/dev-util/nvidia-cuda-toolkit/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>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<use>
-		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
-		<flag name="debugger">Installs the CUDA debugger</flag>
-		<flag name="eclipse">Install plugins for eclipse</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
deleted file mode 100644
index f9562a7fb37e..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
deleted file mode 100644
index b980d663d12f..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
deleted file mode 100644
index 7122efbeae91..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-5[cxx]
-	>=x11-drivers/nvidia-drivers-352.39[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
deleted file mode 100644
index 45b0828f1ece..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run"
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-6[cxx]
-	>=x11-drivers/nvidia-drivers-367.44[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
deleted file mode 100644
index 0295aba23074..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="375.26"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-6[cxx]
-	>=x11-drivers/nvidia-drivers-375.26[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
deleted file mode 100644
index 3e56d9e5c3a5..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="384.81"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	<sys-devel/gcc-7[cxx]
-	>=x11-drivers/nvidia-drivers-384.81[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
deleted file mode 100644
index e7f7fb9df63d..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="387.26"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-7[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
deleted file mode 100644
index de825e179c3c..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cuda toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="396.26"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-8[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses:5/5[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="3500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-
-	if use doc; then
-		DOCS+=( doc/pdf/. )
-		HTML_DOCS+=( doc/html/. )
-	fi
-	einstalldocs
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for i in nvvp nsight; do
-			cat > bin/${i} <<- EOF || die
-				#!/usr/bin/env sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${i} || die
-		done
-	else
-		use eclipse || remove+=( libnvvp libnsight )
-		remove+=( extras/CUPTI )
-	fi
-
-	for i in "${remove[@]}"; do
-		ebegin "Cleaning ${i}..."
-		rm -rf "${i}" || die
-		eend
-	done
-
-	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
-
-	cat > "${T}"/99cuda <<- EOF || die
-		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
-			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn ""
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}
diff --git a/dev-util/objconv-2.32_pre20131127 b/dev-util/objconv-2.32_pre20131127
new file mode 100644
index 000000000000..a3f29b8d5d0a
--- /dev/null
+++ b/dev-util/objconv-2.32_pre20131127
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=object code file converted (COFF, ELF, OMF, MACHO)
+EAPI=5
+HOMEPAGE=http://agner.org/optimize/#objconv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.32_pre20131127.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=f5fe1988ea0adbdb8b803e1eb78aafe8
diff --git a/dev-util/objconv-2.42 b/dev-util/objconv-2.42
new file mode 100644
index 000000000000..699845bc5e2f
--- /dev/null
+++ b/dev-util/objconv-2.42
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=object code file converted (COFF, ELF, OMF, MACHO)
+EAPI=5
+HOMEPAGE=http://agner.org/optimize/#objconv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.42.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=c0e490c690dae33abba236ceab00cd44
diff --git a/dev-util/objconv/Manifest b/dev-util/objconv/Manifest
deleted file mode 100644
index 2d49a0d2e7b5..000000000000
--- a/dev-util/objconv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST objconv-2.32_pre20131127.zip 814334 BLAKE2B 2d0d548d54b7868d29d892fc7512a7ec50ec768d4d3f023b08fd1a69a722418d675a5d578313868195dc13822c5710d3e3fe8eb9db6404a0ebd240296289f989 SHA512 9be8f6e7f33794ade3340604508a996139c3f7a3a620efc634919e20ad29c5510b25a88df469769862d969375eefaed39c4e200b1ef25d9eff8abb1936027f7b
-DIST objconv-2.42.zip 1016499 BLAKE2B fec4a386b3d8e0e870066098353c33d78e6b027de1f0183d568479ce508b2c10b020ab3de47d1d24481ddc785be5ee1d0b8053ec354bb23dd317a6e08de8c1a4 SHA512 9ccc49ddfe5a6d353c746917832419478335e73d1cb85762cad314f918532bd20844b9812e392d57789a4a6cb8764945a6b1894884b50d5486bdf635fe58d35f
-EBUILD objconv-2.32_pre20131127.ebuild 936 BLAKE2B 8eb2ea4b82a92a929dabb85203bdff30439b97b51f505f0febc8af83cb991088a1b26f58bc623faf7f3f13e995506e956e07645a76bf5ad23f324d5a15cfad20 SHA512 a83b95ec7cc666d6824209a69308962192a5ef99afe8bc517a11184a535952ec6bf974f8e47d1b05d02fd2b1948e59e34f8b65cef0b119a1d1bf4d25d2c5dce5
-EBUILD objconv-2.42.ebuild 949 BLAKE2B f95d329c5aa43d77a7e4289ab547ce55624dc6b22e01387ecdca86ca1c5606e84fc3f53c250bfedb25db757b191e9ebf9c4745f07f11be516d5e5e5a46d235ae SHA512 069c496238aa3b511101216399a86c18e914d7d8b1d95dbde134a7d7097d5aadbed75732ed75915f5c141eff82cf3c74a37e58b1da9f1a34732649c984cdbc17
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/dev-util/objconv/metadata.xml b/dev-util/objconv/metadata.xml
deleted file mode 100644
index c5298995d2d4..000000000000
--- a/dev-util/objconv/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/objconv/objconv-2.32_pre20131127.ebuild b/dev-util/objconv/objconv-2.32_pre20131127.ebuild
deleted file mode 100644
index e9288020b183..000000000000
--- a/dev-util/objconv/objconv-2.32_pre20131127.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
-HOMEPAGE="http://agner.org/optimize/#objconv"
-# original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
-# I copy those to distfiles time to time
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpacker_src_unpack
-	mkdir "${S}" || die
-	pushd "${S}" || die
-	unpack_zip ../source.zip
-}
-
-src_prepare() {
-	# project has extremenly poor build system (see build.sh)
-	local sources=$(echo *.cpp)
-
-	{
-		echo "objconv: ${sources//.cpp/.o}"
-		echo "	\$(CXX) -o \$@ \$^ \$(LDFLAGS)"
-	} > Makefile || die
-
-	tc-export CXX
-}
-
-src_install() {
-	dobin objconv
-	dodoc ../objconv-instructions.pdf
-}
diff --git a/dev-util/objconv/objconv-2.42.ebuild b/dev-util/objconv/objconv-2.42.ebuild
deleted file mode 100644
index f4aa2421d778..000000000000
--- a/dev-util/objconv/objconv-2.42.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
-HOMEPAGE="http://agner.org/optimize/#objconv"
-# original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
-# I copy those to distfiles time to time
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpacker_src_unpack
-	mkdir "${S}" || die
-	pushd "${S}" || die
-	unpack_zip ../source.zip
-}
-
-src_prepare() {
-	# project has extremenly poor build system (see build.sh)
-	local sources=$(echo *.cpp)
-
-	{
-		echo "objconv: ${sources//.cpp/.o}"
-		echo "	\$(CXX) \$(CXXFLAGS) -o \$@ \$^ \$(LDFLAGS)"
-	} > Makefile || die
-
-	tc-export CXX
-}
-
-src_install() {
-	dobin objconv
-	dodoc ../objconv-instructions.pdf
-}
diff --git a/dev-util/obs-service-cpanspec-20130318 b/dev-util/obs-service-cpanspec-20130318
new file mode 100644
index 000000000000..e5571cf85ab5
--- /dev/null
+++ b/dev-util/obs-service-cpanspec-20130318
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - cpanspec service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-cpanspec/cpanspec -> cpanspec-20130318 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-cpanspec/cpanspec.service -> cpanspec-20130318.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=80c06e1e254bebfcec0d5a02fd6c9ecf
diff --git a/dev-util/obs-service-cpanspec/Manifest b/dev-util/obs-service-cpanspec/Manifest
deleted file mode 100644
index a5115758e92b..000000000000
--- a/dev-util/obs-service-cpanspec/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cpanspec-20130318 2228 BLAKE2B f0a2ccc51fa083a93590ca18714dc1ae5b7e32130713cc02c0bdf5328a6f8505442dcea91d32f517a8f065c61ac6654b157267239e2e8c34e4fd4aa45941dafd SHA512 a3150811f12af16d62f4635833a92827de8bd2260ae5e43cecf65b066d7beb2aeb1323c428e379e4a53168d3c99dd9ce988b4f41ad58026a267ab9e809df7eef
-DIST cpanspec-20130318.service 986 BLAKE2B 6479dec1b4073b3bcddd124263424af076c2cf6afe500c40743eb62f82b281cdd5cdc2ef074e790a7d752ed36d3176115a972a8f966f3cd0217d787f4f1565bf SHA512 c4191060a576cb63986dc9a115e397d4f8870a6bb10ddaf642310eb6acaf0b0c3b8d803c239e401ff85058f8ca1455058c246757ab4b53a26b884cb7f4525c3c
-EBUILD obs-service-cpanspec-20130318.ebuild 197 BLAKE2B 3b0d7e84c7430cb5d26a617a405773f64d4ad4dd878d806712813ca103f96f3b409443d20837e4cb25e23d99a279e7267738cefcf6b1c7740e38680d80eaa14f SHA512 fcf4225d5a1d6fedc5b70a8d4dfd01559a8e77d55428150699d2a24a1fb8ced695e8dc6fa972f11d3b0d9c6aab4797362dcf3cce519fdea6730f35b71f28b9b2
-MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
deleted file mode 100644
index 5367c1e31d21..000000000000
--- a/dev-util/obs-service-cpanspec/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. It's a wrapper around cpanspec script.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild b/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
deleted file mode 100644
index 5a275bb4cb27..000000000000
--- a/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/obs-service-download_files-20130716 b/dev-util/obs-service-download_files-20130716
new file mode 100644
index 000000000000..def7e88a6ccd
--- /dev/null
+++ b/dev-util/obs-service-download_files-20130716
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - download_files service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=net-misc/wget dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_files/download_files -> download_files-20130716 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_files/download_files.service -> download_files-20130716.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=bc48028b3f31f96cadeed01b9764ddc5
diff --git a/dev-util/obs-service-download_files/Manifest b/dev-util/obs-service-download_files/Manifest
deleted file mode 100644
index 31435943506e..000000000000
--- a/dev-util/obs-service-download_files/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST download_files-20130716 6333 BLAKE2B 92daea2092ae14960b875610a3c86f6e4b733ce2d136c315df25f297795e1098f4be348374ac573393186d79b8a4210d39d2d43a7edddb20d8fd26413e290484 SHA512 2df185d535043c4652c09f8404a67d6b6e27436d01187378c21b2309bd4ea4928162dbe93a980ffc5aa212f83195facf90c602adf7984b0af7b3c14875a904e5
-DIST download_files-20130716.service 1070 BLAKE2B b6f60323ea9a82eb573a518a3b1ade41b013c2ebdca4331864f661e1dc12b65704f8d2b2428af0dee0736cd6dfd5c64ced95f9ef7183431a8cb913094623947e SHA512 3c19bc317bf4d9559d61ea388bdbb9a04fd8f3749102a52579737af9809f9dcfe045ce39feefbf08c42b52f7ca5a3d598b85609a0fb8fcefc55a7f846f13dbb2
-EBUILD obs-service-download_files-20130716.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-download_files/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild b/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
deleted file mode 100644
index 3ef73e967e02..000000000000
--- a/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/wget
-"
diff --git a/dev-util/obs-service-download_src_package-20130318 b/dev-util/obs-service-download_src_package-20130318
new file mode 100644
index 000000000000..64c69f89a797
--- /dev/null
+++ b/dev-util/obs-service-download_src_package-20130318
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - download_src_package service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=net-misc/wget dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_src_package/download_src_package -> download_src_package-20130318 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_src_package/download_src_package.service -> download_src_package-20130318.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=bc48028b3f31f96cadeed01b9764ddc5
diff --git a/dev-util/obs-service-download_src_package/Manifest b/dev-util/obs-service-download_src_package/Manifest
deleted file mode 100644
index 2b1db83f65bc..000000000000
--- a/dev-util/obs-service-download_src_package/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST download_src_package-20130318 1454 BLAKE2B 2f042931421087e12de0cefdcce1ae3fd1f5837e8f08e9d588a3d67568f026a2e0aee71e4c74915ae21a11eafd53e030ae943d8e6a6520caa971d0d02d729039 SHA512 47c83be8f97bebd9920e7ad115c5f1ef52281c2f0b11f62b31426349d9139b8a236530a7617473535dd160326de15d1f4a629017c8e47f5e8ec09e111b179500
-DIST download_src_package-20130318.service 1054 BLAKE2B 3722422eea433519a065caa4e1534a9501435e1d796910635c89b5ae8b5b9565a6077c1fb75993e658635048846d65b4cc8181c324edb2034e7fcebd23886d52 SHA512 b2f97f32ccd28e148f7317c4213523cc87adfc19ebb85ab5277ec62fa75ef603b6b4d65bd69e44f168c374ad890e28e69250735b1c9476f09a8dac89b3682f5f
-EBUILD obs-service-download_src_package-20130318.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-download_src_package/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild b/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
deleted file mode 100644
index 3ef73e967e02..000000000000
--- a/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/wget
-"
diff --git a/dev-util/obs-service-download_url-20130318 b/dev-util/obs-service-download_url-20130318
new file mode 100644
index 000000000000..355de401600d
--- /dev/null
+++ b/dev-util/obs-service-download_url-20130318
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - download_url service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=net-misc/wget dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_url/download_url -> download_url-20130318 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-download_url/download_url.service -> download_url-20130318.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=bc48028b3f31f96cadeed01b9764ddc5
diff --git a/dev-util/obs-service-download_url/Manifest b/dev-util/obs-service-download_url/Manifest
deleted file mode 100644
index d10c6a36651f..000000000000
--- a/dev-util/obs-service-download_url/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST download_url-20130318 2225 BLAKE2B 7795c3fa273d551ff7012d4e36f8fd80868bb0da5bdd7591e78521fe455eac205559eab49e020c3e9fb013a383c53c6e80557093969682a463e8e5d6bb206d3d SHA512 70aa703d36d7e43a8533a8b6ea15fa92e01653759a86d187184a9bae272ea10fdbf25e4a6c6a70ad59d39be88e30293fb8d8b65720b80b4e2e8f739839259cb0
-DIST download_url-20130318.service 849 BLAKE2B 099876c196c1f2ff3c297bcd7f52962c931293cbb48dc976934bab36eabe6f44ada8109a95905ea0038a6f5a95992f3a2111813047878970c12cf3b4d563c4ae SHA512 b32d87e490e04e561013d9d0981674be8fc63c07575bf7a2fd7282c423fe755615547e5ef19ba7fa058b2a3803714a32cbee618aa4bedcad2fe4b9c54a7172e4
-EBUILD obs-service-download_url-20130318.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-download_url/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild b/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
deleted file mode 100644
index 3ef73e967e02..000000000000
--- a/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/wget
-"
diff --git a/dev-util/obs-service-extract_file-20130318 b/dev-util/obs-service-extract_file-20130318
new file mode 100644
index 000000000000..0841b616604f
--- /dev/null
+++ b/dev-util/obs-service-extract_file-20130318
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - extract_file service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/tar app-arch/unzip app-arch/xz-utils dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-extract_file/extract_file -> extract_file-20130318 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-extract_file/extract_file.service -> extract_file-20130318.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=b8130284f8807b586fee0c4e24aeab9e
diff --git a/dev-util/obs-service-extract_file/Manifest b/dev-util/obs-service-extract_file/Manifest
deleted file mode 100644
index 83a453ee5dc6..000000000000
--- a/dev-util/obs-service-extract_file/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST extract_file-20130318 1828 BLAKE2B 11fcf5be2a634c403674b02c0b174b8f6324282164f7af8f0f2b604eb114705dd542daf519c231722a9d6beb5870d9701aa56f1a62cf3730def730c457ddb6ac SHA512 ceb09d0c7f86a04ddc7389e97ba94105249488be267c998ab601add03cd6ec6e7fd26baf463b18d9422f3360b69ea73000ccbb331807b19ae7df95e468d8aba1
-DIST extract_file-20130318.service 615 BLAKE2B e5c25bc39b5a3ba247ba96e0a780b7a3b1e58a001fc84f677ce4565852900680c99f3e2ee4a50b8a5256ca8d315c89bbb5a3dfc3513792c165e857a803f35994 SHA512 e647787b83bc1f45e9104bb210d3807481f2ab7ddcc7dd4eb3c522a9dc6f94580b60a92ad5ff73a634c025438d2ccaa655ea005c26e1f214532e69f67510d7c6
-EBUILD obs-service-extract_file-20130318.ebuild 278 BLAKE2B ab7f73b178a1c6013bedbd26968ebf30b939ced6401a48b7a3c3dc78d48b9222b2ac4a6acd8f552ba3cdd5797437a0dda47e26c8147e83a87fd5e88f16cdc6ce SHA512 5790e7402588e6c9605e321809ad9bb31ac13673b591f8122c82e1295f41ebd5e5a9c20fd83646d26904915011eb7aaca4afdf707bb9b82dbe4824610acae356
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-extract_file/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild b/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
deleted file mode 100644
index a3976408f7c9..000000000000
--- a/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/tar
-	app-arch/unzip
-	app-arch/xz-utils
-"
diff --git a/dev-util/obs-service-format_spec_file-20130618 b/dev-util/obs-service-format_spec_file-20130618
new file mode 100644
index 000000000000..3958cd902f37
--- /dev/null
+++ b/dev-util/obs-service-format_spec_file-20130618
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - format_spec_file service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-util/obs-service-source_validator dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-format_spec_file/format_spec_file -> format_spec_file-20130618 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-format_spec_file/format_spec_file.service -> format_spec_file-20130618.service https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-format_spec_file/licenses_changes.txt -> licenses_changes.txt-20130618 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-format_spec_file/patch_license -> patch_license-20130618 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-format_spec_file/prepare_spec -> prepare_spec-20130618
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=c6277dd128f8b487a5ae094509b4532b
diff --git a/dev-util/obs-service-format_spec_file/Manifest b/dev-util/obs-service-format_spec_file/Manifest
deleted file mode 100644
index 00e51d27ed4a..000000000000
--- a/dev-util/obs-service-format_spec_file/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST format_spec_file-20130618 957 BLAKE2B 35d139fa870a879f4b1b7e875f2be68c2a86eb15c0df4ec07cf79e560452a43656dd3f6eaabb6c621980edcf57b10a5027b937c12598921d66e9bc1eb088078e SHA512 52dfb06f6d7ab71570090a940f69d631fdf027b48797354911e5aca9d8aeab53026251f4da1c0e8fc58044344762d01633f02253fcdb096e8d9e9edae0cd0ebe
-DIST format_spec_file-20130618.service 274 BLAKE2B 4881be40c8cb029325bde56ba8edc36d2c174cd3969cc45489c9afa66f6f0cae82482780292efb63695a03c8ea05f29c069331744448e87b90350b56d1d133db SHA512 a97789f41f9493aab3cb2dc15da3de69d3e9dd025ae3660afb6dec436f050112460611db969f0c9f2ba8ec786f210714c51088a7089bdbaed3353635e7e8e6b1
-DIST licenses_changes.txt-20130618 24641 BLAKE2B f117143a815446e94c49438d75d5e58911edaf9cd72f584b03f8093e8af616f5b0328ae17e63150f1ccc0ce1f9cb1f28a3da700f9b44cb6db5e2a758e5e2fb7a SHA512 ca5a3a56892331b8c7377ffdd0010ac8174871aa710ff60e58bc3aaa9def8b25676ac377aef8cc27035e648e7b60e315a5ec39c1ace05a76d26c41f46d647d9f
-DIST patch_license-20130618 14873 BLAKE2B 38c7b71cd06a952ed3f6a91af6d80edc8f132ef1a2249d7b2d6728254af62bf9242bfadf65a7cb84f2a2b5175e159698f80d6d0e8d2508ec833885e3ed9a0be6 SHA512 b3eaa1a99d3035ce1fc36da702f563896a16328ad0bd01da62a36e7973558749724203fcd5d24a7e3dc2118ab1f9099daa71b3c33fa46f2926f072d4227c81bf
-DIST prepare_spec-20130618 19929 BLAKE2B 8e450d5159e67e01c8cb5788fde94106a370917d46926bfd5e0eb52ad69be31a34e15cb21923053159ad84eebb78f172512cad300298d5fb9b5ad687d815db2a SHA512 51826979c2ca8f5c9adf5d51c3d2c0a6422785cf690d044798a439e532a90eb399f776d0d7fdbc8673779a988a71629ba6dcbd3a572198a4cd4aef4dd1fedc7f
-EBUILD obs-service-format_spec_file-20130618.ebuild 309 BLAKE2B 0879ac539587d25c665812cee5972842f6932414aa15be58063974d25cb383e319d81c2f9fdc4c2cd4ea26df4839c14fd1eb1c60867d860d22a8cc51d29cdfc1 SHA512 603b74b3867e168dd6e1d31edeb8f9894e690974bbdbfb9ee243a21a5dbc56d5de8a85b094ed43bc44b6edea600330197d58c68f52004551362c97bb448feb64
-MISC metadata.xml 510 BLAKE2B 91006cc6c61ef5b146d634bd9da4c872683d593c150dcde0161492b9bc09774bed0721462c6c3a572e942fd93010e4614eba9516e806cd55cb13058fb9a9f2f8 SHA512 a7d004495a6cca14ab2bdd63fa8541b513b71f139985407f693b01cf74281a90f87bb25b0585088c6c83cfe55f01c32e03d12d28056801b9e4ba26b406b54dc5
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
deleted file mode 100644
index 64b4157a6127..000000000000
--- a/dev-util/obs-service-format_spec_file/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>
-<longdescription lang="en">
-This is a source service for openSUSE Build Service.
-
-This source service is formating the spec file to SUSE standard. The rational
-behind is to make it easier to review spec files from unknown packagers.
-
-This should be used in "trylocal" mode, so that osc is adapting the existing
-spec file instead of creating a new one.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild b/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
deleted file mode 100644
index 96be738c15fe..000000000000
--- a/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ADDITIONAL_FILES="
-	licenses_changes.txt
-	patch_license
-	prepare_spec
-"
-inherit obs-service
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/obs-service-source_validator
-"
diff --git a/dev-util/obs-service-generator_driver_update_disk-20130318 b/dev-util/obs-service-generator_driver_update_disk-20130318
new file mode 100644
index 000000000000..4a49b7d42d29
--- /dev/null
+++ b/dev-util/obs-service-generator_driver_update_disk-20130318
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - generator_driver_update_disk service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-generator_driver_update_disk/generator_driver_update_disk -> generator_driver_update_disk-20130318 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-generator_driver_update_disk/generator_driver_update_disk.service -> generator_driver_update_disk-20130318.service https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-generator_driver_update_disk/BSKiwiXML.pm -> BSKiwiXML-20130318.pm
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=fa21a94f1be7d5656bdeef409876d7e1
diff --git a/dev-util/obs-service-generator_driver_update_disk/Manifest b/dev-util/obs-service-generator_driver_update_disk/Manifest
deleted file mode 100644
index 574068f3c38a..000000000000
--- a/dev-util/obs-service-generator_driver_update_disk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST BSKiwiXML-20130318.pm 7295 BLAKE2B b5e2220c8b23e1ac7a733b90eb9f7703a90bf771d63eda0f239c25546fad813e9cc334933383a0f89c54437fca8c85c40f8a29c1e7106e08cab39b4a00b4e5cd SHA512 1e6df1903b0ac8447a26385df4a83ccea62d2a9f698a1d46745216bb7b8f44563c8502791b4da42f702aaaad5f0e3597636de437194af457b366d7b42f492782
-DIST generator_driver_update_disk-20130318 11776 BLAKE2B 77f075dc976b2c66cb2081b3705636355b4dd3ebb742222cbe1a8727dcae375acc0df99ae02e621b9b244bf0eca2334b7a2ded6846e5e1b61255b05869344c31 SHA512 155924d561e7256cd9ea0c862a538310c96014527f461c9256c2b6e11c8a820e8df38c111c3f7662c3f2ff73845450189970364f28904afebe2abc6366328213
-DIST generator_driver_update_disk-20130318.service 838 BLAKE2B f52f618db1429ddc60195ea49ddfb719b179ed587005e99c04215ce471265f2451ea269d57e23fdf59a9efed06cac3a8e137bc59fabff57a219cf41dad107424 SHA512 85ebeef1d79a37e81c5e8558a078f9b929e5f9b5b8960b7930bab7812846eda911210f9cdacff82686298c9b58f62560f99ed76a33d346f3c65be0738f9ff374
-EBUILD obs-service-generator_driver_update_disk-20130318.ebuild 391 BLAKE2B 162c3d12fd6957835dd73a0629ec63715a0abfc1f2650b80b6ef3059e03934283c2e680cf95d9658f0dca423a1148abf3e40346ae1d416cca3c026f8be6c6e1e SHA512 28b844bad72f840c41df9d53e6c3e241e52e725f859ad22f2a3099267d38338d161e243893c4e88dd364989972d2bf8fc86c6a76fbd2a0e94b1194d4756e6371
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-generator_driver_update_disk/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild b/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
deleted file mode 100644
index c5cb32134a8c..000000000000
--- a/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-SRC_URI+=" ${OBS_URI}/BSKiwiXML.pm -> BSKiwiXML-${PV}.pm"
-
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-lang/perl
-"
-
-src_install() {
-	obs-service_src_install
-
-	insinto /usr/libexec/obs/service
-	newins BSKiwiXML-${PV}.pm BSKiwiXML.pm
-}
diff --git a/dev-util/obs-service-git_tarballs-0.1.7 b/dev-util/obs-service-git_tarballs-0.1.7
new file mode 100644
index 000000000000..1c3f8047bae1
--- /dev/null
+++ b/dev-util/obs-service-git_tarballs-0.1.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - git_tarballs service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/git dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7+git.1375261502.72b5224.tar.gz
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=f0b5ec2544e39246df4a3cda523dbac1
diff --git a/dev-util/obs-service-git_tarballs/Manifest b/dev-util/obs-service-git_tarballs/Manifest
deleted file mode 100644
index 74d3d9538a6f..000000000000
--- a/dev-util/obs-service-git_tarballs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-git_tarballs-0.1.7+git.1375261502.72b5224.tar.gz 11006 BLAKE2B 7aa73395add210cc770756f4a13c49c882a5e33e43988d531a5f49a353285fdf6c2e667a898c2020d51eeec383446f8ef4e14bbb25b48a6502f20dcddeca0a62 SHA512 4c8557aa0139a6b65a7993b5ebd5b3cbf3a9f9bbd7da50d56619ed6dc54bdba6e098af92163cf4819acc42e5d4106b6056f120c6f4d0cc38e67daf5c92cc0e6a
-EBUILD obs-service-git_tarballs-0.1.7.ebuild 535 BLAKE2B b4c1c82af0e45702e5b86710b45ba6bf17d29ca0588dad2a32ab49dd8df3a82f784a5ff886e76a2f03466cbedebd2c6ce426f18cee26fbc50d893b25c75d9c77 SHA512 1c25ddea7c6e623dcc58a2a7384e2206f43f5efa9f0093e6854dca829917ec732fa3b57333cd3a181ed3349853dc2d4e258918c012e63295a4a25daa5287959a
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-git_tarballs/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild b/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
deleted file mode 100644
index 4ae8a446b50a..000000000000
--- a/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-HASH="git.1375261502.72b5224"
-SRC_URI="${OBS_URI}/${P}+${HASH}.tar.gz"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-vcs/git
-"
-
-S="${WORKDIR}/${P}+${HASH}"
-
-src_unpack() {
-	default
-}
-
-src_install() {
-	# different folder and files in this module
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-
-	insinto /usr/libexec/obs/service
-	doins ${OBS_SERVICE_NAME}.service
-}
diff --git a/dev-util/obs-service-github_tarballs-0.2.1 b/dev-util/obs-service-github_tarballs-0.2.1
new file mode 100644
index 000000000000..757539d75f3b
--- /dev/null
+++ b/dev-util/obs-service-github_tarballs-0.2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Open Build Service client module - github_tarballs service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/osc dev-util/suse-build dev-vcs/git
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.tar.gz
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd
+_md5_=6828fd130f8482a6d7da05123dba07f7
diff --git a/dev-util/obs-service-github_tarballs/Manifest b/dev-util/obs-service-github_tarballs/Manifest
deleted file mode 100644
index b432f7a596d7..000000000000
--- a/dev-util/obs-service-github_tarballs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-github_tarballs-0.2.1.tar.gz 8837 BLAKE2B 829fb5e607016a4254b846d45444a1eda3328835f2ecb9666b6926360c311741f46dfba4dd00650703449d2261a5dfce54c319bd5d2a331970fbbb1c818153f9 SHA512 7e4d2b9bc5f27448d7c6f11e05307fdb5860ccfff285fc486a4b17ce475716db73fe026c5019674a7dea02dd3e892045eae735c8060735fd1384e2b672995599
-EBUILD obs-service-github_tarballs-0.2.1.ebuild 662 BLAKE2B 7137b4d32e4dcc98188bbffabe9bcda2231b25712a65e086d3e9289e02a5572d79768083fdf2fc8aec18463a6d703a4e87780c2321bd78953350f2eae205128f SHA512 914eb965c952cc97dafb1287777c934f522a7e388f51b564d080a640d3aad4348832f6e067e04bcdbf12ee67580ee9ccf2d53a4505c7aa290456243f54646c62
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-github_tarballs/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild b/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
deleted file mode 100644
index a2acafce99b0..000000000000
--- a/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
-OBS_PROJECT="openSUSE:Tools"
-
-inherit obs-download
-
-DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
-HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
-LICENSE="GPL-2"
-SLOT="0"
-
-SRC_URI="${OBS_URI}/${P}.tar.gz"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/osc
-	dev-util/suse-build
-	dev-vcs/git
-"
-
-src_install() {
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-	insinto /usr/libexec/obs/service
-	doins *.service
-}
diff --git a/dev-util/obs-service-meta-1 b/dev-util/obs-service-meta-1
new file mode 100644
index 000000000000..d07bd42d8706
--- /dev/null
+++ b/dev-util/obs-service-meta-1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Metapackage to pull all open build service services
+EAPI=5
+HOMEPAGE=https://openbuildservice.org/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-util/obs-service-cpanspec dev-util/obs-service-download_files dev-util/obs-service-download_src_package dev-util/obs-service-download_url dev-util/obs-service-extract_file dev-util/obs-service-format_spec_file dev-util/obs-service-generator_driver_update_disk dev-util/obs-service-recompress dev-util/obs-service-set_version dev-util/obs-service-source_validator dev-util/obs-service-verify_file
+SLOT=0
+_md5_=03fada9efd3368bb16780d5cb729f137
diff --git a/dev-util/obs-service-meta-2 b/dev-util/obs-service-meta-2
new file mode 100644
index 000000000000..d0966c040df3
--- /dev/null
+++ b/dev-util/obs-service-meta-2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Metapackage to pull all open build service services
+EAPI=5
+HOMEPAGE=https://openbuildservice.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/obs-service-cpanspec dev-util/obs-service-download_files dev-util/obs-service-download_src_package dev-util/obs-service-download_url dev-util/obs-service-extract_file dev-util/obs-service-format_spec_file dev-util/obs-service-generator_driver_update_disk dev-util/obs-service-git_tarballs dev-util/obs-service-github_tarballs dev-util/obs-service-rearchive dev-util/obs-service-recompress dev-util/obs-service-set_version dev-util/obs-service-source_validator dev-util/obs-service-update_source dev-util/obs-service-verify_file
+SLOT=0
+_md5_=706a18f8f3da5acba97bde062f93d8cd
diff --git a/dev-util/obs-service-meta/Manifest b/dev-util/obs-service-meta/Manifest
deleted file mode 100644
index 6fd1cd53811d..000000000000
--- a/dev-util/obs-service-meta/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD obs-service-meta-1.ebuild 963 BLAKE2B 7bb96e80dd9d9a1224ad6bcb679376e5ffc644f6c32fc5f9f3cdecfe0a16f312a56916049592e1ed5370462a58b3d8d7fdb7acd1599463471c982feb9c9a87d1 SHA512 72c265562247aa26cb837b44e71ffe7bfba602266711761aa24add9d41be61569b3246bf3f28db2009d1d3f7db6ea7e726b8f5cdb24f3ea141839cf7efecf651
-EBUILD obs-service-meta-2.ebuild 1106 BLAKE2B e0b3acbe8b5a2fb751bc3e8dded592b52b84c7c105a4c6a7ab84fe60f68cbd5255e22691a19324e3065fc889fad50dfbd8ab7d2a7eb3a2e15dfbd3cd847052b5 SHA512 0ba04465a112412e57d8fe5ec6762d466cc020d8b480c13749668df528f703cff64147769cf970c7eff96d6ea889ed5682771f2aee7037b77aa0909de1bb8b4e
-MISC metadata.xml 430 BLAKE2B 35bbe8e34562680edf5a62049fb63dacf82cca405e0ff782189d43f6ee3b5f138c21185383ddc652abf4451dff5db5c3f7910d4f7712157cfb1cb4219079a42b SHA512 02ec9efc9cc663b49d26135f1651abdb732b2850a2bf311fa16bc137364a15cd8762391a14e46c38f005dec215b9392026ad8ac085ba21e57be52d5406df2333
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
deleted file mode 100644
index 05828e15c8a8..000000000000
--- a/dev-util/obs-service-meta/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-meta/obs-service-meta-1.ebuild b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
deleted file mode 100644
index bf4526b1dbe5..000000000000
--- a/dev-util/obs-service-meta/obs-service-meta-1.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
-
-DESCRIPTION="Metapackage to pull all open build service services"
-HOMEPAGE="https://openbuildservice.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/obs-service-cpanspec
-	dev-util/obs-service-download_files
-	dev-util/obs-service-download_src_package
-	dev-util/obs-service-download_url
-	dev-util/obs-service-extract_file
-	dev-util/obs-service-format_spec_file
-	dev-util/obs-service-generator_driver_update_disk
-	dev-util/obs-service-recompress
-	dev-util/obs-service-set_version
-	dev-util/obs-service-source_validator
-	dev-util/obs-service-verify_file
-"
-
-pkg_postinst() {
-	if ! has_version dev-util/obs-service-tar_scm ; then
-		elog "You should consider installing also following package"
-		elog "if you plan to work with SCM packages:"
-		elog "    dev-util/obs-service-tar_scm"
-	fi
-}
diff --git a/dev-util/obs-service-meta/obs-service-meta-2.ebuild b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
deleted file mode 100644
index 787e83740747..000000000000
--- a/dev-util/obs-service-meta/obs-service-meta-2.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
-
-DESCRIPTION="Metapackage to pull all open build service services"
-HOMEPAGE="https://openbuildservice.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/obs-service-cpanspec
-	dev-util/obs-service-download_files
-	dev-util/obs-service-download_src_package
-	dev-util/obs-service-download_url
-	dev-util/obs-service-extract_file
-	dev-util/obs-service-format_spec_file
-	dev-util/obs-service-generator_driver_update_disk
-	dev-util/obs-service-git_tarballs
-	dev-util/obs-service-github_tarballs
-	dev-util/obs-service-rearchive
-	dev-util/obs-service-recompress
-	dev-util/obs-service-set_version
-	dev-util/obs-service-source_validator
-	dev-util/obs-service-update_source
-	dev-util/obs-service-verify_file
-"
-
-pkg_postinst() {
-	if ! has_version dev-util/obs-service-tar_scm ; then
-		elog "You should consider installing also following package"
-		elog "if you plan to work with SCM packages:"
-		elog "    dev-util/obs-service-tar_scm"
-	fi
-}
diff --git a/dev-util/obs-service-rearchive-20130802 b/dev-util/obs-service-rearchive-20130802
new file mode 100644
index 000000000000..388fbae4b1eb
--- /dev/null
+++ b/dev-util/obs-service-rearchive-20130802
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - rearchive service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/gzip app-arch/unrar app-arch/unzip dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-rearchive/rearchive -> rearchive-20130802 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-rearchive/rearchive.service -> rearchive-20130802.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=562a6962fe1cb22582cb367a23fb7c59
diff --git a/dev-util/obs-service-rearchive/Manifest b/dev-util/obs-service-rearchive/Manifest
deleted file mode 100644
index 922f28e0058e..000000000000
--- a/dev-util/obs-service-rearchive/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rearchive-20130802 2182 BLAKE2B d5b653ee39f5dd027434aa13eac6a17ae9b534c394dfedd7dbb463f7dd98361cf65828039b6da020a99679de6fc3a93bfa88db5235b7c96c60d852e8ec7f8070 SHA512 7266f142cdfcbcf9b96b36ed70d80e3640ec8897b98619abd885b892ffd6b86980bb337957879871b7b268bf72cc12e2b4bf8c1e0ecb9a45cf95a6f535ca0279
-DIST rearchive-20130802.service 544 BLAKE2B a8e86bd47a7afa0e6f92f987cdb8b0117f7e34a1395da4bd7fded6805487cc759d472556626f227209f315c993d0234c672cf9724cc518b7b7353905be170537 SHA512 a228f780b5494d19565c190f4e97389a9e2fb6926ee939220df8862082f0cc881e5bdbaeac2db9085fcb57f47e4e43eb504c49929fc55a7954786e57d2a9925f
-EBUILD obs-service-rearchive-20130802.ebuild 247 BLAKE2B fbe07876074370163b77d93d7f3c907676a3f239d2a10081684ca37eac4ef898ef2fab30dfe030c714ada705b89bc647fd902c30dd436b6ca6472a1c7f1e3cf3 SHA512 dd7d850126cea03cd680fa94626ee8fac698ae154bf1c2c73124466182673fae24611e60ec3c37b29c81fd42364dc27e110945dde907f677d0d550cfc07da6ac
-MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
deleted file mode 100644
index 5367c1e31d21..000000000000
--- a/dev-util/obs-service-rearchive/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. It's a wrapper around cpanspec script.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild b/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
deleted file mode 100644
index e7c8f22f7f8d..000000000000
--- a/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/gzip
-	app-arch/unrar
-	app-arch/unzip
-"
diff --git a/dev-util/obs-service-recompress-0.2 b/dev-util/obs-service-recompress-0.2
new file mode 100644
index 000000000000..6048278b37da
--- /dev/null
+++ b/dev-util/obs-service-recompress-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Open Build Service client module - recompress service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/xz-utils dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-recompress/obs-service-recompress-0.2.tar.gz
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd
+_md5_=9ba35c1b938792e431fb691e612e06cf
diff --git a/dev-util/obs-service-recompress/Manifest b/dev-util/obs-service-recompress/Manifest
deleted file mode 100644
index fd2f33d5ecbc..000000000000
--- a/dev-util/obs-service-recompress/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-recompress-0.2.tar.gz 1593 BLAKE2B 62525fe7951744663adf5cbc1aaf1f4324583f383036249e92d06f1457cdc0d167f9f95f6499ede5db312a50354202ba0ae4e60e9963993f3d61304dafda4d1c SHA512 085a6b47ca2a2930a41a6edcdbec85960c0d3c092e5d4e643c90c5bbc97f01ddbf35c73edad9293ffc0ff3254270a3f7ae2d6c500708bd4f41e355b5549a2585
-EBUILD obs-service-recompress-0.2.ebuild 697 BLAKE2B 5bff3b2177960160943f6ea8b7eddd498ca9482deed55ae1c86cf3f44d2c19ec2dc49e8f8c3934ae64eb4f7b6713bc2cb99ff8b0cd65bad2e9ceaaca00692e94 SHA512 fb2881f11270eb819b41b5665ebeb69f760e43437686a9d459089dbb24b3ff5cf93c06c605818f8d62113b1f150df08d3a077b79e31238191620b36e39020e44
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-recompress/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild b/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
deleted file mode 100644
index 31af6a9e8911..000000000000
--- a/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
-OBS_PROJECT="openSUSE:Tools"
-
-inherit obs-download
-
-DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
-HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
-LICENSE="GPL-2"
-SLOT="0"
-
-SRC_URI="${OBS_URI}/${P}.tar.gz"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/xz-utils
-	dev-util/osc
-	dev-util/suse-build
-"
-
-src_install() {
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-	insinto /usr/libexec/obs/service
-	doins *.service
-}
diff --git a/dev-util/obs-service-set_version-0.3 b/dev-util/obs-service-set_version-0.3
new file mode 100644
index 000000000000..b90367bb00b9
--- /dev/null
+++ b/dev-util/obs-service-set_version-0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Open Build Service client module - set_version service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-set_version/obs-service-set_version-0.3.tar.gz
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd
+_md5_=288c20b66af0e088d0c74a4a5f66b6ac
diff --git a/dev-util/obs-service-set_version/Manifest b/dev-util/obs-service-set_version/Manifest
deleted file mode 100644
index f747516062de..000000000000
--- a/dev-util/obs-service-set_version/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-set_version-0.3.tar.gz 1993 BLAKE2B 5cbb674455088c3034bc1592a82f71919c90e96d07fa5fa50ba5f0f21edb8b8a1560f1f8634123ebf4dbfeda55589e6842be530bb9b7f0e9007b3b66ac801dbc SHA512 a053c869199441aec54af3e170258297584c018a2d7b6a0f48119762ac2386f74b0a15132280d3428c948454cd4d0c8dadc65eb68d9439df40d55ba4f9e5da7a
-EBUILD obs-service-set_version-0.3.ebuild 647 BLAKE2B 697da430963daaa4724c5f790d972706909d6bf848881bbf0e11fbc1df46aad142803449fceeec67f90135c1fd6c86fb7ee4887b0229d87d83d38e5dd140540a SHA512 6bebaa5504442f27349bf9ef6c402e633c459642d7177fc8239ec370342fc937c6f174034d60612003bcf816632556f0f6b08c35827bacb38ee603260166aa13
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-set_version/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild b/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
deleted file mode 100644
index 9e7ca4b56d9e..000000000000
--- a/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
-OBS_PROJECT="openSUSE:Tools"
-
-inherit obs-download
-
-DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
-HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
-LICENSE="GPL-2"
-SLOT="0"
-
-SRC_URI="${OBS_URI}/${P}.tar.gz"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-util/osc
-	dev-util/suse-build
-"
-
-src_install() {
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-	insinto /usr/libexec/obs/service
-	doins *.service
-}
diff --git a/dev-util/obs-service-source_validator-0.3 b/dev-util/obs-service-source_validator-0.3
new file mode 100644
index 000000000000..9198c51e5ac3
--- /dev/null
+++ b/dev-util/obs-service-source_validator-0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=dev-perl/TimeDate
+DESCRIPTION=Open Build Service client module - source_validator service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/TimeDate dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-source_validator/obs-service-source_validator-0.3.tar.bz2
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=513d5aae52343202c88c5d7fe89b1348
diff --git a/dev-util/obs-service-source_validator/Manifest b/dev-util/obs-service-source_validator/Manifest
deleted file mode 100644
index 5cab8caf2b9d..000000000000
--- a/dev-util/obs-service-source_validator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-source_validator-0.3.tar.bz2 18472 BLAKE2B 4f98b9d073da43c60b0d548f484497534105b9a3da843b15e7489dd2224c64ca7e44082b9981177651c0fbba44b377a0a94c989af10c1c38b503ebdc7ba72d21 SHA512 129d69a896bbd157b781f6d9014420fa7a9717f6a48b677bbe99d5d92a242ff25be470108d6f6da00a170b3133b9fceaf8d7447f356e9ddc1090ba7f7d79c164
-EBUILD obs-service-source_validator-0.3.ebuild 655 BLAKE2B 262b8006267afe6142325d3e892bdaa3f49138ff8f3d48137494d47d16e7f16972e627420f62fbdc39d33215bf6056a09f51c2e5ba592695e3242139770854f6 SHA512 8e93e5089f00c2021ff712a866b5cd8f0067b1e446df61b3f17994c929fee7a4dded124b08a2ecf401848dbe7a934d9aa602ae924526812d091f42c775960855
-MISC metadata.xml 430 BLAKE2B 35bbe8e34562680edf5a62049fb63dacf82cca405e0ff782189d43f6ee3b5f138c21185383ddc652abf4451dff5db5c3f7910d4f7712157cfb1cb4219079a42b SHA512 02ec9efc9cc663b49d26135f1651abdb732b2850a2bf311fa16bc137364a15cd8762391a14e46c38f005dec215b9392026ad8ac085ba21e57be52d5406df2333
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
deleted file mode 100644
index 05828e15c8a8..000000000000
--- a/dev-util/obs-service-source_validator/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild b/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
deleted file mode 100644
index 8a85f2cb822e..000000000000
--- a/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-# only one sanely packed service
-SRC_URI="${OBS_URI}/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-perl/TimeDate"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-}
-
-src_install() {
-	# different folder and files in this module
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-
-	insinto /usr/libexec/obs/service
-	doins ${OBS_SERVICE_NAME}.service
-
-	exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}s
-	doexe [0-9]*
-	exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}s/helpers/
-	doexe helpers/*
-}
diff --git a/dev-util/obs-service-tar_scm-0.3.1 b/dev-util/obs-service-tar_scm-0.3.1
new file mode 100644
index 000000000000..4d4ec75daf04
--- /dev/null
+++ b/dev-util/obs-service-tar_scm-0.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - tar_scm service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/bzr dev-vcs/git dev-vcs/mercurial dev-vcs/subversion dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-tar_scm/obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=9fdb5797d78ad6e960d015f274650a3f
diff --git a/dev-util/obs-service-tar_scm/Manifest b/dev-util/obs-service-tar_scm/Manifest
deleted file mode 100644
index b2d57b0f0363..000000000000
--- a/dev-util/obs-service-tar_scm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz 18252 BLAKE2B c12934dd07ee884214f9643395623f1d3d7b806c16076d2342ea3d961358025029ac1f0660842b778b2522fef350466efef8f40bf06287dbd6501f38f0f0fbb9 SHA512 c150e6a0867befacfbd029726e997b3e64307646e2887d00e6ad7493ac2bd9200afd7bfb9057255549ff87cc5280161edc7c96f31c7fcfa572ab4b96ba74cfbe
-EBUILD obs-service-tar_scm-0.3.1.ebuild 660 BLAKE2B 80a502aa184472874e1caf7a8924e7f3833b077807814428bbd25d9bc93242f658789dfb5d7313d2c00982f95f744a48b5b596d8633748a63e295246e4c6adee SHA512 692ce8d5dd5d609d0da701260534bfbd52cac70768b30095e6a7895ebeed68d6f956581055bff2522e46353cd4efd62f13205efe40d6dc3bbdcadc53d1292972
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-tar_scm/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild b/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
deleted file mode 100644
index d3d82662a49f..000000000000
--- a/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-HASH="1383144507.58d1af8"
-SRC_URI="${OBS_URI}/${P}.${HASH}.tar.gz"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-vcs/bzr
-	dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/subversion
-"
-
-S="${WORKDIR}/${P}.${HASH}"
-
-src_unpack() {
-	default
-}
-
-src_install() {
-	# different folder and files in this module
-	exeinto /usr/libexec/obs/service
-	doexe ${OBS_SERVICE_NAME}
-
-	insinto /usr/libexec/obs/service
-	doins ${OBS_SERVICE_NAME}.service
-
-	insinto /etc/obs/services
-	newins ${OBS_SERVICE_NAME}.rc ${OBS_SERVICE_NAME}
-}
diff --git a/dev-util/obs-service-update_source-20130802 b/dev-util/obs-service-update_source-20130802
new file mode 100644
index 000000000000..a3850037733f
--- /dev/null
+++ b/dev-util/obs-service-update_source-20130802
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - update_source service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-misc/wget sys-apps/diffutils dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-update_source/update_source -> update_source-20130802 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-update_source/update_source.service -> update_source-20130802.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=7357dab07fd681b22de75c08d563ce8f
diff --git a/dev-util/obs-service-update_source/Manifest b/dev-util/obs-service-update_source/Manifest
deleted file mode 100644
index 2884b2d00e90..000000000000
--- a/dev-util/obs-service-update_source/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST update_source-20130802 4081 BLAKE2B e27cce2be12f1cf82235ad2b43cf7c92b5d624936e9805a3581b2c686266a6a95bb4cdabd3da3f0d6034ddacd37d320c6417918a476a6d931a0a57639666ab41 SHA512 24a28c9f487b9ecc247988dcffc3ab612fa11b33824f9b3f1537548722186143dfeefe5208444383a918baa599fc57994dc6a7ae7049aea8108c087fd49f6e17
-DIST update_source-20130802.service 486 BLAKE2B a3c7c8ff5689ff3979e54f4e890dd5898c62c4a940b6998ec89811de6290e808c65966226eac8ff549c9fb4561d70268f230d4f82481eeaa839d0081e729429a SHA512 3cfb25566f2806c145bca0817976e7129436334706c2f0022fe7e94be62ce11b8e2420c2e97c24999bcda1de88850a589e5b6a0de633a27cdce52b4253965818
-EBUILD obs-service-update_source-20130802.ebuild 235 BLAKE2B f582aa916933f53b29a96a6859d42cb04829d7d514d37ab300398aea9b5defca5d4d8f7958e0d676bd3a4b878f29b14e290b33fbd5e5b0dbfd2ffcc98524435d SHA512 5b2512a4c45a0259432f35b1e48dfdf5f9a2290740d5cafe60855af329edbd4619b9209ef8d8fa0f405749a6b1b601aea706fe95ef14ee660fa857cc11e77013
-MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
deleted file mode 100644
index 5367c1e31d21..000000000000
--- a/dev-util/obs-service-update_source/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. It's a wrapper around cpanspec script.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild b/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
deleted file mode 100644
index 0ca3539359e9..000000000000
--- a/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/wget
-	sys-apps/diffutils
-"
diff --git a/dev-util/obs-service-verify_file-20130403 b/dev-util/obs-service-verify_file-20130403
new file mode 100644
index 000000000000..0cf3fb9f5ca4
--- /dev/null
+++ b/dev-util/obs-service-verify_file-20130403
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Open Build Service client module - verify_file service
+EAPI=5
+HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=net-misc/wget dev-util/osc dev-util/suse-build
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-verify_file/verify_file -> verify_file-20130403 https://api.opensuse.org/public/source/openSUSE:Tools/obs-service-verify_file/verify_file.service -> verify_file-20130403.service
+_eclasses_=obs-download	dee642b7a40967b3fee1c026a6ba33dd	obs-service	165dda862c81ee0013948ebe7c8d8b78
+_md5_=b1ed5afcbdb9f8042a60845fce3921d6
diff --git a/dev-util/obs-service-verify_file/Manifest b/dev-util/obs-service-verify_file/Manifest
deleted file mode 100644
index 13656a06b6aa..000000000000
--- a/dev-util/obs-service-verify_file/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST verify_file-20130403 1279 BLAKE2B 49e755a19bb57672ccc84a7f187d3d3c5cdb856e0273e76c60a5c851453d0fbe5d93d08754f29bb387e574a9f58bc708206cea68111de194f48c93657d7b0300 SHA512 8fd6771c6c93766429d58620750132a6139df34041009f890792458c2f6de4efd8548c1f9f96aba051563d32a60294bae7e14d6c5523db345787c609e1a0a5dc
-DIST verify_file-20130403.service 513 BLAKE2B ec01c4c7ea656677695934fcea832162f84d206aeb0a1fb57a5c59c25fe998d460894a800614744893de6de32c7a047f25cbacf2edf33e85011e84a703637700 SHA512 3ad6b31fc5599ebf3389f32b909c8859b78a2134079692e2891aa03cca1b9fea420f6796d762fbceb431c6216610427fb33fb2d58859a521ff34639cab38a63c
-EBUILD obs-service-verify_file-20130403.ebuild 227 BLAKE2B b6c61a81fdfc935f36d4c5fea4ae8e2a824e1353531ca285e6689f7d99e810b0a640ee8556ddbb95fd8564bb1e1bf076814bfb727c627efa7fd34176962e4791 SHA512 d967efea3eed4ca6245ad248cc6e40162581a43945c0016afe7b149332fc93faa60a3053d6cabec417202e94c69ec9984f8d5e6704994303b55e3f850066e29e
-MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
deleted file mode 100644
index 8eed9fddc78e..000000000000
--- a/dev-util/obs-service-verify_file/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>
-<longdescription lang="en">
-This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild b/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
deleted file mode 100644
index 47d7404b6f41..000000000000
--- a/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit obs-service
-
-LICENSE="MIT"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	net-misc/wget
-"
diff --git a/dev-util/omake-0.10.2 b/dev-util/omake-0.10.2
new file mode 100644
index 000000000000..68f6f0926001
--- /dev/null
+++ b/dev-util/omake-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+DESCRIPTION=Make replacement
+EAPI=5
+HOMEPAGE=http://projects.camlcity.org/projects/omake.html
+IUSE=doc fam ncurses +ocamlopt readline
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+RESTRICT=installsources
+SLOT=0
+SRC_URI=http://download.camlcity.org/download/omake-0.10.2.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_=2f5169c31b94969d95b93d00ac2d31fb
diff --git a/dev-util/omake-0.10.3 b/dev-util/omake-0.10.3
new file mode 100644
index 000000000000..7379d0254c8b
--- /dev/null
+++ b/dev-util/omake-0.10.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+DESCRIPTION=Make replacement
+EAPI=5
+HOMEPAGE=http://projects.camlcity.org/projects/omake.html
+IUSE=doc fam ncurses +ocamlopt readline
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+RESTRICT=installsources
+SLOT=0
+SRC_URI=http://download.camlcity.org/download/omake-0.10.3.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_=a7a8e531740b9bc802cbc114df981cbc
diff --git a/dev-util/omake-0.9.8.6.0_rc1 b/dev-util/omake-0.9.8.6.0_rc1
new file mode 100644
index 000000000000..ca9e58b328cd
--- /dev/null
+++ b/dev-util/omake-0.9.8.6.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+DESCRIPTION=Make replacement
+EAPI=5
+HOMEPAGE=http://omake.metaprl.org/
+IUSE=doc fam ncurses +ocamlopt readline
+KEYWORDS=~amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
+RESTRICT=installsources
+SLOT=0
+SRC_URI=http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=713291be51a5e681bf6f9f705c9b0131
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
deleted file mode 100644
index 445cd5d92bc0..000000000000
--- a/dev-util/omake/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX omake-0.10.2-cflags.patch 353 BLAKE2B 87cada574eb029493f5a0d9dbe4bc705888fbaf26bf64b2bfa63ddd6694dd0e652c698a960c2c13c6a8acbb7410137075b704871ec9396ee6d4f1f14ef637d3a SHA512 460ff11b457eb99f2d3a89f862deffcddc8ccddfeac7b4c7d5cce78544bb223feffb448cc39c440e03a2d028698180cc7439f3b39dd07ce237cc60cedf7e7d37
-AUX omake-0.9.8.6.0_rc1-cflags.patch 231 BLAKE2B 9f7b587caec9991d6710c24ec6743f71a707f631c7bd2002ad10c4967fd258db7916064d0db6b80a2e5b3c4bb1f6fbbaf63f200a12028950e97306807f30809b SHA512 733aeb2288b8c6494eb4a46ceff2a88149477ae95da8470f11fa321b3f1623adae13169effb95f45c16fff893d610af05be54ad892c4d7a97019e2a12fe3d19b
-AUX omake-0.9.8.6.0_rc1-warnerror.patch 287 BLAKE2B 20b28db41f662e8f3fa75a65fd9ea8c44b091e6abe31a3813e8120684b9a078e70cfa4141766b263549ae885c2199abcb4e23e7e7fee6a0e2fc643ae810b9863 SHA512 0b099c314e2eb19ab48eca873710f3c5716b4a2b82048ddd5baf3b2c7a82de5245ca36f1f72c6dbdbd79bd023de7ab3716a6c46c87986d00db2ec3661daa9d50
-DIST omake-0.10.2.tar.gz 2434316 BLAKE2B f8ca58058ddee39f4e803b91fce061041adfdd71644c17282353b9057acddf23dcc25f836d0ae4014dd44d9c3889c32e5b14788916bcc07015aa6d93e6b5ebdb SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd
-DIST omake-0.10.3.tar.gz 2438877 BLAKE2B c14adc4da9849b369a2cf5e3676260a2efeb6339939de95965f708b93ac5964af0a8b7e79ebaf98a20061c45530a20ca3825e7a432a3d8b86cdef3ab661cd5d9 SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733
-DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 BLAKE2B 0fbb77932178e067ff771ed4d448fa2342f56e281799915ab559a606bc195f7817f710caaa44b2debb6243aabf73ebc3d11e0fa010fdfcca14060c8e6e808b15 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-EBUILD omake-0.10.2.ebuild 1155 BLAKE2B e10d07acab60a438a76828e7a180d794341750d8640574e8ce36af08b4ca621a5866267bfcfff8d868b64c21585356e8dace0b8fb21118610af17fc90838ac5c SHA512 79b90c2feab16dc5520897f752e771ab0c1578d92f0d7d8fd6a6e88e298c7e6493334ad10895efef98158d7f4e42e0971954a81ab4a0037f5aa89dc72e895c06
-EBUILD omake-0.10.3.ebuild 1163 BLAKE2B 9532cf33dcd65052d797fe6aea845b2a6851fcd9a88975ebe09170cee1de994d0a1cb47a6d25ff72cf55ecfd88b383451c4ade3d015c7d73c5709fe141867b45 SHA512 43625219b14f8e501af79cddb0ee180c12c2c7320343e7138bdea3d7e661a89949ca5ab7da1d0179aa8eac28d1476a937821ea8bdae646efeb4037ff20108727
-EBUILD omake-0.9.8.6.0_rc1.ebuild 2000 BLAKE2B 86ed7b64f461cb3069d74b79cc30d28a295b26923f3b8649ba88d84d4514d3461a4bbfcc1e64c384ccbea39004441b3d54e9e2f1a6cbc95473122b98bc65c0e6 SHA512 b1ca3e4b4687a1535fb4908cd02235706f8138ee6f2b2de66e3363c6800b3b4eb63c5389fba03e8e630848edbe03ca74ac3f1351c20f148595554095cd5cc25e
-MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-util/omake/files/omake-0.10.2-cflags.patch b/dev-util/omake/files/omake-0.10.2-cflags.patch
deleted file mode 100644
index b4dc9ee38aa7..000000000000
--- a/dev-util/omake/files/omake-0.10.2-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: omake-0.10.2/OMakefile
-===================================================================
---- omake-0.10.2.orig/OMakefile
-+++ omake-0.10.2/OMakefile
-@@ -49,7 +49,7 @@ else
-     #
-     # Extra options for the C compiler
-     #
--    CFLAGS += -g -O2 -Wall -Wno-unused
-+    CFLAGS += -Wall -Wno-unused
- 
-     #
-     # We never need threads on Unix
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
deleted file mode 100644
index a6eaf707c971..000000000000
--- a/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/OMakefile
-+++ b/OMakefile
-@@ -33,7 +33,7 @@
-     #
-     # Extra options for the C compiler
-     #
--    CFLAGS += -g -O2 -Wall -Werror -Wno-unused
-+    CFLAGS += -Wall -Wno-unused
- 
-     #
-     # We never need threads on Unix
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
deleted file mode 100644
index cf8a7972027d..000000000000
--- a/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/build/OCaml.om
-+++ b/lib/build/OCaml.om
-@@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
deleted file mode 100644
index ffac4d7ebc01..000000000000
--- a/dev-util/omake/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>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
deleted file mode 100644
index 46e34cdb6a51..000000000000
--- a/dev-util/omake/omake-0.10.2.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
-
-inherit toolchain-funcs multilib eutils
-
-RESTRICT="installsources"
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc fam ncurses +ocamlopt readline"
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3:0= )
-	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-cflags.patch"
-}
-
-src_configure() {
-	./configure \
-		-prefix "${EPREFIX}/usr" \
-		$(use readline || echo '-disable-readline') \
-		$(use ncurses  || echo '-disable-ncurses' ) \
-		$(use fam      || echo '-disable-fam'     ) \
-		|| die
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc ChangeLog CONTRIBUTORS.org README.md
-	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
-	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-}
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
deleted file mode 100644
index 019e3e3775e7..000000000000
--- a/dev-util/omake/omake-0.10.3.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
-
-inherit toolchain-funcs multilib eutils
-
-RESTRICT="installsources"
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc fam ncurses +ocamlopt readline"
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3:0= )
-	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
-}
-
-src_configure() {
-	./configure \
-		-prefix "${EPREFIX}/usr" \
-		$(use readline || echo '-disable-readline') \
-		$(use ncurses  || echo '-disable-ncurses' ) \
-		$(use fam      || echo '-disable-fam'     ) \
-		|| die
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc ChangeLog CONTRIBUTORS.org README.md
-	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
-	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-}
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
deleted file mode 100644
index daa7fd04918a..000000000000
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib versionator eutils
-
-MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )")
-RESTRICT="installsources"
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://omake.metaprl.org/"
-SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="doc fam ncurses +ocamlopt readline"
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3:0= )
-	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3:0= )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV%-*}
-
-use_boolean() {
-	if use $1; then
-		echo "true"
-	else
-		echo "false"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-cflags.patch" \
-		"${FILESDIR}/${P}-warnerror.patch"
-}
-
-src_configure() {
-	# Configuration steps...
-	echo "PREFIX = \$(dir \$\"/usr\")" > .config
-	echo "BINDIR = \$(dir \$\"\$(PREFIX)/bin\")" >> .config
-	echo "LIBDIR = \$(dir \$\"\$(PREFIX)/$(get_libdir)\")" >> .config
-	echo "MANDIR = \$(dir \$\"\$(PREFIX)/man\")" >> .config
-
-	echo "CC = $(tc-getCC)" >> .config
-	echo "CFLAGS = ${CFLAGS}" >> .config
-
-	if use ocamlopt; then
-		echo "NATIVE_ENABLED = true" >> .config
-		echo "BYTE_ENABLED = false" >> .config
-	else
-		echo "NATIVE_ENABLED = false" >> .config
-		echo "BYTE_ENABLED = true" >> .config
-	fi
-
-	echo "NATIVE_PROFILE = false" >> .config
-
-	echo "READLINE_ENABLED = $(use_boolean readline)" >> .config
-	echo "FAM_ENABLED = $(use_boolean fam)" >> .config
-	echo "NCURSES_ENABLED = $(use_boolean ncurses)" >> .config
-
-	echo "DEFAULT_SAVE_INTERVAL = 60" >> .config
-
-	echo "OCAMLDEP_MODULES_ENABLED = false" >> .config
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc CHANGELOG.txt
-	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
-	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-}
diff --git a/dev-util/open-vcdiff-0.8.4-r1 b/dev-util/open-vcdiff-0.8.4-r1
new file mode 100644
index 000000000000..0f97d7c923a4
--- /dev/null
+++ b/dev-util/open-vcdiff-0.8.4-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=An encoder/decoder for the VCDIFF (RFC3284) format
+EAPI=6
+HOMEPAGE=https://github.com/google/open-vcdiff
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0/0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/open-vcdiff-0.8.4.tar.gz
+_md5_=47994412feab61e6395777d26f8c2351
diff --git a/dev-util/open-vcdiff/Manifest b/dev-util/open-vcdiff/Manifest
deleted file mode 100644
index ab0742cbe73c..000000000000
--- a/dev-util/open-vcdiff/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX open-vcdiff-0.8.4-gcc6.patch 8635 BLAKE2B 78abbc4df03d082ec936a6ddd2ff18d69acb15dd4bb4bc6628799c9b700afc049dde52f9941a5098a93ab37bff76da3eb6eeb1a22541a407e111b095654cae55 SHA512 f4b1ce46832bc279cc5fb421171f5efba64e1e733a1d733b8ed26d6b024e9e2875ab2dfffcecf3b48ab805c3f44ba9da3eb961fd36ebe5fa6beba3642177a368
-DIST open-vcdiff-0.8.4.tar.gz 780923 BLAKE2B 26e36866f8aab15e1103017e1ac2666634b5bdebf02738b5339dc31c283e643f4cbd75f58bff6a3d27965e568c6dd444dcf74655ce8abe1e1503f5f8424bd141 SHA512 fb9062d6a854c999d04eb68672596583e958c3d1705d58429280cb53dcf381c880b23d7fc9d5277545b4a5f9023435648d7bc87bad10cb30385fb950e5d499bd
-EBUILD open-vcdiff-0.8.4-r1.ebuild 510 BLAKE2B e1f6e4427453eb9a5f5c7a0deebd2fc009f20f8ad3ad89150646ec6694365ad80e9647b3aa2ab5f8225f46279f5f592aa94a8e6dd6745919661459ef1329ef52 SHA512 21c85520b16b17158ba09e3d9bc6b97079f5d19c32a946219ee5e3421c09f4b60af3e5adc1b5b4f47e5111551cdf3d0c159b6723862c5d4c8e3b243438ef6aea
-MISC metadata.xml 278 BLAKE2B a84e58dcfad537c763aea7363e551a386372db6961dc099bca0bd90a7c770b7004a91f4be5879c91c88b263435a27969222f7b37f72b41f91d5228c6f06259c4 SHA512 4b637493a5e196c76d1e2f560230f35b24549aa54088d0b718fa91c3ccb8631e6d30c49038bf19265f2fbe25dfd92247827827b576af5841fd061094bcea6f14
diff --git a/dev-util/open-vcdiff/files/open-vcdiff-0.8.4-gcc6.patch b/dev-util/open-vcdiff/files/open-vcdiff-0.8.4-gcc6.patch
deleted file mode 100644
index fdba3faa78b2..000000000000
--- a/dev-util/open-vcdiff/files/open-vcdiff-0.8.4-gcc6.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- a/src/vcdecoder_test.cc
-+++ b/src/vcdecoder_test.cc
-@@ -23,7 +23,7 @@
- 
- namespace open_vcdiff {
- 
--const char VCDiffDecoderTest::kStandardFileHeader[] = {
-+const uint8_t VCDiffDecoderTest::kStandardFileHeader[] = {
-     0xD6,  // 'V' | 0x80
-     0xC3,  // 'C' | 0x80
-     0xC4,  // 'D' | 0x80
-@@ -31,7 +31,7 @@
-     0x00   // Hdr_Indicator: no custom code table, no compression
-   };
- 
--const char VCDiffDecoderTest::kInterleavedFileHeader[] = {
-+const uint8_t VCDiffDecoderTest::kInterleavedFileHeader[] = {
-     0xD6,  // 'V' | 0x80
-     0xC3,  // 'C' | 0x80
-     0xC4,  // 'D' | 0x80
-@@ -61,21 +61,22 @@
- }
- 
- void VCDiffDecoderTest::UseStandardFileHeader() {
--  delta_file_header_.assign(kStandardFileHeader,
-+  delta_file_header_.assign(reinterpret_cast<const char *>(kStandardFileHeader),
-                             sizeof(kStandardFileHeader));
- }
- 
- void VCDiffDecoderTest::UseInterleavedFileHeader() {
--  delta_file_header_.assign(kInterleavedFileHeader,
--                            sizeof(kInterleavedFileHeader));
-+  delta_file_header_.assign(
-+      reinterpret_cast<const char *>(kInterleavedFileHeader),
-+      sizeof(kInterleavedFileHeader));
- }
- 
- void VCDiffDecoderTest::InitializeDeltaFile() {
-   delta_file_ = delta_file_header_ + delta_window_header_ + delta_window_body_;
- }
- 
--char VCDiffDecoderTest::GetByteFromStringLength(const char* s,
--                                                int which_byte) {
-+uint8_t VCDiffDecoderTest::GetByteFromStringLength(const char* s,
-+                                                   int which_byte) {
-   char varint_buf[VarintBE<int32_t>::kMaxBytes];
-   VarintBE<int32_t>::Encode(static_cast<int32_t>(strlen(s)), varint_buf);
-   return varint_buf[which_byte];
-@@ -101,10 +102,10 @@
- // (0x7FFFFFFF) at the given offset in the delta window.
- void VCDiffDecoderTest::WriteMaxVarintAtOffset(int offset,
-                                                int bytes_to_replace) {
--  static const char kMaxVarint[] = { 0x87, 0xFF, 0xFF, 0xFF, 0x7F };
-+  static const uint8_t kMaxVarint[] = { 0x87, 0xFF, 0xFF, 0xFF, 0x7F };
-   delta_file_.replace(delta_file_header_.size() + offset,
-                       bytes_to_replace,
--                      kMaxVarint,
-+                      reinterpret_cast<const char*>(kMaxVarint),
-                       sizeof(kMaxVarint));
- }
- 
-@@ -112,10 +113,10 @@
- // in the delta window.
- void VCDiffDecoderTest::WriteNegativeVarintAtOffset(int offset,
-                                                     int bytes_to_replace) {
--  static const char kNegativeVarint[] = { 0x88, 0x80, 0x80, 0x80, 0x00 };
-+  static const uint8_t kNegativeVarint[] = { 0x88, 0x80, 0x80, 0x80, 0x00 };
-   delta_file_.replace(delta_file_header_.size() + offset,
-                       bytes_to_replace,
--                      kNegativeVarint,
-+                      reinterpret_cast<const char*>(kNegativeVarint),
-                       sizeof(kNegativeVarint));
- }
- 
-@@ -123,18 +124,18 @@
- // at the given offset in the delta window.
- void VCDiffDecoderTest::WriteInvalidVarintAtOffset(int offset,
-                                                    int bytes_to_replace) {
--  static const char kInvalidVarint[] = { 0x87, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F };
-+  static const uint8_t kInvalidVarint[] = { 0x87, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F };
-   delta_file_.replace(delta_file_header_.size() + offset,
-                       bytes_to_replace,
--                      kInvalidVarint,
-+                      reinterpret_cast<const char*>(kInvalidVarint),
-                       sizeof(kInvalidVarint));
- }
- 
- bool VCDiffDecoderTest::FuzzOneByteInDeltaFile() {
-   static const struct Fuzzer {
--    char _and;
--    char _or;
--    char _xor;
-+    uint8_t _and;
-+    uint8_t _or;
-+    uint8_t _xor;
-   } fuzzers[] = {
-     { 0xff, 0x80, 0x00 },
-     { 0xff, 0xff, 0x00 },
-@@ -162,7 +163,7 @@
-   return false;
- }
- 
--const char VCDiffStandardDecoderTest::kWindowHeader[] = {
-+const uint8_t VCDiffStandardDecoderTest::kWindowHeader[] = {
-     VCD_SOURCE,  // Win_Indicator: take source from dictionary
-     FirstByteOfStringLength(kDictionary),  // Source segment size
-     SecondByteOfStringLength(kDictionary),
-@@ -176,7 +177,7 @@
-     0x03  // length of addresses for COPYs
-   };
- 
--const char VCDiffStandardDecoderTest::kWindowBody[] = {
-+const uint8_t VCDiffStandardDecoderTest::kWindowBody[] = {
-     // Data for ADDs: 1st section (length 61)
-     ' ', 'I', ' ', 'h', 'a', 'v', 'e', ' ', 's', 'a', 'i', 'd', ' ',
-     'i', 't', ' ', 't', 'w', 'i', 'c', 'e', ':', '\n',
-@@ -216,11 +217,13 @@
- 
- VCDiffStandardDecoderTest::VCDiffStandardDecoderTest() {
-   UseStandardFileHeader();
--  delta_window_header_.assign(kWindowHeader, sizeof(kWindowHeader));
--  delta_window_body_.assign(kWindowBody, sizeof(kWindowBody));
-+  delta_window_header_.assign(reinterpret_cast<const char *>(kWindowHeader),
-+                              sizeof(kWindowHeader));
-+  delta_window_body_.assign(reinterpret_cast<const char *>(kWindowBody),
-+                            sizeof(kWindowBody));
- }
- 
--const char VCDiffInterleavedDecoderTest::kWindowHeader[] = {
-+const uint8_t VCDiffInterleavedDecoderTest::kWindowHeader[] = {
-     VCD_SOURCE,  // Win_Indicator: take source from dictionary
-     FirstByteOfStringLength(kDictionary),  // Source segment size
-     SecondByteOfStringLength(kDictionary),
-@@ -234,7 +237,7 @@
-     0x00  // length of addresses for COPYs (unused)
-   };
- 
--const char VCDiffInterleavedDecoderTest::kWindowBody[] = {
-+const uint8_t VCDiffInterleavedDecoderTest::kWindowBody[] = {
-     0x13,  // VCD_COPY mode VCD_SELF, size 0
-     0x1C,  // Size of COPY (28)
-     0x00,  // Address of COPY: Start of dictionary
-@@ -272,8 +275,10 @@
- 
- VCDiffInterleavedDecoderTest::VCDiffInterleavedDecoderTest() {
-   UseInterleavedFileHeader();
--  delta_window_header_.assign(kWindowHeader, sizeof(kWindowHeader));
--  delta_window_body_.assign(kWindowBody, sizeof(kWindowBody));
-+  delta_window_header_.assign(reinterpret_cast<const char *>(kWindowHeader),
-+                              sizeof(kWindowHeader));
-+  delta_window_body_.assign(reinterpret_cast<const char *>(kWindowBody),
-+                            sizeof(kWindowBody));
- }
- 
- }  // namespace open_vcdiff
---- a/src/vcdecoder_test.h
-+++ b/src/vcdecoder_test.h
-@@ -16,6 +16,7 @@
- #define OPEN_VCDIFF_VCDECODER_TEST_H_
- 
- #include "google/vcdecoder.h"
-+#include <stdint.h>  // utf8_t
- #include <string>
- #include "checksum.h"
- #include "testing.h"
-@@ -80,7 +81,7 @@
-   // Assuming the length of the given string can be expressed as a VarintBE
-   // of length N, this function returns the byte at position which_byte, where
-   // 0 <= which_byte < N.
--  static char GetByteFromStringLength(const char* s, int which_byte);
-+  static uint8_t GetByteFromStringLength(const char* s, int which_byte);
- 
-   // Assuming the length of the given string can be expressed as a one-byte
-   // VarintBE, this function returns that byte value.
-@@ -90,13 +91,13 @@
- 
-   // Assuming the length of the given string can be expressed as a two-byte
-   // VarintBE, this function returns the first byte of its representation.
--  static char FirstByteOfStringLength(const char* s) {
-+  static uint8_t FirstByteOfStringLength(const char* s) {
-     return GetByteFromStringLength(s, 0);
-   }
- 
-   // Assuming the length of the given string can be expressed as a two-byte
-   // VarintBE, this function returns the second byte of its representation.
--  static char SecondByteOfStringLength(const char* s) {
-+  static uint8_t SecondByteOfStringLength(const char* s) {
-     return GetByteFromStringLength(s, 1);
-   }
- 
-@@ -124,8 +125,8 @@
-  private:
-   // These values should only be accessed via UseStandardFileHeader() and
-   // UseInterleavedFileHeader().
--  static const char kStandardFileHeader[];
--  static const char kInterleavedFileHeader[];
-+  static const uint8_t kStandardFileHeader[];
-+  static const uint8_t kInterleavedFileHeader[];
- 
-   // These two counters are used by FuzzOneByteInDeltaFile() to iterate through
-   // different ways to corrupt the delta file.
-@@ -141,8 +142,8 @@
-   virtual ~VCDiffStandardDecoderTest() {}
- 
-  private:
--  static const char kWindowHeader[];
--  static const char kWindowBody[];
-+  static const uint8_t kWindowHeader[];
-+  static const uint8_t kWindowBody[];
- };
- 
- class VCDiffInterleavedDecoderTest : public VCDiffDecoderTest {
-@@ -151,8 +152,8 @@
-   virtual ~VCDiffInterleavedDecoderTest() {}
- 
-  private:
--  static const char kWindowHeader[];
--  static const char kWindowBody[];
-+  static const uint8_t kWindowHeader[];
-+  static const uint8_t kWindowBody[];
- };
- 
- }  // namespace open_vcdiff
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
deleted file mode 100644
index 4d97c1a4a4ec..000000000000
--- a/dev-util/open-vcdiff/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>
-		<remote-id type="google-code">open-vcdiff</remote-id>
-		<remote-id type="github">google/open-vcdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.ebuild
deleted file mode 100644
index 18324677305e..000000000000
--- a/dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.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="An encoder/decoder for the VCDIFF (RFC3284) format"
-HOMEPAGE="https://github.com/google/open-vcdiff"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/oprofile-1.1.0-r1 b/dev-util/oprofile-1.1.0-r1
new file mode 100644
index 000000000000..920d8095a743
--- /dev/null
+++ b/dev-util/oprofile-1.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) >=sys-kernel/linux-headers-2.6.31 >=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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A transparent low-overhead system-wide profiler
+EAPI=5
+HOMEPAGE=http://oprofile.sourceforge.net
+IUSE=java pch elibc_FreeBSD java kernel_linux
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/oprofile/oprofile-1.1.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9c94d8c2168258a405610c74b7f515b
diff --git a/dev-util/oprofile-1.2.0-r1 b/dev-util/oprofile-1.2.0-r1
new file mode 100644
index 000000000000..e3a4be35ebe3
--- /dev/null
+++ b/dev-util/oprofile-1.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) >=sys-kernel/linux-headers-2.6.31 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A transparent low-overhead system-wide profiler
+EAPI=6
+HOMEPAGE=http://oprofile.sourceforge.net
+IUSE=java pch elibc_FreeBSD java kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/oprofile/oprofile-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=32fdd43bb99b0a842ff0ba935ac34775
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
deleted file mode 100644
index 1fd057836922..000000000000
--- a/dev-util/oprofile/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX oprofile-1.1.0-gcc6-template-depth.patch 454 BLAKE2B 5250e083156853905ca8e1107a0af51eeadbef93881c39f407ed28af41b5f75ebe4003c96b9bc6e5be8a6445e8b7cd6cd4e499d6d44769d258242c8ba0192a9d SHA512 c5356ff2e0b31b792eac13c4f19123f6fadfc5fa0154bd422a86185514410eef48eabc321c32d344b1dbf9357de888130e0a84336d08551cea7c787478f9f21e
-AUX oprofile-1.1.0-gcc6.patch 777 BLAKE2B a4def027ba0f8e8c1eb877105f4e0e215599fd5004a4c59d3e3b77c2bda356736b96dc2030a994a179c1596e452e7e7a9303f0676eb68997b4922c9fe3374899 SHA512 de907f9583255a313c719eaf8163385de15a40d4ea76eb13e91f223375597f9d1ef41ad21bf129e550536e6a6a316beb3cd2c528fd38cb17e3fc22256f1dbc38
-DIST oprofile-1.1.0.tar.gz 1468502 BLAKE2B 5c0abdf1ce6f3fa9b7140036ff654b2f5d5e29d996afec834014c141a4669e57c1d4ac60d6705c35ee1dce23ce790e07063b58508abd39b6562b7298744e2eb4 SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758
-DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
-EBUILD oprofile-1.1.0-r1.ebuild 1835 BLAKE2B 16d17d42849a4fcba8f3946aa39b7ccb517d257942405bba521bde11d278baa88a465f3ef9ff8c07178933748ab0fb6feca648e943272affbc9cc0e59a035da5 SHA512 d53e071b01e6f2e9247444ea9130debd07db16c6df589709ee1a3e71a3d5f923af5f2c22ef4f721ddce3fd37c26b4744284d0bbf43138040dbddcae79960b4ed
-EBUILD oprofile-1.2.0-r1.ebuild 1603 BLAKE2B 92fdf9b4ae4a7f5b20d0c09ee5b933bb49a29a490cc8b34460452cc30b1487453e89ec465e35e97fc34ae733d13fc4c60a5af1a1fbd3953171116a6bf453554e SHA512 be29f71b347cf06159f406baedc7064c1c42248e26ff6557946ad216cb3024c7ee1a8f92f565dfdbdd96989ec000e832fb3002baac63f9dcb7cc618c42808f2b
-MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
deleted file mode 100644
index 01fc86910a3a..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- oprofile-1.1.0/configure.ac.orig	2015-07-21 17:53:27.000000000 +0300
-+++ oprofile-1.1.0/configure.ac	2016-11-22 01:15:31.329067697 +0300
-@@ -320,7 +320,6 @@
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-Wall])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-fno-common])
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-fno-common])
--AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-ftemplate-depth-50])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-Wdeclaration-after-statement])
- 
- dnl enable option to use GCC test coverage
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
deleted file mode 100644
index ab3ca7c1b142..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/libop/op_alloc_counter.c
-+++ b/libop/op_alloc_counter.c
-@@ -171,7 +171,7 @@
- 	/* no counters then probably perfmon managing perfmon hw */
- 	if (nr_counters <= 0) {
- 		nr_counters = op_get_nr_counters(cpu_type);
--		unavailable_counters = (~0) << nr_counters;
-+		unavailable_counters = (~0U) << nr_counters;
- 	}
- 
- 	/* Check to see if we have enough physical counters to map events*/
---- a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@
- {
- 	op_bfd_symbol const & sym = syms[sym_idx];
- 
--	bool const verbose = cverb << (vbfd & vlevel1);
--
- 	if (anon_obj)
- 		start = sym.vma();
- 	else
- 		start = sym.filepos();
- 	end = start + sym.size();
- 
--	if (!verbose)
-+	if (!(cverb << (vbfd & vlevel1)))
- 		return;
- 
- 	io_state state(cverb << (vbfd & vlevel1));
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
deleted file mode 100644
index 2a35c6646c1e..000000000000
--- a/dev-util/oprofile/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-  <longdescription>A transparent low-overhead system-wide profiler</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">oprofile</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
deleted file mode 100644
index 2c8a16f7a16f..000000000000
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils java-pkg-opt-2 linux-info multilib user
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="java pch"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
-	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
-	java? ( >=virtual/jdk-1.5:= )
-	ppc64? ( dev-libs/libpfm )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.31"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="PERF_EVENTS"
-ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! kernel_is -ge 2 6 31; then
-		echo
-		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
-		echo
-	fi
-
-	# Required for JIT support, see README_PACKAGERS
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
-	use java && java-pkg_init
-}
-
-src_prepare() {
-	# fix bug #594178
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
-	# bug #600000
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6-template-depth.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable pch) \
-		$(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
-	dodoc ChangeLog* README TODO
-	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}"
-	doenvd "${T}/10${PN}"
-}
-
-pkg_postinst() {
-	echo
-	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
-	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
-	elog "Please read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/${PN}.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
deleted file mode 100644
index 809a7ce8a485..000000000000
--- a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit java-pkg-opt-2 linux-info user
-
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java pch"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
-	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
-	java? ( >=virtual/jdk-1.5:= )
-	ppc64? ( dev-libs/libpfm )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.31"
-
-CONFIG_CHECK="PERF_EVENTS"
-ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! kernel_is -ge 2 6 31; then
-		echo
-		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
-		echo
-	fi
-
-	# Required for JIT support, see README_PACKAGERS
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
-	use java && java-pkg_init
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable pch) \
-		$(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
-	dodoc ChangeLog* README TODO
-	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die
-	doenvd "${T}/10${PN}"
-}
-
-pkg_postinst() {
-	echo
-	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
-	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
-	elog "Please read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/${PN}.html"
-	echo
-}
diff --git a/dev-util/osc-0.152.0 b/dev-util/osc-0.152.0
new file mode 100644
index 000000000000..2f3b5c1fd0f4
--- /dev/null
+++ b/dev-util/osc-0.152.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Command line tool for Open Build Service
+EAPI=5
+HOMEPAGE=https://en.opensuse.org/openSUSE:OSC
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+PDEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-admin/sudo dev-util/obs-service-meta
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/osc/osc-0.152.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17666db324d0012d4a6f57422b82fddb
diff --git a/dev-util/osc-0.154.0 b/dev-util/osc-0.154.0
new file mode 100644
index 000000000000..1a685e915a48
--- /dev/null
+++ b/dev-util/osc-0.154.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Command line tool for Open Build Service
+EAPI=5
+HOMEPAGE=https://en.opensuse.org/openSUSE:OSC
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-admin/sudo dev-util/obs-service-meta
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/osc/osc-0.154.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=577906e28215dff0e4dcf99763169377
diff --git a/dev-util/osc-9999 b/dev-util/osc-9999
new file mode 100644
index 000000000000..4e426c948667
--- /dev/null
+++ b/dev-util/osc-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-vcs/git
+DESCRIPTION=Command line tool for Open Build Service
+EAPI=5
+HOMEPAGE=https://en.opensuse.org/openSUSE:OSC
+IUSE=python_targets_python2_7
+LICENSE=GPL-2
+PDEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-admin/sudo dev-util/obs-service-meta
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=577906e28215dff0e4dcf99763169377
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
deleted file mode 100644
index 1b1b904784e0..000000000000
--- a/dev-util/osc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX osc-0.139.2-out-of-tree-build.patch 708 BLAKE2B 88cece6103f3f6690ba2897127ff75e63e2395727dd991c359b14b180b44cbd43ad4cf18730b8c1b286ccedd0f4f191c7925bd515a5de43685c2d89ab341237e SHA512 5663497e5a2685a48407d4eece16b64c33275808252b29f05ff507274951b0a8d9fc77e0d3f9a2412089d683ac1eb547ebd16ef2491ac55944fcc6f40fc8c166
-DIST osc-0.152.0.tar.gz 331512 BLAKE2B 19605f2cba7befca160ed213ab13ddd337726602adf01b72e857133ecd97b221dad5b6fb48f6c4be1af4987d5da5e837ef1edeed13299df68f0d60d0a0506611 SHA512 273bad36565d4f90b1a1f9af965367728559e5d0d8060689b1086f1df12fd3ef575900064973888cba1c06fb2d7c0e998161d65c04581a040750ef34281f035a
-DIST osc-0.154.0.tar.gz 341789 BLAKE2B 69fdaea439c7d82efba7568c318f076b5b267ea4ffb319ca95c81b85305aa4daba43f53d6b9979c6d76c0b0c0bef124e25d3fa4cdb2ac74a044c12b7bd3ea06b SHA512 1240bc9cc9079115342fc0bff1e522ca8fbff0a22b15fc2bfa90817241fd42e2350dd9344e5d6e3e0b5842be3f010398d108c7f9c7d474bde5c2300f7bf6bfb7
-EBUILD osc-0.152.0.ebuild 1520 BLAKE2B ca46aeaa8904653bd3cf496bce9ba0147bb8a000ed39d9fee9fd75a791b48885996ff7cf73bd027b8d601b40d514f61539af0b0d1e0b70821d359f760f6d544b SHA512 d9147c1a3c9269a46095e72cd2bfb7d09b1a8bbcd51ee76ea2f7134cf154509cf92d1440fecb42c0b91a99fa2502fecf7d32eea2ed0f391a983284ee2799f1ea
-EBUILD osc-0.154.0.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
-EBUILD osc-9999.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
-MISC metadata.xml 405 BLAKE2B 45335bfe58f22878457bf3bc2f4ac87be41f72b04c308e9032def5064bdfbd8ea3110694deb7357e053ba770a9a7c5dc7dfcac1acac427290383dd2a81fd0254 SHA512 69c9e248a7d927ca17816ac1f6679427c576b860ecfeb2407326393044ef4344197b04b6b2301ffa01ed2c738592dd904b09837e30972b15abc2c947298e6698
diff --git a/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch b/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
deleted file mode 100644
index d0adfe53f615..000000000000
--- a/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.orig	2013-05-27 13:51:06.143039789 +0000
-+++ setup.py	2013-05-27 13:53:27.814034661 +0000
-@@ -25,7 +25,7 @@
-         """
-         """
-         import gzip
--        man_path = os.path.join('build', 'osc.1.gz')
-+        man_path = 'osc.1.gz'
-         distutils.log.info('generating %s' % man_path)
-         outfile = gzip.open(man_path, 'w')
-         osccli = commandline.Osc(stdout=outfile)
-@@ -48,7 +48,7 @@
- 
- data_files = []
- if sys.platform[:3] != 'win':
--    data_files.append((os.path.join('share', 'man', 'man1'), [os.path.join('build', 'osc.1.gz')]))
-+    data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1.gz']))
- 
- setup(name='osc',
-       version = osc.core.__version__,
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
deleted file mode 100644
index 24f0a4d2bee3..000000000000
--- a/dev-util/osc/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>
-<longdescription lang="en">
-Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/osc/osc-0.152.0.ebuild b/dev-util/osc/osc-0.152.0.ebuild
deleted file mode 100644
index 0a9fe2d65388..000000000000
--- a/dev-util/osc/osc-0.152.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-PDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-util/obs-service-meta
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym osc-wrapper.py /usr/bin/osc
-	keepdir /usr/lib/osc/source_validators
-	cd "${ED}"/usr/
-	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
-	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
-	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
-}
diff --git a/dev-util/osc/osc-0.154.0.ebuild b/dev-util/osc/osc-0.154.0.ebuild
deleted file mode 100644
index 42d6d248359a..000000000000
--- a/dev-util/osc/osc-0.154.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-PDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-util/obs-service-meta
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym osc-wrapper.py /usr/bin/osc
-	keepdir /usr/lib/osc/source_validators
-	cd "${ED}"/usr/
-	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
-	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
-	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
-}
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
deleted file mode 100644
index 42d6d248359a..000000000000
--- a/dev-util/osc/osc-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-PDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-util/obs-service-meta
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym osc-wrapper.py /usr/bin/osc
-	keepdir /usr/lib/osc/source_validators
-	cd "${ED}"/usr/
-	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
-	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
-	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
-}
diff --git a/dev-util/ostree-2018.5 b/dev-util/ostree-2018.5
new file mode 100644
index 000000000000..7f80daa9fdb3
--- /dev/null
+++ b/dev-util/ostree-2018.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=6
+HOMEPAGE=https://ostree.readthedocs.io/en/latest/
+IUSE=grub selinux soup systemd zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.5/libostree-2018.5.tar.xz -> ostree-2018.5.tar.xz
+_md5_=0274150ecbc2043e93654da4273d4086
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
deleted file mode 100644
index 05157ac3dbe9..000000000000
--- a/dev-util/ostree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
-EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
-MISC metadata.xml 1644 BLAKE2B 3085135779d4dbefb278b1b7ca4e80e4b892f38585aea5a71fde726d55b9975c0c097917940045a0770a5d8bc2c3732a371773a8cb6750dd272ca0b4a9488182 SHA512 5fb6f77a5068d1ff4aab1635ba41ed895f6b31cce39b571b4f3487c68242bb5634e7454bce318d0c585cb581533d1fe239344a9eb7f1485c4b75a5a24d78f5ad
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
deleted file mode 100644
index d31a82267686..000000000000
--- a/dev-util/ostree/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<longdescription lang="en">
-		This project is now known as "libostree", though it is
-		still appropriate to use the previous name: "OSTree" (or
-		"ostree"). The focus is on projects which use libostree's
-		shared library, rather than users directly invoking the command
-		line tools (except for build systems). However, in most of
-		the rest of the documentation, we will use the term "OSTree",
-		since it's slightly shorter, and changing all documentation
-		at once is impractical. We expect to transition to the new
-		name over time.
-
-		As implied above, libostree is both a shared library and suite
-		of command line tools that combines a "git-like" model for
-		committing and downloading bootable filesystem trees, along
-		with a layer for deploying them and managing the bootloader
-		configuration.
-
-		The core OSTree model is like git in that it checksums
-		individual files and has a content-addressed-object
-		store. It's unlike git in that it "checks out" the files
-		via hardlinks, and they thus need to be immutable to prevent
-		corruption. Therefore, another way to think of OSTree is that
-		it's just a more polished version of Linux VServer hardlinks.
-	</longdescription>
-	<use>
-		<flag name="grub">Enable grub configuration generator</flag>
-		<flag name="soup">Use libsoup for networking</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ostreedev/ostree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild
deleted file mode 100644
index 3c2aec24a4af..000000000000
--- a/dev-util/ostree/ostree-2018.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=6
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="grub selinux soup systemd zeroconf"
-RESTRICT="test"
-
-S="${WORKDIR}/lib${P}"
-COMMON_DEPEND="
-	app-arch/libarchive:=
-	app-arch/xz-utils:=
-	app-crypt/gpgme:=
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	dev-libs/openssl:=
-	net-misc/curl:=
-	sys-apps/util-linux:=
-	sys-fs/fuse:=
-	sys-libs/zlib:=
-
-	grub? ( sys-boot/grub:* )
-	selinux? ( sys-libs/libselinux:= )
-	soup? ( net-libs/libsoup:= )
-	systemd? ( sys-apps/systemd:= )
-	zeroconf? ( net-dns/avahi:* )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf \
-		--with-crypto=openssl \
-		--with-curl \
-		--with-openssl \
-		$(use_with soup) \
-		$(use_with selinux ) \
-		$(use_with zeroconf avahi)
-}
diff --git a/dev-util/patchbin-20160208 b/dev-util/patchbin-20160208
new file mode 100644
index 000000000000..c5b87c6bcac8
--- /dev/null
+++ b/dev-util/patchbin-20160208
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Apply binary patches without git
+EAPI=6
+HOMEPAGE=https://github.com/wine-compholio/wine-staging
+IUSE=userland_BSD userland_GNU
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep userland_BSD? ( sys-freebsd/freebsd-bin sys-freebsd/freebsd-ubin ) userland_GNU? ( sys-apps/util-linux sys-devel/patch )
+SLOT=0
+SRC_URI=https://github.com/wine-compholio/wine-staging/archive/4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c.tar.gz -> patchbin-20160208.tar.gz
+_md5_=c689d3e961e428818a6a28ea9847d051
diff --git a/dev-util/patchbin-99999999 b/dev-util/patchbin-99999999
new file mode 100644
index 000000000000..9252519f5a2e
--- /dev/null
+++ b/dev-util/patchbin-99999999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Apply binary patches without git
+EAPI=6
+HOMEPAGE=https://github.com/wine-compholio/wine-staging
+IUSE=userland_BSD userland_GNU
+LICENSE=LGPL-2.1
+RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep userland_BSD? ( sys-freebsd/freebsd-bin sys-freebsd/freebsd-ubin ) userland_GNU? ( sys-apps/util-linux sys-devel/patch )
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=161ff1c3aa7b500f035ff5d2b45050c2
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
deleted file mode 100644
index dd5af9b8f8b9..000000000000
--- a/dev-util/patchbin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 1113 BLAKE2B 15cc745c58f9af2a9e0724b5bb78d4c0e44eda3f52eee4f242a42f8ff94bf9c2023f3584717ed3a1b163290474971cbd575dc621be0a5fa6d17ec5793c15f97a SHA512 d4e8d1ffb09f910e88158fea92a82ae2606ee288d02ed636cc0fc932d9540d9b4b55d0baa58b81e51d9dd41ca1c7deaab7035fa852c629167bef2c4473ac6756
-EBUILD patchbin-99999999.ebuild 1115 BLAKE2B 14dce023dd58892cb6df213ba5ec2aa2c4ff8334c882023f85f79200902615b2d8c7b91e54cb9f4eb3e98730fe462ba5a609e3da2a5f2e31cc402517ab9882b2 SHA512 aefae56d63d80a27a2fdecc2743ea0406e1b495b78638e81459d3dd6102d3c07b0602d99a07dffed85c9948b1568a2d8522b3bd21e70425a8a21ade9b5110569
-MISC metadata.xml 528 BLAKE2B 566d71b86021dba9948978378279d2a4c95d50e4402c31c3da9bb3e1ab50d1d6148e104e3e3ea4c688a2bf1f720f3c4379d3eefc2eb57d316d9952d3f1e04409 SHA512 d15966f28c81025fd34bc247fc2f3f4ceda3c7dadd23f28487c80fe3155666665b9dd451e59356cd6bdcd30197be9a0439ab5c0b9383ab655870aa9033d58d94
diff --git a/dev-util/patchbin/metadata.xml b/dev-util/patchbin/metadata.xml
deleted file mode 100644
index 1f33891b2670..000000000000
--- a/dev-util/patchbin/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>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
-	</maintainer>
-	<longdescription lang="en">
-		Apply binary patches without git
-	</longdescription>
-	<upstream>
-		<remote-id type="github">wine-compholio/wine-staging</remote-id>
-		<maintainer>
-			<name>Sebastian Lackner</name>
-			<email>sebastian@fds-team.de</email>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
deleted file mode 100644
index 1f883b3bfbca..000000000000
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-	KEYWORDS=""
-else
-	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
-	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x86-fbsd"
-	S="${WORKDIR}/wine-staging-${SHA}"
-fi
-
-DESCRIPTION="Apply binary patches without git"
-HOMEPAGE="https://github.com/wine-compholio/wine-staging"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="userland_BSD userland_GNU"
-
-RDEPEND="
-	app-shells/bash
-	sys-apps/coreutils
-	sys-apps/gawk
-	sys-apps/grep
-	userland_BSD? (
-		sys-freebsd/freebsd-bin
-		sys-freebsd/freebsd-ubin
-	)
-	userland_GNU? (
-		sys-apps/util-linux
-		sys-devel/patch
-	)
-"
-
-src_prepare(){
-	mv patches/gitapply.sh ${PN} || die
-	sed -E -i "s/(\.\/)?gitapply(\.sh)?/${PN}/g" ${PN} || die
-
-	default
-}
-
-src_install(){
-	exeinto /usr/bin/
-	doexe ${PN}
-}
-
-pkg_postinst(){
-	einfo "${PN} can optionally use dev-util/git to apply patches if installed."
-}
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
deleted file mode 100644
index 3f22e8921aa8..000000000000
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-	KEYWORDS=""
-else
-	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
-	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-	S="${WORKDIR}/wine-staging-${SHA}"
-fi
-
-DESCRIPTION="Apply binary patches without git"
-HOMEPAGE="https://github.com/wine-compholio/wine-staging"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="userland_BSD userland_GNU"
-
-RDEPEND="
-	app-shells/bash
-	sys-apps/coreutils
-	sys-apps/gawk
-	sys-apps/grep
-	userland_BSD? (
-		sys-freebsd/freebsd-bin
-		sys-freebsd/freebsd-ubin
-	)
-	userland_GNU? (
-		sys-apps/util-linux
-		sys-devel/patch
-	)
-"
-
-src_prepare(){
-	mv patches/gitapply.sh ${PN} || die
-	sed -E -i "s/(\.\/)?gitapply(\.sh)?/${PN}/g" ${PN} || die
-
-	default
-}
-
-src_install(){
-	exeinto /usr/bin/
-	doexe ${PN}
-}
-
-pkg_postinst(){
-	einfo "${PN} can optionally use dev-util/git to apply patches if installed."
-}
diff --git a/dev-util/patchelf-0.8 b/dev-util/patchelf-0.8
new file mode 100644
index 000000000000..2049d17e85da
--- /dev/null
+++ b/dev-util/patchelf-0.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+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
+DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables
+EAPI=5
+HOMEPAGE=http://nixos.org/patchelf.html
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://releases.nixos.org/patchelf/patchelf-0.8/patchelf-0.8.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_=0a6396255ca31b183f06906f05302ebd
diff --git a/dev-util/patchelf-0.9 b/dev-util/patchelf-0.9
new file mode 100644
index 000000000000..6347f83d797a
--- /dev/null
+++ b/dev-util/patchelf-0.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+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
+DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables
+EAPI=6
+HOMEPAGE=http://nixos.org/patchelf.html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://releases.nixos.org/patchelf/patchelf-0.9/patchelf-0.9.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d23c316b6208ce561cb4194e07c6e083
diff --git a/dev-util/patchelf-0.9_p20180129 b/dev-util/patchelf-0.9_p20180129
new file mode 100644
index 000000000000..caee7b70c881
--- /dev/null
+++ b/dev-util/patchelf-0.9_p20180129
@@ -0,0 +1,11 @@
+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
+DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executables
+EAPI=6
+HOMEPAGE=http://nixos.org/patchelf.html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/NixOS/Patchelf/archive/1fa4d36fead44333528cbee4b5c04c207ce77ca4.tar.gz -> patchelf-0.9_p20180129.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=f9e6d5b7079d46a5cdf8d513c900cc1d
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
deleted file mode 100644
index 98c035d4c7f1..000000000000
--- a/dev-util/patchelf/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e39fbac60e9dba20ed407347e1e84d193469bc0fba6744953fde4cdf04c807135465edb5519f7b970189df9d7ab SHA512 35f32d43a85ddcfa0a1c3879b0a934dea8c58c7121d3d86157183a175bcf64fc0d4aadf96a91b5e4d5aeade773ff3145c683378fbee019f5293bc0f636104a7e
-DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
-DIST patchelf-0.9.tar.bz2 159956 BLAKE2B 7e8543a98aa683eeafacfb836a02ad7cf2fb52409b0780edb614e30edc66f8f356a9bd19e133b185861fe9c6ae0e4868b0b307c174610eef80e3446610f76bcb SHA512 5bd3a1268b809f173debde5d34c3f736f38d7afb69decf609a422884c51eb1d5ccf62f2d454d4ef8b2c20e263ece49e3c2f801347ef1dfcceecd89c78a214790
-DIST patchelf-0.9_p20180129.tar.gz 99490 BLAKE2B a5372942f7f400085a1d5e15701a25f916012ae6afc90cc3065aebf6fd0fc7cae3a626496cae4a7ce7320e5c954b0b11a14defae0bacf3350bf6b201db952eb5 SHA512 eabeb34dbef68dc6e79374f46bdbe473ca3c21515962c684f3368fdf7a1dbea75ec152fdb7796f9d22c2f40da25e3f9c181cd1a29e52fbe5843a8cd02acb2c75
-EBUILD patchelf-0.8.ebuild 795 BLAKE2B 92efb5ae34357cbdc5676b473e89b3411241c3f506ee6904b6f4b69c974370c3d9a69c66c9413f573aa9c736236b31c436b063b9dab1a24419f955dfcb8e2f4d SHA512 ab5ab9ce393c12b5439646cda2d25226a65a9f262481357dac7c4fd12133790b6623b4ca8fd939306b6fe31d10082597e1b28319f9cc26b66b23316443eff191
-EBUILD patchelf-0.9.ebuild 573 BLAKE2B 7fcfb6054e32622a2143ed2bcfef63ea35fd06e6eae1727e06a1ec852f49e4ea0562b160466db7ced028d0c2864a56e9e63f25819e1513d68aeb9e8cd64ecf01 SHA512 4ddfecee6bf2198234b8aadc4f7f058e778d83b030c4b9c8ce3334c4a1ea6c3918eb257f97401b0fb217b2bbcccfe00d111e3ca49b800998f0b29d9a88b29968
-EBUILD patchelf-0.9_p20180129.ebuild 656 BLAKE2B aea76418c2d25afa969de73256da20c636cc26514c8aa1de5e36410217d1c56e188dde980ea926c6958ee35d924d401d8caa9b63fd3a7540f2c6c6cd8d4a2834 SHA512 3e03ca019847454a3da5f6b9e6908ab0a71d9a45137aaafa4413f53620cd005be71e60606205857f6d0a763a89de4c9908423758cf2d3f22fba403ae36e54a0b
-MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/files/patchelf-0.8-dash.patch b/dev-util/patchelf/files/patchelf-0.8-dash.patch
deleted file mode 100644
index 4210b1c054d0..000000000000
--- a/dev-util/patchelf/files/patchelf-0.8-dash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3b9e7913a6d14cb09ed91ce8a1110955bda200ef Mon Sep 17 00:00:00 2001
-From: Alexandre Pretyman <alexandre.pretyman@gmail.com>
-Date: Tue, 14 Jul 2015 09:12:38 -0400
-Subject: [PATCH] Change configure.ac from OpenWrt to support Mac OS
-
-This change is from the OpenWrt project, from the URL:
-https://dev.openwrt.org/ticket/18998
-It enables patchelf to sucessfully compile and run under Mac OS and
-keeps compatibility with Linux.
-
-Tested under Mac OS X 10.9.5 and Ubuntu 15.04 to patch a binary of type
-ELF 32-bit LSB executable - the patch fully worked
-
-This patch is credited to Felix Fietkau
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8ca9ad4..69e12de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
-+AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)]))
- AC_CONFIG_SRCDIR([src/patchelf.cc])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])
diff --git a/dev-util/patchelf/metadata.xml b/dev-util/patchelf/metadata.xml
deleted file mode 100644
index 1769853ef7e2..000000000000
--- a/dev-util/patchelf/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>chewi@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
deleted file mode 100644
index 92c86cecf1a4..000000000000
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE=""
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-dash.patch )
-
-src_prepare() {
-	rm src/elf.h || die
-	sed -e 's:-Werror::g' -i configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
diff --git a/dev-util/patchelf/patchelf-0.9.ebuild b/dev-util/patchelf/patchelf-0.9.ebuild
deleted file mode 100644
index 334bfba21b47..000000000000
--- a/dev-util/patchelf/patchelf-0.9.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
-
-inherit autotools
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-
-src_prepare() {
-	default
-	rm src/elf.h || die
-
-	sed -i \
-		-e 's:-Werror::g' \
-		-e 's:parallel-tests:serial-tests:g' \
-		configure.ac || die
-
-	eautoreconf
-}
diff --git a/dev-util/patchelf/patchelf-0.9_p20180129.ebuild b/dev-util/patchelf/patchelf-0.9_p20180129.ebuild
deleted file mode 100644
index 0efbab73c0ab..000000000000
--- a/dev-util/patchelf/patchelf-0.9_p20180129.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
-
-inherit autotools vcs-snapshot
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-COMMIT=1fa4d36fead44333528cbee4b5c04c207ce77ca4
-SRC_URI="https://github.com/NixOS/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-
-src_prepare() {
-	default
-	rm src/elf.h || die
-
-	sed -i \
-		-e 's:-Werror::g' \
-		-e 's:parallel-tests:serial-tests:g' \
-		configure.ac || die
-
-	eautoreconf
-}
diff --git a/dev-util/patchutils-0.3.3 b/dev-util/patchutils-0.3.3
new file mode 100644
index 000000000000..4256dd2a971f
--- /dev/null
+++ b/dev-util/patchutils-0.3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=test? ( app-arch/rpm )
+DESCRIPTION=A collection of tools that operate on patch files
+EAPI=5
+HOMEPAGE=http://cyberelk.net/tim/patchutils/
+IUSE=test
+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 ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=52c94a17b6e4971004394e425d2be64a
diff --git a/dev-util/patchutils-0.3.4 b/dev-util/patchutils-0.3.4
new file mode 100644
index 000000000000..317dd1bb232e
--- /dev/null
+++ b/dev-util/patchutils-0.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=test
+DEPEND=test? ( app-arch/rpm )
+DESCRIPTION=A collection of tools that operate on patch files
+EAPI=6
+HOMEPAGE=http://cyberelk.net/tim/patchutils/
+IUSE=test
+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 ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz
+_md5_=0cb8362d0e1c5b7979c44d831f568749
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
deleted file mode 100644
index 575e662d7175..000000000000
--- a/dev-util/patchutils/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
-DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
-DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 754 BLAKE2B 2fd891fb4f4f8e98ebc3c76d08f3ab2652838ad8760f09516b10761297cb93dbdcc29ec03421eb41bbd47a84eba9f445224a3071620c20c329ae60e06c73425b SHA512 8f67afa723ad1162d17c816bb3b185019dd648da5c6e541ac74a974e9b76689ce93df139bbf7d87c6746a87425e0e65c76cff70ae9d06b731afbf06ce7d1ddef
-EBUILD patchutils-0.3.4.ebuild 786 BLAKE2B 28d234a96c05e400f7827b543983ca77833ad58a176c48949c80f7adc6d2efedeab2506aec4f096100c64225c36470488714fc2818c9f4c3adc3b3adbe23c92c SHA512 e3903c17b9397e3597ffcaa0850101e3d25e1b20cc81db908691404fa0e9c7279cf96564a7804a10dfc458a12988898130895426af49b820b6c13ead44fb1977
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
deleted file mode 100644
index be190b65a734..000000000000
--- a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- src/filterdiff.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/filterdiff.c b/src/filterdiff.c
-index eb08d49..0b2b301 100644
---- a/src/filterdiff.c
-+++ b/src/filterdiff.c
-@@ -1263,7 +1263,7 @@ read_regex_file (const char *file)
- 			char errstr[300];
- 			regerror (err, &regex[num_regex - 1], errstr,
- 				  sizeof (errstr));
--			error (EXIT_FAILURE, 0, errstr);
-+			error (EXIT_FAILURE, 0, "%s", errstr);
- 			exit (1);
- 		}
- 	}
-@@ -1509,7 +1509,7 @@ int main (int argc, char *argv[])
- 			char errstr[300];
- 			regerror (err, &regex[num_regex - 1], errstr,
- 				  sizeof (errstr));
--			error (EXIT_FAILURE, 0, errstr);
-+			error (EXIT_FAILURE, 0, "%s", errstr);
- 			exit (1);
- 		}
- 	}
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/dev-util/patchutils/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
deleted file mode 100644
index 7cccfbdbbac7..000000000000
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A collection of tools that operate on patch files"
-HOMEPAGE="http://cyberelk.net/tim/patchutils/"
-SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-# The testsuite makes use of gendiff(1) that comes from rpm, thus if
-# the user wants to run tests, it should install that too.
-DEPEND="test? ( app-arch/rpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
-}
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
deleted file mode 100644
index cc9698ac817a..000000000000
--- a/dev-util/patchutils/patchutils-0.3.4.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
-
-DESCRIPTION="A collection of tools that operate on patch files"
-HOMEPAGE="http://cyberelk.net/tim/patchutils/"
-SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-
-# testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
-# to run tests, it should install that package as well.
-DEPEND="test? ( app-arch/rpm )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.3-format-security.patch"
-)
-
-src_test() {
-	# See bug 605952.
-	make check || die
-}
diff --git a/dev-util/patdiff-0.9.0 b/dev-util/patdiff-0.9.0
new file mode 100644
index 000000000000..e50e4319b3d8
--- /dev/null
+++ b/dev-util/patdiff-0.9.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/patience_diff:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/pcre-ocaml:= dev-ml/opam dev-ml/jbuilder
+DESCRIPTION=Colored patience diffs with word-level refinement
+EAPI=6
+HOMEPAGE=https://github.com/janestreet/patdiff
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/core_extended:= dev-ml/patience_diff:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/re2:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/pcre-ocaml:=
+SLOT=0/0.9.0
+SRC_URI=https://github.com/janestreet/patdiff/archive/v0.9.0.tar.gz -> patdiff-0.9.0.tar.gz
+_md5_=e92c3ffc00d297686798ed16360747df
diff --git a/dev-util/patdiff/Manifest b/dev-util/patdiff/Manifest
deleted file mode 100644
index eaf34e7b635d..000000000000
--- a/dev-util/patdiff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST patdiff-0.9.0.tar.gz 40059 BLAKE2B e9994397f44572d4e11d510de79007b0d621ef7c841d9d4d8a8ede2dd9867f202e9b53c31dcdfa7166cec9d7e0aa8ae2151e2cb148a5ddad6da5ea6706aaeef4 SHA512 a48d58c7b2681d5be6281fd6ff4e95df98d6c6f50622eaae5560a9f99c3b8ea0154cec5e6e5eaff687122a1d907657e943239869125089cab5e94e65f7c6a298
-EBUILD patdiff-0.9.0.ebuild 847 BLAKE2B 6fb9f0269b8625015009fa44d911c171896c4335b92f3ff2301791a108e84a8b1ddf60d093e48bb4d4e5dee6ea19f77d3bfbec5141956b3922ff48a7ccc2ac7a SHA512 17cad2854442957d5c5ac9a41d5d35553c1f28c6a39d924757ddac66431152323fbfa9d3eca99427209f9c32c7e05b87406c70c27e7034720a74400ba46ff6aa
-MISC metadata.xml 330 BLAKE2B 25cf17fad7b6600aef724390b7253da203e27748b0582a15f5fef21e8d5025ca560eab4b9202752717b41a142f2a6a564e38a514b872d9eeab38cd746f50167d SHA512 bd88c00a353b7899ccfdecba9c1049a4fd618fcc353dfa7570f5d101c99a8da5037d0593a19d4614a4f640f8c46217c98a2833876b977647235cae9bf2f1c6f0
diff --git a/dev-util/patdiff/metadata.xml b/dev-util/patdiff/metadata.xml
deleted file mode 100644
index b31ec668fef0..000000000000
--- a/dev-util/patdiff/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>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/patdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/patdiff/patdiff-0.9.0.ebuild b/dev-util/patdiff/patdiff-0.9.0.ebuild
deleted file mode 100644
index 2c95dc9f4545..000000000000
--- a/dev-util/patdiff/patdiff-0.9.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Colored patience diffs with word-level refinement"
-HOMEPAGE="https://github.com/janestreet/patdiff"
-SRC_URI="https://github.com/janestreet/patdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/core:=
-	dev-ml/core_extended:=
-	dev-ml/patience_diff:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_jane:=
-	dev-ml/re2:=
-	dev-ml/sexplib:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/pcre-ocaml:=
-"
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${PN}.install || die
-}
diff --git a/dev-util/peg-0.1.15-r1 b/dev-util/peg-0.1.15-r1
new file mode 100644
index 000000000000..d1829761d063
--- /dev/null
+++ b/dev-util/peg-0.1.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=Recursive-descent parser generators for C
+EAPI=5
+HOMEPAGE=http://piumarta.com/software/peg/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=http://piumarta.com/software/peg/peg-0.1.15.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6acb70998c965145cf0f0de63b43b312
diff --git a/dev-util/peg-0.1.18 b/dev-util/peg-0.1.18
new file mode 100644
index 000000000000..5c8aa64a07cb
--- /dev/null
+++ b/dev-util/peg-0.1.18
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=Recursive-descent parser generators for C
+EAPI=7
+HOMEPAGE=http://piumarta.com/software/peg/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://piumarta.com/software/peg/peg-0.1.18.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a052fb4b4fd4e30343af474ab8338016
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
deleted file mode 100644
index 646d86969700..000000000000
--- a/dev-util/peg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST peg-0.1.15.tar.gz 56522 BLAKE2B cfc13761d4f3de3e4906abefc04fb732e7f30e0a1eb70dcab79de6001434866329cb4263fba68a5c8aac9dd895805d0de43dafa5a9e382c4c2e12fe90189676e SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018
-DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
-EBUILD peg-0.1.15-r1.ebuild 896 BLAKE2B e286cf9cd51c9e14563528a27635b4fe4f0779aade712d782a2017f36de303866c0026a0f629e4bfa8185a640165938c0948f1406af94a9a60bf3a546f3d0a9b SHA512 21b10c4f565e3dd927f08e3e4a1aa70cdd572ce8777e74dc069dd830d813abb5080127d2789e91e86d5048217c94663090a4c548ad5efeab595f34200fabcaed
-EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
-MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301
diff --git a/dev-util/peg/metadata.xml b/dev-util/peg/metadata.xml
deleted file mode 100644
index 50a821d8b2dc..000000000000
--- a/dev-util/peg/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>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/peg/peg-0.1.15-r1.ebuild b/dev-util/peg/peg-0.1.15-r1.ebuild
deleted file mode 100644
index f9bd88d83f92..000000000000
--- a/dev-util/peg/peg-0.1.15-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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
-			Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake -j1 \
-		ROOT="${D}" \
-		PREFIX="/usr" \
-		install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.18.ebuild b/dev-util/peg/peg-0.1.18.ebuild
deleted file mode 100644
index 3853be968a49..000000000000
--- a/dev-util/peg/peg-0.1.18.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	eapply_user
-
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
-			Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake \
-		ROOT="${D}" \
-		PREFIX="/usr" \
-		install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check test \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
diff --git a/dev-util/perf-3.12 b/dev-util/perf-3.12
new file mode 100644
index 000000000000..3c4cb0385634
--- /dev/null
+++ b/dev-util/perf-3.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit +demangle +doc perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aee35e71a323ee473bdd7963902ed14e
diff --git a/dev-util/perf-3.13.1-r1 b/dev-util/perf-3.13.1-r1
new file mode 100644
index 000000000000..ead549732f40
--- /dev/null
+++ b/dev-util/perf-3.13.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11-libs/gtk+:2 ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit +demangle +doc gtk perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11-libs/gtk+:2 ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.13.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4d8f07253af631744783366f0fdf93ca
diff --git a/dev-util/perf-3.15.5 b/dev-util/perf-3.15.5
new file mode 100644
index 000000000000..f1f73303bce0
--- /dev/null
+++ b/dev-util/perf-3.15.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11-libs/gtk+:2 ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11-libs/gtk+:2 ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.15.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5db2043ab93a4efbaab5a6e5731b9477
diff --git a/dev-util/perf-4.1.5-r1 b/dev-util/perf-4.1.5-r1
new file mode 100644
index 000000000000..1362921bb0fd
--- /dev/null
+++ b/dev-util/perf-4.1.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a210243203fdf5f5065cc73d3dbccbc6
diff --git a/dev-util/perf-4.14.33 b/dev-util/perf-4.14.33
new file mode 100644
index 000000000000..2bd4475148e2
--- /dev/null
+++ b/dev-util/perf-4.14.33
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils >=sys-kernel/linux-headers-4.9 dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=6
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=780b21326c5264724673cc55b8d388e6
diff --git a/dev-util/perf-4.4.4 b/dev-util/perf-4.4.4
new file mode 100644
index 000000000000..495fa829de2f
--- /dev/null
+++ b/dev-util/perf-4.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils >=sys-kernel/linux-headers-4.4 dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.4.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=991b85ef85bc939277e5055b45d41a8c
diff --git a/dev-util/perf-4.9.13 b/dev-util/perf-4.9.13
new file mode 100644
index 000000000000..90fb3dd7847c
--- /dev/null
+++ b/dev-util/perf-4.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils >=sys-kernel/linux-headers-4.9 dev-util/patchutils sys-devel/bison sys-devel/flex doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time )
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=5
+HOMEPAGE=https://perf.wiki.kernel.org/
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9e4c66fadc72e59a173a4bf912438708
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
deleted file mode 100644
index 6a49fc90d1a8..000000000000
--- a/dev-util/perf/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX perf-4.1.5-prefix.patch 1637 BLAKE2B 8fdccb3d6d8f2955118e96edf4990e4d9a172524d49f36d757254dd983733c81f82d3920c21f40b6dd5e4df3d5ec2b799bb163c44dc5340f4128c5560430bb4d SHA512 ff7179d7b06513a83f0909723ad47774c07ad089079f43750c24a1dca685745048bce5ea6b0766e65e48b75b50d5a26866e827a89b0206800769ea2779355d6b
-DIST linux-3.12.tar.bz2 91111381 BLAKE2B ec3295f41b639f0a7c63eed5d5be4a53c435ddb6e3681bce519263c33172efec46c25b284e7c58ef590387dc13b1e2e76d77b67dcd0345e8de7611bb78c9eb5a SHA512 bea14d044c8a0257d8312f45db6a39ca4f9dffe8ac32a11198e90762ee1735c8b6975bb81c635a4755d451793fa7c7e5b2d7d692c9e57133b15b4cdc941febf1
-DIST linux-3.13.tar.xz 77187032 BLAKE2B 4c0d96a9f1f8f971b9886651a1a0438bd7e00c3eb5de6b52c599c0e621714e34f4048348e836bc8bf8d0c879d447569ee99adda09c3de2fc197ce9503bc2b568 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87
-DIST linux-3.15.tar.xz 79676484 BLAKE2B a21b0b97fe0c9c2ef032b10b71062065fe0d27417f7f51c2ca4215891d254fef00aec11d20bfa4f7a71937f7e307a18f4c3ab08e45b9600816cd1c9dfe6c8fbb SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02
-DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
-DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.13.1.xz 2884 BLAKE2B 6fd04189866fa50efb48c3c979de2880231dcb06b857a67eab18321a589bbab611bb1a2df68adae513d16e9e3ca897b8533a677121e1c7c430f7027044f899f1 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc
-DIST patch-3.15.5.xz 122232 BLAKE2B 9c138316beea8ea04b704baca23621c76291064ac72a5eb107bcec4f371c2680471f96c678e269d04b03eaa857dc054ddd8057a06e5c7ac2b7ea8a303468139b SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755
-DIST patch-4.1.5.xz 170056 BLAKE2B 3beee64274154565bbe80389fe6258228f388ad5fa77a69e4d83906755c746bfd9d6052bf224d0f1bad33c4b656c1b6538345d05efd3e4f3953495241c05f0c8 SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5
-DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
-DIST patch-4.4.4.xz 200972 BLAKE2B 76f5505fae96c6ec21ef3480c54bd53d7021d9ec360527209dd16b069d5f7c65ab8f1e44aeeed49480cd7c2a685fd42852e062fff703a1d010cc487f55ec15fa SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc
-DIST patch-4.9.13.xz 295932 BLAKE2B 37a90811dc1591d3f5d6609185ae518b02b36827c8557e400e7bb359ea04bf9cee66ea74fceaefb02c6e145ac34697efaecca6db071b35d6d872c9ac7c84b9ab SHA512 d7956cc8a4ab11514789af4f1f7023268e4b003216766c153f0f09aac659aabda5de634b363d53f8daeddfcf5820619c5bca31ff5f9aeb187c1df016c05f68d5
-EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef65fd8089a3190859a93a0c937ca4609e68e25ea7e606a92b8f574aa9863b8bc50be3f07413c9c3d9749a88 SHA512 c247393496ac96e14ede7eaebb7e00d32221ccd38c2dca2cf50e3b7fe158172f49803c1e697584e25917a6d7d829890952cc7e8ae09a87158180530af66afb56
-EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
-EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
-EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
-EBUILD perf-4.14.33.ebuild 4950 BLAKE2B f4b86b4fc45dbbaada34a9cbf463dd68675ea74ab93794891eba66e20869e931c653d5e20e6cbf41df035d49a2b5aa298eb08829f2819c0055221d134e2cd353 SHA512 a4a6323f62c46cfcf1141a41025609f8eb990978ca9a3f77be65f1c5913a84a733ad3c16d8e65fea8728064d15308a3d99f20a859364dcd3b3eef58747fec2ef
-EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
-EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
-MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch
deleted file mode 100644
index 0c4dff011306..000000000000
--- a/dev-util/perf/files/perf-4.1.5-prefix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 75e84ab906ef8935cff3df3d8929f1bafea81599
-Author: Lukas Wunner <lukas@wunner.de>
-Date:   Thu Jun 18 13:00:32 2015 +0200
-
-    perf tools: Fix build breakage if prefix= is specified
-    
-    Invoking Makefile.perf with prefix= breaks the build since Makefile.perf
-    hands that variable down to Makefile.build where it overrides
-    
-        prefix       := $(subst ./,,$(OUTPUT)$(dir)/)
-    
-    leading to errors like this:
-    
-        No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o'
-    
-    Signed-off-by: Lukas Wunner <lukas@wunner.de>
-    Acked-by: Jiri Olsa <jolsa@kernel.org>
-    Cc: David Ahern <dsahern@gmail.com>
-    Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5
-    Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com
-    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-
-diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
-index 10df572..98cfc38 100644
---- a/tools/build/Makefile.build
-+++ b/tools/build/Makefile.build
-@@ -94,12 +94,12 @@ obj-y        := $(patsubst %/, %/$(obj)-in.o, $(obj-y))
- subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y))
- 
- # '$(OUTPUT)/dir' prefix to all objects
--prefix       := $(subst ./,,$(OUTPUT)$(dir)/)
--obj-y        := $(addprefix $(prefix),$(obj-y))
--subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y))
-+objprefix    := $(subst ./,,$(OUTPUT)$(dir)/)
-+obj-y        := $(addprefix $(objprefix),$(obj-y))
-+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y))
- 
- # Final '$(obj)-in.o' object
--in-target := $(prefix)$(obj)-in.o
-+in-target := $(objprefix)$(obj)-in.o
- 
- PHONY += $(subdir-y)
- 
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
deleted file mode 100644
index abff870927b6..000000000000
--- a/dev-util/perf/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-	<use>
-		<flag name="demangle">
-			Enable C++ symbol name demangling, using libbfd from
-			<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
-			package will have to be rebuilt after every version bump of
-			binutils.
-		</flag>
-		<flag name="doc">
-			Build documentation and man pages. With this USE flag disabled,
-			the --help parameter for perf and its sub-tools will not be
-			available. This is optional because it depends on a few
-			documentation handling tools that are not always welcome on user
-			systems.
-		</flag>
-		<flag name="numa">Enable NUMA support</flag>
-		<flag name="perl">
-			Add support for Perl as a scripting language for perf tools.
-		</flag>
-		<flag name="unwind">
-			Use sys-libs/libunwind for frame unwinding support.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
deleted file mode 100644
index 9b930d58dece..000000000000
--- a/dev-util/perf/perf-3.12.ebuild
+++ /dev/null
@@ -1,177 +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 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV/_rc} != ${PV} ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.bz2
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ $(get_version_component_count) == 4 ]] ; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.bz2
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-	SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit +demangle +doc perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-devel/binutils )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e 's:-Werror::' \
-		-e 's:-ggdb3::' \
-		-e 's:-fstack-protector-all::' \
-		-e 's:^LDFLAGS =:EXTLIBS +=:' \
-		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
-		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
-		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
-		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
-		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
-		"${S}"/Makefile || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
-	sed -i \
-		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
-		"${S}"/Makefile \
-		"${S}"/Documentation/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(KV=2.6.23 tc-arch-kernel)
-	emake -j1 V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		prefix="/usr" bindir_relative="sbin" \
-		CFLAGS_OPTIMIZE="${CFLAGS}" \
-		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
deleted file mode 100644
index 39c962d6d05c..000000000000
--- a/dev-util/perf/perf-3.13.1-r1.ebuild
+++ /dev/null
@@ -1,182 +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 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="audit +demangle +doc gtk perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-devel/binutils )
-	gtk? ( x11-libs/gtk+:2 )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e 's:-Werror::' \
-		-e 's:-ggdb3::' \
-		-e 's:-fstack-protector-all::' \
-		-e 's:^LDFLAGS =:EXTLIBS +=:' \
-		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
-		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
-		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
-		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
-		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
-		"${S}"/Makefile || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
-	sed -i \
-		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
-		"${S}"/Makefile \
-		"${S}"/Documentation/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(KV=2.6.23 tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		prefix="/usr" bindir_relative="bin" \
-		CFLAGS_OPTIMIZE="${CFLAGS}" \
-		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-3.15.5.ebuild b/dev-util/perf/perf-3.15.5.ebuild
deleted file mode 100644
index c2e5a6f47f2c..000000000000
--- a/dev-util/perf/perf-3.15.5.ebuild
+++ /dev/null
@@ -1,182 +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 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-devel/binutils )
-	gtk? ( x11-libs/gtk+:2 )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=( tools/perf tools/scripts tools/include tools/lib include lib "arch/*/include" "arch/*/lib" )
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e 's:-Werror::' \
-		-e 's:-ggdb3::' \
-		-e 's:-fstack-protector-all::' \
-		-e 's:^LDFLAGS =:EXTLIBS +=:' \
-		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
-		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
-		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
-		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
-		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
-		"${S}"/Makefile || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
-	sed -i \
-		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
-		"${S}"/Makefile \
-		"${S}"/Documentation/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(KV=2.6.23 tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		prefix="/usr" bindir_relative="bin" \
-		CFLAGS_OPTIMIZE="${CFLAGS}" \
-		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-4.1.5-r1.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild
deleted file mode 100644
index 4fdec292a19d..000000000000
--- a/dev-util/perf/perf-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,190 +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 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-devel/binutils:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/include" "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	epatch "${FILESDIR}"/${P}-prefix.patch
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e 's:-Werror::' \
-		-e 's:-ggdb3::' \
-		-e 's:-fstack-protector-all::' \
-		-e 's:^LDFLAGS =:EXTLIBS +=:' \
-		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
-		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
-		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
-		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
-		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
-		"${S}"/Makefile || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
-	sed -i \
-		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
-		"${S}"/Makefile \
-		"${S}"/Documentation/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		prefix="/usr" bindir_relative="bin" \
-		CFLAGS_OPTIMIZE="${CFLAGS}" \
-		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
deleted file mode 100644
index 609530402717..000000000000
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ /dev/null
@@ -1,179 +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 bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.9
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		eapply "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-4.4.4.ebuild b/dev-util/perf/perf-4.4.4.ebuild
deleted file mode 100644
index a1366ba16e6f..000000000000
--- a/dev-util/perf/perf-4.4.4.ebuild
+++ /dev/null
@@ -1,184 +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 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-devel/binutils:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e 's:-Werror::' \
-		-e 's:-ggdb3::' \
-		-e 's:-fstack-protector-all::' \
-		-e 's:^LDFLAGS =:EXTLIBS +=:' \
-		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
-		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
-		"${S}"/config/Makefile || die
-	sed -i \
-		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
-		"${S}"/Makefile.perf || die
-	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
deleted file mode 100644
index e9c0e8f0c42e..000000000000
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ /dev/null
@@ -1,178 +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 bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.9
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		epatch "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		dohtml Documentation/*.html
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/pkgcheck-0.5.3 b/dev-util/pkgcheck-0.5.3
new file mode 100644
index 000000000000..66c557c83ff5
--- /dev/null
+++ b/dev-util/pkgcheck-0.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/pkgcore-0.9.3[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-python/snakeoil-0.7.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(-)] dev-python/lxml[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-python/setuptools[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(-)] 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=pkgcore-based QA utility
+EAPI=5
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=sys-apps/pkgcore-0.9.3[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-python/snakeoil-0.7.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(-)] dev-python/lxml[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(-)] 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/pkgcore/pkgcheck/releases/download/v0.5.3/pkgcheck-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_=6cf13a729dbf8ab2d16da455c6ef7870
diff --git a/dev-util/pkgcheck-0.5.4 b/dev-util/pkgcheck-0.5.4
new file mode 100644
index 000000000000..4f0c00b7c93c
--- /dev/null
+++ b/dev-util/pkgcheck-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/snakeoil-0.7.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(-)] >=sys-apps/pkgcore-0.9.5[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[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/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=pkgcore-based QA utility
+EAPI=5
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=dev-python/snakeoil-0.7.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(-)] >=sys-apps/pkgcore-0.9.5[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[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=mirror://pypi/p/pkgcheck/pkgcheck-0.5.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_=868971f4a2b1b4ba852a16bd295d5cbf
diff --git a/dev-util/pkgcheck-9999 b/dev-util/pkgcheck-9999
new file mode 100644
index 000000000000..75e6d53d031d
--- /dev/null
+++ b/dev-util/pkgcheck-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=pkgcore-based QA utility
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=python_targets_python3_6
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( 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_=378b9d2b368ece474f52b55a697e9a05
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
deleted file mode 100644
index 0d353b8d1bde..000000000000
--- a/dev-util/pkgcheck/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67116c081818ae8d769ca492f201a1da206d9ea4d0011e01790ce54a1d0c0e174de966938adea46ad526652f766 SHA512 39804112b70bb90b655754b78d87a23906b749622083534dda1cb7b7e381c61f95c41c02fbfc6f8dea075bd3665cfda93f565c5d896779d5746ac71b74878df9
-DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
-EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
-MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
deleted file mode 100644
index a43b6993fd17..000000000000
--- a/dev-util/pkgcheck/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>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pkgcore/pkgcheck</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
deleted file mode 100644
index 7f6377c90e14..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
+++ /dev/null
@@ -1,53 +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,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/pkgcore-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
deleted file mode 100644
index 6a4fce0ea524..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
+++ /dev/null
@@ -1,58 +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,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
-fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
deleted file mode 100644
index 2b1a33742b3b..000000000000
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
-fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgconf-1.3.10 b/dev-util/pkgconf-1.3.10
new file mode 100644
index 000000000000..1b14a99782ab
--- /dev/null
+++ b/dev-util/pkgconf-1.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/atf dev-util/kyua )
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.10.tar.xz
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3f818b1e7f8aaa788b495b3813cb0d7c
diff --git a/dev-util/pkgconf-1.3.7 b/dev-util/pkgconf-1.3.7
new file mode 100644
index 000000000000..8d1ec44f6804
--- /dev/null
+++ b/dev-util/pkgconf-1.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/atf dev-util/kyua )
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.7.tar.xz
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1e24e18e5840e67af0352f3ab9c3f4a1
diff --git a/dev-util/pkgconf-1.3.90 b/dev-util/pkgconf-1.3.90
new file mode 100644
index 000000000000..1d0ed1c640a2
--- /dev/null
+++ b/dev-util/pkgconf-1.3.90
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/atf dev-util/kyua )
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.90.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5207e95ba194b0dd5cbad6c98dcad214
diff --git a/dev-util/pkgconf-1.4.2 b/dev-util/pkgconf-1.4.2
new file mode 100644
index 000000000000..414b8e2a9f38
--- /dev/null
+++ b/dev-util/pkgconf-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/atf dev-util/kyua )
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.4.2.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5786b0dca04f070c9a7f1056ab519486
diff --git a/dev-util/pkgconf-1.5.1 b/dev-util/pkgconf-1.5.1
new file mode 100644
index 000000000000..4ba6f2f3e5e4
--- /dev/null
+++ b/dev-util/pkgconf-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/atf dev-util/kyua )
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.5.1.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=df512cb449d7220099d9438005ab3ffd
diff --git a/dev-util/pkgconf-9999 b/dev-util/pkgconf-9999
new file mode 100644
index 000000000000..8b2aa3dec82f
--- /dev/null
+++ b/dev-util/pkgconf-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-libs/atf dev-util/kyua ) >=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=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=6
+HOMEPAGE=https://github.com/pkgconf/pkgconf
+IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=BSD-1
+RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=df512cb449d7220099d9438005ab3ffd
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
deleted file mode 100644
index c2779d5b5add..000000000000
--- a/dev-util/pkgconf/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST pkgconf-1.3.10.tar.xz 272704 BLAKE2B 7d39a17ba100818eecb64acc46d7000a5d7ecb2493d7d9b75a7f2451ac3499bb5de68a38cca2188b19937410b3a82bc8a910a8b7cec211315980c0d9c49f8c81 SHA512 22ccc6b41b4571992f00e0b2e6f9922fd7f1bf9ef1b790ff978d8bff8ca0697321f7a7ecf1a193ccb4efda2c5d6430c1ad24487a50d3ab27f9f16e6be9fb9e83
-DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
-DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
-DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
-DIST pkgconf-1.5.1.tar.xz 289616 BLAKE2B 32cd7b3440635cacbc197ac6163c2d0c0a57281d060e27ba097f7845636e41160c25092f42e3d3dacacc0d9f01f6d3468ffaa2a18a82f98ce5fdc8e9f7267137 SHA512 a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a
-EBUILD pkgconf-1.3.10.ebuild 1297 BLAKE2B 033585762fe3fb08869fb9264f3ca37717da75061098cef3ab073fee9a63b8856d81a2142874081e9e419c1f07ed285ee16a5620663701fb5bfaa54dc9884068 SHA512 0e3b7a27767b6f2570947dd1cd433cafa0df4936d9925bd4b04b61602c58341073b9c9479a6241d3acbc4a3e701c048e965fae6240b8ad254efab520edaf96ff
-EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 0ab8f8e988a9d412585b6c53cbd06a6be0c71ab09a50fdceffaa2b90615c00de9864af9b8742f047d7b8a0b901844362582d90114728c8802d5a1563e1cb62f9 SHA512 60b22b469624108ba9f3aef81de7d493e7a4fa931f4579e4d909b41fde068c2ecb60283daff61133ac9d3682e326351a05551f265a651f2bfc7ce8e3a3cfd511
-EBUILD pkgconf-1.3.90.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-EBUILD pkgconf-1.4.2.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
-EBUILD pkgconf-1.5.1.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
-EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
-MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
deleted file mode 100644
index f6730b8bcc6e..000000000000
--- a/dev-util/pkgconf/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>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<slots>
-		<subslots>SONAME version of libpkgconf</subslots>
-	</slots>
-	<use>
-		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">pkgconf/pkgconf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
deleted file mode 100644
index 8e7570f72a8c..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
deleted file mode 100644
index 7382d049d3c8..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-util/pkgconf/pkgconf-1.3.90.ebuild b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
deleted file mode 100644
index 86434bc5ebfd..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.90.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
deleted file mode 100644
index e2b768e8e572..000000000000
--- a/dev-util/pkgconf/pkgconf-1.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.5.1.ebuild b/dev-util/pkgconf/pkgconf-1.5.1.ebuild
deleted file mode 100644
index 1ae23ee0c0d3..000000000000
--- a/dev-util/pkgconf/pkgconf-1.5.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
deleted file mode 100644
index 1ae23ee0c0d3..000000000000
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconfig-0.28-r2 b/dev-util/pkgconfig-0.28-r2
new file mode 100644
index 000000000000..403d76ecb7c8
--- /dev/null
+++ b/dev-util/pkgconfig-0.28-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] >=app-portage/elt-patches-20170422
+DESCRIPTION=Package config system that manages compile/link flags
+EAPI=5
+HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
+IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
+SLOT=0
+SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=948a66f932f78dd58baa987597e8565a
diff --git a/dev-util/pkgconfig-0.28-r3 b/dev-util/pkgconfig-0.28-r3
new file mode 100644
index 000000000000..77727723f6fd
--- /dev/null
+++ b/dev-util/pkgconfig-0.28-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] >=app-portage/elt-patches-20170422
+DESCRIPTION=Package config system that manages compile/link flags
+EAPI=5
+HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
+IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
+SLOT=0
+SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b8ca870ece2958b478fa465564c7a36
diff --git a/dev-util/pkgconfig-0.29.1 b/dev-util/pkgconfig-0.29.1
new file mode 100644
index 000000000000..f61422b7bc3e
--- /dev/null
+++ b/dev-util/pkgconfig-0.29.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl >=app-portage/elt-patches-20170422
+DESCRIPTION=Package config system that manages compile/link flags
+EAPI=6
+HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
+IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
+SLOT=0
+SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c6c79fb5cb1e0da3da8d5dca400957ab
diff --git a/dev-util/pkgconfig-0.29.2 b/dev-util/pkgconfig-0.29.2
new file mode 100644
index 000000000000..a0af2f4b27ef
--- /dev/null
+++ b/dev-util/pkgconfig-0.29.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl >=app-portage/elt-patches-20170422
+DESCRIPTION=Package config system that manages compile/link flags
+EAPI=6
+HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
+IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
+SLOT=0
+SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=596a6ab191a0f389f6648e6b626e8c8e
diff --git a/dev-util/pkgconfig-9999 b/dev-util/pkgconfig-9999
new file mode 100644
index 000000000000..f3a75478e41f
--- /dev/null
+++ b/dev-util/pkgconfig-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Package config system that manages compile/link flags
+EAPI=6
+HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
+IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-2
+RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c6c79fb5cb1e0da3da8d5dca400957ab
diff --git a/dev-util/pkgconfig-openbsd-20130507-r1 b/dev-util/pkgconfig-openbsd-20130507-r1
new file mode 100644
index 000000000000..bb12fe556ddd
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd-20130507-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=A perl based version of pkg-config from OpenBSD
+EAPI=5
+HOMEPAGE=http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/
+IUSE=+pkg-config abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=058d0191e54f3bd1020ef8aa4e16e8ef
diff --git a/dev-util/pkgconfig-openbsd-20130507-r2 b/dev-util/pkgconfig-openbsd-20130507-r2
new file mode 100644
index 000000000000..d7647a7d4dc8
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd-20130507-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=A perl based version of pkg-config from OpenBSD
+EAPI=5
+HOMEPAGE=http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/
+IUSE=+pkg-config abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d8637fb8984e49adf8faa2e352daa2aa
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
deleted file mode 100644
index d2410c218520..000000000000
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pkgconfig-openbsd-20130507-zap-warning.patch 525 BLAKE2B 7da7e41a0ad141df1df0a291a87c9ec874dc279613649afa33825f1d3b1149e843ea5686621da50ffae9ca337cfdc0026475f017a2f68b4d44ca3582b340f91e SHA512 984d662b5918a4a0f1bc75cee538f8414ca431a6e3132b74f86a2e3ef538479b7966042f414a103393a78ff236a78eb5aeef0107c16493ffe86f3c66cc64f791
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-DIST pkgconfig-openbsd-20130507.tar.xz 10876 BLAKE2B 38beb8dfe17742fe83d57e62d5898de1d6d029ec5bf4caa5d16edb317e179e45fc6bf3c5d7bd56792b5e774ebc53d7cb51a721abd62753f67b1cd5cb76bdfb1a SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69
-EBUILD pkgconfig-openbsd-20130507-r1.ebuild 1719 BLAKE2B b17123ea49628de44d728108ee8ddd125c77dd4d808acfef2e6bc82e897c5189e28f719409a2376970e3cf60267c1def5d76e643acd0d226c338d8ec4e3573d0 SHA512 8a5bcb1bc6d16ada5f7b3b913e8c3eafaead8a17b15de12e90c3422127e0f93a728cc344d5444e66f0ccffe5b12b361f44b6e63816bc1d2ecd0fe1e18eff37c9
-EBUILD pkgconfig-openbsd-20130507-r2.ebuild 1765 BLAKE2B 76fd533299735c8aa83a3a0fe60975b7c93fc48f300e6f49fb048c2516e736bb3d5ca2e41c14507391b2202c22178f6c2f930ff8e8e694e8754162e1dbc0438f SHA512 71e2cea8ef068c4e0b6f81796529f6c6be6db03264621a3a7b676f311697d606a53554f07e6132626f8955757f9bef585ee88d6c8f6dcc1b551edd13d417120b
-MISC metadata.xml 250 BLAKE2B a66f2f22e145fed3677b05a9dc47b3741005d8b172cddd357cc76cc608f3ec918bc23fde06d723606086f246fe414c2231bd3483b9c523b9f699a699c21dc2e5 SHA512 57c5d6cefedd04f50e461d73db25c3166735de76c6500985888a13fe3c23cb44b3e17b046d53376192abe8924257b8bd97c14934a2d24c7df29298660998e7c9
diff --git a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch b/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
deleted file mode 100644
index 41784c919e19..000000000000
--- a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use of $_ produces warnings which can cause build failures in certain consumers.
-
-Backported from revision 1.4 upstream (http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm).
-
-Gentoo-bug: 538012
-Gentoo-bug: 545314
-Gentoo-bug: 545322
-Gentoo-bug: 545962
-
---- a/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-+++ b/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-@@ -91,7 +91,6 @@
- {
- 	my ($class, $fh, $name) = @_;
- 	my $cfg = $class->new;
--	my $_;
- 
- 	$name = '' if !defined $name;
- 	while (<$fh>) {
diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
deleted file mode 100644
index 1632dc7b3fb8..000000000000
--- a/dev-util/pkgconfig-openbsd/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>
-  <use>
-    <flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
deleted file mode 100644
index ff2fbadd47bb..000000000000
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib perl-module multilib-minimal
-
-# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
-
-PKG_M4_VERSION=0.28
-
-DESCRIPTION="A perl based version of pkg-config from OpenBSD"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
-	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pkg-config"
-
-RDEPEND="virtual/perl-Getopt-Long
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkgconf[pkg-config]
-	)"
-
-S=${WORKDIR}/src
-
-src_prepare() {
-	epatch_user
-	ecvs_clean
-
-	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
-	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
-	else
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
-	fi
-}
-
-multilib_src_install() {
-	local pc_bin=pkg-config
-	use pkg-config || pc_bin+=-openbsd
-
-	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
-	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
-
-	# insert proper paths
-	local pc_paths=(
-		/usr/$(get_libdir)/pkgconfig
-		/usr/share/pkgconfig
-	)
-	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
-		"${ED%/}/usr/bin/${pc_bin}" || die
-}
-
-multilib_src_install_all() {
-	if use pkg-config; then
-		insinto /usr/share/aclocal
-		doins "${WORKDIR}"/pkg-config-*/pkg.m4
-	fi
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"
-	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
-}
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
deleted file mode 100644
index e47abefe3039..000000000000
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib perl-module multilib-minimal
-
-# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
-
-PKG_M4_VERSION=0.28
-
-DESCRIPTION="A perl based version of pkg-config from OpenBSD"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
-	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pkg-config"
-
-RDEPEND="virtual/perl-Getopt-Long
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkgconf[pkg-config]
-	)"
-
-S=${WORKDIR}/src
-
-src_prepare() {
-	epatch_user
-	ecvs_clean
-
-	epatch "${FILESDIR}/${P}-zap-warning.patch"
-
-	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
-	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
-	else
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
-	fi
-}
-
-multilib_src_install() {
-	local pc_bin=pkg-config
-	use pkg-config || pc_bin+=-openbsd
-
-	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
-	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
-
-	# insert proper paths
-	local pc_paths=(
-		/usr/$(get_libdir)/pkgconfig
-		/usr/share/pkgconfig
-	)
-	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
-		"${ED%/}/usr/bin/${pc_bin}" || die
-}
-
-multilib_src_install_all() {
-	if use pkg-config; then
-		insinto /usr/share/aclocal
-		doins "${WORKDIR}"/pkg-config-*/pkg.m4
-	fi
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"
-	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
-}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
deleted file mode 100644
index 81adac1e8224..000000000000
--- a/dev-util/pkgconfig/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX pkgconfig-0.28-lfs.patch 8351 BLAKE2B c54878b2f53f17e66444ec300e6e066505287d0a730983222b5c457e13510a78e2afc73c8e83476257bbfd703f8b1c724edeb8cb9a8eb8e41304aabdfcdd10a7 SHA512 1fbf5d326467f92cc9a82627f2b855ed5bd1a1843dbb922d7a48391ed900d45b6b228d2ee5e5860a4755812645095a8501765d85ffbb6eb28e0c088d7e9559c5
-AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae79bdfe4b68d155e7945a49d6980454234c45a0ca1683c15decc3b4063e3a6f0b00185da59fa7849b1aea0003593576f7044f453990fa1777b37989724 SHA512 9511c0f966b4acc90d0421906ef0937edeae6901fa267a282d878e1d4a1ef84ee12f89b8feafe7172cecbde98e6d106fc446ac98780efd41b036c1f7a2f97d87
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
-DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2917 BLAKE2B ae95639874d906788ce1e3511b965f03e64b545e9097d71efca5a2e430ef59e660a164581ca383f87d408d60a36728697ca5b14dd641ada7163a14932eb6c8e1 SHA512 3524f45c92d629a2f615f273897fd792ce760fc47046eeffbebe5f0e619f9d812202da73d54c60d5d142523c409175d4143cdfb8991c27b5e42c6d0ba17edfbc
-EBUILD pkgconfig-0.28-r3.ebuild 3440 BLAKE2B 2a83430e96362e930f23f71b18cf239e846aed65ae2868bddc05e0c5b40150e63142139a87b046e77fd67dec5284afc2b0208ed48cd4a1bb8a21fb09d75b2c8c SHA512 b9f615b244ff8774453aa4a8de547a66e71e34f3cf084f71c8ed27a4761e74a34b6d90a9170b3a1a6d62c5e3392e5204153ea739af5f48818df1eaddcc426506
-EBUILD pkgconfig-0.29.1.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
-EBUILD pkgconfig-0.29.2.ebuild 3791 BLAKE2B 14a5e7f9d94063d68b36512641745c742bffaf996ef170a6c4b2fa73f3fdeb32c1edd4a5d0f56d7362635af2a80496b1fd930e66859afd40f267fe18e816a24f SHA512 33ea45c748eafd8468d9000ab03d67548041310ffd54f1eec1925e8b0d7af15fa6303d11d315a0c970b0678702fc277cb698275dfb220278be8ff4843f5be274
-EBUILD pkgconfig-9999.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
-MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
deleted file mode 100644
index 9515f4f650a0..000000000000
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 15 Apr 2015 12:25:29 -0400
-Subject: [PATCH] Enable large file support
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90078
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: expand out configure,
- config.h.in modifications.]
----
- configure.ac |   3 +
- config.h.in  |  11 ++++
- configure    | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 217 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2b33371..1a321e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
- dnl to make
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
-+dnl Enable large file support
-+AC_SYS_LARGEFILE
-+
- dnl Check for programs
- AC_PROG_CC
- AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp])
-diff --git a/config.h.in b/config.h.in
-index 0aac8f3..fdae454 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -72,3 +72,14 @@
- 
- /* Version number of package */
- #undef VERSION
-+
-+/* Enable large inode numbers on Mac OS X 10.5.  */
-+#ifndef _DARWIN_USE_64_BIT_INODE
-+# define _DARWIN_USE_64_BIT_INODE 1
-+#endif
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-diff --git a/configure b/configure
-index 160ecab..f897e22 100755
---- a/configure
-+++ b/configure
-@@ -783,6 +783,7 @@ with_gnu_ld
- with_sysroot
- enable_libtool_lock
- enable_silent_rules
-+enable_largefile
- with_pc_path
- with_system_include_path
- with_system_library_path
-@@ -1435,6 +1436,7 @@ Optional Features:
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --enable-silent-rules   less verbose build output (undo: "make V=1")
-   --disable-silent-rules  verbose build output (undo: "make V=0")
-+  --disable-largefile     omit support for large files
-   --enable-indirect-deps  list both direct and indirect dependencies.
-        --disable-indirect-deps only list direct dependencies.
-     default=auto
-@@ -11389,6 +11391,207 @@ fi
- AM_BACKSLASH='\'
- 
- 
-+# Check whether --enable-largefile was given.
-+if test "${enable_largefile+set}" = set; then :
-+  enableval=$enable_largefile;
-+fi
-+
-+if test "$enable_largefile" != no; then
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-+if ${ac_cv_sys_largefile_CC+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 CC="$CC -n32"
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_largefile_CC=' -n32'; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-+if ${ac_cv_sys_file_offset_bits+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=64; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  if test $ac_cv_sys_file_offset_bits = unknown; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-+if ${ac_cv_sys_large_files+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=1; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-+$as_echo "$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  fi
-+
-+
-+fi
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--- 
-2.4.2
-
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
deleted file mode 100644
index e1a2bb534a37..000000000000
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/512336
-http://bugs.freedesktop.org/show_bug.cgi?id=78077
-
-From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001
-From: Andrew Oakley <aoakley@espial.com>
-Date: Tue, 29 Apr 2014 13:14:35 +0100
-Subject: [PATCH 1/1] Strip system library directories reliably
-
-This loop was changed from a while loop to a for loop in commit
-9bf6277b, but the iterator is now advanced twice each time round the
-loop.
----
- pkg.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pkg.c b/pkg.c
-index 3697fec..c847c95 100644
---- a/pkg.c
-+++ b/pkg.c
-@@ -917,7 +917,6 @@ verify_package (Package *pkg)
-             }
-           system_dir_iter = system_dir_iter->next;
-         }
--      iter = iter->next;
-     }
-   g_list_free (system_directories);
- 
--- 
-1.8.3.2
-
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
deleted file mode 100644
index feea3b542d9b..000000000000
--- a/dev-util/pkgconfig/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>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="internal-glib">Use internal copy of <pkg>dev-libs/glib</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
deleted file mode 100644
index 9fa7fb11e9de..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	inherit autotools git-2
-else
-	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"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
-
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	epatch_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
deleted file mode 100644
index c94ca03db9bd..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	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"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
-
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	# Large file support, fixed in upstream git; bug #550508
-	epatch "${FILESDIR}"/${P}-lfs.patch
-	# lfs patch touches config.h.in; need this hack to prevent autoreconf and automake
-	touch aclocal.m4 config.h.in Makefile.in
-
-	epatch_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
deleted file mode 100644
index c5d3bf7ec72e..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	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"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
deleted file mode 100644
index 3600aca2b077..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	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"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
deleted file mode 100644
index c5d3bf7ec72e..000000000000
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	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"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/plan9port-20140306-r4 b/dev-util/plan9port-20140306-r4
new file mode 100644
index 000000000000..3f35be92fc4e
--- /dev/null
+++ b/dev-util/plan9port-20140306-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+DESCRIPTION=Port of many Plan 9 programs and libraries
+EAPI=5
+HOMEPAGE=http://swtch.com/plan9port/
+IUSE=X aqua truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
+RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconfig )
+REQUIRED_USE=?? ( X aqua )
+SLOT=0
+SRC_URI=https://github.com/9fans/plan9port/archive/e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz -> plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5ad1a023ddce2c6a71678ddb0d8037bd
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
deleted file mode 100644
index 04919201779f..000000000000
--- a/dev-util/plan9port/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX plan9port-builderr.patch 936 BLAKE2B 7cf8a229fdf33823522d8de0bf465a7065d74078d5f16391b21c6a2c0de4f6764e07a50680ed21038205d27fa6e2e550ababd24e7e37d76a024d568e22494f61 SHA512 d95e6c5b4b75d54167721f7250288b8640945ebeb10ff346e989a4690828bb8448e46cbcf30d5e35c27d094680b2995ca04b8106c4dce083260f605fc2024d84
-AUX plan9port-cflags.patch 328 BLAKE2B 2f96d9b44760655807cfe845193fe8bca3faf2eb6b1bf3c024c554da4cc90c4dd41454d20ea4c7b065fe2351c9f51cf01dc7437597e619232233c9cedcb3e02c SHA512 281b236893cc1efde75d7fc5160168c8602a5eff27229f9b0e2b1284ac36cf73fdbd22f2ae4d3776556f7b881ad63f4dd68d56628942ca6e84abca12b93616bc
-AUX plan9port-freebsd-10.patch 265 BLAKE2B 0a942f899bd05d3ad671134a3277a5bf8e41bf2fc7ab8c11a8be9cd27a2c334a85a44e583d36efb1253347f0877171cf82094f18a2e9a4251df9ca8259a5ff74 SHA512 69c8d4ee824afb453bd4ebc8ba9af3e73c37fd31e40d92ae62685a9a6916571ed16e8f3eee8aff32e2db96177439fa34e52bba8d7c52a296328ae1d9d3767c19
-AUX plan9port-noexecstack.patch 984 BLAKE2B 5e7dc7b084096b3b49eda81e244dc16849fe7fb66bc17b15fcba2d35aec63067eb75dff73ea74bad02878e50353ba145ba101ade8e086434a5be2568c416df02 SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8
-DIST plan9port-e78ed7a67bbaa37dc57dfb37219f505c48755e14.tar.gz 23442851 BLAKE2B 89e2a8dcdf650cc3640ef0ba496f1c22e74831fda2e4a51cf8419c496da5a480a10324eb295369e9192defbd3c6411ea351bba1c6bdec5d72bc4ee397da58114 SHA512 3cb126eb0f8c58c76c4da5aaca6b3956b9cc30b1955c1b9db4727a01a46cae696f01b538a47f6f009e955f6ed8f308b60b6519d4184e10b255636ea32a1e9099
-EBUILD plan9port-20140306-r4.ebuild 3536 BLAKE2B 257db122e1fbd1939aa60dd640cccd5c461792dddd05fa168b6b89e4813c5089781fd6c5c4ebe45131ac25112cf86fcf459905ed379d928b5a3f3d14f30efb5f SHA512 290a3824ee3aaaa2a813f2e703b16851988126e1d7c1636552767529fb9bcbc01edf86851d6869f1000df71bb8ce8a0fa34af807810c6dd87702e6a9e711685f
-MISC metadata.xml 683 BLAKE2B 4a52db553cb90ab9472d190a70260e4d8937037008d8aec07b6b92dd336b1506a1753bec4e916b655f177fdd4efd793f645be51d1613124e6bcba570255c3273 SHA512 8d8bc34ae706ed839de9f2c1e32be135545b706208ef800d9ebde98f2f182111a91bc92c1f764c6fa6d26af8615bd528e1dfb87e0597e86d4ffce06f3a0c0b33
diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch
deleted file mode 100644
index 266f10c4b9d5..000000000000
--- a/dev-util/plan9port/files/plan9port-builderr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Prevent mk from ignoring errors
-
-By default, the plan9port INSTALL script doesn't report build error,
-which can result in a mostly broken build begin installed.
---- a/INSTALL
-+++ b/INSTALL
-@@ -41,7 +41,6 @@ echo " "
- echo "* Resetting $PLAN9/config"
- rm -f config
- 
--(
- echo "* Compiler version:"
- 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
- 
-@@ -134,7 +133,7 @@ if $dobuild; then
- 		echo "* Warning: not all binaries built successfully."
- 	fi
- 	echo "* Installing everything in $PLAN9/bin..."
--	mk -k install || exit 1
-+	mk install || exit 1
- 	if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then
- 		echo " "
- 		echo "* Warning: not all binaries built successfully."
-@@ -182,5 +181,4 @@ if $doinstall; then
- 	echo "	PLAN9=$PLAN9 export PLAN9"
- 	echo '	PATH=$PATH:$PLAN9/bin export PATH'
- fi
--) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum
- 
diff --git a/dev-util/plan9port/files/plan9port-cflags.patch b/dev-util/plan9port/files/plan9port-cflags.patch
deleted file mode 100644
index c2d2ed6defe5..000000000000
--- a/dev-util/plan9port/files/plan9port-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Prevent resetting CFLAGS and LDFLAGS
-
-This allows the plan9port build to inherit cflags from the environment.
-
-(This patch must be applied after plan9port-noexecstack.patch)
---- a/src/mkhdr
-+++ b/src/mkhdr
-@@ -28,8 +28,6 @@ LD=9l
- AS=9a
- AR=9ar
- INSTALL=install
--CFLAGS=
--LDFLAGS=
- AFLAGS=--noexecstack
- CLEANFILES=
- NUKEFILES=
diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch b/dev-util/plan9port/files/plan9port-freebsd-10.patch
deleted file mode 100644
index cc46dc6f4509..000000000000
--- a/dev-util/plan9port/files/plan9port-freebsd-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bin/9l	2015-12-09 19:12:50.000000000 +0000

-+++ b/bin/9l	2015-12-09 19:13:00.000000000 +0000

-@@ -19,7 +19,7 @@ case "$tag" in

- 	5.2.*)

- 		extralibs="$extralibs -lkse"

- 		;;

--	[5-9].*)

-+	[5-9].*|10.*)

- 		extralibs="$extralibs -lpthread"

- 		;;

- 	esac

diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch
deleted file mode 100644
index fb4f19f21fc5..000000000000
--- a/dev-util/plan9port/files/plan9port-noexecstack.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Remove unneeded executable stack
-
-Assembly routines in libthread and libmp use an executable stack by
-default. This is not needed and can be removed using --noexecstack.
-
-The plan9port 9a wrapper wrapper needs to be modified to pass flags to the
-underlying assembler first though..
-
-Patch by Andy Spencer
-
-  http://code.swtch.com/plan9port/issue/76/
---- a/bin/9a
-+++ b/bin/9a
-@@ -1,10 +1,5 @@
- #!/bin/sh
- 
--if [ $# != 1 ]; then
--	echo 'usage: 9a file.s' 1>&2
--	exit 1
--fi
--
- test -f $PLAN9/config && . $PLAN9/config
- 
- aflags=""
-@@ -17,5 +12,16 @@ Darwin-*x86_64*)
- 	;;
- esac
- 
--out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
--exec as $aflags -o $out $1
-+for arg; do
-+	case $arg in
-+	-*)
-+		opts="$opts $arg"
-+		;;
-+	*.s)
-+		src=$arg
-+		dst=$(echo $arg | sed 's/\.s/\.o/')
-+		;;
-+	esac
-+done
-+
-+exec as $aflags $opts -o $dst $src
---- a/src/mkhdr
-+++ b/src/mkhdr
-@@ -30,7 +30,7 @@ AR=9ar
- INSTALL=install
- CFLAGS=
- LDFLAGS=
--AFLAGS=
-+AFLAGS=--noexecstack
- CLEANFILES=
- NUKEFILES=
- YACC=9 yacc
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
deleted file mode 100644
index 1ddb5cc0124d..000000000000
--- a/dev-util/plan9port/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>andy753421@gmail.com</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		Plan9Port is a set of Plan 9 utilities ported to the POSIX
-		environment - also know as Plan 9 from User Space.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">9fans/plan9port</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/plan9port/plan9port-20140306-r4.ebuild b/dev-util/plan9port/plan9port-20140306-r4.ebuild
deleted file mode 100644
index 68a51b267f4e..000000000000
--- a/dev-util/plan9port/plan9port-20140306-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multiprocessing toolchain-funcs
-
-MY_HASH="e78ed7a67bbaa37dc57dfb37219f505c48755e14"
-MY_P="${PN}-${MY_HASH}"
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/"
-SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X aqua truetype"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="X? ( x11-apps/xauth )
-	truetype? ( media-libs/freetype
-	            media-libs/fontconfig )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PLAN9=/usr/lib/plan9
-EPLAN9="${EPREFIX}"${PLAN9}
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
-	case ${CHOST} in
-		*freebsd10.*)  # patch 9l to use -pthread also on FreeBSD-10
-			epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
-		*apple*)
-			sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
-			die "Failed to sed AFLAGS" ;;
-	esac
-
-	# don't hardcode /bin and /usr/bin in PATH
-	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
-
-	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
-	for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
-		$(find -name makefile); do
-		sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
-		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" ${f} \
-		|| die "sed on ${f} failed"
-	done
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
-}
-
-src_configure() {
-	local myconf=()
-	if use X; then
-		myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
-	elif use aqua; then
-		local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
-		awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
-		myconf+=("WSYSTYPE=${wsystype}")
-	else
-		myconf+=(WSYSTYPE=nowsys)
-	fi
-
-	if use truetype; then
-		myconf+=(FONTSRV=fontsrv)
-	else
-		myconf+=(FONTSRV=)
-	fi
-	printf '%s\n' "${myconf[@]}" >> LOCAL.config
-}
-
-src_compile() {
-	export NPROC=$(makeopts_jobs)
-	export CC9=$(tc-getCC)
-
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
-}
-
-src_install() {
-	dodir "${PLAN9}"
-
-	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
-
-	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${ED}/${PLAN9}"
-
-	# build the environment variables and install them in env.d
-	cat > "${T}/60plan9" <<-EOF
-		PLAN9="${EPLAN9}"
-		PATH="${EPLAN9}/bin"
-		ROOTPATH="${EPLAN9}/bin"
-		MANPATH="${EPLAN9}/man"
-	EOF
-	doenvd "${T}/60plan9"
-}
-
-pkg_postinst() {
-	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
-	elog "also been appropriately set, please use env-update and"
-	elog "source /etc/profile to bring that into immediate effect."
-	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
-	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
-	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
-	elog
-	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
diff --git a/dev-util/ply-0_pre20160313 b/dev-util/ply-0_pre20160313
new file mode 100644
index 000000000000..4caaf20f50ce
--- /dev/null
+++ b/dev-util/ply-0_pre20160313
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare pretend setup
+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
+DESCRIPTION=Dynamic instrumentation of the Linux kernel with BPF and kprobes
+EAPI=6
+HOMEPAGE=https://github.com/iovisor/ply
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/iovisor/ply/archive/cfc56c789ad1eff1080ecb0dad18d009b91ae8ea.tar.gz -> ply-0_pre20160313.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5bb0f69ae2c8cc14bd0a5e40e29eeed2
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
deleted file mode 100644
index fe560e41acde..000000000000
--- a/dev-util/ply/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ply-0_pre20160313.tar.gz 38530 BLAKE2B 3c709e98c32cfd5dce389cf8829e135e0ecdc7907c83dcd2eed88c9c4c5f5a81093cc9ca7045b0cdb18566f0a8b49ddb4d3ba7320c7eaf56a350e45345e8d7bf SHA512 2de2ca2751574fe23b48188b0e8d1b4f1afe46003cbdefa69aeadaed0442675dad42b6cbfd161ebfbe006fbb21d447be4fca0ea7350b1409207473511f685d47
-EBUILD ply-0_pre20160313.ebuild 1539 BLAKE2B ea3962c5a222eda81b7da7d97c3e33622c9e871e3d8e9101a65f9120e611c130f8d2af87d4d30b8a1147d9ebd73abe99c716c2c7695b521200a2ce79da0115ae SHA512 76457c4d3d0b7e537fca072b4133cbeec5898a786e09e758bf5ea42c870e039c3386e4a29fe7dd5e357d04ff7d75f0ed7be6d978e3b6fd1801a55bd164d66c1a
-MISC metadata.xml 302 BLAKE2B f400d60a9dad4f8afcbf107bcf139d58435e77b8dfc8b5178f4fa8cce592b62eee40f6ef5bfef0cf1793c9c5293c43df8ce701bb1243d096f1872fc701d82799 SHA512 528855426ce54aa03f915178952e3b82d98dfe1dec45ef7a5a9ddf1069bc279e5bd4c894ab9bb5e328b72a10e05a5f9d5d9b5c60650246343b832bb6381bd24c
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
deleted file mode 100644
index 0e1f3d58af2b..000000000000
--- a/dev-util/ply/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>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">iovisor/ply</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/ply/ply-0_pre20160313.ebuild b/dev-util/ply/ply-0_pre20160313.ebuild
deleted file mode 100644
index 46367c55cfcd..000000000000
--- a/dev-util/ply/ply-0_pre20160313.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
-HOMEPAGE="https://github.com/iovisor/ply"
-EGIT_COMMIT="cfc56c789ad1eff1080ecb0dad18d009b91ae8ea"
-SRC_URI="https://github.com/iovisor/ply/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~HAVE_BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econf_args=() kerneldir_orig
-	if [[ -d ${KERNEL_DIR} ]]; then
-		# Using KBUILD_OUTPUT can fail, depending on the source tree
-		# state (it might demand that we make mrproper). Therefore,
-		# create a symlink copy of the source tree so that we are free
-		# to clean things up as needed.
-		kerneldir_orig=${KERNEL_DIR}
-		cp -sR "$(realpath "${kerneldir_orig}")" "${T}/kerneldir" || die
-		export KERNEL_DIR="${T}/kerneldir"
-		pushd "${KERNEL_DIR}" || die
-		# avoid sandbox violation for scripts/kconfig/.conf.cmd
-		find . -name '\.*' -delete
-		cp "${kerneldir_orig}/.config" ./.config || die
-		set_arch_to_kernel
-		make mrproper oldconfig prepare || die
-		popd || die
-		econf_args+=(--with-kerneldir="${KERNEL_DIR}")
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	rm -f "${ED}/usr/share/doc/${P}/COPYING"
-}
diff --git a/dev-util/pmd-4.2.5 b/dev-util/pmd-4.2.5
new file mode 100644
index 000000000000..624f5be90367
--- /dev/null
+++ b/dev-util/pmd-4.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/ant-junit4 ) dev-java/ant-core dev-java/asm:3 dev-java/jaxen:1.1 >=dev-java/junit-4.4:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Java source code analyzer
+EAPI=2
+HOMEPAGE=http://pmd.sourceforge.net
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=pmd
+RDEPEND=>=virtual/jre-1.5 dev-java/ant-core dev-java/asm:3 dev-java/jaxen:1.1 >=dev-java/junit-4.4:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/pmd/pmd-src-4.2.5.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=563ada3d854efc902bbfb07ced5eb6e3
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
deleted file mode 100644
index d22f8632033d..000000000000
--- a/dev-util/pmd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pmd-4.2.5-build.xml.patch 2313 BLAKE2B 421317e680142370c00fcf326397f7a8411cd3a591c45bd0f3b78822cb3a5631e95a7ec0007f20eda47cff5ff9f798e1ff8a8b37a4c0a77a23169c8d916707b6 SHA512 ee0851e642013a59698043fd2aa120b804c5e8ddbdcaa462d8196a8f1e63011b90396c921b4881f1d21687d58e11352a269554420e74718b5d059e1b4b7bdecf
-AUX pmd-4.2.5-launcher-pre-commands 171 BLAKE2B 2c276edcd8b9ec0d2803737cb12523279577f6546b70479a610f12e7a9b3c455ecba2acdb124c7239184f4c3ccab8611e15026e241990a45b5669853f2975f5e SHA512 9d36998cee64096d5d71562cc255ae951a11ad6d67057359b2a16cb860b8d542b121c1482fb9bd1458d93a4bc69e3b4720080e8153bc01930b8927e653fe5c75
-DIST pmd-src-4.2.5.zip 10801078 BLAKE2B c80acf1f723aaeff4b4af68a666eff747845ed13f941b46299c37dfe8a5fc910d662a526e5d7723faee6d647705ac6d7fefb53c53bd3bbd196db1faa5266f5c7 SHA512 f515445126d0b3ad11adac491df94d4e1e806764b2601b4ad9974a090d8542cfc4992d4aaf5ef61470459ecaf4c75db0865e257a1f7ea065b3d248b53387e93e
-EBUILD pmd-4.2.5.ebuild 1701 BLAKE2B 08f81a35818ba5e929ce9bef0e03d3aef8ce0663b66a216135169d7db230f487e71965baba6b421cc82969afec2159bbffa656677852aef2959a35c9d83d82bd SHA512 bf9d1248854b1863c8c78de70340681b3ea45b1c8bd98f11ee9378de7ae8e79fc7650a9acd0cc0fdb61689a2f8f53878ad3c563772edc26beb8877917b187f03
-MISC metadata.xml 309 BLAKE2B 4fcf5ec1f65debacf01e4fc765fb620d6b4c0e44d163f07bd77062e9c206adde9ec583e8d3be8647e8339eebf9d6914911f2044a10aaddb52aff972a1f157efd SHA512 516024e7c481f53034f039bb417ac691aaac3b2650349ef7744badd450a073f3388de60c616e869ad8697b66b57b5241f0e3077363db51a82c579d5cc8347bc2
diff --git a/dev-util/pmd/files/pmd-4.2.5-build.xml.patch b/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
deleted file mode 100644
index a0f043568625..000000000000
--- a/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nur pmd-4.2.4/bin/build.xml pmd-4.2.4_patched/bin/build.xml
---- pmd-4.2.4/bin/build.xml	2008-08-31 15:32:20.000000000 +0300
-+++ pmd-4.2.4_patched/bin/build.xml	2008-11-23 08:15:09.000000000 +0200
-@@ -22,11 +22,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-${jaxen.version}.jar" />
--			<include name="asm-${asm.version}.jar" />
--			<include name="junit-${junit.version}.jar" />
--		</fileset>
-+		<fileset dir="${dir.lib}" includes="*.jar"/>
- 	</path>
- 
- 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -76,7 +72,6 @@
- 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
- 			<manifest>
- 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
--				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
- 			</manifest>
- 		</jar>
- 
-@@ -86,17 +81,6 @@
- 			basedir="${dir.build}" />
- 	</target>
- 
--	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
--		<classpath>
--			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
--			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
--			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
--			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
--			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
--			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
--		</classpath>
--	</taskdef>
--
- 	<target name="weavejunit" depends="jar">
- 		<path id="retroweaverclasspath">
- 			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-@@ -211,7 +195,7 @@
- 	<target name="test-execute" description="Runs the unit tests">
- 		<delete dir="${test.outputdir}" />
- 		<mkdir dir="${test.outputdir}/xml"/>
--		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="no" jvm="${test.jvm}" forkmode="perBatch"
-+		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="yes" jvm="${test.jvm}" forkmode="perBatch"
- 			failureProperty="test.failure" 
- 		>
- 			<sysproperty key="pmd.regress" value="${test.regression}"/>
diff --git a/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands b/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
deleted file mode 100644
index b2e48852597d..000000000000
--- a/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -z "$3" ]; then
-    script=`basename $0`
-    echo "Usage:"
-    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-    exit 1
-fi
diff --git a/dev-util/pmd/metadata.xml b/dev-util/pmd/metadata.xml
deleted file mode 100644
index f4e182129a3d..000000000000
--- a/dev-util/pmd/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pmd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/pmd/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
deleted file mode 100644
index 71b3b7ebd19f..000000000000
--- a/dev-util/pmd/pmd-4.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java source code analyzer"
-HOMEPAGE="http://pmd.sourceforge.net"
-SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
-
-LICENSE="pmd"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/ant-core
-	dev-java/asm:3
-	dev-java/jaxen:1.1
-	>=dev-java/junit-4.4:4"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit4
-	)
-	${COMMON_DEPEND}"
-
-# tests fail
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	find -name "*.jar" | xargs rm -v
-
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from jaxen-1.1 jaxen.jar
-	java-pkg_jar-from junit-4
-}
-
-EANT_BUILD_XML="bin/build.xml"
-
-src_test() {
-	# junit does not like collisions
-	rm lib/ant.jar
-	ANT_TASKS="ant-junit4 ant-core" eant -f bin/build.xml test -DoutputTestResultsToFile=true
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-	java-pkg_register-ant-task
-
-	# Create launchers and copy rulesets
-	java-pkg_dolauncher ${PN} --main net.sourceforge.pmd.PMD --java_args "-Xmx512m" \
-		-pre "${FILESDIR}"/${P}-launcher-pre-commands
-	java-pkg_dolauncher ${PN}-designer --main net.sourceforge.pmd.util.designer.Designer
-	cp -r rulesets "${D}"/usr/share/${PN}
-	mkdir "${D}"/usr/share/${PN}/etc
-	cp -r etc/xslt "${D}"/usr/share/${PN}/etc/
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/net
-}
-
-pkg_postinst() {
-	elog "Example rulesets can be found under"
-	elog "/usr/share/pmd/rulesets/"
-}
diff --git a/dev-util/premake-3.7 b/dev-util/premake-3.7
new file mode 100644
index 000000000000..9e582a7b8d2d
--- /dev/null
+++ b/dev-util/premake-3.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=A makefile generation tool
+EAPI=5
+HOMEPAGE=http://industriousone.com/premake
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+SLOT=3
+SRC_URI=mirror://sourceforge/premake/premake-src-3.7.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa6e71667f35a62a1732051dfa3ae503
diff --git a/dev-util/premake-4.3-r1 b/dev-util/premake-4.3-r1
new file mode 100644
index 000000000000..098d6101e1ae
--- /dev/null
+++ b/dev-util/premake-4.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A makefile generation tool
+EAPI=5
+HOMEPAGE=http://industriousone.com/premake
+KEYWORDS=amd64 ppc x86
+LICENSE=BSD
+SLOT=4
+SRC_URI=mirror://sourceforge/premake/premake-4.3-src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=90fc4455e20fd09c2bcf38b852fe1a5e
diff --git a/dev-util/premake-4.4_beta5 b/dev-util/premake-4.4_beta5
new file mode 100644
index 000000000000..9ac13acbb0ad
--- /dev/null
+++ b/dev-util/premake-4.4_beta5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A makefile generation tool
+EAPI=6
+HOMEPAGE=https://premake.github.io/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+SLOT=4
+SRC_URI=mirror://sourceforge/premake/premake-4.4-beta5-src.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c5f19e469950cc1d15ee94369df711b5
diff --git a/dev-util/premake-5.0.0_alpha12 b/dev-util/premake-5.0.0_alpha12
new file mode 100644
index 000000000000..533565f7ca50
--- /dev/null
+++ b/dev-util/premake-5.0.0_alpha12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=A makefile generation tool
+EAPI=6
+HOMEPAGE=https://premake.github.io/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+SLOT=5
+SRC_URI=https://github.com/premake/premake-core/archive/v5.0.0-alpha12.tar.gz -> premake-5.0.0_alpha12.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=23381fa150a89fbd0e3199eb4cf13047
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
deleted file mode 100644
index 0171537642d1..000000000000
--- a/dev-util/premake/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX archless.patch 1516 BLAKE2B 6a4b335cc41f466a45170b016da0e26c7d5b955c8d0fdb118bb90370663711ea42e66308e455dbc671eee2a29c4999f2628c416e30491825d8ccac151b3bec65 SHA512 e74f895b24a7bb3da118aa694c35b2473994881ffa6e54ec5a0be450ab55374c0bb418b93fa84b5e30f46a04987c1cb75305463a1a181e458c750d38cafecd04
-DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001
-DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61bfa34c1e30c64aa59a6fed9c4c35aaca996fd0e8b728e839c24e74eae9f23ac3c99406361a061f0fa5dc04ce3ce9aa SHA512 47a2c26d3c45578cb2cbae96ec1b647298824d08584e2610aacd038e21069297a1f5b3366340cf781d29827555ff4d955651f70cdc2d36b99808fddf52e7a242
-DIST premake-5.0.0_alpha12.tar.gz 3548788 BLAKE2B 30f7b0e139ac8b7639c78b06ae139137d4f62b4a7690b180d6c292f57205e7ab352042241735f472d20163c24277b835e9b14e307d66602d5c1bc1a7c65da036 SHA512 6f458fada8af9d93e99f9511b0cf1a2cad87eacf155c8330cab9f830c89aac0ba137ea466b8b2ecfd4a104132c7cd79eefbd06b9780066d27760bc695a4b94a2
-DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4
-EBUILD premake-3.7.ebuild 447 BLAKE2B 9a52bc3e693e3500fe706db1e400ef552961952d06106e43c38fb4ef62c172600469fe266b26a9bd3ef7504164cdebb9db2abbb9f9c96d893b85bb0a9d7fbd93 SHA512 8e77f419f850b861e66e77ac0140fc0de4ead84b23d0abd82ab568d6e9dc06c6537eed6ea2b5db8b3a0b88f44f3b915009ae173f6165c53b56bbc5a0b384d1c8
-EBUILD premake-4.3-r1.ebuild 542 BLAKE2B f342745518422ce67abdde93c690299fa98f1c8d3a9563dcc38c2eecefc5b68345111c72f290211fc5f74be539417bd9f2c04f9f0e88edd508fd6cb62ea5ade4 SHA512 5739291a774abf6b87331f1bad8a4e00d890367194b7254abe6a92e252908e6a5e8698519e3a27154cf8518aaab112797b90171c0db8938703760d79986c6d74
-EBUILD premake-4.4_beta5.ebuild 610 BLAKE2B 576418d3d18c1fc2f3a020368711ae33f19cd65c7e0c9300a084fa165cb57e028ef224c9abc2044801f8c247acf80d79b418dedf69a82f867355446629d93875 SHA512 43709cba1c064040a61423808e75dc5d490807a89cffdae21068fa12855a2f1386be90a4d5c975eab370242b1aba41cfce58e1a92d8e8bb94ecf9d7cb6807d75
-EBUILD premake-5.0.0_alpha12.ebuild 611 BLAKE2B a7d0c3cb4eea07b3831665b6cf33faa5a93b7488759f44aab91babbacf9da6d027877c9a92d6388ad1e20192cda8a94f33830f88942a82e70aec0fcc8095c796 SHA512 5515fee0f01f446f180feadb3a3c045b135f50ae3cf10c7b4cefa252a9703e8ccdb50a0f0e635152be188a79fbfc0c5c8758fe95bca119d946cf8b818a5494be
-MISC metadata.xml 710 BLAKE2B fd0c541cfcf4a44f4ca8d4de869358169d4262f6e1007165229a7d3a22eac9baa7c93da868663cda31a52deb421d0bfd93673d808e56a6ce1600fef9e672c695 SHA512 71522dfe5abaee8ad7ef61db8551ccd59a1060d154531cbe3ee0e4c39cbc0cb6f807aed263d52c2aa6b2e3a04ffe267b40f420d25ba22aac7b5b773af192d6ca
diff --git a/dev-util/premake/files/archless.patch b/dev-util/premake/files/archless.patch
deleted file mode 100644
index 68719bc3669c..000000000000
--- a/dev-util/premake/files/archless.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur premake-4.3.orig/build/gmake.unix/Premake4.make premake-4.3/build/gmake.unix/Premake4.make
---- premake-4.3.orig/build/gmake.unix/Premake4.make	2010-11-16 06:29:14.000000000 -0500
-+++ premake-4.3/build/gmake.unix/Premake4.make	2011-04-18 07:24:59.374986001 -0400
-@@ -26,13 +26,12 @@
-   DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-   INCLUDES  += -I../../src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -Os
--  CXXFLAGS  += $(CFLAGS) 
--  LDFLAGS   += -s -rdynamic
-+  CFLAGS    += $(CPPFLAGS) -Wall
-+  LDFLAGS   += -rdynamic
-   LIBS      += -lm -ldl
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
-   LDDEPS    += 
--  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-+  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
-   define PREBUILDCMDS
-   endef
-   define PRELINKCMDS
-@@ -48,13 +47,12 @@
-   DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-   INCLUDES  += -I../../src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g
--  CXXFLAGS  += $(CFLAGS) 
-+  CFLAGS    += $(CPPFLAGS) -Wall -g
-   LDFLAGS   += -rdynamic
-   LIBS      += -lm -ldl
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
-   LDDEPS    += 
--  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-+  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
-   define PREBUILDCMDS
-   endef
-   define PRELINKCMDS
diff --git a/dev-util/premake/metadata.xml b/dev-util/premake/metadata.xml
deleted file mode 100644
index e57cb3c992f6..000000000000
--- a/dev-util/premake/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>titanofold@gentoo.org</email>
-		<name>Aaron W. Swenson</name>
-	</maintainer>
-	<longdescription lang="en">
-		Describe your software project just once, using Premake's simple and
-		easy to read syntax, and build it everywhere. Generate project files
-		for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
-		Windows, Mac OS X, and Linux. Use the full featured Lua scripting
-		engine to make build configuration tasks a breeze.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">premake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/premake/premake-3.7.ebuild b/dev-util/premake/premake-3.7.ebuild
deleted file mode 100644
index 91026f3efad0..000000000000
--- a/dev-util/premake/premake-3.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="http://industriousone.com/premake"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT=$(get_major_version)
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/${P/p/P}
-
-src_install() {
-	dobin bin/${PN}
-}
diff --git a/dev-util/premake/premake-4.3-r1.ebuild b/dev-util/premake/premake-4.3-r1.ebuild
deleted file mode 100644
index 7aba60fc21ee..000000000000
--- a/dev-util/premake/premake-4.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="http://industriousone.com/premake"
-SRC_URI="mirror://sourceforge/premake/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT=$(get_major_version)
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/archless.patch"
-}
-
-src_compile() {
-	emake -C build/gmake.unix/
-}
-
-src_install() {
-	dobin bin/release/premake4
-}
diff --git a/dev-util/premake/premake-4.4_beta5.ebuild b/dev-util/premake/premake-4.4_beta5.ebuild
deleted file mode 100644
index 68325bfb5d3b..000000000000
--- a/dev-util/premake/premake-4.4_beta5.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
-
-MY_P=${P/_/-}
-
-inherit versionator
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="https://premake.github.io/"
-SRC_URI="mirror://sourceforge/premake/${MY_P}-src.zip"
-
-LICENSE="BSD"
-SLOT=$(get_major_version)
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed 's/$(ARCH) //g' -i build/gmake.unix/Premake4.make || die
-}
-
-src_compile() {
-	emake -C build/gmake.unix/
-}
-
-src_install() {
-	dobin bin/release/premake${SLOT}
-
-	einstalldocs
-}
diff --git a/dev-util/premake/premake-5.0.0_alpha12.ebuild b/dev-util/premake/premake-5.0.0_alpha12.ebuild
deleted file mode 100644
index 77ea240109ba..000000000000
--- a/dev-util/premake/premake-5.0.0_alpha12.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
-
-MY_P=${P/_/-}
-MY_PV=${PV/_/-}
-inherit versionator
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="https://premake.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT=$(get_major_version)
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/${PN}-core-${MY_PV}"
-
-src_compile() {
-	emake -f Bootstrap.mak linux
-}
-
-src_test() {
-	bin/release/premake${SLOT} test || die
-}
-
-src_install() {
-	dobin bin/release/premake${SLOT}
-
-	einstalldocs
-}
diff --git a/dev-util/pretrace-0.4-r1 b/dev-util/pretrace-0.4-r1
new file mode 100644
index 000000000000..93b2a0c22fab
--- /dev/null
+++ b/dev-util/pretrace-0.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=start dynamically linked applications under debugging environment
+EAPI=6
+HOMEPAGE=http://dev.inversepath.com/trac/pretrace
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://dev.inversepath.com/pretrace/libpretrace-0.4.tar.gz
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=3e58a3fda80a67003d78d887b2f1894c
diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
deleted file mode 100644
index 720089bb2f92..000000000000
--- a/dev-util/pretrace/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pretrace-0.4--as-needed.diff 511 BLAKE2B 24e47775031a3a9070a4e4c27432572c5b941029659d08e7123847610af6e71bf7bd12e642e91522e4fe8eea68edbc011c24b06245b3b12fb62016bc935994ec SHA512 f12393152ac127e2edc32e51ae185517d053e9022537f69b0ffb74a95ea86551375b70423e8d661f5bed2c252f035023262da66b128750eb8809dfb4a0e8e8b3
-AUX pretrace-0.4-build.patch 315 BLAKE2B 2747739ef3fb6cc33b431d8b4ed65c72fe8073a324bc575fe4463c26f09796dc86b7baa1f2c497fd9954bd594f00fa53883a60aa2c8fb7259113dad3725dbe76 SHA512 282315443239ea2baa12e125d84c6a768010d57a2a7a5050c887ecb9d20b2df1fdf4f7901d80746b809a008cc83af53f20172a8fedf7bef43b1e4ece13f13b5c
-DIST libpretrace-0.4.tar.gz 7370 BLAKE2B 08fb2022433af807675ef089dcf1fbd642c165b353959f81547c2f65fd9e60c49b7494c661f81698c738bd27a3cdbd28d6a227589ef7a2906c5fa930d9709fc6 SHA512 64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8
-EBUILD pretrace-0.4-r1.ebuild 821 BLAKE2B 7c208871ffb91f64ab7aa944342693bb39b334a11ce00673b39e87bbecef6887f22acc12799a88765cdb720f04199980c0cfd5bfed4860bb1dbde9dd112ba080 SHA512 3a73362df6f543c43d776182d763254eb11d0f8aa522aae409a8709711434b5900cd53ad7fc22d66f9b27f5345ec91c2b8f9f1b9c8398691502eb9fac9ee0b3f
-MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/pretrace/files/pretrace-0.4--as-needed.diff b/dev-util/pretrace/files/pretrace-0.4--as-needed.diff
deleted file mode 100644
index 19b66ed40c09..000000000000
--- a/dev-util/pretrace/files/pretrace-0.4--as-needed.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libpretrace-0.4/Makefile libpretrace-0.4.new/Makefile
---- libpretrace-0.4/Makefile	2005-12-15 12:50:06.000000000 +0000
-+++ libpretrace-0.4.new/Makefile	2006-04-01 23:53:00.000000000 +0100
-@@ -14,7 +14,7 @@
- 	@echo 'type `make install` to install to $(PREFIX)'
- 
- ptgenmap: libpretrace.so ptgenmap.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -g -L. -lpretrace ptgenmap.o -o ptgenmap
-+	$(CC) $(CFLAGS) $(LDFLAGS) -g -L. ptgenmap.o -lpretrace -o ptgenmap
- 
- ptgenmap.o:
- 	$(CC) $(CFLAGS) -Wall -g -fPIC -c ptgenmap.c
diff --git a/dev-util/pretrace/files/pretrace-0.4-build.patch b/dev-util/pretrace/files/pretrace-0.4-build.patch
deleted file mode 100644
index 4d7056fa83f7..000000000000
--- a/dev-util/pretrace/files/pretrace-0.4-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix building with newer glibc
-
-http://bugs.gentoo.org/227923
-
---- pretrace.h
-+++ pretrace.h
-@@ -20,3 +20,8 @@
- #include <sys/time.h>
- # define RANDOMIZE(x) { struct timeval tv; gettimeofday(&tv, NULL); x = tv.tv_usec; }
- #endif
-+
-+#include <unistd.h>
-+#ifndef ARG_MAX
-+# define ARG_MAX sysconf(_SC_ARG_MAX)
-+#endif
diff --git a/dev-util/pretrace/metadata.xml b/dev-util/pretrace/metadata.xml
deleted file mode 100644
index b4a27e94fc24..000000000000
--- a/dev-util/pretrace/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/pretrace/pretrace-0.4-r1.ebuild b/dev-util/pretrace/pretrace-0.4-r1.ebuild
deleted file mode 100644
index 998da63f1052..000000000000
--- a/dev-util/pretrace/pretrace-0.4-r1.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
-inherit readme.gentoo-r1
-
-DESCRIPTION="start dynamically linked applications under debugging environment"
-HOMEPAGE="http://dev.inversepath.com/trac/pretrace"
-SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/lib${P}"
-
-DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
-
-PATCHES=(
-	"${FILESDIR}"/${P}--as-needed.diff
-	"${FILESDIR}"/${P}-build.patch #227923
-)
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man3 /usr/share/man/man8
-	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/promu-0.1.0 b/dev-util/promu-0.1.0
new file mode 100644
index 000000000000..d7b9e177a695
--- /dev/null
+++ b/dev-util/promu-0.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Prometheus Utility Tool
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/promu
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/promu/archive/v0.1.0.tar.gz -> promu-0.1.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=2aced555ccec8a8c2d25e7626299109d
diff --git a/dev-util/promu-0.1.0_p20180227 b/dev-util/promu-0.1.0_p20180227
new file mode 100644
index 000000000000..0f90cabb3300
--- /dev/null
+++ b/dev-util/promu-0.1.0_p20180227
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Prometheus Utility Tool
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/promu
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/promu/archive/5a3cc08574c63bb853a21c570d719a0fb548dae0.tar.gz -> promu-0.1.0_p20180227.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=e4fde6bdad2b8f6d46c99093fe92d4c2
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
deleted file mode 100644
index c25612b344b9..000000000000
--- a/dev-util/promu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST promu-0.1.0.tar.gz 1065003 BLAKE2B f56dfda69dae632b1946182b1a92c059cac52867c677d415c2f321f95800d3902f8f0fbd4d4b670870f3dce34603b0c1a50df9311be70404f27e9f5afbaf4699 SHA512 18ad54b1ec9fe8975a0048b5c85609858cd500a2d3aa34e51e5c2c3d07a0df4337bac9648562e2007d5c8572e07c814c6bba7522b94836c258cde457df5815e2
-DIST promu-0.1.0_p20180227.tar.gz 1068386 BLAKE2B b850c1dfa51f86099bd7e32c131ef99a05d4f4caab441a945fddc9a2895e72b74ed3456f18ab69493fc2283902c570e78f99ea303f32998416fdfbf91c3d0cd8 SHA512 6fbe5fe92602437aee90a442028cd846d9d72179b32e601b6167420dab0a3aed22cd9d1c527320ca54a3cfce7b79167753ad9cbeb000762e845056c692212a74
-EBUILD promu-0.1.0.ebuild 852 BLAKE2B 9233be82753b67b6396d85a6df6f49a7ea34857ee751c3b56dab70a47ce0eb7032d1abedf1d4c36ab83317050468b10598f09bfb2adefbbb43b2c15a5a4f474e SHA512 4bc962ebfd3c78d9e8190fa1c11262e8303d76c6ba95760c1dd1aa4a7d9cb8fbb2e4a8048a22737255e56927e0b09798237252b6cb4548afd97be4dbad1a3877
-EBUILD promu-0.1.0_p20180227.ebuild 898 BLAKE2B 8dff410ec5b0c1b8049f6b5b704076c7a3d190b5f545606f296f95e742d7cf2589d8a972ff4f9875d70c7f6fed7cbd98bafb3421f8f69f15ca297d6a158c340d SHA512 c5679affaaffa1d9bab60d3f0b965381161e94f24e88bfab6f6f19fe3b476ccdcbe7b60e6248235359b85f2f2ff0fa6992af1e13fc3d6112b4049128c6bd4d5c
-MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/metadata.xml b/dev-util/promu/metadata.xml
deleted file mode 100644
index 547d58abc6fd..000000000000
--- a/dev-util/promu/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/promu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/promu/promu-0.1.0.ebuild b/dev-util/promu/promu-0.1.0.ebuild
deleted file mode 100644
index 027fda9afb03..000000000000
--- a/dev-util/promu/promu-0.1.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5e82f2f"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/promu/promu-0.1.0_p20180227.ebuild b/dev-util/promu/promu-0.1.0_p20180227.ebuild
deleted file mode 100644
index 94c084e7161a..000000000000
--- a/dev-util/promu/promu-0.1.0_p20180227.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5a3cc08574c63bb853a21c570d719a0fb548dae0"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT:0:7}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/pscan-20000721-r1 b/dev-util/pscan-20000721-r1
new file mode 100644
index 000000000000..65d44af880ae
--- /dev/null
+++ b/dev-util/pscan-20000721-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-devel/flex
+DESCRIPTION=A limited problem scanner for C source files
+EAPI=0
+HOMEPAGE=http://www.striker.ottawa.on.ca/~aland/pscan/
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b6b3190e6643e1a7cdaa30245a5a52b8
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
deleted file mode 100644
index 7f379a832363..000000000000
--- a/dev-util/pscan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pscan.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
-EBUILD pscan-20000721-r1.ebuild 843 BLAKE2B 3fd9ff6066f1e57413c5c2aa1ec6e69102653d88e6713267b3e70b533bcd68ddde2b5dc84ffc5f169baca72379c116b2ab321b36c47dcf25232f1135f8bb4d3f SHA512 bd81029aeaae61446dbf2f4e8ac3b94b689a51ea30a9b0ef99c9a5435bc6aa90b2a655df5f43db91ab912e9854629fecdaf6bb1499f57e3857af376c4e05d8d7
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/pscan/metadata.xml b/dev-util/pscan/metadata.xml
deleted file mode 100644
index 79d462e85571..000000000000
--- a/dev-util/pscan/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>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
deleted file mode 100644
index 11c078d3650b..000000000000
--- a/dev-util/pscan/pscan-20000721-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=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A limited problem scanner for C source files"
-HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
-# I wish upstream would version their files, even if it's only with a date
-SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-# Does NOT contain a testsuite, but does contain a test.c that confuses src_test
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
-}
-
-src_install() {
-	newbin pscan printf-scan || die
-	dodoc README find_formats.sh test.c wu-ftpd.pscan || die
-}
diff --git a/dev-util/pycharm-community-2017.3.4 b/dev-util/pycharm-community-2017.3.4
new file mode 100644
index 000000000000..333fe95df1cd
--- /dev/null
+++ b/dev-util/pycharm-community-2017.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79d0975818f1e5f1b0d8a2eb4086a0cc
diff --git a/dev-util/pycharm-community-2018.1.4 b/dev-util/pycharm-community-2018.1.4
new file mode 100644
index 000000000000..77b7ba05efcc
--- /dev/null
+++ b/dev-util/pycharm-community-2018.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b4d26318673ea6320117067e95f57da5
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
deleted file mode 100644
index b21efa52806b..000000000000
--- a/dev-util/pycharm-community/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
-DIST pycharm-community-2018.1.4.tar.gz 271284732 BLAKE2B 806fb3774f08cd94ea525a3e3a6de3b1a17f1340e093e897ab185b7e08a4f389b627b5f3b5233421ef6c1468f36ec205bfaac73f3b8f151f57c23f0ce44ad3ea SHA512 00040aa0f6d6cc60837277c1413b155b82ec580c6619d425aeb8c50521c11c17654549901a3c324d335d8818120e1e9e730ec03a03722058aa1064685e17cbce
-EBUILD pycharm-community-2017.3.4.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
-EBUILD pycharm-community-2018.1.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/files/README.gentoo b/dev-util/pycharm-community/files/README.gentoo
deleted file mode 100644
index 2164d9e03ff7..000000000000
--- a/dev-util/pycharm-community/files/README.gentoo
+++ /dev/null
@@ -1,5 +0,0 @@
-According to JetBrains, PyCharm has performance and
-graphics issues with OpenJDK Java.
-
-Please consider using Oracle JDK.
-Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/pycharm-community/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild
deleted file mode 100644
index 5afd45d5ad93..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
deleted file mode 100644
index c37c85ebc8eb..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.1.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
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional-2017.3.4 b/dev-util/pycharm-professional-2017.3.4
new file mode 100644
index 000000000000..0ee1d7c657d0
--- /dev/null
+++ b/dev-util/pycharm-professional-2017.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=amd64 x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98d273247d43b9be91e5e17041e91086
diff --git a/dev-util/pycharm-professional-2018.1.4 b/dev-util/pycharm-professional-2018.1.4
new file mode 100644
index 000000000000..278cf184545c
--- /dev/null
+++ b/dev-util/pycharm-professional-2018.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
deleted file mode 100644
index 1aa33e02d632..000000000000
--- a/dev-util/pycharm-professional/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
-DIST pycharm-professional-2018.1.4.tar.gz 348483306 BLAKE2B d03950a8d91c726f175c51fe512fdedef32a26fc39881ff4651ff09f277e9b7b3c053754e391c760856507b64b0a57128092a9fef5b7d2ab5fbfaac47f3216d2 SHA512 e45623fc0127a5f919015937853a4364344b01f586d5a63cf3605f0eac773228f02326c0714e2c25eb490431716f2b794e191aa01149a07ab87c067f1ff3ce3b
-EBUILD pycharm-professional-2017.3.4.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
-EBUILD pycharm-professional-2018.1.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/files/README.gentoo b/dev-util/pycharm-professional/files/README.gentoo
deleted file mode 100644
index 2164d9e03ff7..000000000000
--- a/dev-util/pycharm-professional/files/README.gentoo
+++ /dev/null
@@ -1,5 +0,0 @@
-According to JetBrains, PyCharm has performance and
-graphics issues with OpenJDK Java.
-
-Please consider using Oracle JDK.
-Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/pycharm-professional/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild
deleted file mode 100644
index 71fdc968f972..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.4.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 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
deleted file mode 100644
index 5dc7e67e051f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.4.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 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/qbs-1.10.1 b/dev-util/qbs-1.10.1
new file mode 100644
index 000000000000..dc2542841b3e
--- /dev/null
+++ b/dev-util/qbs-1.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
+DESCRIPTION=Modern build tool for software projects
+EAPI=6
+HOMEPAGE=https://wiki.qt.io/Qbs
+IUSE=doc examples test
+KEYWORDS=amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
+SLOT=0
+SRC_URI=http://download.qt.io/official_releases/qbs/1.10.1/qbs-src-1.10.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4b29fc2a6a54ca4c8abe264d292c8ec2
diff --git a/dev-util/qbs-1.11.1 b/dev-util/qbs-1.11.1
new file mode 100644
index 000000000000..ab9f103b99fe
--- /dev/null
+++ b/dev-util/qbs-1.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
+DESCRIPTION=Modern build tool for software projects
+EAPI=6
+HOMEPAGE=https://wiki.qt.io/Qbs
+IUSE=doc examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
+SLOT=0
+SRC_URI=http://download.qt.io/official_releases/qbs/1.11.1/qbs-src-1.11.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5f01d370f9d3be0b2afb9e750c6a03fd
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
deleted file mode 100644
index 84dacb172d2e..000000000000
--- a/dev-util/qbs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
-DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
-EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3
-EBUILD qbs-1.11.1.ebuild 3067 BLAKE2B c3e28908a89e224589cb89293c50df616cb5b20b733faf80b47ef2f25a7c7e9f676169d5cfa143de51dd85f5d103ac37dde40878899d992522b693eb548764d0 SHA512 4118b383ab47c790f2354667db16e4f1c689a411efa57dacdded76f42ba8f339485c04923d43fc6a15acb60c5e73640d8036a4ba86a88b8f36f849d79bec74a7
-MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
deleted file mode 100644
index eb2faf769298..000000000000
--- a/dev-util/qbs/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pesa@gentoo.org</email>
-		<name>Davide Pesavento</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<longdescription lang="en">
-	Qbs is a tool that helps simplify the build process for developing
-	projects across multiple platforms. Qbs can be used for any software
-	project, whether it is written in Qt or not.
-
-	Qbs is an all-in-one tool that generates a build graph from a
-	high-level project description (like qmake or cmake) and additionally
-	undertakes the task of executing the commands in the low-level build
-	graph (like make).
-	</longdescription>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://doc.qt.io/qbs/</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
deleted file mode 100644
index 55632d81072a..000000000000
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
-
-	# since 1.10, TestApi is either broken or requires more configuration
-	sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die
-
-	# skip several tests that fail and/or have additional deps
-	sed -i \
-		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
-		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
-		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
-		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	# requires jdk, fails, bug 585398
-	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
-	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${WORKDIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	dodoc -r changelogs
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/qbs/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/qbs/qbs-1.11.1.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild
deleted file mode 100644
index 4971aeed8202..000000000000
--- a/dev-util/qbs/qbs-1.11.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	# the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries
-	sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \
-		static-res.pro || die
-
-	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
-
-	# skip several tests that fail and/or have additional deps
-	sed -i \
-		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
-		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
-		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
-		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	# requires jdk, fails, bug 585398
-	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-	export QBS_AUTOTEST_PROFILE=autotests
-
-	"${S}"/bin/qbs-setup-toolchains --detect || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${WORKDIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	dodoc -r changelogs
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/qbs/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/qdevicemonitor-1.0.1-r1 b/dev-util/qdevicemonitor-1.0.1-r1
new file mode 100644
index 000000000000..aaf27276128f
--- /dev/null
+++ b/dev-util/qdevicemonitor-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-util/android-tools app-pda/usbmuxd
+DESCRIPTION=Crossplatform log viewer for Android, iOS and text files
+EAPI=6
+HOMEPAGE=https://github.com/alopatindev/qdevicemonitor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-util/android-tools app-pda/usbmuxd
+SLOT=0
+SRC_URI=https://github.com/alopatindev/qdevicemonitor/archive/1.0.1.tar.gz -> qdevicemonitor-1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=502eb09a85a46ec0112733893b3e026e
diff --git a/dev-util/qdevicemonitor-9999 b/dev-util/qdevicemonitor-9999
new file mode 100644
index 000000000000..a9e436a5dedf
--- /dev/null
+++ b/dev-util/qdevicemonitor-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-util/android-tools app-pda/usbmuxd >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Crossplatform log viewer for Android, iOS and text files
+EAPI=6
+HOMEPAGE=https://github.com/alopatindev/qdevicemonitor
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-util/android-tools app-pda/usbmuxd
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fab84895c0020da5a0e6f5f83d92ac26
diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
deleted file mode 100644
index 2ca4bd6aedbb..000000000000
--- a/dev-util/qdevicemonitor/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX qdevicemonitor-1.0.1-crash-after-fresh-install.patch 925 BLAKE2B 6c187d5698e6c91045c02e8b643f20fa67e5a41d10807f588339f1fd516234180d07f89b45fa22d2a0bc389c1bed53e0d49a8615a91452973ae2aecbbb30dd7a SHA512 c30026bb388038aeb357498ca1c74ec20f2837a0b6bbbb1cf959fc0645189751ecb6e2b8fd736ebb13ff664af5469ec4e96f2240ea17af8714da44fd7c317916
-AUX qdevicemonitor-1.0.1-qt-5.11.patch 677 BLAKE2B c9a1d69980f83745332ac39f1f6577e911198dc8f438b7ad8ac3d8c93bca8051ebcffcf7262c987b1835e975887cb96606409afca04e5485e2dfc300f14281b8 SHA512 cbdce48375b9e89c176507994746275c2193df0d51b62d5dd2772059a4fea5f360fd00d4176f84274ee2fe31189f418aacac82f124659dec8c348bce6199b408
-DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55
-EBUILD qdevicemonitor-1.0.1-r1.ebuild 1019 BLAKE2B f1a64869a9e5e5989779f824c88fd1aa7d38a3d4aff75ebf16379df1645f545009843900f27de30b432c69225a52cacdcbb143a382beba6f27644dcb2aa91a9a SHA512 de87fe281cd5099e6ad8fa0fdef8c3914362122a6dddc47441428217fc8023d5d9ef9b336db978464131f8ca2567967ed84860b3547874b9c2af0e8e2914e61b
-EBUILD qdevicemonitor-9999.ebuild 919 BLAKE2B a0eee1acf84a3ba82e76b3a42a315352da8bdcb25e6f078a4ead7e90c9829efc3eb0da08f4657b5bb569161b910f1fc6e8ab1d584817e62bd2564396bfbb6466 SHA512 6f82903b9aefcef70c88766a5907e1dd14ec1bbdd9163eec724b8c6cb6c23e2ab0375796f443c73fd1944d1dbb0782c8c2a32a426a07becaefe06e38e0423f70
-MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch
deleted file mode 100644
index 00c4dc1cdf3f..000000000000
--- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 079bc4cf3a59a98c429b1db21fcf3f88c19d2bb5 Mon Sep 17 00:00:00 2001
-From: Alexander Lopatin <alopatindev@gmail.com>
-Date: Fri, 13 Jul 2018 18:37:42 +0300
-Subject: [PATCH] fix crash that happens after fresh installation
-
----
- qdevicemonitor/devices/DeviceFacade.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qdevicemonitor/devices/DeviceFacade.cpp b/qdevicemonitor/devices/DeviceFacade.cpp
-index ced04b3..6df67eb 100644
---- a/qdevicemonitor/devices/DeviceFacade.cpp
-+++ b/qdevicemonitor/devices/DeviceFacade.cpp
-@@ -151,8 +151,8 @@ void DeviceFacade::loadSettings(const QSettings& s)
-     if (darkTheme.isValid())
-     {
-         m_darkTheme = darkTheme.toBool();
--        m_colorTheme = ColorTheme::create(m_darkTheme);
-     }
-+    m_colorTheme = ColorTheme::create(m_darkTheme);
- 
-     const QVariant clearAndroidLog = s.value("clearAndroidLog");
-     if (clearAndroidLog.isValid())
--- 
-2.16.4
-
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch
deleted file mode 100644
index 47d9a017f7a9..000000000000
--- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5da5c11ff84cc293b5db3a0d7ba09c62b3db94a8 Mon Sep 17 00:00:00 2001
-From: Alexander Lopatin <alopatindev@gmail.com>
-Date: Fri, 13 Jul 2018 18:30:21 +0300
-Subject: [PATCH] fix Qt 5.11 specific issue https://bugs.gentoo.org/660932
-
----
- qdevicemonitor/ui/MainWindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp
-index c1bf263..fc22b4d 100644
---- a/qdevicemonitor/ui/MainWindow.cpp
-+++ b/qdevicemonitor/ui/MainWindow.cpp
-@@ -31,6 +31,7 @@
- #include <QProcess>
- #include <QSettings>
- #include <QStringList>
-+#include <QTabBar>
- #include <QtCore/QStringBuilder>
- 
- #if defined(Q_OS_WIN32)
--- 
-2.16.4
-
diff --git a/dev-util/qdevicemonitor/metadata.xml b/dev-util/qdevicemonitor/metadata.xml
deleted file mode 100644
index acda2b8dd0ff..000000000000
--- a/dev-util/qdevicemonitor/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>alopatindev@gmail.com</email>
-		<name>Alexander Lopatin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">alopatindev/qdevicemonitor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild
deleted file mode 100644
index 1b9b31c6c9dd..000000000000
--- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
-HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
-else
-	SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-util/android-tools
-	app-pda/usbmuxd"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-crash-after-fresh-install.patch
-)
-
-src_configure() {
-	cd "${PN}" || die
-	export VERSION_WITH_BUILD_NUMBER="${PV}"
-	eqmake5
-}
-
-src_compile() {
-	cd "${PN}" || die
-	emake
-}
-
-src_install() {
-	dobin "${PN}/${PN}"
-	dodoc README.md
-	newicon -s scalable "icons/app_icon.svg" "${PN}.svg"
-	domenu "icons/${PN}.desktop"
-}
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
deleted file mode 100644
index c055bb2fca97..000000000000
--- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
-HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
-else
-	SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-util/android-tools
-	app-pda/usbmuxd"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	cd "${PN}" || die
-	export VERSION_WITH_BUILD_NUMBER="${PV}"
-	eqmake5
-}
-
-src_compile() {
-	cd "${PN}" || die
-	emake
-}
-
-src_install() {
-	dobin "${PN}/${PN}"
-	dodoc README.md
-	newicon -s scalable "icons/app_icon.svg" "${PN}.svg"
-	domenu "icons/${PN}.desktop"
-}
diff --git a/dev-util/qmtest-2.4.1-r1 b/dev-util/qmtest-2.4.1-r1
new file mode 100644
index 000000000000..8f911a705fec
--- /dev/null
+++ b/dev-util/qmtest-2.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=CodeSourcery's test harness system
+EAPI=6
+HOMEPAGE=http://www.codesourcery.com/qmtest/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.codesourcery.com/public/qmtest/qmtest-2.4.1/qmtest-2.4.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=909ff4d6edac7a36102c8f7c2d785e2e
diff --git a/dev-util/qmtest/Manifest b/dev-util/qmtest/Manifest
deleted file mode 100644
index 12e296ad4909..000000000000
--- a/dev-util/qmtest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qmtest-2.4.1.tar.gz 2792290 BLAKE2B 315ae4f79630d367e9b8198811975600f43eec3c2e9cb253fce2523f92a59536a23a7c299094b060292c9719f6edcae521faa4a300b367a226da8597b6fbaac9 SHA512 01a8b317fd5ae3d653b81d031005975d745829eda4b7d4d57c85cc13b71c142213dce053ba13999bf42a1b9b17118075e2c244c67e5c4c8a957d35d2850ae372
-EBUILD qmtest-2.4.1-r1.ebuild 806 BLAKE2B e653e73b7d574ad8bd7b9d770363804a17b305c572ca07287b351a83f7158775e419c86e8ac6a11765ba9fb35f67c8d732cfa8ef3cf3a1e488dc5b93ac1e6846 SHA512 ba57ad071066f58d69058edffbeebec874daf0317cfbd3cb32ecdb817333d6d2aee4798e1c1d48f11c4c75a785a6747a5d19c38a422892e2a5cda6adcfb12e89
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/qmtest/metadata.xml b/dev-util/qmtest/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/qmtest/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/dev-util/qmtest/qmtest-2.4.1-r1.ebuild b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
deleted file mode 100644
index 93ad4a8feb92..000000000000
--- a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="CodeSourcery's test harness system"
-HOMEPAGE="http://www.codesourcery.com/qmtest/"
-SRC_URI="http://www.codesourcery.com/public/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	find "${ED}" -name config.py -print0 | xargs -0 sed -i "s:${ED}:${EPREFIX}/usr:"
-	rm -r "${ED}"usr/share/doc/${PN}/{COPYING,LICENSE.OPL} || die
-	mv "${ED}"usr/share/doc/${PN}/* "${ED}"usr/share/doc/${PF} || die
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-util/qstlink2-1.2.3 b/dev-util/qstlink2-1.2.3
new file mode 100644
index 000000000000..6515b0922c15
--- /dev/null
+++ b/dev-util/qstlink2-1.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1 virtual/pkgconfig
+DESCRIPTION=GUI and CLI ST-Link V2(Debugger/Programmer) client
+EAPI=6
+HOMEPAGE=https://github.com/fpoussin/QStlink2/
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_md5_=82f8c613bd2089d019449e825431dd83
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
deleted file mode 100644
index 5fc1f1ee4678..000000000000
--- a/dev-util/qstlink2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
-DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
-EBUILD qstlink2-1.2.3.ebuild 899 BLAKE2B b1d806b3e66a3903bb89fe8b7ea327bef879f08a4d073cafe64dae432ca2abb261e73f6775e213615002cd967220436ccdb1a13ed950c0ea42317620adfeb9f6 SHA512 76821723e8d535eacf61cc7519922ef064f98a04a8f2a22263a3d2e7c01c6bdf99e1afe3088e20ef4b6de75e1c6b5648cc953cd76184eef6944a2b3159aba63f
-MISC metadata.xml 626 BLAKE2B ba349e967f446ed21c1df37f7433be4e009f28a161745fbc3b886544820f17b4e0c3fce00f411b2e0308106d0c19f821ef3ce83e0c44b8e522640b13081131a4 SHA512 5b086323c16218c71c03a9dff91e7c95a3be54c82a871ce3e653a5208876c08d18e4292e9126e49224e65b93315ec2e3ae82a09eede155c5f705e432ac8603a1
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
deleted file mode 100644
index a8644ee61d15..000000000000
--- a/dev-util/qstlink2/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>no111u3@gmail.com</email>
-		<name>Boris Vinogradov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
-
-		It is developped using QT and LibUsb/WinUsb. 
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mobyfab/qstlink2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/qstlink2/qstlink2-1.2.3.ebuild b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
deleted file mode 100644
index 680f49ef0ce4..000000000000
--- a/dev-util/qstlink2/qstlink2-1.2.3.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
-
-QTUSB_VER=0.2.1
-inherit qmake-utils udev
-
-DESCRIPTION="GUI and CLI ST-Link V2(Debugger/Programmer) client"
-HOMEPAGE="https://github.com/fpoussin/QStlink2/"
-SRC_URI="https://github.com/fpoussin/QStlink2/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/fpoussin/QtUsb/archive/v${QTUSB_VER}.tar.gz -> qtusb-${QTUSB_VER}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/QStlink2-${PV}"
-
-src_prepare() {
-	rmdir QtUsb || die
-	mv "${WORKDIR}/QtUsb-${QTUSB_VER}" QtUsb || die
-
-	default
-
-	sed -i QStlink2.pro -e "s:/etc/udev:$(get_udevdir):" || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/dev-util/quilt-0.50 b/dev-util/quilt-0.50
new file mode 100644
index 000000000000..266f65b7c246
--- /dev/null
+++ b/dev-util/quilt-0.50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup unpack
+DESCRIPTION=quilt patch manager
+EAPI=0
+HOMEPAGE=https://savannah.nongnu.org/projects/quilt
+IUSE=emacs graphviz
+KEYWORDS=amd64 arm ppc ppc64 sparc x86
+LICENSE=GPL-2
+PDEPEND=emacs? ( app-emacs/quilt-el )
+RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) >=sys-apps/coreutils-8.5
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.50.tar.gz
+_eclasses_=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_=ca1d7ca85d522e04941445729e23b8d5
diff --git a/dev-util/quilt-0.63 b/dev-util/quilt-0.63
new file mode 100644
index 000000000000..ff6c4b0027f1
--- /dev/null
+++ b/dev-util/quilt-0.63
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DESCRIPTION=quilt patch manager
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/quilt
+IUSE=emacs graphviz elibc_Darwin elibc_SunOS
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+PDEPEND=emacs? ( app-emacs/quilt-el )
+RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Darwin? ( app-misc/getopt ) elibc_SunOS? ( app-misc/getopt ) >=sys-apps/coreutils-8.5
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.63.tar.gz
+_eclasses_=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_=388efeccec4fc301fa07a5f7afba02b7
diff --git a/dev-util/quilt-0.65 b/dev-util/quilt-0.65
new file mode 100644
index 000000000000..aa9071973986
--- /dev/null
+++ b/dev-util/quilt-0.65
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DESCRIPTION=quilt patch manager
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/quilt
+IUSE=emacs graphviz elibc_Darwin elibc_SunOS
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+PDEPEND=emacs? ( app-emacs/quilt-el )
+RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Darwin? ( app-misc/getopt ) elibc_SunOS? ( app-misc/getopt ) >=sys-apps/coreutils-8.5
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.65.tar.gz
+_eclasses_=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_=a77c6b771bdbd4cb8ec972b30ae6ad8d
diff --git a/dev-util/quilt-9999 b/dev-util/quilt-9999
new file mode 100644
index 000000000000..e0719c99f602
--- /dev/null
+++ b/dev-util/quilt-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=dev-vcs/git
+DESCRIPTION=quilt patch manager
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/quilt
+IUSE=graphviz elibc_Darwin elibc_SunOS
+LICENSE=GPL-2
+RDEPEND=dev-util/diffstat mail-mta/sendmail sys-apps/ed elibc_Darwin? ( app-misc/getopt ) elibc_SunOS? ( app-misc/getopt ) >=sys-apps/coreutils-8.5 graphviz? ( media-gfx/graphviz )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e29ebe7975f6cc95613da52042ca1b7f
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
deleted file mode 100644
index 2adcaf62f008..000000000000
--- a/dev-util/quilt/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX quilt-0.50-no-graphviz.patch 1477 BLAKE2B f070303e072b26bb70de578277ee9fcfa56975d6c4a3927835f0d3a17d3c40bea5e57ce5863c5f91939e6b0f8ff9b63ebbd039458b474591fc3e545efb4e1515 SHA512 281c3f080e6ce6d4fd38e881b5cf111bc8313a9171a1c93edf9393b4f33eb0bd4fdb4c1b1df2cc888391acc6016c0eae9183948f5a76b8dc492e2ebb99f84f98
-AUX quilt-0.63-bash-completion.patch 584 BLAKE2B 68b9a9aa31b7c59ae32661877629b98c65660cd87d8ef2f3c7787f61acb5d6835ee385b8cef6a6dd611f1f819bb3bec5f5a1866db901c37a721d6b07e9eadf39 SHA512 6ec0a3d36d347573f791c7a8217f65a46c35b7fa510a5092b4d425814656f4ef0d9318da42020dc059caeaa631f13d3c5780bbb3ad19e20c87b60a60d32a7bc8
-AUX quilt-0.63-no-graphviz.patch 1431 BLAKE2B 09823c8292e031a0c660210a7b98abb09d7697603611879319dac49118ea8901ebbdcbe0f60faa100670578eeec5fe8e15a78217bab45b52e7fa890b4bd4d880 SHA512 9e66299df9e83f8d89d25b9d72fccff60c2ada37029f3542667c267527fc4b9f36101c752b8393b137553e7ac277ee344158ca131e931c1a61103621ae4a7027
-AUX quilt-0.65-no-graphviz.patch 1482 BLAKE2B 5ab4cd1b728c61582c513229303e9b4eb0c0a10942ec810546da26c4372c9b41521817d1f5a133a5e3c3906c194458d027316e97f7d3a364cc05696966482355 SHA512 4a70ac2abf6e7f2a63d138035ca5a8194bf4fbee5ee2f7be8c3587cbc94104ffb7abca89e37b2b3bfe9063554bab358a86adb92e553ad72099d8baf35b48444d
-DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
-DIST quilt-0.63.tar.gz 389593 BLAKE2B b7aa02819e10d61f45615f3b4beaba993e5a08ee99440d015d1c7a46f34affac391e44a8f75c682d4833055388e27214acaf96533a93728cc0c7863fc74e9722 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45
-DIST quilt-0.65.tar.gz 410780 BLAKE2B 14b0a36afac1376b18e2bcfb672ea3d497a996223dae2cfa966684eda8e819f9d9bfc87f8307dd2c3a3e4246804ca239725325f9e57a5b60986d6f60ea02fbfc SHA512 37dffe34fe209371f2fbc0af2dbb4dcfa6edd2221aed15f31a0651a0bd457f2af03a98450a3e63406f70e040e944246e5b23733b820665eeb3fd4ff2bdde3a08
-EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.63.ebuild 1934 BLAKE2B e921625ccce5e227def5d9b5bb942a7bee3acb7193ff28cdcac545a2fbc2a34f4ec3dd6caa66a8ffa41ffbac88dfb9bd3e963abf9340409b7acd2f2a9b810c0b SHA512 5d60f84f0fa3abd6e15f428182523f9417b5541c3301374b60bfe3704aa2e488628d501f1dffd47028db92de44e95c8fc2e89217d9fe789faff7f56d6c636082
-EBUILD quilt-0.65.ebuild 1647 BLAKE2B 241059eba66ff1af2c563bef7a12cd44e87667e4f1a2260e55c4af1b95fbf4f057d71f0b0c34c21ceb6eab1c0cec0ceaf43e704442e1d5e53052475d743c1c6e SHA512 7be1c157aac11b74de9fe6bd2bb18719f9b5428f58ce8b9d1b1277eeba0f130f591c9815836c6d60004d8774bb5f463aaacdd9ae479ceaa00374fb73bcee49b3
-EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
-MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
deleted file mode 100644
index 04e0d7d3a9a1..000000000000
--- a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
--		remove-trailing-ws
-+SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
-Index: b/bash_completion
-===================================================================
---- a/bash_completion
-+++ b/bash_completion
-@@ -95,7 +95,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands 
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
-           grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -189,19 +189,6 @@ _quilt_completion()
- 	        ;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
deleted file mode 100644
index c85caca5c9e1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bash_completion.orig	2014-10-21 18:15:29.549789267 -0400
-+++ bash_completion	2014-10-21 18:15:38.489789221 -0400
-@@ -11,8 +11,6 @@
- # completion to work then you must set QUILT_PC in your global environment
- # (for example in ~/.profile) and not just in your quiltrc file.
- 
--if type quilt &> /dev/null ; then
--
- if ! type _expand &> /dev/null ; then
-     # This function expands tildes in pathnames
-     #
-@@ -310,5 +308,3 @@ _quilt_completion()
- && _quilt_complete_opt="-o filenames"
- complete -F _quilt_completion $_quilt_complete_opt quilt
- unset -v _quilt_complete_opt
--
--fi
diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
deleted file mode 100644
index 80458120f4f1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2014-10-21 17:08:25.639810130 -0400
-+++ Makefile.in	2014-10-21 17:09:03.269809935 -0400
-@@ -79,8 +79,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN :=  patchfns inspect edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2014-10-21 17:09:08.789809906 -0400
-+++ bash_completion	2014-10-21 17:09:53.189809676 -0400
-@@ -100,7 +100,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
- 	  grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -194,19 +194,6 @@ _quilt_completion()
- 		;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--		COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--		COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch b/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
deleted file mode 100644
index ea06a9eebefb..000000000000
--- a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2017-04-12 09:27:40.853018901 -0400
-+++ Makefile.in	2017-04-12 09:36:16.584315529 -0400
-@@ -78,8 +78,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect-wrapper dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2017-04-12 09:27:57.643126246 -0400
-+++ bash_completion	2017-04-12 09:30:27.673938451 -0400
-@@ -28,7 +28,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
- 	  grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied upgrade'
- 
-@@ -122,19 +122,6 @@ _quilt_completion()
- 		;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--		COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--		COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   type _longopt &> /dev/null && _longopt grep
- 	   COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
deleted file mode 100644
index 8c8d3c0814eb..000000000000
--- a/dev-util/quilt/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/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
deleted file mode 100644
index d5d270c6d424..000000000000
--- a/dev-util/quilt/quilt-0.50.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="emacs graphviz"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
-
-	rm -rf "${D}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${D}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${D}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
deleted file mode 100644
index ea76c38419cf..000000000000
--- a/dev-util/quilt/quilt-0.63.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_prepare() {
-
-	# Apply bash-competion patch see bug #526294
-	epatch "${FILESDIR}/${P}-bash-completion.patch"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.65.ebuild b/dev-util/quilt/quilt-0.65.ebuild
deleted file mode 100644
index 40ccf8926d5c..000000000000
--- a/dev-util/quilt/quilt-0.65.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-}
-
-src_prepare() {
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
deleted file mode 100644
index 4a4042e9a2f0..000000000000
--- a/dev-util/quilt/quilt-9999.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
-
-EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
-
-[[ ${PV} == 9999 ]] && inherit git-2
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-[[ ${PV} == 9999 ]] || SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="graphviz elibc_Darwin elibc_SunOS"
-
-RDEPEND="
-	dev-util/diffstat
-	mail-mta/sendmail
-	sys-apps/ed
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5
-	graphviz? ( media-gfx/graphviz )
-"
-
-src_prepare() {
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${PN}-0.60-no-graphviz.patch"
-
-	# remove failing test, because it fails on root-build
-	rm -rf test/delete.test
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${ED}" install
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
-
-pkg_postinst() {
-	if ! has_version app-emacs/quilt-el ; then
-		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
-	fi
-}
diff --git a/dev-util/radare2-2.6.0 b/dev-util/radare2-2.6.0
new file mode 100644
index 000000000000..56fbdda39caf
--- /dev/null
+++ b/dev-util/radare2-2.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~x86 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/2.6.0.tar.gz -> radare2-2.6.0.tar.gz
+_eclasses_=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_=30e0ae7494cb68796826b3344e84b5ec
diff --git a/dev-util/radare2-2.7.0 b/dev-util/radare2-2.7.0
new file mode 100644
index 000000000000..1d52102e2430
--- /dev/null
+++ b/dev-util/radare2-2.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~x86 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/2.7.0.tar.gz -> radare2-2.7.0.tar.gz
+_eclasses_=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_=696da5a1e64914a0124604a83a76e9ff
diff --git a/dev-util/radare2-9999 b/dev-util/radare2-9999
new file mode 100644
index 000000000000..556fa2dcde7c
--- /dev/null
+++ b/dev-util/radare2-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install unpack
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl +system-capstone
+LICENSE=GPL-2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= )
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0c955d70dd15626dd5691dbccbf3d7ee
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
deleted file mode 100644
index c6fd0b36506b..000000000000
--- a/dev-util/radare2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
-DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
-DIST radare2-2.7.0.tar.gz 6483865 BLAKE2B 4052a601eb154240fb57c64bf2351063685a25e7d8ca46ad721398cd98b5e8bbec6a6daccb9f2df8e222bad74a0ffb4edc72186d7ca51b69ffbf480a7eb576ba SHA512 4a40e4917967aeef34de6ea69dd3c6d07a215e1f1272221db9af92d898e2d44997e339016b3342d69a276eb99f2d0a1e640ce8e9c889fe728dd86865e917a0fd
-EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
-EBUILD radare2-2.7.0.ebuild 1128 BLAKE2B b5491982ca5801b848892d5c6d9b06cf52f1faba10aef11a4da986ff39d554af7f4bf8dbe848901050d8878460c09c239de88093ee16ce9cc0ad380bb469d3ec SHA512 941c05b0ab8db1a3fdf0752754340b2dc0c3cb48ae373c6bcb9f5f5a52407a31dc03b715b00df6895c0e181ca57f06366384d259fb79f0b745cd3e0dc26ab651
-EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
-MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
deleted file mode 100644
index 4eb3c053f07a..000000000000
--- a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3752d992f3140806ea1d513739b6f23addf52df1 Mon Sep 17 00:00:00 2001
-From: cc <longlene@gmail.com>
-Date: Tue, 22 May 2018 12:52:12 +0800
-Subject: [PATCH] fix for build with syscapstone
-
----
- libr/Makefile | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/libr/Makefile b/libr/Makefile
-index 05cb40fec7..0b39b48c02 100644
---- a/libr/Makefile
-+++ b/libr/Makefile
-@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
- #E+=../shlr/sdb/src/libsdb.${EXT_AR}
- #endif
- 
-+ifeq ($(USE_CAPSTONE),1)
-+E+=$(CAPSTONE_LDFLAGS)
-+else
-+E+=../shlr/capstone/libcapstone.${EXT_AR}
-+endif
-+
- libr.${EXT_SO}: .libr
- 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
- 		.libr/*.o \
- 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
- 		../shlr/zip/librz.${EXT_AR} \
--		../shlr/libr_shlr.${EXT_AR} $(E)\
--		../shlr/capstone/libcapstone.${EXT_AR}
-+		../shlr/libr_shlr.${EXT_AR} $(E)
- 
- else
- 
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
deleted file mode 100644
index dc1faaf6b746..000000000000
--- a/dev-util/radare2/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>davidroman96@gmail.com</email>
-		<name>David Roman</name>
-	</maintainer>
-	<use>
-		<flag name='system-capstone'>Use <pkg>dev-libs/capstone</pkg> instead of bundled copy.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/radare2/radare2-2.6.0.ebuild b/dev-util/radare2/radare2-2.6.0.ebuild
deleted file mode 100644
index 74ac2faaaf52..000000000000
--- a/dev-util/radare2/radare2-2.6.0.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
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-syscapstone-2.6.patch" )
-
-src_configure() {
-	econf \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-2.7.0.ebuild b/dev-util/radare2/radare2-2.7.0.ebuild
deleted file mode 100644
index 44da1cbab237..000000000000
--- a/dev-util/radare2/radare2-2.7.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 bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
deleted file mode 100644
index abe520e9a37a..000000000000
--- a/dev-util/radare2/radare2-9999.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 eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl +system-capstone"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/ragel-6.10 b/dev-util/ragel-6.10
new file mode 100644
index 000000000000..559037d6b9df
--- /dev/null
+++ b/dev-util/ragel-6.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+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
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=5
+HOMEPAGE=http://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.colm.net/files/ragel/ragel-6.10.tar.gz
+_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_=2ec0568aabe7a91bd79730410a85f9e3
diff --git a/dev-util/ragel-6.7-r1 b/dev-util/ragel-6.7-r1
new file mode 100644
index 000000000000..d3868a6b83cb
--- /dev/null
+++ b/dev-util/ragel-6.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+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
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=4
+HOMEPAGE=http://www.complang.org/ragel/
+IUSE=vim-syntax
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.complang.org/ragel/ragel-6.7.tar.gz
+_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_=999b90077a9a75534eda6c088f875640
diff --git a/dev-util/ragel-6.8 b/dev-util/ragel-6.8
new file mode 100644
index 000000000000..b7a167a70f48
--- /dev/null
+++ b/dev-util/ragel-6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+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
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=5
+HOMEPAGE=http://www.complang.org/ragel/
+IUSE=vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.complang.org/ragel/ragel-6.8.tar.gz
+_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_=fe114e879d1651ecc7eb64784ff79cc5
diff --git a/dev-util/ragel-6.9 b/dev-util/ragel-6.9
new file mode 100644
index 000000000000..cb23b8befad7
--- /dev/null
+++ b/dev-util/ragel-6.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+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
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=5
+HOMEPAGE=http://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.colm.net/files/ragel/ragel-6.9.tar.gz
+_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_=2ade772a9494a062f66369d42f54b7f1
diff --git a/dev-util/ragel-7.0.0.10 b/dev-util/ragel-7.0.0.10
new file mode 100644
index 000000000000..2244026c30a7
--- /dev/null
+++ b/dev-util/ragel-7.0.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=~dev-util/colm-0.13.0.5
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-util/colm-0.13.0.5
+SLOT=0
+SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.10.tar.gz
+_md5_=64eb79a47a3bbc1a85d57e5d8cdb50e2
diff --git a/dev-util/ragel-7.0.0.10-r1 b/dev-util/ragel-7.0.0.10-r1
new file mode 100644
index 000000000000..12ff603b6c76
--- /dev/null
+++ b/dev-util/ragel-7.0.0.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=~dev-util/colm-0.13.0.5 >=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=Compiles finite state machines from regular languages into executable code
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-util/colm-0.13.0.5
+SLOT=0
+SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.10.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=48fcb4b3b25d43f54b79d4ac07297671
diff --git a/dev-util/ragel-7.0.0.9 b/dev-util/ragel-7.0.0.9
new file mode 100644
index 000000000000..32d20b8ec0d7
--- /dev/null
+++ b/dev-util/ragel-7.0.0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=~dev-util/colm-0.13.0.4
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-util/colm-0.13.0.4
+SLOT=0
+SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.9.tar.gz
+_md5_=9c4afdb751130c04c29a82dd6f0447bb
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
deleted file mode 100644
index 2725e5d196cd..000000000000
--- a/dev-util/ragel/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
-AUX ragel-6.7-cross-compile.patch 576 BLAKE2B f284c71ecc8d801873e814f863eeb4315646b58e07e379844cbd5b5592774829b8ae7234361f64c6e459eb8d94a90b617a35fbd566da69a80544fa1a7a5bf3ca SHA512 0ab26720537bdb77194159145d5fc2e01ee96f3d197d947693141e0559e18b4da3ac7b058d7de4a9d4d9cf9c4ab63649839da359ed3aabcb5ea7163ec975d5b1
-AUX ragel-6.9-gcc6.patch 1902 BLAKE2B be17303b0e4af5edc2b9f97eca8ce4505a0f98ce7797b35bd341f8f09bb9f12845f190ad56ae9638d4d24de80ae15936acb4faffd8c6501ddbd51ebd93d61503 SHA512 3258201336296fd8d0ae7e3008ddbcee9112023801e7ba280de09398bbf7bcf4010e3f5d3e819bff7cdefb26a346e361be84fe5c84354fe03302e5bd9fb92c68
-AUX ragel-7.0.0.10-use-pkginclude.patch 1143 BLAKE2B 980f0248e9f33955b4653fb1a38aa7aa5ec10584650947e85592f9a9ef0a67c41020dca29fad57ab101e98f45c217d332933931ac7da68cb3ea5d3bbc2f02d9a SHA512 44ee69205b87c22d17b5cc419fba96bd69c9b3d4f8fc8133041b9d71b9aae434b1528bdbdcfe15825d663c1d441d6cce97d0586c4bfae58ff5d687b1c156529f
-DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
-DIST ragel-6.7.tar.gz 1182734 BLAKE2B 7a74d58ddee776c5652563d2b804c12fa89d23ab98d743967ff8948d3506266c464b413ced8a2e251cd62e945947778232f483706bbdd87717190a45a9ad088c SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a
-DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292efd94b6c722904c05e30b621f754881f07252c76b0bd3af63c65ce50b8ec98d43e1eec5c1a66ef2593506c7 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458
-DIST ragel-6.9.tar.gz 1226871 BLAKE2B c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72 SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
-DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
-DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
-EBUILD ragel-6.10.ebuild 957 BLAKE2B e4d5820035a3758a9cf4feca708ed4fbce3cdf0d4d4cd8b81b3fd620f25b8eea1e636a86e4f9fc1af5c835d7affcf715b72bb6cbf851017f4ddc1dcd039020da SHA512 764798a04e31436b6026837062c24ea426c0ea81aaa8dd4859b2b8f4b378f636f4078b8cc4a8b3a71cadce7e8ecc8ba436792098b513a396160249f5d019db99
-EBUILD ragel-6.7-r1.ebuild 1152 BLAKE2B 752eab3a8005ccd511727ed5f533560bdeac7d740d19362896c3b54e012a9a5c094bad5227e30920709a332dae2af48558abebf734e51b5b59b04da869ecfdf2 SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822
-EBUILD ragel-6.8.ebuild 1094 BLAKE2B be60938645339d483e12693638a81e77c04c7c4c7799d73de103076c8d7e95ce4c3b6e0e167996c97e5f2f1e65f4f7cecbb300e4b3676f4b198ef1312cb94b86 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce
-EBUILD ragel-6.9.ebuild 1008 BLAKE2B 07f6911e9117b311333b373b2ae9f8e178ddb6417e7ff06f8ba46260eb3c32995647b369a6cebc3a0610766aa54f20fa17ca320d8834fc7dd35a5bdd7786182d SHA512 539763d6d3b96efc6d47b82474126058859e176050380521c473211927c074cb98256050ece6557e7692867fd571d82f8fd2bb0cb03e4855aff7b8ebb060f51e
-EBUILD ragel-7.0.0.10-r1.ebuild 739 BLAKE2B 170c9d6ae61819b4465b71bd6632ff2d5adfed8780a2cc3e57ed9c866edff0fbbc9556f53311cd0d64d13261fc3b7219378a9ed550eab13bb030e8ff5f44b54f SHA512 266e4cccf2141c450a9d07ddc19a70573084ca2fcb2c62a4b0f5751f9ebc87b300c35465c453abf5561d89e3704ed1404d6609109e233cdf3ddaff1a00edb32e
-EBUILD ragel-7.0.0.10.ebuild 627 BLAKE2B 929253ed83851fb333bc6c31b565b83dc30d8b02e6377824945d642a807b5ff5d8e5ea890a33f0601e0f5732c46e213c6aae93f51d19e33b5d209d3b98a9a59a SHA512 023290b91413f0a249aa409de73a22ab622290c81281f699187ea64ceb6393819a9e0e4b9b2eecaf5c25d519d09ba080f7bfbe085dc86c228ab3f7400980d9d5
-EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
-MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f05..000000000000
--- a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-
----
-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aapl/avlcommon.h  |   12 ++++++------
- aapl/bstcommon.h  |   16 ++++++++--------
- aapl/bubblesort.h |    2 +-
- aapl/mergesort.h  |    2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
---- a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()),
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
-index 888717f..7c53ff3 100644
---- a/aapl/bstcommon.h
-+++ b/aapl/bstcommon.h
-@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
-index bcc2fb6..f0f4ce5 100644
---- a/aapl/bubblesort.h
-+++ b/aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
-diff --git a/aapl/mergesort.h b/aapl/mergesort.h
-index 68b8426..8cefa73 100644
---- a/aapl/mergesort.h
-+++ b/aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
--- 
-1.7.8.6
-
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
deleted file mode 100644
index e953a1aeeeef..000000000000
--- a/dev-util/ragel/files/ragel-6.7-cross-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/473970
-
-already sent upstream
-
-patch by Jungshik Shin
-
---- ragel-6.7/configure.in
-+++ ragel-6.7/configure.in
-@@ -27,9 +27,9 @@
- 
- dnl Choose defaults for the build_parsers and build_manual vars. If the dist
- dnl file is present in the root then default to no, otherwise go for it.
--AC_CHECK_FILES( $srcdir/DIST, 
--	[ . $srcdir/DIST; ], 
--	[ build_parsers=yes; build_manual=yes; ] )
-+
-+AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
-+       build_manual=yes])
- 
- dnl
- dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/files/ragel-6.9-gcc6.patch b/dev-util/ragel/files/ragel-6.9-gcc6.patch
deleted file mode 100644
index fb10d9fd2b79..000000000000
--- a/dev-util/ragel/files/ragel-6.9-gcc6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Bug: https://bugs.gentoo.org/582606
-
---- a/ragel/common.cpp
-+++ b/ragel/common.cpp
-@@ -34,7 +34,7 @@
- 	{ "int",      0,       "int",     true,   true,  false,  INT_MIN,   INT_MAX,    sizeof(int) },
- 	{ "unsigned", "int",   "uint",    false,  true,  false,  0,         UINT_MAX,   sizeof(unsigned int) },
- 	{ "long",     0,       "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,   sizeof(long) },
--	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         ULONG_MAX,  sizeof(unsigned long) }
-+	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,  sizeof(unsigned long) }
- };
- 
- #define S8BIT_MIN  -128
-@@ -87,7 +87,7 @@
- 	{ "int32",   0,  "int32",   true,   true,  false,  S32BIT_MIN, S32BIT_MAX,  4 },
- 	{ "uint32",  0,  "uint32",  false,  true,  false,  U32BIT_MIN, U32BIT_MAX,  4 },
- 	{ "int64",   0,  "int64",   true,   true,  false,  S64BIT_MIN, S64BIT_MAX,  8 },
--	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, U64BIT_MAX,  8 },
-+	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, (long long) U64BIT_MAX,  8 },
- 	{ "rune",    0,  "int32",   true,   true,  true,   S32BIT_MIN, S32BIT_MAX,  4 }
- };
- 
-@@ -116,7 +116,7 @@
- 	{ "int",     0,  "int",     true,   true,  false,  INT_MIN,   INT_MAX,     4 },
- 	{ "uint",    0,  "uint",    false,  true,  false,  0,         UINT_MAX,    4 },
- 	{ "long",    0,  "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,    8 },
--	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         ULONG_MAX,   8 }
-+	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,   8 }
- };
- 
- HostType hostTypesOCaml[] =
---- a/ragel/rbxgoto.cpp
-+++ b/ragel/rbxgoto.cpp
-@@ -658,7 +658,7 @@
- 	out <<
- 		"	begin\n"
- 		"		" << P() << " += 1\n"
--		"		" << rbxGoto(ret, "_out") << "\n" 
-+		"		" << static_cast<bool>(rbxGoto(ret, "_out")) << "\n"
- 		"	end\n";
- }
- 
diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
deleted file mode 100644
index 6609af5a99a2..000000000000
--- a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
-From: Adrian Thurston <thurston@colm.net>
-Date: Sat, 10 Dec 2016 15:41:30 -0500
-Subject: [PATCH] use pkginclude for the headers
-
----
- aapl/Makefile.am | 2 +-
- src/Makefile.am  | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aapl/Makefile.am b/aapl/Makefile.am
-index fd9f9cb0..80b972f1 100644
---- a/aapl/Makefile.am
-+++ b/aapl/Makefile.am
-@@ -1,4 +1,4 @@
--include_HEADERS = \
-+pkginclude_HEADERS = \
- 	avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
- 	sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
- 	mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 24a19a4b..60554a99 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
- 
- endif
- 
--include_HEADERS = \
-+pkginclude_HEADERS = \
- 	action.h fsmgraph.h ragel.h common.h \
- 	gendata.h redfsm.h dot.h
- 
--nodist_include_HEADERS = config.h
-+nodist_pkginclude_HEADERS = config.h
- 
- ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
- 
--- 
-2.15.1
-
diff --git a/dev-util/ragel/metadata.xml b/dev-util/ragel/metadata.xml
deleted file mode 100644
index 71e948fffb95..000000000000
--- a/dev-util/ragel/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>lu_zero@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
deleted file mode 100644
index f7581320d291..000000000000
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.colm.net/open-source/ragel/"
-SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
deleted file mode 100644
index 5e3e52d25ccf..000000000000
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	default
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
deleted file mode 100644
index e5090066d3e8..000000000000
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
deleted file mode 100644
index 9de48f66793e..000000000000
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.colm.net/open-source/ragel/"
-SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
deleted file mode 100644
index 7b028b141644..000000000000
--- a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_test() {
-	cd "${S}"/test || die
-	./runtests.in || die
-}
-
-src_install() {
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-	default
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10.ebuild b/dev-util/ragel/ragel-7.0.0.10.ebuild
deleted file mode 100644
index e9215b2485be..000000000000
--- a/dev-util/ragel/ragel-7.0.0.10.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
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	cd "${S}"/test || die
-	./runtests.in || die
-}
-
-src_install() {
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-	default
-}
diff --git a/dev-util/ragel/ragel-7.0.0.9.ebuild b/dev-util/ragel/ragel-7.0.0.9.ebuild
deleted file mode 100644
index fb260ba41723..000000000000
--- a/dev-util/ragel/ragel-7.0.0.9.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
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.4"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	cd "${S}"/test || die
-	./runtests.in || die
-}
-
-src_install() {
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-	default
-}
diff --git a/dev-util/rats-2.4 b/dev-util/rats-2.4
new file mode 100644
index 000000000000..ee5f17c3261a
--- /dev/null
+++ b/dev-util/rats-2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=dev-libs/expat:=
+DESCRIPTION=RATS - Rough Auditing Tool for Security
+EAPI=6
+HOMEPAGE=https://code.google.com/p/rough-auditing-tool-for-security/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat:=
+SLOT=0
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rough-auditing-tool-for-security/rats-2.4.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=880cd277ade71ad434f53b4d280d71ac
diff --git a/dev-util/rats/Manifest b/dev-util/rats/Manifest
deleted file mode 100644
index 9786ccfaf5ac..000000000000
--- a/dev-util/rats/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX rats-2.4-fix-build-system.patch 1131 BLAKE2B a9890ebe1af624e2ede486da6ede63318a7de2775028df5d37f004b575e35890cd833cfc1211196b4cc772b3fff13b6b0f76e0dd0558b781b1e54b96a9a2af4e SHA512 d56accaedbb5b0fa5961c79ee19510ddd36428d3a96b6066ffd304a3167df5cd510041f3eeee9aabfe66b71a29090a9199125d14ae6be6443b5e490e2cdeaf07
-DIST rats-2.4.tgz 393114 BLAKE2B 73dfefc42cd99420edba9ac28d56b51e058b144d9deaf9f1e322e7fe4331e16d05cff049efccd344723fe1634c3691f911dd71001671058c5912f84cfdc0bdbb SHA512 f402717fc935a2f9c2464e1623807575044258fd998cabc8f115c063141004b5978bad739021f109cbbd1abd84231155eb59671ae202aefb40e1fd6733d8ac6d
-EBUILD rats-2.4.ebuild 1127 BLAKE2B b52d2b6c3df8a763d7d89ceea46b0812940afb376819d110c79817dd89cd47100353bb7756924fb25bf0b13df3bb4cf4b914a7cc9eced7fdc41cc0f111f7788f SHA512 ceb6ced278b7c50f321cddfbb705737d97edd821e97543e515996576fbc0589248d2fc6cfe0a38f9b6c4afdf7fa673369bb436d64dedef6d3ddbb65439336217
-MISC metadata.xml 604 BLAKE2B 1df7626ac554d569d4bae9ff3821a998cf2457441e81c55d57b1ed0bc319226847083de8a97f4362339b9b6f9d9de973777274270d19540dfdba95674f456478 SHA512 14edf04ecb58d9fd69c549b9cd64713338aaa8dab9230ddc00824dfaaa3b2e77090deeb0dc7f87fc875ebb3851ea3bae4765ee8e140b8695ad4088f1eb1fbdad
diff --git a/dev-util/rats/files/rats-2.4-fix-build-system.patch b/dev-util/rats/files/rats-2.4-fix-build-system.patch
deleted file mode 100644
index 42972876a5c8..000000000000
--- a/dev-util/rats/files/rats-2.4-fix-build-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -50,15 +50,15 @@
- 	$(LEX) $(LEXFLAGS) -Pyyruby ruby-lex.l     

- 

- install:	$(BIN)

--	./mkinstalldirs $(BINDIR) $(LIBDIR) $(MANDIR) $(MANDIR)/man1 $(SHAREDIR)

--	$(INSTALL_PROGRAM) $(BIN) $(BINDIR)

--	$(INSTALL_DATA) rats-python.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats-c.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats-perl.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats-php.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats-ruby.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats-openssl.xml $(SHAREDIR)

--	$(INSTALL_DATA) rats.1	$(MANDIR)/man1

-+	./mkinstalldirs $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)

-+	$(INSTALL_DATA) rats-python.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats-c.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats-perl.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats-php.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats-ruby.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats-openssl.xml $(DESTDIR)$(SHAREDIR)

-+	$(INSTALL_DATA) rats.1	$(DESTDIR)$(MANDIR)/man1

- 

- clean:

- 	rm -f $(OBJ) *~ $(BIN) core

diff --git a/dev-util/rats/metadata.xml b/dev-util/rats/metadata.xml
deleted file mode 100644
index d7aaff12cec9..000000000000
--- a/dev-util/rats/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>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription>RATS - Rough Auditing Tool for Security - is an open source
-    tool developed and maintained by Secure Software security engineers. RATS
-    is a tool for scanning C, C++, Perl, PHP and Python source code and
-    flagging common security related programming errors such as buffer
-    overflows and TOCTOU (Time Of Check, Time Of Use) race conditions.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild
deleted file mode 100644
index 0a41658a9907..000000000000
--- a/dev-util/rats/rats-2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="RATS - Rough Auditing Tool for Security"
-HOMEPAGE="https://code.google.com/p/rough-auditing-tool-for-security/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rough-auditing-tool-for-security/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-libs/expat:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4-fix-build-system.patch )
-
-src_prepare() {
-	default
-
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		einfo "Converting ${f} from CRLF to LF"
-		edos2unix "${f}"
-	done < <(find \( -name '*.[chl]' -o -name '*.in' -o -name '*.am' \) -print0)
-}
-
-src_configure() {
-	econf --datadir="${EPREFIX}/usr/share/${PN}/"
-}
-
-pkg_postinst() {
-	ewarn "Please be careful when using this program with it's force language"
-	ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
-	ewarn "it tries to treat binary files as some other type."
-}
diff --git a/dev-util/rbtools-0.7.10 b/dev-util/rbtools-0.7.10
new file mode 100644
index 000000000000..72e074796164
--- /dev/null
+++ b/dev-util/rbtools-0.7.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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=Command line tools for use with Review Board
+EAPI=6
+HOMEPAGE=https://www.reviewboard.org/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.10.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8888974dc0fc393a99d9b30ea98ad6c5
diff --git a/dev-util/rbtools-0.7.11 b/dev-util/rbtools-0.7.11
new file mode 100644
index 000000000000..0c2cabaeebe7
--- /dev/null
+++ b/dev-util/rbtools-0.7.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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=Command line tools for use with Review Board
+EAPI=6
+HOMEPAGE=https://www.reviewboard.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[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://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.11.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a5a423e6784c94884587d7e9bfe81a17
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
deleted file mode 100644
index b35dd8955b0c..000000000000
--- a/dev-util/rbtools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST RBTools-0.7.10.tar.gz 171957 BLAKE2B c92c02d2aa9598e063098316440b85842a2c31e5d32894c01b2345a49662b9f1091bb20077c6533c78618fc888f78f447f39580de64d4f48308e4c4aac5c6ecd SHA512 d4495cc73315e10d31d9b6c1517734fc58cc8b795a2d5eb32c9900b7108c57ad5b5f559e0fc7b13de0b00997f014a8f832183da46376f1480abaa5ebf5eb4866
-DIST RBTools-0.7.11.tar.gz 171777 BLAKE2B 67a0cf7d2f1e019a6b5b280a6448747037abb70d498c15b3bb2b0a415a1234e25e159929fc66484f56ad27acdbfe6bcf7bea9adb7042addbd96b88e4a9150ecc SHA512 ea02fbf02f7972d73a90097bc763549e54d130dc81e6325f0b65906d9e03819d4a9202b1e286a04bad5a17c2440b5e84fb9abe447f2b7717acc0f2c46de783cb
-EBUILD rbtools-0.7.10.ebuild 688 BLAKE2B 2769d766e8c88a8f736195a24e14db5be723a96ab9206ba7bf4ee88cdf8138439eabdf4766b75d486a53e904c45d4c00a50735ff3e3966e25d71afea70ab6778 SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118
-EBUILD rbtools-0.7.11.ebuild 690 BLAKE2B 46a716b5e53345deb3d75490445f149d35267f4b5ceeab7a1724372345abf69be67737ab30309e9c8910df2524bf0130849285474c5ddb7ca5b98a35fe669e72 SHA512 3258c7570e96d5d7ce8593232aca797766c0f0951a089533322be81a24dfd0b1c460464200985a45b13e2c48f5e2f9acdd4e1cf4546089d1b70a16e01cefc45e
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/rbtools/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/rbtools/rbtools-0.7.10.ebuild b/dev-util/rbtools/rbtools-0.7.10.ebuild
deleted file mode 100644
index 4ef8e4c719f2..000000000000
--- a/dev-util/rbtools/rbtools-0.7.10.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.7.11.ebuild b/dev-util/rbtools/rbtools-0.7.11.ebuild
deleted file mode 100644
index 94ddd77d3d6b..000000000000
--- a/dev-util/rbtools/rbtools-0.7.11.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=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/re2c-0.13.5-r1 b/dev-util/re2c-0.13.5-r1
new file mode 100644
index 000000000000..753a0bed0e73
--- /dev/null
+++ b/dev-util/re2c-0.13.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=4
+HOMEPAGE=http://re2c.sourceforge.net/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=mirror://sourceforge/re2c/re2c-0.13.5.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_=12d916f79345cc78765c45c1d60bfb4b
diff --git a/dev-util/re2c-0.16 b/dev-util/re2c-0.16
new file mode 100644
index 000000000000..fc7f99de9ce0
--- /dev/null
+++ b/dev-util/re2c-0.16
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=5
+HOMEPAGE=http://re2c.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/0.16/re2c-0.16.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_=20969428d1acc18dfe42a7d860439d59
diff --git a/dev-util/re2c-1.0.1 b/dev-util/re2c-1.0.1
new file mode 100644
index 000000000000..558e2197251e
--- /dev/null
+++ b/dev-util/re2c-1.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=6
+HOMEPAGE=http://re2c.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.1/re2c-1.0.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
+_md5_=c8743be468a199f148d7c0fdab9e955c
diff --git a/dev-util/re2c-1.0.2 b/dev-util/re2c-1.0.2
new file mode 100644
index 000000000000..348f512b1719
--- /dev/null
+++ b/dev-util/re2c-1.0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=6
+HOMEPAGE=http://re2c.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.2/re2c-1.0.2.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_=13883fa74d5820bd595a1414abed5cf7
diff --git a/dev-util/re2c-1.0.3 b/dev-util/re2c-1.0.3
new file mode 100644
index 000000000000..c18d43bf13e4
--- /dev/null
+++ b/dev-util/re2c-1.0.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=6
+HOMEPAGE=http://re2c.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.3/re2c-1.0.3.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_=8a3b0b32ae7b7171ff1931ef9e787161
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
deleted file mode 100644
index 2549bba9cc3b..000000000000
--- a/dev-util/re2c/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST re2c-0.13.5.tar.gz 782725 BLAKE2B 569ded397a2139c76e1c97c73f52628e6723c5c8e2dc9fd46ddda6fb30c9dae8454460b5e457c4a5319ccf4e2fd0f45a7ebc28406881d9d44dc45bed106769c9 SHA512 56101bf01aea6f0c082b85382be34acada51d70036252581cd76ac4b2bdbc144633b97c63a94bfdba434ffb80884e11299a38853e2d805dc7ce6cf9d452c81c8
-DIST re2c-0.16.tar.gz 4892417 BLAKE2B e1160d3f6ebd63d42a22c112d83a31fcd7bb0d5ab239b7be569f603752794048685776602aae754d8b4e47cb6ae3540ce0977b0824e6bf3104e58a8fb0428f9b SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3
-DIST re2c-1.0.1.tar.gz 5758988 BLAKE2B e02d8ce5f82441d33ec055d582e797d33a4b1a5244d37477b5c93117c735790a6a24e1b9e1456a6d4182c3282b59955838b625216cf47abfcc8c4fb5eacc953e SHA512 ab3b652d8f97b0d1be4c7561ce65e28870ab8976f8a31d74a6629b43d2057bfa608c7f393d5e5d59d26f991552a60e6274f554ef58752bdfcfeba330578f1299
-DIST re2c-1.0.2.tar.gz 5805526 BLAKE2B 931e7b00f57cf8c3e49e540496906208e5a5b73f87427c095e9f5744594007b5d536bf8a2920c3fb509f57bc0ba608ca80a6780ae8af033fdfe7bb3c26292007 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176
-DIST re2c-1.0.3.tar.gz 5806555 BLAKE2B 98664998a52e9f3198ac6d19e8c8af8db716414e42aa89b05750cb8a2054d53d0b13fa499ca004eecc294cef2756554c3e08c8167055d38d266be86f0684b83d SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae
-EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d8f8df2ee8d1a81671e4a2d05739863f5f9c32e42f61912b5cdcbfb17f29c0b3dcb3d667c2815c0dcec3b3b353 SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86
-EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
-EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
-EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
-MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
deleted file mode 100644
index 1fc58ccd41a6..000000000000
--- a/dev-util/re2c/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>robbat2@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">re2c</remote-id>
-		<remote-id type="github">skvadrik/re2c</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/re2c/re2c-0.13.5-r1.ebuild b/dev-util/re2c/re2c-0.13.5-r1.ebuild
deleted file mode 100644
index d04be68e9eb1..000000000000
--- a/dev-util/re2c/re2c-0.13.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-MY_PV="${PV/_/.}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dobin re2c
-	doman re2c.1
-	dodoc README CHANGELOG doc/*
-	docinto examples
-	dodoc examples/*.c examples/*.re
-}
diff --git a/dev-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild
deleted file mode 100644
index 072d58199292..000000000000
--- a/dev-util/re2c/re2c-0.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
-	epatch_user
-	export ac_cv_path_BISON="no"
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/{examples,paper}
-	dodoc -r README CHANGELOG examples
-	docinto paper
-	dodoc doc/loplas.ps doc/sample.bib
-}
diff --git a/dev-util/re2c/re2c-1.0.1.ebuild b/dev-util/re2c/re2c-1.0.1.ebuild
deleted file mode 100644
index f81eb657511c..000000000000
--- a/dev-util/re2c/re2c-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
-	default
-	export ac_cv_path_BISON="no"
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/{examples,paper}
-	dodoc -r README CHANGELOG examples
-	docinto paper
-	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.0.2.ebuild b/dev-util/re2c/re2c-1.0.2.ebuild
deleted file mode 100644
index bce28d1d0814..000000000000
--- a/dev-util/re2c/re2c-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
-	default
-	export ac_cv_path_BISON="no"
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/{examples,paper}
-	dodoc -r README CHANGELOG examples
-	docinto paper
-	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
deleted file mode 100644
index bd4ecbe5865e..000000000000
--- a/dev-util/re2c/re2c-1.0.3.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
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-src_prepare() {
-	default
-	export ac_cv_path_BISON="no"
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/{examples,paper}
-	dodoc -r README CHANGELOG examples
-	docinto paper
-	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/rebar-2.6.1 b/dev-util/rebar-2.6.1
new file mode 100644
index 000000000000..9544890bc8de
--- /dev/null
+++ b/dev-util/rebar-2.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/erlang
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=5
+HOMEPAGE=https://github.com/rebar/rebar
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/rebar/rebar/archive/2.6.1.tar.gz -> rebar-2.6.1.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b96d7cb2204dd2ded8c2f144e302ebd3
diff --git a/dev-util/rebar-2.6.2 b/dev-util/rebar-2.6.2
new file mode 100644
index 000000000000..336b1ba6feed
--- /dev/null
+++ b/dev-util/rebar-2.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/erlang
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=5
+HOMEPAGE=https://github.com/rebar/rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/rebar/rebar/archive/2.6.2.tar.gz -> rebar-2.6.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b27666cbe1f75d97f60a6d27613c5ca8
diff --git a/dev-util/rebar-2.6.3 b/dev-util/rebar-2.6.3
new file mode 100644
index 000000000000..8d7320acc531
--- /dev/null
+++ b/dev-util/rebar-2.6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/erlang
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=5
+HOMEPAGE=https://github.com/rebar/rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/rebar/rebar/archive/2.6.3.tar.gz -> rebar-2.6.3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=641033af55a3d240c64ba4d3e9b1d543
diff --git a/dev-util/rebar-2.6.4 b/dev-util/rebar-2.6.4
new file mode 100644
index 000000000000..94c4b26b89cc
--- /dev/null
+++ b/dev-util/rebar-2.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-lang/erlang
+DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
+EAPI=5
+HOMEPAGE=https://github.com/rebar/rebar
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/rebar/rebar/archive/2.6.4.tar.gz -> rebar-2.6.4.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=de5e2f61915fe69bc79243b3ba799fe7
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
deleted file mode 100644
index d65af4e9b20a..000000000000
--- a/dev-util/rebar/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6bfe4a2b278e58828781217c203d2dfc9c39a19bdc3b9fc6bc7f4d9ca85b6d0019057a2841d8b394cc39bdd84 SHA512 0baa10aac65ad78c05d6ecd180327b8752a31bbc51f3b3aa6060f4d2adf9269de83c6481767d9abc8a599e231f569c0496edc6c47f43d1e2892c4e98de6ccd85
-DIST rebar-2.6.2.tar.gz 210775 BLAKE2B e06a6fb0c29397dfcfe83de60cdcfb8e89f4a8e4287a41e0102ff972a93c8632d760c7bb6cfe669d98d324bf3afa007198eec773fde9991daa9964a452b5613c SHA512 410129defbf98af00f5040f9d3956299a70a0a1a21d28c42db32350b922e207f8af5830d8c322e9d3cfed8697ddcb228d5a98b983995414ed32662659a5c4c96
-DIST rebar-2.6.3.tar.gz 213146 BLAKE2B 1e74281de629b7f007a718af3d9f5afe7bbef72562f07e7df8f4ee996593b428d84030c8ef50e0a8f6b694b104fac01783175b5f3c6a0c113e263d3de3d8852f SHA512 451f18cec02f9b23ab1e522d4e9bc2a43cf5ace5fea6a7543874a76615cdb55e3d705ad2be94e7c28e6e1acfbc519eb3452588880f0846b928f8a28369623dde
-DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.1.ebuild 631 BLAKE2B 767d3538242b6c7165543ab2030fa1af1d16779dcabf35d745e5702fc9a9ba58517e116fc623b287d128a4e1dd983b3d926112081895839e4f46a6d0e2e21b08 SHA512 f6e545bd98f66499f9fe846c19bff96dc121748fb99d6e6b9c5b74adec066e1d5b035ed4df9da3577d93c68c0b72713070fab19ae48ec4c8298d5005d3366da9
-EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
-EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
-EBUILD rebar-2.6.4.ebuild 627 BLAKE2B a852cb28105e1ffe1e48f99fdac2ff4fe2eb425d64474a775cd91f913c24197bea6aa7340982779c792fc35e60eafa0ea509af4f8d79ccc4cf83b8fe012cc369 SHA512 078f490dc9d359495d3d26eb4c4b93a70782cc7f6fb2eacde5072de1fe10bdaa23bbd53047a56d1b1eab159894bf543cf5c759caf5d18a7e5c6c26773fdbec43
-MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
deleted file mode 100644
index 64589b9da557..000000000000
--- a/dev-util/rebar/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-needed -->
-  <upstream>
-    <remote-id type="github">rebar/rebar</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/rebar/rebar-2.6.1.ebuild b/dev-util/rebar/rebar-2.6.1.ebuild
deleted file mode 100644
index ee7f7421d880..000000000000
--- a/dev-util/rebar/rebar-2.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rebar/rebar-2.6.2.ebuild b/dev-util/rebar/rebar-2.6.2.ebuild
deleted file mode 100644
index 3f512e87afde..000000000000
--- a/dev-util/rebar/rebar-2.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rebar/rebar-2.6.3.ebuild b/dev-util/rebar/rebar-2.6.3.ebuild
deleted file mode 100644
index 6e91c65845b5..000000000000
--- a/dev-util/rebar/rebar-2.6.3.ebuild
+++ /dev/null
@@ -1,28 +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 sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
deleted file mode 100644
index ed807feeb1ab..000000000000
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/regexxer-0.10 b/dev-util/regexxer-0.10
new file mode 100644
index 000000000000..47090929c363
--- /dev/null
+++ b/dev-util/regexxer-0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool virtual/pkgconfig 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An interactive tool for performing search and replace operations
+EAPI=5
+HOMEPAGE=http://regexxer.sourceforge.net/
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
+SLOT=0
+SRC_URI=mirror://sourceforge/regexxer/regexxer-0.10.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ff2e4f85b6e2f62d2dfbba2380d62983
diff --git a/dev-util/regexxer/Manifest b/dev-util/regexxer/Manifest
deleted file mode 100644
index f8446a48b57c..000000000000
--- a/dev-util/regexxer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX regexxer-0.10-glib-2.32.patch 864 BLAKE2B 330dbfaad5752ba94bfcdcd669550ab3b7f2e2f72b8f7160a1621fa586e62f0505f259b79d7476744005c2097d3b41a840eece4203c43e33dc1d2775e340af0c SHA512 99e25b974a6be678169a57f8f5e728f60c470e7d2290e365f7b9c0c326d8e7867af0a093f6b0a7505ea7068e01770cdc565cf33e2db8cc6695bd5bd269a56a8b
-AUX regexxer-0.10-sandbox.patch 412 BLAKE2B 9d1e1d6f5b9e73ca6d8250bcaea5f2dab5b1843c5a0df01c0da16bdebdbf7b73b56b392d9e0368e3b2e6df5b7b87046d905ffe86ea38a84e5837c99daec265f8 SHA512 2e895d2686e243ce1ada04dc9fe4db846b59dd076252e992349442658c96cba6ce62499fb056c77d0aa19329794545ea313c538c61efab147a44fe85b2c40534
-DIST regexxer-0.10.tar.xz 251544 BLAKE2B a6ec17e27754de86de60eb44e1b945f09bd66b5755a558c9934eea7b52854ea86b64fc7742d5adfd227514df7565e37b78a567a0a9b83fa421c0140fa8ae0e02 SHA512 0b18c8f167595984a042403c7e91c8b65c1348870c47d664c6cfc825b74e047f657190f30830ce6e2098867bbd8e1b042e1adc2798aedb86a59299583340f920
-EBUILD regexxer-0.10.ebuild 724 BLAKE2B cbdfd4041660fba8ff173fcf2a002efdb29be90dad14ee6c5a66fc01a175b8b4d2f485573fc8d6e32c6ead5d8ef1ece333c90679d5c89c43637d93bc2d24ffc4 SHA512 23bc0caf21d75aaec7ae65def8cf30f77ee3f06eaa91dce8dd0e77bbca261d3377fb353f42f36e30c100f656878056d6229da23ef93c33c5feffb461d84081f2
-MISC metadata.xml 354 BLAKE2B 9dfd93a2017cadc91d9ec6d138cf3e172ece5b4800e536c8882f79ff64e8160983cadbb6e3ecfb48769436dccd93f2a991138abf0df0b503816ef3419001b69b SHA512 3da056033c05593bc2bf0b606cdb7ff99879eb99580c3b7741759a0b4bdcfd0025cebaa1e586fe12e69972f75df6003b041bd338800ff814e7aae6094fad02aa
diff --git a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
deleted file mode 100644
index fbbb1cbf20f0..000000000000
--- a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Downloaded from https://projects.archlinux.org/svntogit/community.git/plain/trunk/regexxer-glib2.32.patch?h=packages/regexxer
-for bug 417049
-
---- a/src/fileshared.h
-+++ b/src/fileshared.h
-@@ -23,6 +23,7 @@
-
- #include "sharedptr.h"
-
-+#include <glibmm/regex.h>
- #include <gtkmm/textbuffer.h>
- #include <functional>
- #include <utility>
---- a/src/globalstrings.h
-+++ b/src/globalstrings.h
-@@ -21,7 +21,7 @@
- #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
- #define REGEXXER_GLOBALSTRINGS_H_INCLUDED
-
--#include <glib/gutils.h>  /* for G_DIR_SEPARATOR_S */
-+#include <glib.h>  /* for G_DIR_SEPARATOR_S */
-
- namespace Regexxer
- {
---- a/src/translation.h
-+++ b/src/translation.h
-@@ -21,7 +21,7 @@
- #ifndef REGEXXER_TRANSLATION_H_INCLUDED
- #define REGEXXER_TRANSLATION_H_INCLUDED
-
--#include <glib/gmacros.h>
-+#include <glib.h>
- #include <glibmm/ustring.h>
-
- #ifndef gettext_noop
diff --git a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
deleted file mode 100644
index f460344b8ad7..000000000000
--- a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,12 +107,6 @@
- @INTLTOOL_DESKTOP_RULE@
- @INTLTOOL_XML_NOMERGE_RULE@
- 
--install-data-hook: install-update-icon-cache
--	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
--#$(gsettingsupdateschemacache) $(gsettingsschemadir)
--
--uninstall-hook: uninstall-update-icon-cache
--
- dist-hook: dist-changelog
- 
- # Note that this rule creates the ui/ build directory as a side effect.
diff --git a/dev-util/regexxer/metadata.xml b/dev-util/regexxer/metadata.xml
deleted file mode 100644
index b59e5c70aebc..000000000000
--- a/dev-util/regexxer/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>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">regexxer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
deleted file mode 100644
index 2e3e14fec72b..000000000000
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG=no
-
-inherit autotools eutils flag-o-matic gnome2
-
-DESCRIPTION="An interactive tool for performing search and replace operations"
-HOMEPAGE="http://regexxer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND=">=dev-cpp/glibmm-2.28
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	append-cxxflags -std=c++11
-
-	epatch "${FILESDIR}"/${P}-glib-2.32.patch
-	epatch "${FILESDIR}"/${P}-sandbox.patch
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/dev-util/rej-0.16 b/dev-util/rej-0.16
new file mode 100644
index 000000000000..c02d976031ce
--- /dev/null
+++ b/dev-util/rej-0.16
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A utility for solving diff/patch rejects
+EAPI=0
+HOMEPAGE=http://ftp.suse.com/pub/people/mason/rej/
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl !<app-editors/mp-5 !dev-lang/qu-prolog !dev-util/mpatch
+SLOT=0
+SRC_URI=http://ftp.suse.com/pub/people/mason/rej/rej-0.16.tar.gz
+_md5_=9ecc8c36693c38bc2cc1c06d77a7dcd5
diff --git a/dev-util/rej/Manifest b/dev-util/rej/Manifest
deleted file mode 100644
index 3927729052b7..000000000000
--- a/dev-util/rej/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rej-0.16.tar.gz 422796 BLAKE2B bfbf3b82d71247797485006ed3c032f4db078bfe9fc67c0c01ae15a3b85e913a0bd05867c91a9f3577eeae43c9c708aecab786a9912a24194d3faf7686a6dee5 SHA512 e216edf5559141c571f56265a499dbb4273b47e3a05305a13233d3fc7d9d02aca4a2305317fb467fee1b08ecba147dbe72516d71ba189f1dfeedb45faa525d46
-EBUILD rej-0.16.ebuild 571 BLAKE2B 402e0475e1a70647cc99efea2a12771150e482156e943813ecef088cbe0d6473f2d115e1611602c280ca4b7e80a474109da47aeda4904832fde2651f7c1cbdc5 SHA512 55df3a272485bdf3d124241e98221436de0f1ce59c12fc283c9695d160c756b6a061b0e0a7c13ef25eb99791cd1906a345f20ed829de2b94227091bdd4443d93
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
deleted file mode 100644
index a8fb43312942..000000000000
--- a/dev-util/rej/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>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/rej/rej-0.16.ebuild b/dev-util/rej/rej-0.16.ebuild
deleted file mode 100644
index 5ff7d706253d..000000000000
--- a/dev-util/rej/rej-0.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A utility for solving diff/patch rejects"
-HOMEPAGE="http://ftp.suse.com/pub/people/mason/rej/"
-SRC_URI="http://ftp.suse.com/pub/people/mason/rej/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-	!<app-editors/mp-5
-	!dev-lang/qu-prolog
-	!dev-util/mpatch
-	"
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	dobin rej qp mp
-	dodoc CHANGELOG README vimrc
-}
diff --git a/dev-util/repo-1.12.37 b/dev-util/repo-1.12.37
new file mode 100644
index 000000000000..c50a0cac57e8
--- /dev/null
+++ b/dev-util/repo-1.12.37
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+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(-)] !app-admin/radmind
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=6
+HOMEPAGE=https://android.googlesource.com/tools/repo
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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(-)] !app-admin/radmind
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~wizardedit/dist/repo-1.12.37.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3916a31a98f6c7e1584097165f8b7680
diff --git a/dev-util/repo/Manifest b/dev-util/repo/Manifest
deleted file mode 100644
index ffc6fc64d7a2..000000000000
--- a/dev-util/repo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST repo-1.12.37.tar.gz 115098 BLAKE2B 7a54afad5a3355edfab09be62c6881b4c0d3bc521c04313bb1dd428fc7a1c9a82a65186d20fd05d67227c88d2f6a30fd70f53f35dbfc0b6e7e668252ce6fbd9d SHA512 3ff6b5c3bcc8fba1861102035b86b59137e7dcebeab7a0fb01672da28473e1912c3cbac7c085e9b8d3fce404bd18095ba022d4978d83833f666bd31d621d5953
-EBUILD repo-1.12.37.ebuild 801 BLAKE2B 8fe1e4ded31323b6631687429f66c5cb255255deb0271a9bd4c2bff3bf84bf25a4c691976031e7c584ca1a277d410a5a196abcd59012b7623070c4e2910aebe3 SHA512 7605c9427efcec6eec5b89165fd821ceea4a7234cf15c94187f8a890f8565e9dc1a7b3dde4836c285571cce207a3806235ac3d35c60c2c084b69ba9304b55aad
-MISC metadata.xml 387 BLAKE2B 78c64cb9d80402907983723261bc49e4429c0c3be69ea93b06090bd4c7d64b0289a6cdb52cee1fd867c2e2460b59a92a5605126ff3faa1fe7816edae54a2d33d SHA512 25be1dab3058fe3d823c1a0863c9894bf5c7d8020c0faeab73db09cde992589eda83f36ea718396e327bfb18627a58f2db2fc3d21e2f1d490d91ebe867d33dee
diff --git a/dev-util/repo/metadata.xml b/dev-util/repo/metadata.xml
deleted file mode 100644
index e31c816a429f..000000000000
--- a/dev-util/repo/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>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
-  <longdescription>
-  Tool for managing multiple git repositories. From Google, useful for building Android.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/repo/repo-1.12.37.ebuild b/dev-util/repo/repo-1.12.37.ebuild
deleted file mode 100644
index 7ee57ac5ba7c..000000000000
--- a/dev-util/repo/repo-1.12.37.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
-
-# 3.x is currently very buggy, only 2.7 actually works
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://android.googlesource.com/tools/repo"
-# Should be:
-#SRC_URI="https://android.googlesource.com/tools/repo/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~wizardedit/dist/repo-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_foreach_impl python_fix_shebang ./repo
-	python_foreach_impl python_doexe ./repo
-}
diff --git a/dev-util/reswrap-4.0.0 b/dev-util/reswrap-4.0.0
new file mode 100644
index 000000000000..2753f5218385
--- /dev/null
+++ b/dev-util/reswrap-4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=Utility to wrap icon resources into C++ code, from the FOX Toolkit
+EAPI=0
+HOMEPAGE=http://www.fox-toolkit.org/
+IUSE=debug doc profile
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.40.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fox	7c70615c3c15c50eb1025055fef16df4	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b28d1b8c62e3fe0684f49f3115e90834
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
deleted file mode 100644
index 6094ad80bb9a..000000000000
--- a/dev-util/reswrap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-4.0.0.ebuild 592 BLAKE2B 464b2ad09bfb917f5b86d6c88331c6b50e332c45e30698b44b7eaa35596a56deba85bcb32a068bc2add3fc2e4829d44e585458a72c6172366ca9035750d6b322 SHA512 c8c18bad64210a5e94deb89421737683d442b55780a3ac29aa6beed25601f70298d58790a287e6cfd6f35443441c6c3178656f653a247fc54f4322fdc4dfe4dc
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/reswrap/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
deleted file mode 100644
index 35ff5ad583ad..000000000000
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-FOX_COMPONENT="utils"
-FOX_PV="1.6.40"
-
-inherit fox
-
-DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-
-FOXCONF="--disable-bz2lib \
-	--disable-jpeg \
-	--without-opengl \
-	--disable-png \
-	--without-shape \
-	--disable-tiff \
-	--without-x \
-	--without-xcursor \
-	--without-xrandr \
-	--without-xshm \
-	--without-xft \
-	--disable-zlib"
diff --git a/dev-util/rosdep-0.12.1 b/dev-util/rosdep-0.12.1
new file mode 100644
index 000000000000..8e5fdeeaf8b8
--- /dev/null
+++ b/dev-util/rosdep-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Command-line tool for installing ROS system dependencies
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosdep
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.12.1.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.1.tar.gz -> rosdep-0.12.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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/dev-util/rosdep-0.12.2 b/dev-util/rosdep-0.12.2
new file mode 100644
index 000000000000..beb2fb9d670d
--- /dev/null
+++ b/dev-util/rosdep-0.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Command-line tool for installing ROS system dependencies
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosdep
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.12.2.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.2.tar.gz -> rosdep-0.12.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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/dev-util/rosdep-9999 b/dev-util/rosdep-9999
new file mode 100644
index 000000000000..968a9a0db7de
--- /dev/null
+++ b/dev-util/rosdep-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Command-line tool for installing ROS system dependencies
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosdep
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
deleted file mode 100644
index 6d24d1d6d670..000000000000
--- a/dev-util/rosdep/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
-DIST rosdep-0.12.2.tar.gz 118343 BLAKE2B 98163feef406707772a54bf6d1825900ac593113d635de92adcac0ae7ce201c2e312116104c76c13b9c1e3b1847ef4dcc0cfb4fd1edcb2795c6b323fa9cc7167 SHA512 0932a5ff9874bbdffa1160fe0a391d27eef9a2f2435d7a89fa3b5e4eab0fc08205d4417aaea1254ab7bfe679cfeb61a6f1b199f06d65154b30505e2a280c0b61
-EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
-EBUILD rosdep-0.12.2.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
-EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
-MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/metadata.xml b/dev-util/rosdep/metadata.xml
deleted file mode 100644
index d067e076ce7f..000000000000
--- a/dev-util/rosdep/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-infrastructure/rosdep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rosdep/rosdep-0.12.1.ebuild b/dev-util/rosdep/rosdep-0.12.1.ebuild
deleted file mode 100644
index 842ec4941e9e..000000000000
--- a/dev-util/rosdep/rosdep-0.12.1.ebuild
+++ /dev/null
@@ -1,61 +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{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.12.2.ebuild b/dev-util/rosdep/rosdep-0.12.2.ebuild
deleted file mode 100644
index 842ec4941e9e..000000000000
--- a/dev-util/rosdep/rosdep-0.12.2.ebuild
+++ /dev/null
@@ -1,61 +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{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
deleted file mode 100644
index 842ec4941e9e..000000000000
--- a/dev-util/rosdep/rosdep-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=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosinstall-0.7.8 b/dev-util/rosinstall-0.7.8
new file mode 100644
index 000000000000..10a8216e858a
--- /dev/null
+++ b/dev-util/rosinstall-0.7.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/catkin_pkg[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/vcstools-0.1.38[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/rosdistro[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-util/wstool-0.1.12[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(-)] test? ( dev-python/nose[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 dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) 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=Command-line tools for maintaining a workspace of projects for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[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/vcstools-0.1.38[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/rosdistro[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-util/wstool-0.1.12[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 ) 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://download.ros.org/downloads/rosinstall/rosinstall-0.7.8.tar.gz https://github.com/vcstools/rosinstall/archive/0.7.8.tar.gz -> rosinstall-0.7.8.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_=138642721c89919538c6cbe9d7d35d08
diff --git a/dev-util/rosinstall-9999 b/dev-util/rosinstall-9999
new file mode 100644
index 000000000000..3e4cf94a31f5
--- /dev/null
+++ b/dev-util/rosinstall-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/catkin_pkg[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/vcstools-0.1.38[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/rosdistro[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-util/wstool-0.1.12[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(-)] test? ( dev-python/nose[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 dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) >=dev-vcs/git-1.8.2.1[curl] 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=Command-line tools for maintaining a workspace of projects for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[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/vcstools-0.1.38[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/rosdistro[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-util/wstool-0.1.12[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 ) 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_=138642721c89919538c6cbe9d7d35d08
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
deleted file mode 100644
index 75ac5cc5c9f1..000000000000
--- a/dev-util/rosinstall/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
-EBUILD rosinstall-9999.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
-MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/metadata.xml b/dev-util/rosinstall/metadata.xml
deleted file mode 100644
index 22544f9d5e39..000000000000
--- a/dev-util/rosinstall/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vcstools/rosinstall</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
deleted file mode 100644
index 34fc06b21e2a..000000000000
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ /dev/null
@@ -1,60 +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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
-HOMEPAGE="http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		app-shells/zsh
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	# Local tests work even if ros.org is down
-	export ROSINSTALL_SKIP_PYTHON3=1
-	nosetests test || die
-}
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
deleted file mode 100644
index 34fc06b21e2a..000000000000
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ /dev/null
@@ -1,60 +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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
-HOMEPAGE="http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		app-shells/zsh
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	# Local tests work even if ros.org is down
-	export ROSINSTALL_SKIP_PYTHON3=1
-	nosetests test || die
-}
diff --git a/dev-util/rosinstall_generator-0.1.13 b/dev-util/rosinstall_generator-0.1.13
new file mode 100644
index 000000000000..4c01de88b317
--- /dev/null
+++ b/dev-util/rosinstall_generator-0.1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/catkin_pkg-0.1.28[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/rosdistro-0.5.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/rospkg[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(-)] 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=Generates rosinstall metadata about repositories with ROS packages/stacks
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosinstall_generator
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[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/rosdistro-0.5.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/rospkg[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 ) 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/ros-infrastructure/rosinstall_generator/archive/0.1.13.tar.gz -> rosinstall_generator-0.1.13.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_=b136b143ecbd67ee929b5ba3e24a92a9
diff --git a/dev-util/rosinstall_generator-0.1.14 b/dev-util/rosinstall_generator-0.1.14
new file mode 100644
index 000000000000..3917c64010e3
--- /dev/null
+++ b/dev-util/rosinstall_generator-0.1.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosinstall_generator
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.14.tar.gz -> rosinstall_generator-0.1.14.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_=15511ee52c5182df15dcfc726ca6f730
diff --git a/dev-util/rosinstall_generator-9999 b/dev-util/rosinstall_generator-9999
new file mode 100644
index 000000000000..cdd081061343
--- /dev/null
+++ b/dev-util/rosinstall_generator-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosinstall_generator
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( >=virtual/pypy3-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 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_=15511ee52c5182df15dcfc726ca6f730
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
deleted file mode 100644
index 3d211b7ff7a9..000000000000
--- a/dev-util/rosinstall_generator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
-DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
-EBUILD rosinstall_generator-0.1.13.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
-EBUILD rosinstall_generator-0.1.14.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
-EBUILD rosinstall_generator-9999.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
-MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
deleted file mode 100644
index b8df423a729e..000000000000
--- a/dev-util/rosinstall_generator/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-infrastructure/rosinstall_generator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
deleted file mode 100644
index 484e133e8ea0..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
deleted file mode 100644
index 725ccaf60ba1..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.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{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
deleted file mode 100644
index 725ccaf60ba1..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-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=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-util/rpmdevtools-8.10 b/dev-util/rpmdevtools-8.10
new file mode 100644
index 000000000000..7470936edeab
--- /dev/null
+++ b/dev-util/rpmdevtools-8.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/perl:* sys-apps/help2man
+DESCRIPTION=Collection of rpm packaging related utilities
+EAPI=6
+HOMEPAGE=https://pagure.io/rpmdevtools
+IUSE=emacs python_targets_python2_7
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/perl:* net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-8.10.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=041e89d2186d51fbc212354d12cd20f9
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
deleted file mode 100644
index b8532e12bc18..000000000000
--- a/dev-util/rpmdevtools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
-EBUILD rpmdevtools-8.10.ebuild 769 BLAKE2B 1c28573992da646b7fa4cc5e71679e8c66c6671615aee8845e37833852852c05f0e2b803a835a5e9b41ec9ae878e34d820d422b2dc7fc55d315aa58daa13c103 SHA512 8c39b0b3f70595226a60199f0b32263d9c6a5b7c3a219d716c7ff08ab3593e21e4ca46aa39346681de3e49ca2307324a9b8d182719842d3850710fd532f59d41
-MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/metadata.xml b/dev-util/rpmdevtools/metadata.xml
deleted file mode 100644
index 69570e849328..000000000000
--- a/dev-util/rpmdevtools/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>kensington@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
deleted file mode 100644
index 695baa91caf8..000000000000
--- a/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Collection of rpm packaging related utilities"
-HOMEPAGE="https://pagure.io/rpmdevtools"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-lang/perl:*
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/curl
-	emacs? ( app-emacs/rpm-spec-mode )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-	python_fix_shebang rpmdev-{rmdevelrpms.py,checksig,sort,vercmp,bumpspec}
-}
diff --git a/dev-util/rr-4.5.0 b/dev-util/rr-4.5.0
new file mode 100644
index 000000000000..fd347b682fae
--- /dev/null
+++ b/dev-util/rr-4.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Record and Replay Framework
+EAPI=6
+HOMEPAGE=https://rr-project.org/
+IUSE=test kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/4.5.0.tar.gz -> mozilla-rr-4.5.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=796f391cdb2b2ec7bb1f50139aaecbec
diff --git a/dev-util/rr-5.0.0 b/dev-util/rr-5.0.0
new file mode 100644
index 000000000000..dbc362704624
--- /dev/null
+++ b/dev-util/rr-5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib dev-libs/capnproto 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Record and Replay Framework
+EAPI=6
+HOMEPAGE=https://rr-project.org/
+IUSE=test kernel_linux python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib dev-libs/capnproto 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.0.0.tar.gz -> mozilla-rr-5.0.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=097311b73d85afd66ddd1aabf570dfd2
diff --git a/dev-util/rr-5.1.0 b/dev-util/rr-5.1.0
new file mode 100644
index 000000000000..94133b07a15e
--- /dev/null
+++ b/dev-util/rr-5.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib dev-libs/capnproto 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Record and Replay Framework
+EAPI=6
+HOMEPAGE=https://rr-project.org/
+IUSE=test kernel_linux python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib dev-libs/capnproto 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-devel/gdb[xml]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.1.0.tar.gz -> mozilla-rr-5.1.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=097311b73d85afd66ddd1aabf570dfd2
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
deleted file mode 100644
index 9e02ef171609..000000000000
--- a/dev-util/rr/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b5192e3e1baca36b8b6aa8e35254191ffa783aa8a2b3ee504f85baebf50fdd5e8534a443a6363d73a82108f9e5 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6
-DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
-DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
-DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
-EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084
-EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/files/rr-4.5.0-sysmacros.patch b/dev-util/rr/files/rr-4.5.0-sysmacros.patch
deleted file mode 100644
index 573d5956598b..000000000000
--- a/dev-util/rr/files/rr-4.5.0-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/mozilla/rr/pull/1981
-
-From fefdb3b89e98192601dfdc98c8927c9a91f07f9f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 13 Feb 2017 16:01:52 -0500
-Subject: [PATCH] tests: include sys/sysmacros.h for minor/major funcs
-
-Newer versions of glibc are deprecating the implicit sys/sysmacros.h
-include via sys/types.h, so include it explicitly.
----
- src/test/rrutil.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test/rrutil.h b/src/test/rrutil.h
-index 60de6e47a57b..bb5b527c4c9a 100644
---- a/src/test/rrutil.h
-+++ b/src/test/rrutil.h
-@@ -76,6 +76,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/sysinfo.h>
-+#include <sys/sysmacros.h>
- #include <sys/time.h>
- #include <sys/timerfd.h>
- #include <sys/times.h>
--- 
-2.11.0
-
diff --git a/dev-util/rr/metadata.xml b/dev-util/rr/metadata.xml
deleted file mode 100644
index 4c3360d06373..000000000000
--- a/dev-util/rr/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>lu_zero@gentoo.org</email>
-		<name>Luca Barbato</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mozilla/rr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rr/rr-4.5.0.ebuild b/dev-util/rr/rr-4.5.0.ebuild
deleted file mode 100644
index 32d5d5d6983e..000000000000
--- a/dev-util/rr/rr-4.5.0.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
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rr/rr-5.0.0.ebuild b/dev-util/rr/rr-5.0.0.ebuild
deleted file mode 100644
index 330b1821df13..000000000000
--- a/dev-util/rr/rr-5.0.0.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
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rr/rr-5.1.0.ebuild b/dev-util/rr/rr-5.1.0.ebuild
deleted file mode 100644
index 330b1821df13..000000000000
--- a/dev-util/rr/rr-5.1.0.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
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rustfmt-0.5.0 b/dev-util/rustfmt-0.5.0
new file mode 100644
index 000000000000..63abea9eaa57
--- /dev/null
+++ b/dev-util/rustfmt-0.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DESCRIPTION=Tool to find and fix Rust formatting issues
+EAPI=6
+HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.1/download -> aho-corasick-0.5.1.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/term/0.2.14/download -> term-0.2.14.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.19/download -> rustc-serialize-0.3.19.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/toml/0.1.28/download -> toml-0.1.28.crate https://crates.io/api/v1/crates/bitflags/0.5.0/download -> bitflags-0.5.0.crate https://crates.io/api/v1/crates/strings/0.0.1/download -> strings-0.0.1.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/diff/0.1.9/download -> diff-0.1.9.crate https://crates.io/api/v1/crates/mempool/0.3.1/download -> mempool-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/0.1.2/download -> unicode-segmentation-0.1.2.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/syntex_syntax/0.32.0/download -> syntex_syntax-0.32.0.crate https://crates.io/api/v1/crates/winapi/0.2.6/download -> winapi-0.2.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.1/download -> kernel32-sys-0.2.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/regex/0.1.63/download -> regex-0.1.63.crate https://crates.io/api/v1/crates/regex-syntax/0.3.1/download -> regex-syntax-0.3.1.crate https://crates.io/api/v1/crates/rustfmt/0.5.0/download -> rustfmt-0.5.0.crate https://crates.io/api/v1/crates/env_logger/0.3.3/download -> env_logger-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.9/download -> libc-0.2.9.crate
+_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=a9f913a24eb5a2ca731e80ca71e644b9
diff --git a/dev-util/rustfmt-0.6.3 b/dev-util/rustfmt-0.6.3
new file mode 100644
index 000000000000..2527e281e6c9
--- /dev/null
+++ b/dev-util/rustfmt-0.6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DESCRIPTION=Tool to find and fix Rust formatting issues
+EAPI=6
+HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/diff/0.1.9/download -> diff-0.1.9.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itertools/0.4.19/download -> itertools-0.4.19.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.16/download -> libc-0.2.16.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/multimap/0.3.0/download -> multimap-0.3.0.crate https://crates.io/api/v1/crates/regex/0.1.77/download -> regex-0.1.77.crate https://crates.io/api/v1/crates/regex-syntax/0.3.5/download -> regex-syntax-0.3.5.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.19/download -> rustc-serialize-0.3.19.crate https://crates.io/api/v1/crates/rustfmt/0.6.3/download -> rustfmt-0.6.3.crate https://crates.io/api/v1/crates/strings/0.0.1/download -> strings-0.0.1.crate https://crates.io/api/v1/crates/syntex_errors/0.44.0/download -> syntex_errors-0.44.0.crate https://crates.io/api/v1/crates/syntex_pos/0.44.0/download -> syntex_pos-0.44.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.44.1/download -> syntex_syntax-0.44.1.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/toml/0.1.30/download -> toml-0.1.30.crate https://crates.io/api/v1/crates/unicode-segmentation/0.1.2/download -> unicode-segmentation-0.1.2.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/walkdir/0.1.8/download -> walkdir-0.1.8.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
+_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=6f30c14e7e861b05fdb1fe76cce2b6aa
diff --git a/dev-util/rustfmt-0.8.6 b/dev-util/rustfmt-0.8.6
new file mode 100644
index 000000000000..c5313100ec48
--- /dev/null
+++ b/dev-util/rustfmt-0.8.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DESCRIPTION=Tool to find and fix Rust formatting issues
+EAPI=6
+HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/diff/0.1.10/download -> diff-0.1.10.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/extprim/1.2.2/download -> extprim-1.2.2.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.23/download -> libc-0.2.23.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/num-traits/0.1.39/download -> num-traits-0.1.39.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.1/download -> rustc_version-0.2.1.crate https://crates.io/api/v1/crates/rustfmt/0.8.6/download -> rustfmt-0.8.6.crate https://crates.io/api/v1/crates/semver/0.6.0/download -> semver-0.6.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.8/download -> serde-1.0.8.crate https://crates.io/api/v1/crates/serde_derive/1.0.8/download -> serde_derive-1.0.8.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.1/download -> serde_derive_internals-0.15.1.crate https://crates.io/api/v1/crates/serde_json/1.0.2/download -> serde_json-1.0.2.crate https://crates.io/api/v1/crates/strings/0.1.0/download -> strings-0.1.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex_errors/0.59.0/download -> syntex_errors-0.59.0.crate https://crates.io/api/v1/crates/syntex_pos/0.59.0/download -> syntex_pos-0.59.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.59.0/download -> syntex_syntax-0.59.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/thread-id/3.1.0/download -> thread-id-3.1.0.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.4.1/download -> toml-0.4.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.0/download -> unicode-segmentation-1.2.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
+_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=11e063e6ef6c1bbc9f53047fcc5cf7da
diff --git a/dev-util/rustfmt/Manifest b/dev-util/rustfmt/Manifest
deleted file mode 100644
index 9dce8f3ff695..000000000000
--- a/dev-util/rustfmt/Manifest
+++ /dev/null
@@ -1,85 +0,0 @@
-DIST aho-corasick-0.5.1.crate 29015 BLAKE2B af79c5c22e2b4d9ab81d7b0ccd70a375853e50277edb4bd31d0ff9acc670d8776c14044ac06dc659209549259ce8debc18d63ea38ac6812cb52f0f28dd2c8c7f SHA512 81dbcf720613671880c5f28066a1368ee7e953c5d9f44253dc1f9c31b601e87bac518baa48cfaa34b905a4f687ec30233c1dcb00da093dbe502ce8a2f96b9619
-DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
-DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
-DIST bitflags-0.5.0.crate 10940 BLAKE2B 69d9f52d1dfbec986034981f4629022b25b94c01d54424ae2399a0749c51f0f1c725ca312cfb3f953efc95732b7ca32e432e29b1e5bbba416cb4e0c21a266546 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c
-DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST diff-0.1.10.crate 7534 BLAKE2B 4dbb88e8b516de6441a1e1a090f0b58399c53bac8bddc212bcc2acd05613ddb81ebe689270aeca01b8395da02a5bdcf80ea9daa050c85d5835915ed4d901978d SHA512 1ba0f700ecd4f0598ed3d32e5f54f8df9d47b4a440c8a16ac99a45fd8401ef68acb6b743056fc769ba29f5c060745de7fec697aa1dff14f44c8f7c6bec74057b
-DIST diff-0.1.9.crate 2954 BLAKE2B bf192e188a616626e595b29095f55b4c2f860dcf8dff527e85340ab984e1cfa29e541cd044adbb70f0f2659eb671a1cac11a546fc04386e5ef412679c4c6011d SHA512 d208be8da107d438168197c7ea67377048519b350c10d30410b57d71954ef634d03dfdb87b88f5a9fd7e0527ac31d165df95bf7a040b03c161831b9bb3f78dee
-DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
-DIST env_logger-0.3.3.crate 5603 BLAKE2B dcb2e90e5b3476a11c4f2cd4449918375fb530b745b9e598a69a5384b03ec6908d62fb3c32ec2b15087b87e33a090e2d1fc7d9ae52de4a5f54413e3fc43d2632 SHA512 336384348b052e5af4f1b8be2930e124b35b4652c4c6fdf4861012092b81790da51776c6fea1d2667bcca65d0e0a27186ceee7aba6657a45551dfbc37a348b48
-DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
-DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
-DIST extprim-1.2.2.crate 40910 BLAKE2B 92cf01e760fff5f1b8f880779c97a193bd338e9a4a4257d975082db873fa0a891f6bf700c629fcc57bbc4acb707a34c11da4273f640b9a527497325ba1cdaf4b SHA512 e14c5720c799b9822ce27fb000eb040b3aee41634c3a80a4ac275fd36575c777e0103b8572afc1d5c4ca9b08317b7620cace93fedb9363983617e8d8927cfba2
-DIST getopts-0.2.14.crate 16622 BLAKE2B 14dc08b56cc7d11bc58bfe952d2b3958c5b0054499f2a4bb7b7bcd100dbef5ab3c0fba4ac7f50b688512d71fd0a7eb27568c9f26023c451f0034883742ddeb45 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd
-DIST itertools-0.4.19.crate 64212 BLAKE2B 0136195264e3ebc1aa0f109049902799ac5d6e9bb9443dd9841e4bb9e82442f07a7dff8a3eb8c7a52790df430edc5d535783f63a9ace9965c97627fa22930723 SHA512 3cc1ec3928ace76394572a92f28d883a11f6f6481a0efcfbb9ef73b30e7f1f0ea35c407639dc45feb83da16bb756faa10192c75aea0cbfe573c22e20a5d97c99
-DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
-DIST kernel32-sys-0.2.1.crate 24530 BLAKE2B 8672864fb347a8cae336d822bce493ac98e11e807413bd8b8c0b141226f5db8fd0a306acd1c920a625f0aad248bc45b3b44a2d605f0c762edce283a4d73464c1 SHA512 7d63fda3200fc565853e5c2733f06c97f48f94ddfb13db73f889197917478948c3f73b61a9c0efc42cd4f8a4355af4c1790e3145ea18f35ccf29a2be997f5bad
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST libc-0.2.16.crate 104182 BLAKE2B fb35aeeeb840b4b55f8ef3ec3e722ac57e69cd175396e6f2e9c1261f4a31d6aca9cf042514dff4b80eb694f5c3ad9523f3122015e199b617bf6d017bd3356add SHA512 7af473d11ad4a34e9bfbd1dddf77d3d39773f76d779a60664458fbe0acecc871286ab41d90beb0ac5ae7285099ed1ff0c94ca69f5cbac4d3b2cb56b0ff766203
-DIST libc-0.2.23.crate 153939 BLAKE2B e89495dc4b9bb791bfe51e31a8047a20b74ffd585ddd81daec411c583d5d66b0c4fb2ecf13b19d2ef49a7023018df395f388681b1cb7f2f0449ffb4babe8a8ca SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72
-DIST libc-0.2.9.crate 77923 BLAKE2B b9b1b62ba6c06ac6b19ae639b20d9da4dfebc176ffb8c1caa9757311c36ddbf941c099ed3bf644c51baa4caeab53898faef8a8422ad48ecdeb8bccde6cb59f64 SHA512 4c0c7d1a28f42ad9c7ac8a12171a6d5d747b174ad3637497ea0db79f3b72469f811f2f6fb8dbbc6aee8d9e04637a9de7d8888db766b15a35b428c986d2650a16
-DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
-DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
-DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
-DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
-DIST mempool-0.3.1.crate 6678 BLAKE2B 6330ace3f58a43852d36c825cfe1fcb467412db7018f542d0270156a947ee3cf990126d094542f949d57c481e586841d53d6e3eb10038ab7a09d26faabb03ffc SHA512 79c6d1891b6d8c6b8d2e6ec76b3ce49a4595fe5d4d21320c004657c6db37d0ef56d7caf6a7e113a1ad8332fa5be333aaa54e7a7ba88ea59c6ccb971e7043ef03
-DIST multimap-0.3.0.crate 10681 BLAKE2B 8b5fcc7481ee60e6fbd032415906c2275b6797f874161749a752538414365ce9a1ef35867d353eccd64294cf47d3c0d31bedf120539be4594e10101a86d1e704 SHA512 ba1c8c4f9f23da2b80b5a16668b8227d1147aa9999f3b11343deb3e4b0582ead6fd957b7d0cb18f4b8141df3e6c8b81aa7f6c2ee0d0d61868b4e00181f5f290e
-DIST num-traits-0.1.39.crate 22618 BLAKE2B acacffc5ba41e2eeab0cb50f2746dba800fc5ebc4b9bb32000678eae117bf0e26d52b8225f71ac7c646bd7f5d8ab37615aad74086dc6ff4ea25e6e6fa141f024 SHA512 daf317fcd87807b2e295a4f748f1152f5a9b012bdada80204c97d33e3ef18c89432680db6f79ec655e585e0c38428c50ce5fbe7215f626af6f6f83eff47a364e
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST regex-0.1.63.crate 276618 BLAKE2B 8f7258e068638d02e3edb608480042b4f93e5ebc4c6f8a13d491aae02f05a24ea2839a9d603fe79221e18e178f92d4edf6ccc8911fd2e37db49d65fa13d985f5 SHA512 1758fc37f60e64a44bdaee66af84e9f5126c694186cf17612da7ff9b828261cb5136ea34a14e0a160cc7de2aa211f8fa806e3d27762e3aba8d0f4e0ba8c4e13d
-DIST regex-0.1.77.crate 185559 BLAKE2B 62e621f45375f4bdd7412c834f6f8efc25ec7e90e80b1b4d80761e39afdce96718760b10483504ce5c0427f76c307982beac00557a80c57860d8578a40b9bda0 SHA512 6b63a8d51a79ff020f6256d319d86e0a4a5efbf56071877ff4f23bb283c5a92ae914b6d7a00e4ac85c1b0efd45f68dd3672356e86a63343cd3ee6be1a206bfea
-DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
-DIST regex-syntax-0.3.1.crate 115911 BLAKE2B f13f70a43fad2abcd60a2d906cb04401b9eaaca0f74fa79b19c69bc8798b0805954d26e345788225f0a18d48488ac55758b9284b03ef749605b0b1f6e76e78d2 SHA512 ed040291d3c9e195923134fae7cf436752578c9bf975b48e3a426009ea5a71eb3852441036726781172f2006dc450801b12f6dc0cba31e60d7ed4fa8e85dd721
-DIST regex-syntax-0.3.5.crate 116666 BLAKE2B 38a3d258817405f3b0e5c01703d8da6e1d4dcd8588013ab659f02c70fd1716fe24fda00106f967f90000285d1f76db10086cf3596e4daaf8ab482f696e689873 SHA512 df3757a583b546af275937264788d04fb212d13fbce84b4200e88f10aa38558cf098ec7f91b838c09905ae2b71a8984566b71ef9f9b6e74d9404f3e5a4c027fc
-DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
-DIST rustc-serialize-0.3.19.crate 40870 BLAKE2B d0b944e3f73e84ca31164b301805f82ad3513119f642cd17dd34b6dba6cb776d665e60d0cb576a5d33ddda5bdf88d6d548da68750d5fb7a388a2d369d8ba583d SHA512 265f6426287e532822ba4ab7e209b0a0ba0fd58466f292c38b554ea12c7a992ad1a1910e10d151eedf1f0c99c248c64cdc4d4609cb67e36472e425d315f8a83e
-DIST rustc_version-0.2.1.crate 9840 BLAKE2B 765402ed397f839f1766da11ac80464d2f3cbd150508dcf1336402eaede9c20052dda4f9baed6ad73192c7586a50147b53e6c45a8d534463731653c113cae85f SHA512 edec68b24e95a04c58a08c67b58dd044f28930a87ad04aff0c0c66ffb3f1e89ab07f2fb9fed5e2e8c6ca3b372225da347bc10bbcd13d62b4552ab15abfdce0f7
-DIST rustfmt-0.5.0.crate 77624 BLAKE2B f57fe18e12b00961d845bab8977f2e3ffc22e69120784da107cf7ca429b12b4a50066cf7ef0e786166cdb2f939e20ce97a3eb05ecb4f5fca03c09de047c78c8d SHA512 228a68ba7d2c12483635506d2564edae3203848fd00020554993ffdad3d160be78ffb917564553f0eaafe2862c53316447dc131269cf14abeec9714a137d8fed
-DIST rustfmt-0.6.3.crate 88474 BLAKE2B 551cb0ada50ef0b388a287e9d42ee2a67dd9ba29f6c8ad48481325b6c7cbcfb2c31cafe5cf4081cd2e237314378742e5b195da226a747a4d863d19ab8f8f3eba SHA512 d2b12ae9cb78af43029363d97dcd5e0bbbc4f1eaf96d738b06d2c13662b20b9e4ca975056ccb683be3e52099307431da9e31db452f2f355b825bb1bd83b12f80
-DIST rustfmt-0.8.6.crate 110133 BLAKE2B 09d41e337179b534504fd9f9c259f07e90564c84bcb8810cdea1bc7b45fe4e10b85baf0b4f4dcb0c117876240f072c267a10449ec3ff8af0e765233394ec5141 SHA512 d7f8baba7b35a18ea21c6b0549bbfa4b2e2ff6bce681b4395ac5a08643f138a8de492455edb51d9ed1553cca19807a503b113b860f11359a33a339674ed9cb81
-DIST semver-0.6.0.crate 15598 BLAKE2B b46a0e8b782550a49174e461b447e617f0232d9df3bf2363273d4815452df5a587ba7534c843d7d68969166059704e1e8abd716623cfac5b42957b2eda55e14f SHA512 8b4dcad3c672ff8468a68fc19de2804e079af1a75406d71b996621021b5e05dc53fef972455fa9146c199493b71e2b80fe180e33ba4ccfb4dda10ba962a0a6bf
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
-DIST serde_derive-1.0.8.crate 24015 BLAKE2B d97f73055a5375d338fd078f2f55ca3db59c5c6212c9cc02817237ae964fba1076bc8e901f0d80285619568519745f9d55731ffacf3e4965aef80a662f61bc7f SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a
-DIST serde_derive_internals-0.15.1.crate 16441 BLAKE2B e1b82c9a0b8c08eddaafbaa3ca5c23aa1b11462e3e45912d2ee109a991206df5a65605739bf8365e3a29836c2fb0a551401bb090f5bf1418c5d6ed9d41c91bd6 SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c
-DIST serde_json-1.0.2.crate 55422 BLAKE2B 346d929bfebaf04b0afaebc9ac1c54119f2ce9b77e7163b474fe92669051bae12f0e2fff8ce9899219cc37032b4ea9f5dfc2fbdc022440246526ee11dedb71bd SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5
-DIST strings-0.0.1.crate 12981 BLAKE2B 224439fdb3c46298e9f0789ba647d43fa7233c7283f1910f96e59de4236c43271762e78aed33bc60fd0e3d8e0137f8646bbce865649dffe079d5ee0393e189c4 SHA512 be94151f46962ce4980d225af4bd007cd3bd56e630e361078b119796ae34566db97e8f35ae82e6bcef299fb79cd3101570eff25914dd9b4b410ea133ec0938a9
-DIST strings-0.1.0.crate 14234 BLAKE2B a84f7136072e1e403cc3b1a18c29265ed04352e338b683d52fa3f2e2f546924ee71a11e87ed806153e58a6f25444402a1a88bb33c093cda1d98f74f131e4072c SHA512 ac7aac7456d74263bfca93443041517938ee59c4b807877e70d4abd2840387e54eac41fa8406a263e317109401d16df662306756c3d869757e2a48643310c214
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST syntex_errors-0.44.0.crate 17411 BLAKE2B 1c50d2c778ef367cca18703f5da8915a48714df7e16ac0e4fa7481c1e580503f93c2dce59f216f2eba6294fb6066ff17f532cb2e4a7759b1e0f52e82491e0f66 SHA512 25a4f8580e253b10fa08953b34e66d6ddbe85cbc9f872b8343e739b8a8c754b823ae7c948de9678c2f3bef58bf54bfe35fda63b0eaf7f5d5e935143f531d166d
-DIST syntex_errors-0.59.0.crate 29194 BLAKE2B 36c35e5e5ecfe433e756b75ce09e1753496186ec178c6bd44725b4676af201eab1e833cb083fe9092beb3a9bdaf2a244998f8a7bd503e4e48f6985e884f3b465 SHA512 ad6931e3a9d64400deba090e8f269eb81ede1582238fe3889b35404ae38c4f33fd767ba9bd69cea13c87585f40271d41c7df6cdd9ebf7e1401d321323f4fc442
-DIST syntex_pos-0.44.0.crate 6883 BLAKE2B f59ba27e084b792ec420b9ddbc9dee79a49b9dcc4399a3204fe7fb2bd698bf1d2022897349200eec4854672d113b20ecd3c868a61d9747814ab37f838d7d01f3 SHA512 856a3103446afa42b615668c74ca073af55c03e8d1e3043ea120889aa9e18f284fb43a8982aa9bec4eb6bddc272e8ff45a26a8570dff1777c945185ae500a280
-DIST syntex_pos-0.59.0.crate 19199 BLAKE2B 9181c16d570591e0b05f0e11c0de47636824f8f924ece677ecec08fbb1810d6440e9780d56c625fade6e9ed214370d58ccc18756f6cbb2c6dc3e030159dcb883 SHA512 af1af6b6311d8dfb713850b48e4b4f4b16cde7249822a8b62c255e4b3c70e88fd4a5b1cb0ef9394b7f9f2833ca406b8d5a4646dd1f59868987fe0fa9276264fd
-DIST syntex_syntax-0.32.0.crate 663466 BLAKE2B 759df4062e032a9ee69619f6fae78b76f6bd5d0ca213739b028576141b44c62f0baf830b77477917049a930da05b66494422456d564f4acaf314dd3205deb8c9 SHA512 28059e6c68dc1324c0fb4411f829ad6a25fdb4573e15be5021206fb519b1a4d350129a073d279c7bf785308becfced5ecbdb7a60eb6ca78eada0111b5480d61b
-DIST syntex_syntax-0.44.1.crate 257816 BLAKE2B 22fb37800cc55ad21bfd4be1daa3c43a04d957338077e4c88a2f615aa8c35fdee5c2d23dafe0d64e35ca6497291ff219aaf74ad39d5adce802e908f9d22658cf SHA512 4d26e2a207efefc42993fd2e707a7b16882dfcf91e6d3ad385e210c3e2e9dafb3686e5a508ec27dd5acbf7bcf8edbf53d891cfb925b782691fc5d4243ecb376f
-DIST syntex_syntax-0.59.0.crate 269946 BLAKE2B 5114590f0902ef14d1dc3bddf9f42b4326dcf0ed70c51c9ff3279a0c433dfe0eac5f671eea6e72c0bc2302577c80ef96a7989f3326b81c9e3673b8052faf1808 SHA512 08420148294c2840f92b10cc695d5a2c50a72501c1b191fc863637d62ac673bd68fd6f08826091a932b3cdef228b175f37ac98186b4c797f249b5a7a7804adb9
-DIST term-0.2.14.crate 25395 BLAKE2B 1c1ba25927fc1bc4e1113214ebed009f5ce96a0f7d361798bd011fc989d5e8b8fd876580790c4043bb08e5d6af20e6f0ea2f0851be4ee79f643d3e45a0a09b3a SHA512 34872c1c1b06afb79ed3ac8a92d9c145681d22c09a3f1f5dd6047dfcc177ad5b1b9c9201ec982009e9f85d7ea71bac26d1f317fecfc67d2cd7569aa52c3327ed
-DIST term-0.4.4.crate 35853 BLAKE2B c3cc3955790f68d2500d6103f93a8d5d763d4b5ed3e00ee437cc597b4176bb6891c6b63a1c49bc7c85bec23906b09583fbe7160ef14d868eb00182d1da4d6165 SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7
-DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
-DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
-DIST thread-id-3.1.0.crate 7195 BLAKE2B 8bed46dc27434635f5dfba629e56c2aa1ab0a74733d37b9e90339d70443471e95bbe59672525962143b85df60b6834e1a3cf98b071c07eab371419e09aa28512 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13
-DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
-DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
-DIST toml-0.1.28.crate 42323 BLAKE2B c2a726def30924e8b56d594f01163d577cc524f3d42b7d44b886d1b55f28ce94484c1624c31c0e3f5718daf634c5ac9c00967520030c00a88a95c1574e882f9d SHA512 4b4af8fa2f9079259e2c4ebddde70e82f96603c4ec69a266394366671a5c42c61a6ea13fd51145a97c286ca48cbe731650065fac1c20822f818aff48f2a2b13c
-DIST toml-0.1.30.crate 45082 BLAKE2B f5cb494fbec4f4266afb3bdeb1be66975bc127ae16e207618594528ee32859aa337631a08050f84e21e7240f47b72d8c3f57e83126631a5028223a64975e09da SHA512 e6d06f47750fea66705f7b7e34c396665c564dc7687a9d1ff5f56bb63f37aaa991c253a022f76aa8857e9b95dcb0c11d0246889df98d4c8aca34ba7e1fb97ae7
-DIST toml-0.4.1.crate 54017 BLAKE2B 20fd8f0f8501adba0cfc504446d490da8d488efe218f54e8b9bda2e95d70b1a26d660fdfd512bd6344a2858e7a813edb10c26f366041171407db29abd1025654 SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480
-DIST unicode-segmentation-0.1.2.crate 53030 BLAKE2B 05827df7bab2e96ea8af542cd3700de685fa7f32d11722df0fac9d266d037cc8dd6a8791d0887beb88c1b40c7ba58462cb9191aa16d92061cb164d0d896ac3f2 SHA512 bdc196b56b7776fba44ed068823752fd48b962fbf9fa64fc3b976ab6ef3bced449b9f76c2fa5ab5c91294253b697871c1fc66a9ea6b95f087fadd1ee047bddd9
-DIST unicode-segmentation-1.2.0.crate 67562 BLAKE2B e294566ff0f0bbf8873c73c8f1103bce8d4d0fc8a03f41b299f88aeacecbcb44a3cf2ce95aab9682177a9e3f2e3db9cbd53403830c761724ee3654b9c328f862 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab
-DIST unicode-xid-0.0.3.crate 15998 BLAKE2B 2e112dbd311399836dd12ee37bbe7b9d83ed6fba89549784f1bf2ca9479b3e3cedd1bc2b15bf5e21b0cdb30fd3b88b973aadf37cb634024316ac33fc77d98d11 SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
-DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-0.1.8.crate 19807 BLAKE2B f5e89df2365a8ac34728d49bf0248014ef9dc080dd117ab699572aaf3c3abc695eb105fce44ada7d276d53201d5ed43134c7677ce1c6b31fc13128338f4ccf3d SHA512 292602f33d0eec44529f9fd763a76420177d7a3a417645975053871823b6531691cb0c253bc8ead2c32cd061538c161701aa86b111148960417e2d5e198b0d0f
-DIST winapi-0.2.6.crate 741153 BLAKE2B 908a8fce05cb76de370d5eea6463654b10abe09fea5e04c5762d4831662470dd4889f0bd211ada87966cb033b698f80f23e6cff2fb8474d26dd3d44624e17015 SHA512 ee81295e8154b0656b2ec892a38c69b3e1f839d6915ff68439ab5fe9ef9cf2d85cdadc9e8c9779d0eb3046821cafbc1f6e7977057178c85b29a21a86781bcc38
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD rustfmt-0.5.0.ebuild 791 BLAKE2B 042fcea5f674176d69e4b2438e547b74b731981e21e0652d0b267acac2627025d64e2618adcfb69ac475c3769610d622980e51c717dc9e54ee6cc989e92acd31 SHA512 6bb1e080bda390178620af636f7ad5d0eeb06d588c089daf4d63d67eb82a9f19a3dcb7b0d02e2e87117902324439fe9e07dc86dfe5f37b0a754b2e88899236b6
-EBUILD rustfmt-0.6.3.ebuild 886 BLAKE2B 63476f21040e5d65462df90eb06c2e878ecafa24f4bc93986529891b3e4cd8adc4619cc88b6bc6bf63d0fedec0c0278e55d93992ad3e948ec2e9d49718034e29 SHA512 346cc52c5085f191f77200f11011c1270d43ac341aba9782a8a655715521f2f9f34ce0c2cdadbf029e31fe61f52925ed9f93546cf30e6452a6273c94b2875e27
-EBUILD rustfmt-0.8.6.ebuild 1138 BLAKE2B 8a34a08085a3d0623808a06d8e38e0fe5eb4c4a8efba1eafb3b670baa890dd0d9ac35a318b86962690fdb70e001b3d726dddee73ceecc897ecd66d116398e99c SHA512 8d5682dc0a546b1309dea2855360a89c37c172c0bce80ac50e2b5e19534d04a5ec49f06fb53999e98d149d805c3c4c5a2e2d61286bb1437df9ae1a62570925a7
-MISC metadata.xml 344 BLAKE2B 9ad68bd02a6cb23d8801af7d5a7f83ba655ea3fa2a566433d00e79c924db04a1963e4d37b5102671f24cfe2f44aa4408c975bb63c09de35c629b9e1cda1e2ada SHA512 aeced857d8f01a427d61171bd400db3503c524dde306580d4c92790fa4843e7a5ab3e8a4b0c429a626b87ae6575ed65eeb7913334faa219d6cae0c445cce7c04
diff --git a/dev-util/rustfmt/metadata.xml b/dev-util/rustfmt/metadata.xml
deleted file mode 100644
index 838e7b2c8423..000000000000
--- a/dev-util/rustfmt/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>rust@gentoo.org</email>
-    <name>Rust Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rust-lang-nursery/rustfmt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/rustfmt/rustfmt-0.5.0.ebuild b/dev-util/rustfmt/rustfmt-0.5.0.ebuild
deleted file mode 100644
index 4ccf2c0b1711..000000000000
--- a/dev-util/rustfmt/rustfmt-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.5.1
-unicode-xid-0.0.3
-log-0.3.6
-term-0.2.14
-rustc-serialize-0.3.19
-memchr-0.1.11
-toml-0.1.28
-bitflags-0.5.0
-strings-0.0.1
-getopts-0.2.14
-diff-0.1.9
-mempool-0.3.1
-unicode-segmentation-0.1.2
-term-0.4.4
-syntex_syntax-0.32.0
-winapi-0.2.6
-winapi-build-0.1.1
-kernel32-sys-0.2.1
-utf8-ranges-0.1.3
-regex-0.1.63
-regex-syntax-0.3.1
-rustfmt-0.5.0
-env_logger-0.3.3
-libc-0.2.9
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/rust-1.8.0"
-RDEPEND=""
diff --git a/dev-util/rustfmt/rustfmt-0.6.3.ebuild b/dev-util/rustfmt/rustfmt-0.6.3.ebuild
deleted file mode 100644
index bb7b0a5a35f7..000000000000
--- a/dev-util/rustfmt/rustfmt-0.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.5.3
-bitflags-0.7.0
-diff-0.1.9
-env_logger-0.3.5
-getopts-0.2.14
-itertools-0.4.19
-kernel32-sys-0.2.2
-libc-0.2.16
-log-0.3.6
-memchr-0.1.11
-multimap-0.3.0
-regex-0.1.77
-regex-syntax-0.3.5
-rustc-serialize-0.3.19
-rustfmt-0.6.3
-strings-0.0.1
-syntex_errors-0.44.0
-syntex_pos-0.44.0
-syntex_syntax-0.44.1
-term-0.4.4
-thread-id-2.0.0
-thread_local-0.2.7
-toml-0.1.30
-unicode-segmentation-0.1.2
-unicode-xid-0.0.3
-utf8-ranges-0.1.3
-walkdir-0.1.8
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/rust-1.8.0"
-RDEPEND=""
diff --git a/dev-util/rustfmt/rustfmt-0.8.6.ebuild b/dev-util/rustfmt/rustfmt-0.8.6.ebuild
deleted file mode 100644
index 34cfca3fcc58..000000000000
--- a/dev-util/rustfmt/rustfmt-0.8.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.3
-bitflags-0.9.1
-diff-0.1.10
-dtoa-0.4.1
-env_logger-0.4.3
-extprim-1.2.2
-getopts-0.2.14
-itoa-0.3.1
-kernel32-sys-0.2.2
-libc-0.2.23
-log-0.3.8
-memchr-1.0.1
-num-traits-0.1.39
-quote-0.3.15
-rand-0.3.15
-regex-0.2.2
-regex-syntax-0.4.1
-rustc_version-0.2.1
-rustfmt-0.8.6
-semver-0.6.0
-semver-parser-0.7.0
-serde-1.0.8
-serde_derive-1.0.8
-serde_derive_internals-0.15.1
-serde_json-1.0.2
-strings-0.1.0
-syn-0.11.11
-synom-0.11.3
-syntex_errors-0.59.0
-syntex_pos-0.59.0
-syntex_syntax-0.59.0
-term-0.4.5
-thread-id-3.1.0
-thread_local-0.3.3
-toml-0.4.1
-unicode-segmentation-1.2.0
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-0.1.1
-utf8-ranges-1.0.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/rust-1.8.0"
-RDEPEND=""
diff --git a/dev-util/sasm-2.2-r1 b/dev-util/sasm-2.2-r1
new file mode 100644
index 000000000000..784dc5a3afb7
--- /dev/null
+++ b/dev-util/sasm-2.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=Simple crossplatform IDE for NASM assembly language
+EAPI=6
+HOMEPAGE=http://dman95.github.io/SASM/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/Dman95/SASM/archive/v2.2.tar.gz -> sasm-2.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8351851d9f58820fd5291315f1a535b4
diff --git a/dev-util/sasm-9999 b/dev-util/sasm-9999
new file mode 100644
index 000000000000..c2bcfadb8a2c
--- /dev/null
+++ b/dev-util/sasm-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Simple crossplatform IDE for NASM assembly language
+EAPI=6
+HOMEPAGE=https://dman95.github.io/SASM/
+LICENSE=GPL-3
+SLOT=0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7f3e9a407beb29ddb021ccca780fa15f
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
deleted file mode 100644
index c7f8761c5c31..000000000000
--- a/dev-util/sasm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
-EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc
-EBUILD sasm-9999.ebuild 770 BLAKE2B c78133844ee317fbc57b7650359d56cf86ca102056b8241ced281450a8d755d9ab72b32aa2edf4901375bc634bac347041ecfa825fddec6e5b280fce4c26f10c SHA512 0dba9e85f0c9a638f82ef99f1a6deb4854c84f40ac2d8845f0d0dc155d22a84363af58a07e1ed4e32b9c797b1c4f4bb8ac0e35c77bbcccfc9c0718d62af59e27
-MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92
diff --git a/dev-util/sasm/metadata.xml b/dev-util/sasm/metadata.xml
deleted file mode 100644
index 0dd346aa2e8d..000000000000
--- a/dev-util/sasm/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="github">Dman95/SASM</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
deleted file mode 100644
index 7c9c73aab793..000000000000
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
-fi
-
-DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="http://dman95.github.io/SASM/"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-REPEND="${DEPEND}
-	dev-lang/nasm
-	sys-devel/gdb
-"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
deleted file mode 100644
index 61a911989dd0..000000000000
--- a/dev-util/sasm/sasm-9999.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
-
-inherit qmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
-fi
-
-DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="https://dman95.github.io/SASM/"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-REPEND="${DEPEND}
-	dev-lang/nasm
-	sys-devel/gdb
-"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-util/scala-ide-4.7.0 b/dev-util/scala-ide-4.7.0
new file mode 100644
index 000000000000..a478d4dd2ae7
--- /dev/null
+++ b/dev-util/scala-ide-4.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install preinst prepare setup unpack
+DEPEND=java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=The Scala IDE
+EAPI=6
+HOMEPAGE=http://www.scala-ide.org
+IUSE=elibc_FreeBSD java
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=virtual/jdk-1.6 || ( dev-lang/scala dev-lang/scala-bin ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=amd64? ( http://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz ) x86? ( http://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b4b5d2df45925df98a144e4f34ce5b1b
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
deleted file mode 100644
index 532b07211a15..000000000000
--- a/dev-util/scala-ide/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz 281266580 BLAKE2B dd7e38385228e5bcb5d9997324e5f9abeba8b9c1a09bb503eb0b10368df89ee48357900123e230341880356f24eb1e3138326970e4dc6bd85204a48422a464b4 SHA512 622f930b665b1187baaa416f3172dc6b48551148c6267fa251e1ab17cdc5c78cccce07371ce909e59af0202d7e9a0126aa9e1d22798e0498f217e7e541e0e1a8
-EBUILD scala-ide-4.7.0.ebuild 1174 BLAKE2B 2334d098ca53d551ba7d2895d0094c92c55fa59377c9be72d63aee6e29748e9895b5059275f10dfb29d70444b215311cba56737b56e229c07e4eb02375fb72dc SHA512 a844721fe8fb090d445b44fa31b291310bd03ce75b4d5ea36f6b4a3a57eb436cefcdb6d2253dc00c7f391188017ceec6f59d54d4bc3914954a6f3e9ed98fae60
-MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
deleted file mode 100644
index 4422c51f84a2..000000000000
--- a/dev-util/scala-ide/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>monsieurp@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/scala-ide/scala-ide-4.7.0.ebuild b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
deleted file mode 100644
index e7e17c02f4c6..000000000000
--- a/dev-util/scala-ide/scala-ide-4.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-opt-2
-
-# scala-ide -> scalaide
-S_PACK="${PN/-/}-pack"
-
-# scala-ide -> scala-SDK-${PV}
-S_SDK="${PN%-*}-SDK-${PV}"
-
-SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-20170929/${S_SDK}-vfinal-2.12-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-20170929/${S_SDK}-vfinal-2.12-linux.gtk.x86_64.tar.gz"
-
-DESCRIPTION="The Scala IDE"
-HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="amd64 x86"
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )"
-
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND=">=virtual/jdk-1.6
-	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
-	)"
-
-MY_D="/opt"
-
-src_unpack() {
-	default
-	unpack ${A}
-	mv "${WORKDIR}"/eclipse "${WORKDIR}/${P}" || die
-}
-
-src_prepare() {
-	default
-	mv "${WORKDIR}/${P}"/eclipse "${WORKDIR}/${P}/${PN}" || die
-}
-
-src_install() {
-	cd "${D}" || die
-	dodir "${MY_D}"
-	insinto "${MY_D}"
-	doins -r "${WORKDIR}/${P}"
-	insopts -m 0755
-	insinto "${MY_D}/${P}"
-	doins "${WORKDIR}/${P}/${PN}"
-	dosym "${MY_D}/${P}/${PN}" "/usr/bin/${PN}"
-}
diff --git a/dev-util/scanmem-0.15.3 b/dev-util/scanmem-0.15.3
new file mode 100644
index 000000000000..34678bfbcaea
--- /dev/null
+++ b/dev-util/scanmem-0.15.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=sys-libs/readline:= >=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=Locate and modify variables in executing processes
+EAPI=5
+HOMEPAGE=https://github.com/scanmem/scanmem
+IUSE=gui 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 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/readline:= gui? ( 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/pygobject:3 sys-auth/polkit )
+REQUIRED_USE=gui? ( ^^ ( 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/scanmem/scanmem/archive/v0.15.3.tar.gz -> scanmem-0.15.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cbd53e0a75cca7c43f8fe97645f5e466
diff --git a/dev-util/scanmem-0.16.1 b/dev-util/scanmem-0.16.1
new file mode 100644
index 000000000000..450658f0a981
--- /dev/null
+++ b/dev-util/scanmem-0.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=sys-libs/readline:= >=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=Locate and modify variables in executing processes
+EAPI=6
+HOMEPAGE=https://github.com/scanmem/scanmem
+IUSE=gui 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 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/readline:= gui? ( 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/pygobject:3 sys-auth/polkit )
+REQUIRED_USE=gui? ( ^^ ( 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/scanmem/scanmem/archive/v0.16.1.tar.gz -> scanmem-0.16.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4ba3dc405898657ac9abdbc03d867b85
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
deleted file mode 100644
index 99ff25b5f511..000000000000
--- a/dev-util/scanmem/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scanmem-0.15.3.tar.gz 243150 BLAKE2B d9a218815163da31c191884268698ea8f4e12521c9f512deb850327fef44b0590d977906b4e4d48b8f15b5958523951a90fae2ace1c3a9db3f677249c706ced5 SHA512 7f14e8a129321d7e58651d7e98ab71e58926465c98d256226ef7803fa7e42ba8bbe0879da8173ad2659deb655c73338db27d832a264b429f740331aee1f6d4b7
-DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
-EBUILD scanmem-0.15.3.ebuild 953 BLAKE2B d194393272643c6161875cf8c1d51dac45804eafa60c9e487b8fb201ec852670d71bd262de6d4bd29dd8cd894f0bf09696348ae4327d5e449b86c9417519e408 SHA512 58cef753e1603467e1f80544fad0c4ae0fe124a49c322a46c4c4efb31d30df082ba171eca2685533b5969b93371cff25ad4cba2724fdaebbe62d09a8b7ea8eef
-EBUILD scanmem-0.16.1.ebuild 989 BLAKE2B 7beff0a82c896dfae227c5081c69df3e4420c022a20322b27b4b0a2a2a1b33d4657cb8a11d64fc23240d3662ba2c19a2a9476b6052312619e00a20d5fd9d3a54 SHA512 3771f6c6fe69ac354b16dbc3bb89ed40ba112070dbf6a689b5100b400ffd5ac8611115728fc5dc43dbdd53c62232f4b9c725e3ab70cf569d35c0081fe813b95d
-MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/metadata.xml b/dev-util/scanmem/metadata.xml
deleted file mode 100644
index 0796a9ceda90..000000000000
--- a/dev-util/scanmem/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-needed -->
-	<use>
-		<flag name="gui">Enable the GameConqueror GUI</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">scanmem/scanmem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/scanmem/scanmem-0.15.3.ebuild b/dev-util/scanmem/scanmem-0.15.3.ebuild
deleted file mode 100644
index 036313e7dd56..000000000000
--- a/dev-util/scanmem/scanmem-0.15.3.ebuild
+++ /dev/null
@@ -1,52 +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,3_5} )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Locate and modify variables in executing processes"
-HOMEPAGE="https://github.com/scanmem/scanmem"
-SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-DEPEND="sys-libs/readline:="
-RDEPEND="${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3
-		sys-auth/polkit
-	)"
-
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i "/CFLAGS/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable gui)
-}
-
-src_install() {
-	default
-
-	if use gui ; then
-		docinto gui
-		dodoc gui/{README,TODO}
-		python_fix_shebang "${D}"
-	fi
-}
diff --git a/dev-util/scanmem/scanmem-0.16.1.ebuild b/dev-util/scanmem/scanmem-0.16.1.ebuild
deleted file mode 100644
index 7c226726a1fc..000000000000
--- a/dev-util/scanmem/scanmem-0.16.1.ebuild
+++ /dev/null
@@ -1,56 +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 autotools eutils python-single-r1
-
-DESCRIPTION="Locate and modify variables in executing processes"
-HOMEPAGE="https://github.com/scanmem/scanmem"
-SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-DEPEND="sys-libs/readline:="
-RDEPEND="${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3
-		sys-auth/polkit
-	)"
-
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i "/CFLAGS/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-readline
-		$(use_enable gui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use gui ; then
-		docinto gui
-		dodoc gui/{README,TODO}
-		python_fix_shebang "${D}"
-	fi
-}
diff --git a/dev-util/schroot-1.6.10-r4 b/dev-util/schroot-1.6.10-r4
new file mode 100644
index 000000000000..f693b5c3b8f6
--- /dev/null
+++ b/dev-util/schroot-1.6.10-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Utility to execute commands in a chroot environment
+EAPI=6
+HOMEPAGE=https://packages.debian.org/source/sid/schroot
+IUSE=btrfs +dchroot debug doc lvm nls pam test
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-2.debian.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=880939d1ab1916c47f4355756dd2c04c
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
deleted file mode 100644
index d67856a63443..000000000000
--- a/dev-util/schroot/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
-AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
-DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
-DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
-MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
diff --git a/dev-util/schroot/files/schroot.confd b/dev-util/schroot/files/schroot.confd
deleted file mode 100644
index b62263175721..000000000000
--- a/dev-util/schroot/files/schroot.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a configuration file for /etc/init.d/schroot; it allows you
-# to perform common modifications to the behavior of schroot
-# initialization without editing the init script.
-
-# What do we want to do with "orphan" sessions when starting or
-# restarting?  Recover them (leave empty or set to "recover") or just
-# end them (set to "end")?
-SESSIONS_RECOVER="recover"
-
diff --git a/dev-util/schroot/files/schroot.initd b/dev-util/schroot/files/schroot.initd
deleted file mode 100644
index be58c3a0f2d0..000000000000
--- a/dev-util/schroot/files/schroot.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need localmount
-	after net netmount
-}
-
-start() {
-	local msg param
-	case "${SESSIONS_RECOVER}" in
-		end)
-			msg="Ending"
-			param="--end-session"
-			;;
-		recover|"")
-			msg="Recovering"
-			param="--recover-session"
-			;;
-		*)
-			ewarn "Invalid value \"$SESSIONS_RECOVER\" for \$SESSIONS_RECOVER, using \"recover\""
-			msg="Recovering"
-			param="--recover-session"
-			;;
-	esac
-
-	einfo "$msg schroot sessions"
-	eindent
-	local chroot
-	local chroots="$(schroot --all-sessions --list --quiet)"
-	if [ -n "$chroots" ]; then
-		for chroot in $chroots; do
-			ebegin "$chroot"
-			schroot --chroot=$chroot $param
-			eend $?
-		done
-	else
-		einfo "(none)"
-	fi
-	eoutdent
-	einfo "...done"
-}
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
deleted file mode 100644
index cc3f6c238b48..000000000000
--- a/dev-util/schroot/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-needed -->
-<use>
-  <flag name="btrfs">Enable support for chroots using btrfs snapshots.</flag>
-  <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg>.</flag>
-  <flag name="lvm">Enable support for chroots using LVM snapshots.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
deleted file mode 100644
index 432388f071b4..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=2
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="https://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
-	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? (
-		>=app-text/po4a-0.40
-		sys-devel/gettext
-	)
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${S}/debian/patches/Add-support-for-more-compression-formats.patch"
-	"${S}/debian/patches/Add-SESSION_SOURCE-and-CHROOT_SESSION_SOURCE.patch"
-	"${S}/debian/patches/10mount-Move-mount-directory-to-var-run.patch"
-	"${S}/debian/patches/Support-union-mounts-with-overlay-as-in-Linux-4.0.patch"
-	"${S}/debian/patches/GCC5-fixes-on-regexes.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dbtrfs-snapshot=$(usex btrfs)
-		-Ddchroot=$(usex dchroot)
-		-Ddchroot-dsa=$(usex dchroot)
-		-Ddebug=$(usex debug)
-		-Ddoxygen=$(usex doc)
-		-Dlvm-snapshot=$(usex lvm)
-		-Dnls=$(usex nls)
-		-Dpam=$(usex pam)
-		-Dtest=$(usex test)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newdoc debian/schroot.NEWS NEWS.debian
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dohtml "${BUILD_DIR}"/doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
-		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
-		elog "upgrade information."
-	fi
-	# If installing to a running system, upgrading from <=1.6.10-r3, then
-	# make sure that the runtime dirs are still visible to the new install
-	if [[ ${ROOT} == / && ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.6.10-r4 ${REPLACING_VERSIONS}; then
-		ln -s "${EPREFIX}"/var/lib/schroot "${EPREFIX}"/var/run/schroot
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		for dir in $(find "${EROOT}"/var/lib/schroot/mount -maxdepth 1 -type d | tac); do
-			rmdir "$dir" || elog "Failed to remove session mount directory $dir: Please check for any stray mounts or data under this directory and remove by hand."
-		done
-	fi
-}
diff --git a/dev-util/scons-2.4.1 b/dev-util/scons-2.4.1
new file mode 100644
index 000000000000..3c440a757a3b
--- /dev/null
+++ b/dev-util/scons-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=5
+HOMEPAGE=http://www.scons.org/
+IUSE=doc python_targets_pypy python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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/scons/scons-2.4.1.tar.gz doc? ( http://www.scons.org/doc/2.4.1/PDF/scons-user.pdf -> scons-2.4.1-user.pdf http://www.scons.org/doc/2.4.1/HTML/scons-user.html -> scons-2.4.1-user.html )
+_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_=98a8481096b5ea66bae0efd9139be4a5
diff --git a/dev-util/scons-2.5.1 b/dev-util/scons-2.5.1
new file mode 100644
index 000000000000..030c52fa6fda
--- /dev/null
+++ b/dev-util/scons-2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc python_targets_pypy python_targets_python2_7
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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/scons/scons-2.5.1.tar.gz doc? ( http://www.scons.org/doc/2.5.1/PDF/scons-user.pdf -> scons-2.5.1-user.pdf http://www.scons.org/doc/2.5.1/HTML/scons-user.html -> scons-2.5.1-user.html )
+_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_=6966bd249cd60966085c8f489f0be9cd
diff --git a/dev-util/scons-3.0.1 b/dev-util/scons-3.0.1
new file mode 100644
index 000000000000..aed318b5f233
--- /dev/null
+++ b/dev-util/scons-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.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_=e8408b739863b92190737b5155cf8fe5
diff --git a/dev-util/scons-3.0.1-r1 b/dev-util/scons-3.0.1-r1
new file mode 100644
index 000000000000..0530d0b649fa
--- /dev/null
+++ b/dev-util/scons-3.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.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_=02662da0458bd7771654955587aa347e
diff --git a/dev-util/scons-3.0.1-r100 b/dev-util/scons-3.0.1-r100
new file mode 100644
index 000000000000..153873a8228a
--- /dev/null
+++ b/dev-util/scons-3.0.1-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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_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=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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_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://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.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_=5d32d4cc154ea4cab2c6b06fd01fc48a
diff --git a/dev-util/scons-3.0.1-r3 b/dev-util/scons-3.0.1-r3
new file mode 100644
index 000000000000..9eec233a3b06
--- /dev/null
+++ b/dev-util/scons-3.0.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extensible Python-based build utility
+EAPI=6
+HOMEPAGE=http://www.scons.org/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.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_=a240f8f5514a4f3a4b45ffa6981161b2
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
deleted file mode 100644
index 27487728d6af..000000000000
--- a/dev-util/scons/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
-AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
-AUX scons-3.0.1-respect-cc-etc-r1.patch 3470 BLAKE2B 4302f7f6448541ba76aa1e66a51535603b4ea7a4c47cf9ed59c23d559f32668604a2b7250ef1d7e6c40e34c93d02ac4858bee1f3b7196c8eda05c4cb8fd464b0 SHA512 6154b22c677176d8644a392ad68d63da04a2f3616c6861471b7ea397f4542aba63ee30b1f14e2ad2f183ef78e3ccaf8ddea8c712b46f18da44881b20ea8c1497
-DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
-DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
-DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
-DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
-DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
-DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
-DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b06129c26ca64d45923066ad92cf5519fa4933ef74dd5254d5b068b2909290c5c930a4247ebd6a5f1761f683a6e2 SHA512 e49ae91b04509d32f67d17cabb6619ede49c7190d80efcbd1e0bd1992574ea08c7abc892cad26f8b995b0f43bccd099a96ce633d63d6f56aafc442f9aa734aec
-DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
-DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
-DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
-EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1603 BLAKE2B 2469be4adae61636d044e2beec6bba28cb62bc81c6381d8eb1228a8907ae05c248ca042490cb4af0ef94bd1e081b950dfff064d07e194cba347e01c5ad647624 SHA512 1609e0aa9c7ac60e38aa92cae29d15bebec7583656d9f18cd545745f8fd29677fbd00643e617408866df88b42949c47de3405e2c57ddfde1e608a88a8ea83611
-EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
-EBUILD scons-3.0.1-r100.ebuild 2078 BLAKE2B 44634da960c7a30c9a0b8923cf163ea0be4ce31308d9b57d6705dc9baacd8661d62b317ad622f058cdfaae29728d781708df22021038281b83e9e9f0dda1db71 SHA512 f34c403ac05b2f42f3e1de1dd4ab3a3e22c3377f68ac0781da2a04280123cd218c912f5ff784876139b78cd93fe9b0dabd8d3304a4f3341f01645459a154f766
-EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
-EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
-MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-2.5.1-respect-path.patch b/dev-util/scons/files/scons-2.5.1-respect-path.patch
deleted file mode 100644
index d5da07bc980b..000000000000
--- a/dev-util/scons/files/scons-2.5.1-respect-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Clang/LLVM is installed in an "odd" location (/usr/lib/llvm/<ver>/bin/)
-which is added to PATH.  Since we cannot know <ver> upfront, it's wrong
-to hardcode the PATH at the time of installation else we'd break after a
-Clang update.  Since Clang is the primary compiler on Darwin, just
-extract the relevant path on each invocation.
-
---- a/engine/SCons/Platform/posix.py
-+++ b/engine/SCons/Platform/posix.py
-@@ -87,9 +87,15 @@
-     pspawn = piped_env_spawn
-     # Note that this means that 'escape' is no longer used
- 
-+    with open('@GENTOO_PORTAGE_EPREFIX@/etc/profile.env', 'r') as f:
-+        for l in f:
-+            if "export PATH=" in l:
-+                path = l.split('=')[1].strip("'")
-+                break
-+
-     if 'ENV' not in env:
-         env['ENV']        = {}
--    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+    env['ENV']['PATH']    = path
-     env['OBJPREFIX']      = ''
-     env['OBJSUFFIX']      = '.o'
-     env['SHOBJPREFIX']    = '$OBJPREFIX'
-@@ -104,7 +110,7 @@
-     env['LIBSUFFIXES']    = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
-     env['PSPAWN']         = pspawn
-     env['SPAWN']          = spawn
--    env['SHELL']          = 'sh'
-+    env['SHELL']          = '@GENTOO_PORTAGE_EPREFIX@/bin/sh'
-     env['ESCAPE']         = escape
-     env['TEMPFILE']       = TempFileMunge
-     env['TEMPFILEPREFIX'] = '@'
diff --git a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch b/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
deleted file mode 100644
index 16de316766b1..000000000000
--- a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 9 May 2018 17:04:49 +0200
-Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
-
-Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
-of wiping the environment and resetting PATH to default, and instead
-pass all variables through.
----
- src/engine/SCons/Platform/posix.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index 8db08db1..af34650c 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -87,9 +87,17 @@ def generate(env):
-     pspawn = piped_env_spawn
-     # Note that this means that 'escape' is no longer used
- 
--    if 'ENV' not in env:
--        env['ENV']        = {}
--    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+    # Force pass-through of environment variables in Gentoo builds
-+    if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
-+        new_env = os.environ.copy()
-+        if 'ENV' in env:
-+            new_env.update(env['ENV'])
-+        env['ENV'] = new_env
-+    else:
-+        if 'ENV' not in env:
-+            env['ENV']        = {}
-+        env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+
-     env['OBJPREFIX']      = ''
-     env['OBJSUFFIX']      = '.o'
-     env['SHOBJPREFIX']    = '$OBJPREFIX'
--- 
-2.17.0
-
diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
deleted file mode 100644
index 748646b14f10..000000000000
--- a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 68fc19b7fd6b65ab850e4fd8ef5e85c672989f92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++
- src/engine/SCons/Tool/cc.py        |  3 ++-
- src/engine/SCons/Tool/cxx.py       |  3 ++-
- src/engine/SCons/Tool/link.py      |  3 ++-
- 4 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index af34650c..5533c87c 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -93,6 +93,26 @@ def generate(env):
-         if 'ENV' in env:
-             new_env.update(env['ENV'])
-         env['ENV'] = new_env
-+
-+        # Furthermore, force common compiler/linker variables as well
-+        envvar_mapping = {
-+            'AR': 'AR',
-+            'AS': 'AS',
-+            'ASFLAGS': 'ASFLAGS',
-+            'CC': 'CC',
-+            'CXX': 'CXX',
-+            'CFLAGS': 'CFLAGS',
-+            'CXXFLAGS': 'CXXFLAGS',
-+            'CPPFLAGS': 'CPPFLAGS',
-+            'LDFLAGS': 'LINKFLAGS',
-+        }
-+
-+        for envvar, toolvar in envvar_mapping.items():
-+            if toolvar not in env and envvar in env['ENV']:
-+                val = env['ENV'][envvar]
-+                if toolvar.endswith('FLAGS'):
-+                    val = SCons.Util.CLVar(val)
-+                env[toolvar] = val
-     else:
-         if 'ENV' not in env:
-             env['ENV']        = {}
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/engine/SCons/Tool/cc.py
-+++ b/src/engine/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
- 
-     if 'CC' not in env:
-         env['CC']    = env.Detect(compilers) or compilers[0]
--    env['CFLAGS']    = SCons.Util.CLVar('')
-+    if 'CFLAGS' not in env:
-+        env['CFLAGS'] = SCons.Util.CLVar('')
-     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCC']      = '$CC'
-     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/engine/SCons/Tool/cxx.py
-+++ b/src/engine/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
- 
-     if 'CXX' not in env:
-         env['CXX']    = env.Detect(compilers) or compilers[0]
--    env['CXXFLAGS']   = SCons.Util.CLVar('')
-+    if 'CXXFLAGS' not in env:
-+        env['CXXFLAGS'] = SCons.Util.CLVar('')
-     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCXX']      = '$CXX'
-     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
-index 07e92507..614d1779 100644
---- a/src/engine/SCons/Tool/link.py
-+++ b/src/engine/SCons/Tool/link.py
-@@ -292,7 +292,8 @@ def generate(env):
-     env.Append(SHLIBEMITTER = [shlib_emitter])
-     env['SMARTLINK']   = smart_link
-     env['LINK']        = "$SMARTLINK"
--    env['LINKFLAGS']   = SCons.Util.CLVar('')
-+    if 'LINKFLAGS' not in env:
-+        env['LINKFLAGS'] = SCons.Util.CLVar('')
-     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
-     env['LINKCOM']     = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
-     env['LIBDIRPREFIX']='-L'
--- 
-2.17.0
-
diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml
deleted file mode 100644
index 979bab55bc3a..000000000000
--- a/dev-util/scons/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>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <longdescription lang="en">
-    SCons is a make replacement providing a range of enhanced
-    features such as automated dependency generation and built in
-    compilation cache support. SCons rule sets are Python scripts so
-    as well as the features it provides itself SCons allows you to use
-    the full power of Python to control compilation.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">scons</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/scons/scons-2.4.1.ebuild b/dev-util/scons/scons-2.4.1.ebuild
deleted file mode 100644
index 68b9b393ddfa..000000000000
--- a/dev-util/scons/scons-2.4.1.ebuild
+++ /dev/null
@@ -1,52 +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="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
deleted file mode 100644
index 22476258b7e4..000000000000
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# bug #361061
-	if use prefix ; then
-		eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
-		eprefixify engine/SCons/Platform/posix.py
-	fi
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
deleted file mode 100644
index 212863e12920..000000000000
--- a/dev-util/scons/scons-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/}$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
deleted file mode 100644
index 93ab8b574de7..000000000000
--- a/dev-util/scons/scons-3.0.1-r100.ebuild
+++ /dev/null
@@ -1,73 +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}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/}$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1-r3.ebuild b/dev-util/scons/scons-3.0.1-r3.ebuild
deleted file mode 100644
index eaa2ef2426d0..000000000000
--- a/dev-util/scons/scons-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/}$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild
deleted file mode 100644
index 1a6f2c59360e..000000000000
--- a/dev-util/scons/scons-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/}$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/sel-0.08.4-r2 b/dev-util/sel-0.08.4-r2
new file mode 100644
index 000000000000..32af5c63b0c5
--- /dev/null
+++ b/dev-util/sel-0.08.4-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A filemanager for shell scripts
+EAPI=6
+HOMEPAGE=http://www.rninet.de/darkstar/sel.html
+KEYWORDS=amd64 ppc s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f0f91488b8bb75fd025b3c4710a31171
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
deleted file mode 100644
index 8d3152d4544c..000000000000
--- a/dev-util/sel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
-EBUILD sel-0.08.4-r2.ebuild 715 BLAKE2B 41e13a713d79512edc37c48b1d105a8a0a81a2cf6de07104dc4e0f4d368ebd741450b691dbf086af5a8fc191a2f5d9435e99a3709fc207cf418a0269e6dd59a3 SHA512 00b466c888d325f1168ad94d9e85ba96aeeba29045fd5545af56a5e42a9b9c54cdae3bab980e61492cd0858be5c0fcca9d856540e5930fbd1ee055e8635ad0b8
-MISC metadata.xml 278 BLAKE2B 6a95d389f2204d31fba86bfb283058e708907d15c8a58c0ea599e83b34297f8bcd3f9a44f98d5927a64f4866d09ac3b80e268713905ce27b0e6bfd707d1e470b SHA512 27d648be83bdf79c6728bb4936d00499b71be48225b9fc544f2a4f6d54bc60670f167a4b7a51ef28740b36a9faecf396c0df1fcfff08bfc89b88dc902109eda1
diff --git a/dev-util/sel/metadata.xml b/dev-util/sel/metadata.xml
deleted file mode 100644
index 2adeed764081..000000000000
--- a/dev-util/sel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-sel is a file selection utility for use on the shell and in shell scripts
-</longdescription>
-</pkgmetadata>
-
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
deleted file mode 100644
index 62715868b15a..000000000000
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc s390 sparc x86"
-
-RDEPEND="sys-libs/ncurses:0="
-
-DOCS=( "help.txt" README.GER whatsnew )
-
-src_prepare () {
-	default
-	sed -i \
-		-e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		"${PN}.c" || die 'sed failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
-}
-
-src_install () {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/dev-util/serialtalk-1.2 b/dev-util/serialtalk-1.2
new file mode 100644
index 000000000000..17d1ca57995d
--- /dev/null
+++ b/dev-util/serialtalk-1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=simple command-line tool to talk to serial devices
+EAPI=6
+HOMEPAGE=https://github.com/BGO-OD/serialtalk
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/BGO-OD/serialtalk/archive/v1.2.tar.gz -> serialtalk-1.2.tar.gz
+_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_=dda3736c93c7779da1b3f7065f92e597
diff --git a/dev-util/serialtalk-9999 b/dev-util/serialtalk-9999
new file mode 100644
index 000000000000..63a0fa94007b
--- /dev/null
+++ b/dev-util/serialtalk-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=simple command-line tool to talk to serial devices
+EAPI=6
+HOMEPAGE=https://github.com/BGO-OD/serialtalk
+LICENSE=GPL-3+
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=07639d554d15262d2fd6a105d2fbbda9
diff --git a/dev-util/serialtalk/Manifest b/dev-util/serialtalk/Manifest
deleted file mode 100644
index f1d2a4cfe338..000000000000
--- a/dev-util/serialtalk/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST serialtalk-1.2.tar.gz 19214 BLAKE2B c3b07e7134ac2884bf5dfb8db9433485b21b325fa025c1ea198e01e8a9037ebac5190dee2e450727adb3711615b2a2072f47cfabd84aa123c9759623f06701b5 SHA512 4634e4a044915841bf4c2ba141b479207237b1d078a3af47515adebbca3feeb8e1a8e86a673b8a77595255b017e51bbe3e3567e4914b9d603ba676525a7f1dc2
-EBUILD serialtalk-1.2.ebuild 535 BLAKE2B f3a7ae233ca897ff10bc3757779b91b1ad26d6e17fc02d5e450d588a91c485fd95db1d3e667702102c2ee2baaff5b364358620aee8e5bbc55419a6df00c23a2f SHA512 1d9e605a1c4d203868934b04fcfdbbdd485520826d40569291d12690987a3120590f172f5e08522282e9ebf3f5ee9f957ec756c33e7160fff58710069ef8cab1
-EBUILD serialtalk-9999.ebuild 537 BLAKE2B 5e72daded8874c8e7b59e223378d733a5f72db52c0049c5f4a21f2e24f0552884e589ba898c6ff73918c9c5e90dd7bc340ce9b1bd12489bfdd6e930775aadf00 SHA512 b92141c5eb194f25ff8a984c1285015155448d462d201a4949981f61471bd6dd37a9b9569237ff168100ea30be72dc562abc94dd31573d9629a4248ffa488f18
-MISC metadata.xml 475 BLAKE2B 4fce004e271bc77dd68ef59184469081f941d5bcc27c6710305d1a7b1376c531ab557aac8997a9ea3439a1224c8b46b32d00c02b60b536f2d90f82a02af2a13f SHA512 7b2a2b0436c52b0548534b479dcf93f68803badded46ae6147145412060286685a5e094865082b9e7614ddb6b515e8fd1b309b4879e0be8258b152a0f4867d91
diff --git a/dev-util/serialtalk/metadata.xml b/dev-util/serialtalk/metadata.xml
deleted file mode 100644
index 0dd8b67910d7..000000000000
--- a/dev-util/serialtalk/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>o.freyermuth@googlemail.com</email>
-    <name>Oliver Freyermuth</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">BGO-OD/serialtalk</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/serialtalk/serialtalk-1.2.ebuild b/dev-util/serialtalk/serialtalk-1.2.ebuild
deleted file mode 100644
index b521c9dd9d0a..000000000000
--- a/dev-util/serialtalk/serialtalk-1.2.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
-
-inherit cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
-else
-	SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple command-line tool to talk to serial devices"
-HOMEPAGE="https://github.com/BGO-OD/serialtalk"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/serialtalk/serialtalk-9999.ebuild b/dev-util/serialtalk/serialtalk-9999.ebuild
deleted file mode 100644
index 59c9ad0a3efd..000000000000
--- a/dev-util/serialtalk/serialtalk-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
-else
-	SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="simple command-line tool to talk to serial devices"
-HOMEPAGE="https://github.com/BGO-OD/serialtalk"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/setconf-0.6.6 b/dev-util/setconf-0.6.6
new file mode 100644
index 000000000000..84576656368e
--- /dev/null
+++ b/dev-util/setconf-0.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=A small python based utility used to change configuration files
+EAPI=5
+HOMEPAGE=http://setconf.roboticoverlords.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86
+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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://setconf.roboticoverlords.org/setconf-0.6.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13e68ef110fcb8aa5c8cf9f6e7f16294
diff --git a/dev-util/setconf-0.6.7 b/dev-util/setconf-0.6.7
new file mode 100644
index 000000000000..4b796cc47788
--- /dev/null
+++ b/dev-util/setconf-0.6.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=A small python based utility used to change configuration files
+EAPI=5
+HOMEPAGE=http://setconf.roboticoverlords.org/
+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 ~x86
+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(+)?]
+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=http://setconf.roboticoverlords.org/setconf-0.6.7.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=486ff3e9a685ac07489e6499353bc28f
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
deleted file mode 100644
index 70fc98675150..000000000000
--- a/dev-util/setconf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST setconf-0.6.6.tar.xz 12620 BLAKE2B 2882c50430a65e6947135808f87674c19bb8a57d0f5ecbb9d3e316b203b359bb79503b1e68931bfac04e52d3d0686fc11f0c74aa4d84797a0d44f8989c26b4cf SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff
-DIST setconf-0.6.7.tar.xz 12700 BLAKE2B 9dd3625f3fa2345ba6f9cb21fffae770a257928c2287e1772f92d831e9b6c09d8c5b09118a146b6704bb5003dd02fb0793ecabc7d8a2410f4f3941bd687b3a14 SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d
-EBUILD setconf-0.6.6.ebuild 834 BLAKE2B 4c4b2547166426976e5b2c2627c535d6b982716fe979b10ee91279d4721f03eb63995bb25773f5550b68f6207e18d1aa5514974133b622323fc96650ddd08217 SHA512 c5752e1c0685d7bcaac043b5d754ab57d26b06f86f58c58cd1f6e95a878af678a2c8fd4a0eaadc606d4d36272e974bb06a45fe8c486c79b10a566bd27a9adfb3
-EBUILD setconf-0.6.7.ebuild 842 BLAKE2B a294df3d635e6835ef36609721b37eba671326a2c0f5ea980336e1bec76b8b5cd17a2fa8cbb162dc8252d18ed45f189972cc7e9c1987f351dbc0b073b0e1d439 SHA512 221d62759fb5cd629aa00e63634b5b9be3a4925c75a2f86c2d6f77656ee0a4f214b836334a1e9bf7f5962c7bdd4053087f94b775326969b7c52d2a79489b5abd
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/dev-util/setconf/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
deleted file mode 100644
index b0646c4fed59..000000000000
--- a/dev-util/setconf/setconf-0.6.6.ebuild
+++ /dev/null
@@ -1,39 +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 python-single-r1
-
-DESCRIPTION="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
deleted file mode 100644
index 1f5e27b579f0..000000000000
--- a/dev-util/setconf/setconf-0.6.7.ebuild
+++ /dev/null
@@ -1,39 +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 python-single-r1
-
-DESCRIPTION="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/sgb-20030623 b/dev-util/sgb-20030623
new file mode 100644
index 000000000000..4449617feb3a
--- /dev/null
+++ b/dev-util/sgb-20030623
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=|| ( >=dev-util/cweb-3.00 virtual/tex-base )
+DESCRIPTION=Stanford GraphBase
+EAPI=0
+HOMEPAGE=ftp://labrea.stanford.edu/pub/sgb/
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=BSD
+RDEPEND=|| ( >=dev-util/cweb-3.00 virtual/tex-base )
+SLOT=0
+SRC_URI=ftp://labrea.stanford.edu/pub/sgb/sgb-2003-06-23.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_=f5247ba851e8bcfd5917b6a5c71d8177
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
deleted file mode 100644
index 001446f097ac..000000000000
--- a/dev-util/sgb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
-AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
-DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
-EBUILD sgb-20030623.ebuild 1343 BLAKE2B fa642ca84965a56c37ee84f86cef7c1f3719607aa9ba41ab9f52825b13127251c29b914a826654a00ddc1fa0f8b5332947354008d0f9b7332c896e46046b5c0a SHA512 98b88390b12a1f2093aef615cc2e01f9fe77994d8ce55776926ce758a3b8b2696fcc2b67d117ac0222409ebe0ddc6b8f60dc27bb88862df09a89dda959663c64
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/sgb/files/sgb-20030623-destdir.patch b/dev-util/sgb/files/sgb-20030623-destdir.patch
deleted file mode 100644
index 0517d0ce46a3..000000000000
--- a/dev-util/sgb/files/sgb-20030623-destdir.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nuar -Nuar work.orig/Makefile work/Makefile
---- work.orig/Makefile	2009-09-22 01:59:32.521217030 +0000
-+++ work/Makefile	2009-09-22 01:58:42.494972535 +0000
-@@ -93,50 +93,48 @@
- 	$(CC) $(CFLAGS) -DDATA_DIRECTORY=\"$(DATADIR)/\" -c gb_io.c
- 
- test_io: gb_io.o
--	$(CC) $(CFLAGS) test_io.c gb_io.o -o test_io
-+	$(CC) $(CFLAGS) $(LDFLAGS) test_io.c gb_io.o -o test_io
- 
- test_graph: gb_graph.o
--	$(CC) $(CFLAGS) test_graph.c gb_graph.o -o test_graph
-+	$(CC) $(CFLAGS) $(LDFLAGS) test_graph.c gb_graph.o -o test_graph
- 
- test_flip: gb_flip.o
--	$(CC) $(CFLAGS) test_flip.c gb_flip.o -o test_flip
-+	$(CC) $(CFLAGS) $(LDFLAGS) test_flip.c gb_flip.o -o test_flip
- 
--tests: test_io test_graph test_flip
-+tests: certified
-+
-+tests_phase1: test_io test_graph test_flip
- 	./test_io
- 	./test_graph
- 	./test_flip
--	make gb_sort.o
--	make lib
--	make test_sample
-+
-+certified tests_phase2: tests_phase1 gb_sort.o lib test_sample
- 	- ./test_sample > sample.out
- 	diff test.gb test.correct
- 	diff sample.out sample.correct
--	rm test.gb sample.out test_io test_graph test_flip test_sample
-+	echo rm test.gb sample.out test_io test_graph test_flip test_sample
- 	echo "Congratulations --- the tests have all been passed."
- 	touch certified
- 
--install: lib
--	if test ! -r certified; then echo "Please run 'make tests' first!"; fi
--	test -r certified
--	make installdata
--	- mkdir $(LIBDIR)
--	- cp libgb.a $(LIBDIR)
--	- mkdir $(CWEBINPUTS)
--	- cp -p boilerplate.w gb_types.w $(CWEBINPUTS)
--	- mkdir $(INCLUDEDIR)
--	- cp -p $(HEADERS) Makefile $(INCLUDEDIR)
-+install: lib certified installdata
-+	- mkdir -p $(DESTDIR)$(LIBDIR)
-+	- cp libgb.a $(DESTDIR)$(LIBDIR)
-+	- mkdir -p $(DESTDIR)$(CWEBINPUTS)
-+	- cp -p boilerplate.w gb_types.w $(DESTDIR)$(CWEBINPUTS)
-+	- mkdir -p $(DESTDIR)$(INCLUDEDIR)
-+	- cp -p $(HEADERS) Makefile $(DESTDIR)$(INCLUDEDIR)
- 
- installdata: $(DATAFILES)
--	- mkdir $(SGBDIR)
--	- mkdir $(DATADIR)
--	- cp -p $(DATAFILES) $(DATADIR)
-+	- mkdir -p $(DESTDIR)$(SGBDIR)
-+	- mkdir -p $(DESTDIR)$(DATADIR)
-+	- cp -p $(DATAFILES) $(DESTDIR)$(DATADIR)
- 
- installdemos: lib $(DEMOS)
--	- mkdir $(BINDIR)
--	- mv $(DEMOS) $(BINDIR)
-+	- mkdir -p $(DESTDIR)$(BINDIR)
-+	- mv $(DEMOS) $(DESTDIR)$(BINDIR)
- 
- uninstalldemos:
--	- cd $(BINDIR); rm -f $(DEMOS)
-+	- cd $(DESTDIR)$(BINDIR); rm -f $(DEMOS)
- 
- doc:
- 	tex abstract.plaintex
diff --git a/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch b/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch
deleted file mode 100644
index 4a96742f24eb..000000000000
--- a/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nuar b/Makefile a/Makefile
---- b/Makefile	1999-12-27 22:27:24.000000000 +0000
-+++ a/Makefile	2009-09-21 11:49:40.000000000 +0000
-@@ -46,26 +46,14 @@
- 
- .SUFFIXES: .dvi .tex .w
- 
--.tex.dvi:
--	tex $*.tex
-+all: libgb.a test_io test_graph test_flip demos
- 
--.w.c:
--	if test -r $*.ch; then ctangle $*.w $*.ch; else ctangle $*.w; fi
--
--.w.tex:
--	if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi
--
--.w.o:
--	make $*.c
--	make $*.o
--
--.w:
--	make $*.c
--	make $*
--
--.w.dvi:
--	make $*.tex
--	make $*.dvi
-+%.dvi: %.tex
-+	tex $^
-+%.c: %.w
-+	ctangle $^
-+%.tex: %.w
-+	cweave $^
- 
- DATAFILES = anna.dat david.dat econ.dat games.dat homer.dat huck.dat \
-         jean.dat lisa.dat miles.dat roget.dat words.dat
-@@ -175,3 +163,9 @@
- 
- fulltar: $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC
- 	tar cvf sgb.tar $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC
-+
-+$(DEMOS) lib tests test_io test_graph test_flip: libgb.a
-+
-+demos: $(DEMOS)
-+
-+.PRECIOUS: .o .c .tex
diff --git a/dev-util/sgb/metadata.xml b/dev-util/sgb/metadata.xml
deleted file mode 100644
index 79d462e85571..000000000000
--- a/dev-util/sgb/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>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/sgb/sgb-20030623.ebuild b/dev-util/sgb/sgb-20030623.ebuild
deleted file mode 100644
index eac1bb81a891..000000000000
--- a/dev-util/sgb/sgb-20030623.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="Stanford GraphBase"
-HOMEPAGE="ftp://labrea.stanford.edu/pub/sgb/"
-SRC_URI="ftp://labrea.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-DEPEND="|| ( >=dev-util/cweb-3.00 virtual/tex-base )"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
-	epatch "${FILESDIR}"/sgb-20030623-destdir.patch
-}
-
-src_compile() {
-	# bug #299028
-	emake -j1 \
-	CFLAGS="${CFLAGS}" \
-	SGBDIR=/usr/share/${PN} \
-	INCLUDEDIR=/usr/include/sgb \
-	LIBDIR=/usr/$(get_libdir) \
-	BINDIR=/usr/bin \
-	CFLAGS="${CFLAGS}" \
-	lib demos tests || die "Failed to build"
-	#CWEBINPUTS=/usr/share/${PN}/cweb \
-	#LDFLAGS="${LDFLAGS}" \
-}
-
-src_install() {
-	dodir /usr/share/${PN} /usr/include/sgb /usr/lib /usr/bin /usr/share/${PN}/cweb
-	emake \
-	DESTDIR="${D}" \
-	SGBDIR=/usr/share/${PN} \
-	INCLUDEDIR=/usr/include/sgb \
-	LIBDIR=/usr/$(get_libdir) \
-	BINDIR=/usr/bin \
-	CFLAGS="${CFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
-	CWEBINPUTS=/usr/share/${PN}/cweb \
-	install \
-	|| die "Failed to install"
-
-	# we don't need no makefile
-	rm "${D}"/usr/include/sgb/Makefile
-
-	dodoc ERRATA README
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-util/shadowman-2 b/dev-util/shadowman-2
new file mode 100644
index 000000000000..faa510278665
--- /dev/null
+++ b/dev-util/shadowman-2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-admin/eselect
+DESCRIPTION=Unified compiler shadow link directory updater
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/shadowman
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect
+SLOT=0
+SRC_URI=https://github.com/mgorny/shadowman/archive/v2.tar.gz -> shadowman-2.tar.gz
+_md5_=652d1607cfcacb295936663beec88785
diff --git a/dev-util/shadowman-9999 b/dev-util/shadowman-9999
new file mode 100644
index 000000000000..66d43f2b9998
--- /dev/null
+++ b/dev-util/shadowman-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-admin/eselect >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Unified compiler shadow link directory updater
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/shadowman
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=c1e230bbbbb4ce15e2415e377f9e44b5
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
deleted file mode 100644
index ac9c2283c58c..000000000000
--- a/dev-util/shadowman/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 665 BLAKE2B c023ebb13da96d711a171d2cb3e93701217b656b0079f1fd5450c270e97009796471c7b5016bcd3704e6a3f23ae3a9629bf26b2f2b86aaeb3d90d3f3ed4c1989 SHA512 cdf5732204eba4e67fc783544001623f2e2d6dd3a7b97d0bfc951a041647ac3b71d60289e745c1671f023e586aaf3c7c036ec8e3a78b869782b876a563ee4e95
-EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/metadata.xml b/dev-util/shadowman/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/dev-util/shadowman/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>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
deleted file mode 100644
index 6887f9b6e0f8..000000000000
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unified compiler shadow link directory updater"
-HOMEPAGE="https://github.com/mgorny/shadowman"
-SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# tool modules are split into their respective packages
-	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install \
-		INSTALL_MODULES_TOOL=""
-	keepdir /usr/share/shadowman/tools
-}
diff --git a/dev-util/shadowman/shadowman-9999.ebuild b/dev-util/shadowman/shadowman-9999.ebuild
deleted file mode 100644
index 816a0bfd21f7..000000000000
--- a/dev-util/shadowman/shadowman-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=6
-
-EGIT_REPO_URI="https://github.com/mgorny/shadowman"
-inherit git-r3
-
-DESCRIPTION="Unified compiler shadow link directory updater"
-HOMEPAGE="https://github.com/mgorny/shadowman"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# tool modules are split into their respective packages
-	emake DESTDIR="${D}" install \
-		INSTALL_MODULES_TOOL=""
-	keepdir /usr/share/shadowman/tools
-}
diff --git a/dev-util/shards-0.7.2 b/dev-util/shards-0.7.2
new file mode 100644
index 000000000000..aa085496bad0
--- /dev/null
+++ b/dev-util/shards-0.7.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>dev-lang/crystal-0.11.1[yaml]
+DESCRIPTION=Dependency manager for the Crystal language
+EAPI=6
+HOMEPAGE=https://github.com/crystal-lang/shards
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>dev-lang/crystal-0.11.1[yaml]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crystal-lang/shards/archive/v0.7.2.tar.gz -> shards-0.7.2.tar.gz
+_md5_=a1457898345c5b249a14423c14977660
diff --git a/dev-util/shards-0.8.1 b/dev-util/shards-0.8.1
new file mode 100644
index 000000000000..8413d5cd0a32
--- /dev/null
+++ b/dev-util/shards-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>dev-lang/crystal-0.11.1[yaml]
+DESCRIPTION=Dependency manager for the Crystal language
+EAPI=6
+HOMEPAGE=https://github.com/crystal-lang/shards
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>dev-lang/crystal-0.11.1[yaml]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/crystal-lang/shards/archive/v0.8.1.tar.gz -> shards-0.8.1.tar.gz
+_md5_=a1457898345c5b249a14423c14977660
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
deleted file mode 100644
index 933138535e8e..000000000000
--- a/dev-util/shards/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST shards-0.7.2.tar.gz 30398 BLAKE2B bf89f978cf9d4687902a8de4222f2c2121a52574c7f1ce46130a97c5770889693efc5d3fcc35208d6b1f23930f83fb98ba8f10391920ff0418c6d28eb810d6a8 SHA512 a99648ae292095278578e47971b556a0da90743db62689a76aae9eab986ad2185ad7adc13c4340f12fce835c5383d8aac93e35258d01fa658e521314eafaf942
-DIST shards-0.8.1.tar.gz 31388 BLAKE2B 3442faad4a9a1bc4fed9193b7e17369913025f0c1be840de15d563a3da4f3638884ac2dbfd0610dafec5af0680f39e9983f076962c2a1167e3ebd39c4b1eeb4a SHA512 c0a8a8531a37e033c6d96ac36dd30dcd3d005c6b1bd7c94dbeee7f6ea9b34a08ab2e14b826c3c18f60dca991f60ec6780df090cafc32403a7272e39dc07e99df
-EBUILD shards-0.7.2.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
-EBUILD shards-0.8.1.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
-MISC metadata.xml 429 BLAKE2B 4c4fe0bb93f3fbcbdbdac215ed36c90a1c3706409f62e4d1d5398976bdb2bb15a178c050f616b908c2cfe87ca0b3b63697620c3ad3ba95e0f836048263ccaf41 SHA512 c5ef30550acdb2b7e8d3179e42db4f0c3c7b7ab6cc5475992c21b6b8c79ac7949cccc2070c278a04c13c62fac2e63c34a39d8c607809731567927ed306905e95
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
deleted file mode 100644
index 43e1575986e2..000000000000
--- a/dev-util/shards/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<longdescription lang="en">
-		Dependency manager for the Crystal language
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ysbaddaden/shards</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/shards/shards-0.7.2.ebuild b/dev-util/shards/shards-0.7.2.ebuild
deleted file mode 100644
index 43d89d4cedbf..000000000000
--- a/dev-util/shards/shards-0.7.2.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="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.8.1.ebuild b/dev-util/shards/shards-0.8.1.ebuild
deleted file mode 100644
index 43d89d4cedbf..000000000000
--- a/dev-util/shards/shards-0.8.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="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shc-3.8.9 b/dev-util/shc-3.8.9
new file mode 100644
index 000000000000..0e5b16a0aa42
--- /dev/null
+++ b/dev-util/shc-3.8.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A (shell-) script compiler/scrambler
+EAPI=4
+HOMEPAGE=http://www.datsi.fi.upm.es/~frosal
+KEYWORDS=~alpha amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.datsi.fi.upm.es/~frosal/sources/shc-3.8.9.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2f18bd8e03390f787efd5cde2eb321bb
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
deleted file mode 100644
index b83bf6222490..000000000000
--- a/dev-util/shc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shc-3.8.9.tgz 20536 BLAKE2B 68f2c18f79e28bcbf5116428ec16a4b6eceffba686aaf3e9075f14a77793831bbb9c80c7f44a849f152eb164000956a383343d4dc8b49fc8cf68758aa9a4d27e SHA512 e8a4f9b0ef6e90fc99ebeeb0af36b89d1020209429c9651a036ab1f51a293d9faa3b775b7f040e91997b6ff5a487cb45943fc3548fa6fa3e7282e0d6f74d2cd4
-EBUILD shc-3.8.9.ebuild 825 BLAKE2B 035a2082aed05a8a71d901f914b6aa84ec4d0cfa93659a51c0b85f6e52e60ae6323a469b2b53ebb73ec322dffc041fccd5e00f80e9de772d99fdb481f0ca7f68 SHA512 048acb29321004230fb3da0713b4879d1c672633fe45212cef21ab72e3a9d9b55e2444449e1a25a333134f185b05641ea2393a475cef3b403666b7086c83168f
-MISC metadata.xml 341 BLAKE2B 9e21bf4fde239181d0dca080e08667fcf098398ea5f89b5e3b2fb27d3797eea6ef792f81b159a25c891c831dda165858172b11f1932469262117c12c155731eb SHA512 f5b2c355996851ad7c34e40f762e636295581148806b5a6129e79d39c564dcd16a8281b289598204048ca53c30b3f5efdea7f393e6ac47008d9a8af9bb54fe2b
diff --git a/dev-util/shc/metadata.xml b/dev-util/shc/metadata.xml
deleted file mode 100644
index e057d190bf73..000000000000
--- a/dev-util/shc/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>pinkbyte@gentoo.org</email>
-	<name>Sergey Popov</name>
-</maintainer>
-<upstream>
-	<changelog>http://www.datsi.fi.upm.es/~frosal/sources/CHANGES</changelog>
-</upstream>
-</pkgmetadata>
diff --git a/dev-util/shc/shc-3.8.9.ebuild b/dev-util/shc/shc-3.8.9.ebuild
deleted file mode 100644
index 78178e4f1ae1..000000000000
--- a/dev-util/shc/shc-3.8.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A (shell-) script compiler/scrambler"
-HOMEPAGE="http://www.datsi.fi.upm.es/~frosal"
-SRC_URI="http://www.datsi.fi.upm.es/~frosal/sources/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i makefile -e 's:$(CC) $(CFLAGS):& $(LDFLAGS):' || die
-	# fix source file name wrt bug #433970
-	mv {${P},${PN}}.c || die
-}
-
-src_compile() {
-	## the "test"-target leads to an access-violation -> so we skip it
-	## as it's only for demonstration purposes anyway.
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" shc
-}
-
-src_install() {
-	dobin shc
-	doman shc.1
-	newdoc shc.README README
-	dodoc CHANGES
-}
diff --git a/dev-util/shellcheck-0.4.6 b/dev-util/shellcheck-0.4.6
new file mode 100644
index 000000000000..1ec129e103b5
--- /dev/null
+++ b/dev-util/shellcheck-0.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell script analysis tool
+EAPI=6
+HOMEPAGE=http://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.6
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.6/ShellCheck-0.4.6.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_=dae3e7fbea8367b03652889bb61ea64a
diff --git a/dev-util/shellcheck-0.4.7 b/dev-util/shellcheck-0.4.7
new file mode 100644
index 000000000000..b44a9278c06a
--- /dev/null
+++ b/dev-util/shellcheck-0.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell script analysis tool
+EAPI=6
+HOMEPAGE=http://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/json:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.7
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.7/ShellCheck-0.4.7.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_=6b7f374665f95d83983446127ea82f9e
diff --git a/dev-util/shellcheck-0.5.0 b/dev-util/shellcheck-0.5.0
new file mode 100644
index 000000000000..50d3e4a80609
--- /dev/null
+++ b/dev-util/shellcheck-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell script analysis tool
+EAPI=6
+HOMEPAGE=https://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.0
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.5.0/ShellCheck-0.5.0.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_=3d942b6a1a7c36d75308477a5f16cac5
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
deleted file mode 100644
index 58d4b78d8056..000000000000
--- a/dev-util/shellcheck/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
-DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
-DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
-EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
-EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
-EBUILD shellcheck-0.5.0.ebuild 911 BLAKE2B 6ae6f5c785950da968eb253db682789f44ba50f62c578226af0526f209a67c22f1ee8b8be027c684437ebaaef3b7bc4d1fed5e10a82c075015c105276c1227ce SHA512 69fc399a74442149185b6f7612f6ddd4cb78dca576cb8d579dce7fdda4f79589a2cab9d2382e42078e57f9c852f86078d9d2753b96cc2fdd36137d0d3fc01a8f
-MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
deleted file mode 100644
index c120a64c1f9e..000000000000
--- a/dev-util/shellcheck/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>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/shellcheck/shellcheck-0.4.6.ebuild b/dev-util/shellcheck/shellcheck-0.4.6.ebuild
deleted file mode 100644
index 0d6b3a6027ce..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.6.ebuild
+++ /dev/null
@@ -1,39 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.4.7.ebuild b/dev-util/shellcheck/shellcheck-0.4.7.ebuild
deleted file mode 100644
index 78dd5b5e1aab..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.7.ebuild
+++ /dev/null
@@ -1,39 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.5.0.ebuild b/dev-util/shellcheck/shellcheck-0.5.0.ebuild
deleted file mode 100644
index 1bd29432c618..000000000000
--- a/dev-util/shellcheck/shellcheck-0.5.0.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
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shelltestrunner-1.3.4 b/dev-util/shelltestrunner-1.3.4
new file mode 100644
index 000000000000..4a3d598e91cb
--- /dev/null
+++ b/dev-util/shelltestrunner-1.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.6 >=dev-haskell/cmdargs-0.7 <dev-haskell/cmdargs-0.11 >=dev-haskell/diff-0.2.0 <dev-haskell/diff-0.4 >=dev-haskell/filemanip-0.3 <dev-haskell/filemanip-0.4 <dev-haskell/hunit-1.3 <dev-haskell/parsec-3.2 >=dev-haskell/regex-tdfa-1.1 <dev-haskell/regex-tdfa-1.3 >=dev-haskell/test-framework-0.3.2 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/utf8-string-0.3.5 <dev-haskell/utf8-string-0.4 >=dev-lang/ghc-7.4.1
+DESCRIPTION=A tool for testing command-line programs
+EAPI=5
+HOMEPAGE=http://joyful.com/shelltestrunner
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/shelltestrunner/1.3.4/shelltestrunner-1.3.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_=ca79a3b3e00758a0d2a8daa02f7f2766
diff --git a/dev-util/shelltestrunner-1.3.5 b/dev-util/shelltestrunner-1.3.5
new file mode 100644
index 000000000000..8e3f3b2a775a
--- /dev/null
+++ b/dev-util/shelltestrunner-1.3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= <dev-haskell/hunit-1.3:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=A tool for testing command-line programs
+EAPI=5
+HOMEPAGE=http://joyful.com/shelltestrunner
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= <dev-haskell/hunit-1.3:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/shelltestrunner/1.3.5/shelltestrunner-1.3.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_=877fb2390272197a18f7868770c8118a
diff --git a/dev-util/shelltestrunner-1.3.5-r1 b/dev-util/shelltestrunner-1.3.5-r1
new file mode 100644
index 000000000000..ca429970a760
--- /dev/null
+++ b/dev-util/shelltestrunner-1.3.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= dev-haskell/hunit:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=A tool for testing command-line programs
+EAPI=5
+HOMEPAGE=http://joyful.com/shelltestrunner
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:= >=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:= >=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:= dev-haskell/hunit:= <dev-haskell/parsec-3.2:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:= >=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:= >=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/shelltestrunner/1.3.5/shelltestrunner-1.3.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_=405b676c320b5a8e522b6a91eb0f8541
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
deleted file mode 100644
index 51b82029ca60..000000000000
--- a/dev-util/shelltestrunner/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST shelltestrunner-1.3.4.tar.gz 21331 BLAKE2B 8530bb93680e678d7b3b439cdcf06817a1054e6c99cbcd028a19b0fb13db5b4e0e9150993348f5dffd7d0dc0dd82acc7a7331e44caf5086df28940e2f739a63c SHA512 b46e5e2456573b06f6958076a001be3fd65471dc6c89b78700f1d77870bb3844e89e9cec98ad2a146554f19550891c2f3c6bd150b8ee8d0b20d9cd3b34f55753
-DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
-EBUILD shelltestrunner-1.3.4.ebuild 978 BLAKE2B b577c97511fd2a74ff52dc5188b70c43954ede111903a714f234aae05b728c8d18393397806ebfc7915c7b78f8b581333879c678c5927d5a87637d4a77f29a79 SHA512 ad9ed06d115b4010ed62ba9cf21dff7c5140f623d23091ac434eb1c3faeaab9aeb7bd15a4bbb566a5edafec0f5274dfb592825c4f15e02fca30963c10092d243
-EBUILD shelltestrunner-1.3.5-r1.ebuild 1202 BLAKE2B f8caf8cc096dd23e12c6f26b431b272f5c583e1215aa01be31201aee4445da6b743bf0a72e80c736afac3c9c1e553b2828045be06eba2bae409c7e2baeb5f8b9 SHA512 92cb13a0627f1981d0cbe1e9a68e540758cfc88c410afca940c0e80627cd7c206443923a7ea51c254d6d74276bbd4d61432b6744c48206f6be609410bc31a776
-EBUILD shelltestrunner-1.3.5.ebuild 1068 BLAKE2B 5f8eb13f124ce7d503d0717527e4e05e33bb0a788e1e4c3271771caac486b44b2192af9608a988b32d18c4518e820eaf4d4b2a644ac5c8c8b146812af6648e2c SHA512 5ade6d8a933e07a444ea97f49b341284d93f266aa33b98564c7f595c6713e32996e471c9e026f6acf4c70542170d1186aabc9927530636bd2a6bfdbfe9ad5190
-MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
deleted file mode 100644
index bc1b5fecdb56..000000000000
--- a/dev-util/shelltestrunner/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>
-		shelltestrunner is a cross-platform tool for testing command-line
-		programs (or arbitrary shell commands.)  It reads simple declarative tests
-		specifying a command, some input, and the expected output, error output
-		and exit status.  Tests can be run selectively, in parallel, with a
-		timeout, in color, and/or with differences highlighted.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
deleted file mode 100644
index d4035c20b502..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	>=dev-haskell/cmdargs-0.7 <dev-haskell/cmdargs-0.11
-	>=dev-haskell/diff-0.2.0 <dev-haskell/diff-0.4
-	>=dev-haskell/filemanip-0.3 <dev-haskell/filemanip-0.4
-	<dev-haskell/hunit-1.3
-	<dev-haskell/parsec-3.2
-	>=dev-haskell/regex-tdfa-1.1 <dev-haskell/regex-tdfa-1.3
-	>=dev-haskell/test-framework-0.3.2 <dev-haskell/test-framework-0.9
-	>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-	>=dev-haskell/utf8-string-0.3.5 <dev-haskell/utf8-string-0.4
-	>=dev-lang/ghc-7.4.1
-"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
deleted file mode 100644
index 217aa1e52dda..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,41 +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.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	dev-haskell/hunit:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit                            < 1.3' 'HUnit' \
-		'process                          < 1.3' 'process'
-}
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
deleted file mode 100644
index e570b6f65de8..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	<dev-haskell/hunit-1.3:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-util/shflags-1.0.3 b/dev-util/shflags-1.0.3
new file mode 100644
index 000000000000..9565d8d1501e
--- /dev/null
+++ b/dev-util/shflags-1.0.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install test
+DESCRIPTION=Command-line flags module for Unix shell scripts
+EAPI=5
+HOMEPAGE=https://github.com/kward/shflags
+IUSE=examples
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/kward/shflags/archive/1.0.3.tar.gz -> shflags-1.0.3.tgz
+_md5_=b15ef6226dd312a97c7449232a15b01a
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
deleted file mode 100644
index 49c59e384660..000000000000
--- a/dev-util/shflags/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
-EBUILD shflags-1.0.3.ebuild 631 BLAKE2B 157620c3114e257478721a5ed30158286022f2accc33e33fa3dda01f48949b510295133b6db28e31eec260bafd773ebea2ff92e7a173c8c4cf75a3b3525fbe96 SHA512 e9cc2545163784ea9d1c9a1d6cddb3a0988a339d15090ad668156c4c398f35c1f699f8f3b34a1db8b29d16511ca661160f07b5ed58d58397a29ccf9afcdf5793
-MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
deleted file mode 100644
index f6f583e29409..000000000000
--- a/dev-util/shflags/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">shflags</remote-id>
-		<remote-id type="github">kward/shflags</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
deleted file mode 100644
index a1bba5a8346f..000000000000
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Command-line flags module for Unix shell scripts"
-HOMEPAGE="https://github.com/kward/shflags"
-SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="examples"
-
-src_test() {
-	cd src || die
-	./shflags_test.sh || die
-}
-
-src_install() {
-	dohtml README.html
-	dodoc README.txt doc/*.txt
-	insinto /usr/share/misc
-	doins src/shflags
-	use examples && dodoc examples/*.sh
-}
diff --git a/dev-util/shtool-2.0.8-r1 b/dev-util/shtool-2.0.8-r1
new file mode 100644
index 000000000000..9ab3a620662d
--- /dev/null
+++ b/dev-util/shtool-2.0.8-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=Set of stable and portable shell scripts
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/shtool/shtool.html
+KEYWORDS=amd64 arm hppa ia64 ppc s390 sh sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gnu/shtool/shtool-2.0.8.tar.gz
+_md5_=197f57f94e60f63aed77b5f051c6a288
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
deleted file mode 100644
index eaa91c70aeb5..000000000000
--- a/dev-util/shtool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shtool-2.0.8.tar.gz 97033 BLAKE2B 05096c0cf4a20ea86a77db59b4d4e0f8431d1cc331c3dbaeac089dc7fcf89cb1ad391b731dab8d31bf010dfe9129a2710f71657600953464b59e0062eb7a7254 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758
-EBUILD shtool-2.0.8-r1.ebuild 493 BLAKE2B 716c682b087cc285700609ea878cf579145a1ae28bc987ae89a0561a2a8c36d1ab2d139ac6a34c8d230c783998aac762ac988f9023c1e27b5205c6ae6b17bcfa SHA512 7e90ec080098b959083e81625579519991f38e83179d57e65f1eb866b120a15c0f2d048308853dca952b35ac983e930cb8cfa8833765059fb00166a409235d2b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/shtool/metadata.xml b/dev-util/shtool/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/shtool/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/dev-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
deleted file mode 100644
index 6fc14e68ba45..000000000000
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of stable and portable shell scripts"
-HOMEPAGE="https://www.gnu.org/software/shtool/shtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README THANKS VERSION NEWS RATIONAL
-}
diff --git a/dev-util/shunit2-2.1.6-r1 b/dev-util/shunit2-2.1.6-r1
new file mode 100644
index 000000000000..fd30660b66f7
--- /dev/null
+++ b/dev-util/shunit2-2.1.6-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Unit-test framework for Bourne-based shell scripts
+EAPI=6
+HOMEPAGE=https://github.com/kward/shunit2
+KEYWORDS=amd64 ~ppc x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz
+_md5_=76bbf8a885b69266c84925119a3d5ad5
diff --git a/dev-util/shunit2/Manifest b/dev-util/shunit2/Manifest
deleted file mode 100644
index 54dd62418803..000000000000
--- a/dev-util/shunit2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shunit2-2.1.6.tgz 61558 BLAKE2B 0568dbe6ff9234346d85925a7f27dc2c8e9003a3266ef0bf7c1bb5f73e06ce758c7ff82933899c9a99e37c189d2efdc111fe5132c69a4d80535dc4d14b7ec8d5 SHA512 c78cf349d72a9048e4932108a62b2d1873019b9b1909c3fb1bd7e873e7bb62df58c1941d916508dc60ef6ba0261a2bc6ee9e25d654eefdcce997682f2bc748d7
-EBUILD shunit2-2.1.6-r1.ebuild 547 BLAKE2B f85d146421c60c42669c418c596cb078b3ac1b402d8bd4687d684a9c3e56a8ee0fe2994cf7cd3e69f437e7a87bf1ed60cf8809220d69841eaf3932feebbd6b07 SHA512 617fdbc114ac334c52fbfa0d5580a062799f8aebf03a16398ef786f8ffd28140273161d18b468665f8dd2ccce93d43d93c10f1170c8e6d8573ce8124935b8251
-MISC metadata.xml 554 BLAKE2B fa966d5f0a498ec0c3327ce604f1a628120c138510890a59c0bc12fd955300cd2e399d6e36fa9720138713a5365751051ce83cd743bc7aabaddda65f5b08e446 SHA512 a548ed7c3551878031b1df0a9c45886e46271034f477f1c34ed1cea69c750176875a61ad526ecc59df5a59aa5c22fc0948ca2cf831feee5bb1178cfb76849dea
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
deleted file mode 100644
index 45da850feec0..000000000000
--- a/dev-util/shunit2/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>
-	<longdescription>
-		shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
-		it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
-		have ever had the desire to write a unit test for a shell script, shUnit2
-		can do the job.
-	</longdescription>
-	<upstream>
-		<remote-id type="google-code">shunit2</remote-id>
-		<remote-id type="github">kward/shunit2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/shunit2/shunit2-2.1.6-r1.ebuild b/dev-util/shunit2/shunit2-2.1.6-r1.ebuild
deleted file mode 100644
index dd75e0e1c249..000000000000
--- a/dev-util/shunit2/shunit2-2.1.6-r1.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"
-
-DESCRIPTION="Unit-test framework for Bourne-based shell scripts"
-HOMEPAGE="https://github.com/kward/shunit2"
-SRC_URI="https://shunit2.googlecode.com/files/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_install() {
-	dobin src/shunit2
-
-	# For backwards compat to <=2.1.5
-	dosym /usr/bin/shunit2 /usr/share/shunit2/shunit2
-
-	dodoc -r examples
-	dodoc doc/*.txt
-
-	docinto html
-	dodoc doc/*.{html,css}
-}
diff --git a/dev-util/skipfish-2.10_beta b/dev-util/skipfish-2.10_beta
new file mode 100644
index 000000000000..eca8a434e863
--- /dev/null
+++ b/dev-util/skipfish-2.10_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-libs/openssl:0 dev-libs/libpcre net-dns/libidn sys-libs/zlib
+DESCRIPTION=A fully automated, active web application security reconnaissance tool
+EAPI=5
+HOMEPAGE=https://github.com/spinkham/skipfish
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 LGPL-3
+RDEPEND=dev-libs/openssl:0 dev-libs/libpcre net-dns/libidn sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/spinkham/skipfish/archive/093800c9de4116706258982376abce01928a3f7b.tar.gz -> skipfish-2.10_beta.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d4b8fa19870d8cb8f449052d98c126cc
diff --git a/dev-util/skipfish/Manifest b/dev-util/skipfish/Manifest
deleted file mode 100644
index 53551b441388..000000000000
--- a/dev-util/skipfish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST skipfish-2.10_beta.tar.gz 243827 BLAKE2B 03c60fb1ec8abc3bdca8b9b0d4c720a14ca8aab8609bd88c8e1b1f06d08c4866338126badf220be659012246a23ad85a92c7e6c28be97eabe41bf6f40853110b SHA512 a726bb7e53299ae3941c6a1645b89bb0a4c1d8a4ced6154696932d9a4844fc22d0a1f29d9311d083908b640155d65466ffea7b342c1f7c38e2c26f657c393af9
-EBUILD skipfish-2.10_beta.ebuild 1287 BLAKE2B 32c5fc30e7cee29a94d0641abdc73f573303d998d3cbcd0db465a618e4b4b54c077d2ffce58c99e5f40b7d1223a7b87f61f5ef42c9a58c64af9b13d7a7b880c0 SHA512 6705b497785661f30b2675093314d856b0785ec14ad22358623a64c55559b0676a048b5a16578cc6dcc1aa29c00acf4fb5062a0b85f93e5222ccc7a46d087428
-MISC metadata.xml 249 BLAKE2B 2435af8a77ab88fff0c2810f37d0d19bf5ee30bc9bea2b7c3d276e315ecff30041481e66f91d4be25576446085b0a4e7b4626e634ee6ac50142b479a2186266a SHA512 66df1edc899ada7514e4682ad663bbfc307b526dd7a1c9c2c9492d429fbbb8e220a137de40af26d4d238262888dde0d25f25e5cd5e1a8864454133e5298cf5eb
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
deleted file mode 100644
index 3e6841b663b1..000000000000
--- a/dev-util/skipfish/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-needed -->
-	<upstream>
-		<remote-id type="github">spinkham/skipfish</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/skipfish/skipfish-2.10_beta.ebuild b/dev-util/skipfish/skipfish-2.10_beta.ebuild
deleted file mode 100644
index 81bb804912a3..000000000000
--- a/dev-util/skipfish/skipfish-2.10_beta.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs vcs-snapshot versionator
-
-MY_COMMIT_HASH="093800c9de4116706258982376abce01928a3f7b"
-
-DESCRIPTION="A fully automated, active web application security reconnaissance tool"
-HOMEPAGE="https://github.com/spinkham/skipfish"
-SRC_URI="https://github.com/spinkham/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libpcre
-	net-dns/libidn
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS_GEN/s:-g -ggdb::' \
-		-e '/CFLAGS_OPT/s:-O3::' \
-		Makefile || die
-
-	sed -i \
-		-e "/ASSETS_DIR/s:assets:/usr/share/doc/${PF}/html:" \
-		-e "/SIG_FILE/s:signatures/:/etc/skipfish/signatures/:" \
-		src/config.h || die
-
-	sed -i \
-		-e "s:signatures/:/etc/skipfish/signatures/:g" \
-		signatures/signatures.conf || die
-}
-
-src_compile() {
-	tc-export CC
-
-	local _debug
-	use debug && _debug=debug
-
-	emake ${_debug}
-}
-
-src_install() {
-	dobin ${PN}
-	doman doc/${PN}.1
-
-	insinto /etc/skipfish
-	doins -r signatures
-
-	insinto /usr/share/${PN}/dictionaries
-	doins dictionaries/*.wl
-
-	dohtml assets/*
-
-	dodoc ChangeLog README doc/*.txt
-}
diff --git a/dev-util/smem-20071119_p1 b/dev-util/smem-20071119_p1
new file mode 100644
index 000000000000..6fb79dc0cb6b
--- /dev/null
+++ b/dev-util/smem-20071119_p1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A tool to parse smaps statistics
+EAPI=0
+HOMEPAGE=http://bmaurer.blogspot.de/2006/03/memory-usage-with-smaps.html
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl dev-perl/Linux-Smaps
+SLOT=0
+SRC_URI=mirror://gentoo/smem.pl.20071119_p1.bz2 https://dev.gentoo.org/~tove/distfiles/dev-util/smem/smem.pl.20071119_p1.bz2
+_md5_=43e357993f915ecda22022fe0b66c729
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
deleted file mode 100644
index ed1c08d29f9a..000000000000
--- a/dev-util/smem/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smem.pl.20071119_p1.bz2 794 BLAKE2B eb48d3ed41d0261a94381da5795764a78d95abcb23fe9d46755e7c4a6672931a972bca8f188a359b7bb4a52afcfe177098c048e3dddc910a7423f5c2bf5d37ac SHA512 452d10b2e3dda5d4167e62e3fd541f89f90cb07c431876e0fb671f30e224b8cd14a0268ab14243342c2188f3d3826e7a8303b3fd2eda393fdc8e31d0f1b1d575
-EBUILD smem-20071119_p1.ebuild 536 BLAKE2B 9d085fefcc41376bb8b6adc2bca0f3ee4937ef1e359cfd4c355396a03ff6e135da49b2af513cd429832fd52583855f6d0904cc079d1bbea9ffd174bf79db1288 SHA512 bb5965edad80b2ac8ece5f1e38ae5b84b1506915d1dcb02f7d44366c43a2754fe37b401c281894947b3a89de1b6988011311a621e42b8bf047e36809f4fa333f
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/smem/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/smem/smem-20071119_p1.ebuild b/dev-util/smem/smem-20071119_p1.ebuild
deleted file mode 100644
index 0873fa2c2de0..000000000000
--- a/dev-util/smem/smem-20071119_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A tool to parse smaps statistics"
-HOMEPAGE="http://bmaurer.blogspot.de/2006/03/memory-usage-with-smaps.html"
-SRC_URI="mirror://gentoo/smem.pl.${PV}.bz2
-	https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/smem.pl.${PV}.bz2"
-
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Linux-Smaps"
-
-src_compile() { :; }
-
-src_install() {
-	newbin smem.pl.${PV} smem || die
-}
diff --git a/dev-util/source-highlight-3.1.7-r2 b/dev-util/source-highlight-3.1.7-r2
new file mode 100644
index 000000000000..8f4d7dedbb5f
--- /dev/null
+++ b/dev-util/source-highlight-3.1.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=>=dev-libs/boost-1.52.0-r1[threads] dev-util/ctags
+DESCRIPTION=Generate highlighted source code as an (x)html document
+EAPI=4
+HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
+IUSE=doc static-libs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.52.0-r1[threads] dev-util/ctags
+SLOT=0
+SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.7.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6d1e5248f44c1953d88c85ceccb74267
diff --git a/dev-util/source-highlight-3.1.8 b/dev-util/source-highlight-3.1.8
new file mode 100644
index 000000000000..b1d1260c6162
--- /dev/null
+++ b/dev-util/source-highlight-3.1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
+DESCRIPTION=Generate highlighted source code as an (x)html document
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
+IUSE=doc static-libs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
+SLOT=0
+SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.8.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	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_=1a21dfc78d41199b0f02cd316801dd32
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
deleted file mode 100644
index 73a9bd84a982..000000000000
--- a/dev-util/source-highlight/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST source-highlight-3.1.7.tar.gz 1600692 BLAKE2B dbd740c79e4368bab6e7207a81e037f3fdf9f4ac5373113aac15acd7c18383cebcc8cadb91f59aa01b5bf30d3240b4510ae8d3af765b6ca579859367aa7e4ea4 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8
-DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
-EBUILD source-highlight-3.1.7-r2.ebuild 1156 BLAKE2B 148dacff17f075819620fe984b8671e2ef11997e496fdc3337ca0a5cab19d248bcdcc8d754b4bc547dfabfe63edec885738ba76561318798330876d21de7f8a8 SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075
-EBUILD source-highlight-3.1.8.ebuild 1266 BLAKE2B d0dfde08f934d821f150d2c9a366b2e73974901ba3b2a944b58b99545b4085e88d2d1d209d4f34e21b61376e1150fa1f31696b7dd6facc5b25e6987598566244 SHA512 4ad82b888406c56e9ba7b882671785a7b9073d24dc21d4f299c83ee32c206b8ddab01ee0de5d4663829456560157c12e13b75564ad0782f9aa7a50b830198eb8
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml
deleted file mode 100644
index 5c23291b5215..000000000000
--- a/dev-util/source-highlight/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>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
deleted file mode 100644
index 11686c55373a..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit bash-completion-r1 versionator
-
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
-SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-SLOT="0"
-IUSE="doc static-libs"
-
-DEPEND=">=dev-libs/boost-1.52.0-r1[threads]
-	dev-util/ctags"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--with-boost-regex="boost_regex" \
-		--without-bash-completion \
-		$(use_enable static-libs static)
-}
-
-src_install () {
-	DOCS="AUTHORS ChangeLog CREDITS NEWS README THANKS TODO.txt"
-	default
-
-	use static-libs || rm -rf "${D}"/usr/lib*/*.la
-
-	dobashcomp completion/source-highlight
-
-	# That's not how we want it
-	rm -fr "${ED}/usr/share"/{aclocal,doc}
-	use doc &&  dohtml -A java doc/*.{html,css,java}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
-	default
-}
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
deleted file mode 100644
index 7fc2f8c4df1a..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
-SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
-	dev-util/ctags"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# required as rev-dep of dev-libs/boost-1.62.0
-	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
-	append-cxxflags -std=c++14
-
-	econf \
-		--with-boost-regex="boost_regex" \
-		--without-bash-completion \
-		$(use_enable static-libs static)
-}
-
-src_install () {
-	use doc && local HTML_DOCS=( doc/*.{html,css,java} )
-	default
-
-	# That's not how we want it
-	rm -rf "${ED%/}"/usr/share/{aclocal,doc} || die
-
-	# package provides .pc file
-	find "${D}" -name '*.la' -delete || die
-
-	dobashcomp completion/source-highlight
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
-	default
-}
diff --git a/dev-util/spec-cleaner-1.0.6 b/dev-util/spec-cleaner-1.0.6
new file mode 100644
index 000000000000..eff648857377
--- /dev/null
+++ b/dev-util/spec-cleaner-1.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=SUSE spec file cleaner and formatter
+EAPI=6
+HOMEPAGE=https://github.com/openSUSE/spec-cleaner
+IUSE=test python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-arch/rpm-4.11.0.1 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.6.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_=24ce86df2597d614e39f39dbea0f05c3
diff --git a/dev-util/spec-cleaner-1.0.7 b/dev-util/spec-cleaner-1.0.7
new file mode 100644
index 000000000000..7db9bfb5d45b
--- /dev/null
+++ b/dev-util/spec-cleaner-1.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest[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(-)] ) 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=SUSE spec file cleaner and formatter
+EAPI=6
+HOMEPAGE=https://github.com/openSUSE/spec-cleaner
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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(-)] >=app-arch/rpm-4.11.0.1 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://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.7.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_=07e8591afb31fe556cf9ef930a935223
diff --git a/dev-util/spec-cleaner-9999 b/dev-util/spec-cleaner-9999
new file mode 100644
index 000000000000..99dd6f390cd5
--- /dev/null
+++ b/dev-util/spec-cleaner-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/pytest[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(-)] ) 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=SUSE spec file cleaner and formatter
+EAPI=6
+HOMEPAGE=https://github.com/openSUSE/spec-cleaner
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=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(-)] >=app-arch/rpm-4.11.0.1 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
+_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_=07e8591afb31fe556cf9ef930a935223
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
deleted file mode 100644
index 5fa0911e2942..000000000000
--- a/dev-util/spec-cleaner/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca
-DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef
-DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
-EBUILD spec-cleaner-1.0.6.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42
-EBUILD spec-cleaner-1.0.7.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
-EBUILD spec-cleaner-9999.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
-MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
diff --git a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch
deleted file mode 100644
index b280cce28bf4..000000000000
--- a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py 2018-03-19 15:23:46.128000000 +0000
-+++ b/setup.py 2018-03-19 15:24:26.920000000 +0000
-@@ -43,7 +43,6 @@
-     platforms=['Linux'],
-     keywords=['SUSE', 'RPM', '.spec', 'cleaner'],
- 
--    setup_requires=['pytest-runner'],
--    tests_require=['pytest', 'pytest-cov'],
-+    tests_require=['pytest'],
- 
-     packages=['spec_cleaner'],
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
deleted file mode 100644
index 209ca060ffe3..000000000000
--- a/dev-util/spec-cleaner/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>jubalh@iodoru.org</email>
-		<name>Michael Vetter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
deleted file mode 100644
index 297d0528ae6b..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
deleted file mode 100644
index f6af4811af24..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
deleted file mode 100644
index f6af4811af24..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/spirv-headers-1.3 b/dev-util/spirv-headers-1.3
new file mode 100644
index 000000000000..9a3b2353a700
--- /dev/null
+++ b/dev-util/spirv-headers-1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Machine-readable files for the SPIR-V Registry
+EAPI=6
+HOMEPAGE=https://www.khronos.org/registry/spir-v/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea.tar.gz -> spirv-headers-1.3.tar.gz
+_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_=c61087e4323f2a3f46a6cb2ca643657d
diff --git a/dev-util/spirv-headers-1.3.1_pre20180710 b/dev-util/spirv-headers-1.3.1_pre20180710
new file mode 100644
index 000000000000..780a2c7ec779
--- /dev/null
+++ b/dev-util/spirv-headers-1.3.1_pre20180710
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Machine-readable files for the SPIR-V Registry
+EAPI=6
+HOMEPAGE=https://www.khronos.org/registry/spir-v/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/ff684ffc6a35d2a58f0f63108877d0064ea33feb.tar.gz -> spirv-headers-1.3.1_pre20180710.tar.gz
+_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_=601e2cac6126c2d75a9f425246878b38
diff --git a/dev-util/spirv-headers-9999 b/dev-util/spirv-headers-9999
new file mode 100644
index 000000000000..1c1f2c7d43fa
--- /dev/null
+++ b/dev-util/spirv-headers-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Machine-readable files for the SPIR-V Registry
+EAPI=6
+HOMEPAGE=https://www.khronos.org/registry/spir-v/
+LICENSE=MIT
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60c2c314d7557c98526e4d6ed58747bb
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
deleted file mode 100644
index e70de086636c..000000000000
--- a/dev-util/spirv-headers/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
-DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c595f816d1e1cc99eb29e086dd4b6cb76cb4696f73f1e05f92f022b77639f5a80f517df75996fdbd10d7bb11cc6eccad8144a7b8b776d5 SHA512 5f0c174ea07dccefdd10242f5122e10b11f8975d2fb36f77975497050b10841fcb4a7f19d90c9ef5853a81dabc8d93b91621d07175a1cf3ab8ba7f6c16fe51fe
-DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
-EBUILD spirv-headers-1.3.1_pre20180710.ebuild 498 BLAKE2B 991fb177a5dfc150428d0dbaa50ef27a41aebbf445dc9aa9702b9976377f7ee40437999f1786561414c2b8c2a1436348cb1e82d7a6ae05bb371a35255a711af6 SHA512 e43a9fc792aff6fa5a1f07fff4c940d7829d31d80b3a9447a2da3e6a47157dd8d4777a51afbc8dd060c9b76e426fe4154cdf49d19e5a634935ac6ba7f6494d4f
-EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
-EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
-MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch b/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
deleted file mode 100644
index b1581f5417b6..000000000000
--- a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c44560949ec78dd13fe1394bf2957e4fd5adec79 Mon Sep 17 00:00:00 2001
-From: Brian Evans <grknight@gentoo.org>
-Date: Wed, 14 Mar 2018 20:00:22 -0400
-Subject: [PATCH] Get rid of custom target
-
----
- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5bff17..bbc3ddc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,5 @@ project(SPIRV-Headers)
- #   3. cmake --build . install-headers
- 
- file(GLOB_RECURSE FILES include/spirv/*)
--add_custom_target(install-headers
--  COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv ${CMAKE_INSTALL_PREFIX}/include/spirv)
--
-+INSTALL(DIRECTORY include/spirv/ DESTINATION include/spirv)
- add_subdirectory(example)
--- 
-2.16.2
-
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
deleted file mode 100644
index e0db081821a3..000000000000
--- a/dev-util/spirv-headers/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
deleted file mode 100644
index c3de1e2ba586..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="ff684ffc6a35d2a58f0f63108877d0064ea33feb"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
deleted file mode 100644
index 4edaed9c09ae..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-9999.ebuild b/dev-util/spirv-headers/spirv-headers-9999.ebuild
deleted file mode 100644
index f5feb0b4bbd9..000000000000
--- a/dev-util/spirv-headers/spirv-headers-9999.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils git-r3
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Headers.git"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
diff --git a/dev-util/spirv-tools-2018.2-r1 b/dev-util/spirv-tools-2018.2-r1
new file mode 100644
index 000000000000..331c3d7ce2bf
--- /dev/null
+++ b/dev-util/spirv-tools-2018.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/spirv-headers sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Provides an API and commands for processing SPIR-V modules
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.2.tar.gz -> spirv-tools-2018.2.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=510277381f7385bf9ce099a329bbc04c
diff --git a/dev-util/spirv-tools-2018.4 b/dev-util/spirv-tools-2018.4
new file mode 100644
index 000000000000..2325e8b4f8b9
--- /dev/null
+++ b/dev-util/spirv-tools-2018.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-util/spirv-headers-1.3.1_pre20180710 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Provides an API and commands for processing SPIR-V modules
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.4.tar.gz -> spirv-tools-2018.4.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5d430708c302c66d066488274ff9dc8c
diff --git a/dev-util/spirv-tools-9999 b/dev-util/spirv-tools-9999
new file mode 100644
index 000000000000..f23d30e9c647
--- /dev/null
+++ b/dev-util/spirv-tools-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-util/spirv-headers-1.3.1_pre20180710 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Provides an API and commands for processing SPIR-V modules
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f4b55675b89b0d12acc82bc066c8004
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
deleted file mode 100644
index ab266c348632..000000000000
--- a/dev-util/spirv-tools/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
-DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
-EBUILD spirv-tools-2018.2-r1.ebuild 988 BLAKE2B cb11ebd8b27a3d0d287f0dd05e9f8f302b159e94f6c8e470d91a3e48249ca442f916387d95cf5fee72de97dde225ef65a07e04b1b6b862b27d92db7d95ce9d45 SHA512 9ffe6f70f02dc0d288f17f18cdea435487d98a4a2830cbd14640433b42bc638512c0566e12990dedeee0d5da359bca326d6e0e82751e3942fd1eba7252696cf1
-EBUILD spirv-tools-2018.4.ebuild 998 BLAKE2B 31de8c7235d648b5494b83160ce36aca43a1268f80de79dfafd8535f852db51bfb001f0b98aa879f8d747db0ac427d5e70e4193e2d7ff276d8a20054004050ff SHA512 017eee1ac06a0bd1a2e7655dc1a69ddb733007790c11b58b790f64e3b3d05459b507e7dbad6e9f0660c97bd1a6ba1bddf50e70e67afd86e610319b3c38c45226
-EBUILD spirv-tools-9999.ebuild 953 BLAKE2B dc661ce85207e845ffae6d6f335d6eb0fbab5099a869733aacfefbb132d5ce2c5f5b85c311d0a4fc7d3731e645d19b62700197b7b0fd428c80af27e625e69971 SHA512 85f7a7bb6de6d82dcb949cdac0a48ba8389844ce575e05821f750e2d504c61293206ea6c7d124c4d08fe5c20da9797cd53606d65f809481d20685718a9ba0c2e
-MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
deleted file mode 100644
index 8199d3b4700f..000000000000
--- a/dev-util/spirv-tools/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
deleted file mode 100644
index 46aa033b73a0..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="dev-util/spirv-headers"
-
-S="${WORKDIR}/SPIRV-Tools-${PV}"
-
-UPSTREAM_COMMIT="8d8a71278bf9e83dd0fb30d5474386d30870b74d"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	default
-	echo "${UPSTREAM_COMMIT}" > "${PN}-commit.h" || die
-	insinto /usr/include/"${PN}"
-	doins  "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
deleted file mode 100644
index 95d38ce604dd..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
-EGIT_COMMIT="f508896d6487d09f5c9a2a3835595446fec0791a"
-S="${WORKDIR}/SPIRV-Tools-${PV}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	default
-	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
-	insinto /usr/include/"${PN}"
-	doins  "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
deleted file mode 100644
index 029556876e65..000000000000
--- a/dev-util/spirv-tools/spirv-tools-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=6
-
-inherit cmake-multilib cmake-utils git-r3
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	default
-
-	# create a header file with the commit hash of the current revision
-	# vulkan-tools needs this to build
-	echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
-}
diff --git a/dev-util/splint-3.1.2-r1 b/dev-util/splint-3.1.2-r1
new file mode 100644
index 000000000000..f8485a4e11c9
--- /dev/null
+++ b/dev-util/splint-3.1.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure prepare test
+DEPEND=sys-devel/flex >=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=Check C programs for vulnerabilities and programming mistakes
+EAPI=5
+HOMEPAGE=http://lclint.cs.virginia.edu/
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.splint.org/downloads/splint-3.1.2.src.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=02dfe1850ad833f67f1a9b1de200874d
diff --git a/dev-util/splint-3.1.2-r2 b/dev-util/splint-3.1.2-r2
new file mode 100644
index 000000000000..16185b104d06
--- /dev/null
+++ b/dev-util/splint-3.1.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure prepare test
+DEPEND=sys-devel/flex >=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=Check C programs for vulnerabilities and programming mistakes
+EAPI=5
+HOMEPAGE=http://lclint.cs.virginia.edu/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.splint.org/downloads/splint-3.1.2.src.tgz
+_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_=7d315380f527794c9964f83eb8cbf90f
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
deleted file mode 100644
index 466cac9189dc..000000000000
--- a/dev-util/splint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31d4c20f03082538aa47ff3614fa8c270a6011c21745c85ad9325884d7447446dcc415995909bcedf1fcf10f9d SHA512 4e74cd5181848c3babf3a6d6687eb6d274be1549f26b7817b2c3fa4c0cee048c841d71a28931ae4db21c0c67154cff536218e7ace6d6e5ba4c7eccb7a800790f
-DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
-EBUILD splint-3.1.2-r1.ebuild 1001 BLAKE2B c96b4fdeeba281d26aa346a77bfa091934421215add9b6c81a93cc820f3ae16c5a20e023774e38b88e81a888a7dc5ee1c0e33626f4ae93537505866f93b937ae SHA512 8e4f2feb30a17f713410328823e9c44af8bf7ca2df44fc1504314cebffad44e1395c1e2ad185f24ea846456b79278ded4cfd8f799f2defebaa2061edfb53533b
-EBUILD splint-3.1.2-r2.ebuild 1100 BLAKE2B 8db7b89182b5fe3da9f13eabdbf555495d1dd32a6a437d9437a8f4c12c45cb1e4a4776bda3fd09f84fe589837d0077002f3835cf4cb42540a5dd36b69a09f6ca SHA512 68e3fc629c36c6a686dec98b3ae30d2afa68a77d5a8ec70de11206f7a23247e669151a189801cc041adb456117da5b70086c117cb38cc99529a59ba6ec6eb28f
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/dev-util/splint/files/splint-3.1.2-musl.patch b/dev-util/splint/files/splint-3.1.2-musl.patch
deleted file mode 100644
index bf8c770b2ef5..000000000000
--- a/dev-util/splint/files/splint-3.1.2-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/osd.c
-+++ b/src/osd.c
-@@ -516,7 +516,7 @@
- # if defined (WIN32) || defined (OS2) && defined (__IBMC__)
-   int pid = _getpid ();
- # else
--  __pid_t pid = getpid ();
-+  pid_t pid = getpid ();
- # endif
- 
-   return (int) pid;
diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
deleted file mode 100644
index f9f8bbfd9405..000000000000
--- a/dev-util/splint/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>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
deleted file mode 100644
index 6b04a9b7874a..000000000000
--- a/dev-util/splint/splint-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
-HOMEPAGE="http://lclint.cs.virginia.edu/"
-SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND="
-	sys-devel/flex
-"
-
-src_prepare() {
-	# verbose compiler calls
-	sed -i -e '/Compiling/d' src/Makefile.am || die
-	# automake complains about trailing \
-	sed -i -e '1600d' test/Makefile.am || die
-	# do not install these header files twice
-	sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# We do not need bison/yacc at all here
-	# We definitely need libfl
-	BISON=no LEXLIB=-lfl econf
-}
-
-src_compile() {
-	local subdir
-	# skip test/ subdir
-	for subdir in src lib imports doc; do
-		emake -j1 -C ${subdir}
-	done
-}
-
-src_test() {
-	emake -C test
-}
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
deleted file mode 100644
index 1549f142bdb8..000000000000
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
-HOMEPAGE="http://lclint.cs.virginia.edu/"
-SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.2-musl.patch
-
-	# verbose compiler calls
-	sed -i -e '/Compiling/d' src/Makefile.am || die
-	# automake complains about trailing \
-	sed -i -e '1600d' test/Makefile.am || die
-	# do not install these header files twice
-	sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# We do not need bison/yacc at all here
-	# We definitely need libfl
-	BISON=no LEXLIB=-lfl econf
-}
-
-src_compile() {
-	local subdir
-	# skip test/ subdir
-	for subdir in src lib imports doc; do
-		emake -j1 -C ${subdir}
-	done
-}
-
-src_test() {
-	emake -C test
-}
diff --git a/dev-util/squashdelta-0.1 b/dev-util/squashdelta-0.1
new file mode 100644
index 000000000000..74b44a35fc10
--- /dev/null
+++ b/dev-util/squashdelta-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Efficient (partially uncompressed) SquashFS binary delta tool
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/squashdelta/
+IUSE=lz4 +lzo
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD public-domain
+RDEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) dev-util/xdelta:3
+REQUIRED_USE=|| ( lz4 lzo )
+SLOT=0
+SRC_URI=https://www.github.com/mgorny/squashdelta/releases/download/v0.1/squashdelta-0.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_=95a15d3d19d1ee717274f97f15566265
diff --git a/dev-util/squashdelta-9999 b/dev-util/squashdelta-9999
new file mode 100644
index 000000000000..dcc1d89d6f79
--- /dev/null
+++ b/dev-util/squashdelta-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) >=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=Efficient (partially uncompressed) SquashFS binary delta tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/squashdelta/
+IUSE=lz4 +lzo
+LICENSE=BSD public-domain
+RDEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) dev-util/xdelta:3
+REQUIRED_USE=|| ( lz4 lzo )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=402751767b947f72084bc2a47252a940
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
deleted file mode 100644
index aab027372dbc..000000000000
--- a/dev-util/squashdelta/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST squashdelta-0.1.tar.bz2 77702 BLAKE2B c36a90e5bb0c22519fdd6229131039b881ccda82117a8180959e463debf767bc2382cc7e38645003cb23ae8e58492aaed849d1951adaedea56837900fda0025f SHA512 1ce93b59b6c51be49aaaee9576049677c8ba146fa3a17c7d3552440a1c0ebe93fb4d8cbe1182db691e2c9552713ecfeef0e50d95f7e94218c341c51364bf724f
-EBUILD squashdelta-0.1.ebuild 816 BLAKE2B ed9e06f2b254d3907872234733ee3bd18f203efd18668c1072e44c36b571da7d83510131de61d388c4b6c1b5d58b91f6c00f62939f12d351f47b4fd52616a44a SHA512 db8727fd723ce993b06fc4c12f769b412971c9042609d48f14a6e6bfe681511652e4253bcf57c0a8a20a855edd53c0989462974ba15291a50c61f86e64ff359f
-EBUILD squashdelta-9999.ebuild 812 BLAKE2B 87a425b61222a714e4a4868d5c86ca37ef58c1840137214edb349b1fdf3b94175ee65ece4252be5af89f992b5be4675c2f6b3e92b2133e974b0fe0427bea1748 SHA512 d3551e272526a4c105623bce97879012d998fe57d2bf31d795d9051da3427a7900916f0f8b90d5a725e45fbf3e1282413c13eb32c6eb0ba2faf6ad6fcc799ee0
-MISC metadata.xml 617 BLAKE2B 1a732150f235099533beb0b3672648f3d4e501509d754bc54f1cb9093df38b2c411519417433b1b485c922844814923c2925d699881f07cb0512b5edeb5f93a8 SHA512 a08f732876cfc4455ddd980eb04cffbe73b4bd56426d420777782a93b1229277463f85c71f05699f152f2edaa4ee8e029e1e5185b5c7b47204a9e9b9ba5120a2
diff --git a/dev-util/squashdelta/metadata.xml b/dev-util/squashdelta/metadata.xml
deleted file mode 100644
index 1001cf9123ee..000000000000
--- a/dev-util/squashdelta/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-	</use>
-	<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/squashdelta/issues/</bugs-to>
-		<remote-id type="github">mgorny/squashdelta</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/squashdelta/squashdelta-0.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.ebuild
deleted file mode 100644
index 64d107803421..000000000000
--- a/dev-util/squashdelta/squashdelta-0.1.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
-
-inherit autotools-utils
-
-DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-# uses public-domain murmurhash3
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/squashdelta/squashdelta-9999.ebuild b/dev-util/squashdelta/squashdelta-9999.ebuild
deleted file mode 100644
index fd19fe305141..000000000000
--- a/dev-util/squashdelta/squashdelta-9999.ebuild
+++ /dev/null
@@ -1,41 +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/${PN}.git"
-inherit autotools git-r3
-
-DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI=""
-
-# uses public-domain murmurhash3
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS=""
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-util/squashmerge-0.1 b/dev-util/squashmerge-0.1
new file mode 100644
index 000000000000..f2052cae8303
--- /dev/null
+++ b/dev-util/squashmerge-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) >=app-portage/elt-patches-20170422
+DESCRIPTION=dev-util/squashdelta delta merge tool
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/squashmerge/
+IUSE=lz4 +lzo
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) dev-util/xdelta:3
+REQUIRED_USE=|| ( lz4 lzo )
+SLOT=0
+SRC_URI=https://www.github.com/mgorny/squashmerge/releases/download/v0.1/squashmerge-0.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_=9931878ef5373678eb61c94b4ce2d49e
diff --git a/dev-util/squashmerge-9999 b/dev-util/squashmerge-9999
new file mode 100644
index 000000000000..d8bad77f3dfc
--- /dev/null
+++ b/dev-util/squashmerge-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) >=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=dev-util/squashdelta delta merge tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/squashmerge/
+IUSE=lz4 +lzo
+LICENSE=BSD
+RDEPEND=lz4? ( app-arch/lz4:0= ) lzo? ( dev-libs/lzo:2= ) dev-util/xdelta:3
+REQUIRED_USE=|| ( lz4 lzo )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b42543ba2cf2dfaa288eab6f530a6035
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
deleted file mode 100644
index 4614852f08ed..000000000000
--- a/dev-util/squashmerge/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST squashmerge-0.1.tar.bz2 76678 BLAKE2B 01e1a286081af8ac4f19c0c40c206f5d41c287b612e48750a6900d2a182dac31fbf1831e5e85891366c2edce6851f3d0128eda22b2e01f3b45594a06ee656b8b SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683
-EBUILD squashmerge-0.1.ebuild 762 BLAKE2B fa7ffc72dde14fee3a9ffd1086f2ebfaafca66a13b628ffa0c8eef0f80ee0f27651883d05fe127f0fdfcacbaadca58712429ec4f3ff504ffb1337113974cfb65 SHA512 45c8283e5b02e98cbd071d90b0b859d685c67ad13005846a1b3aa979e70d0e66e14b9e49ec299dac3118f31dc1d19eb9145c04937c43afe040d0de795252f66f
-EBUILD squashmerge-9999.ebuild 758 BLAKE2B 0d11cfa67239e6d928cd95534728a9574437f8851780969dec850feede9462b26431a960041311ea88eb548c0f365af1ea2aad9731f478a6414ef62cbee3aae2 SHA512 f62e8b4ff613c37a7f0446fdd24939cef4c40a1f836fce827d58451f2585166054d2220344f806e39f6fc4e3ef18044b28e8187f1a3228feb00b22fbb34a267a
-MISC metadata.xml 617 BLAKE2B 145f8cab4c01afb4fe99d51e1e714dd26a9c9a3dc68ffa92588b11e29d326723bab1730ce1fce7708951e362f71ed1bfadae58d122ecadb1d6134423935bbd4e SHA512 3fd67397e969a42017f09a6833b0ee2fefefb9c9fdb16c75312f579991f7025ff7284779f01fd7b6f7ebdd491c85d7b26aad24c6fefd2dddac3c868fd0df1b3d
diff --git a/dev-util/squashmerge/metadata.xml b/dev-util/squashmerge/metadata.xml
deleted file mode 100644
index 8c6675d140f4..000000000000
--- a/dev-util/squashmerge/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-	</use>
-	<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/squashmerge/issues/</bugs-to>
-		<remote-id type="github">mgorny/squashmerge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
deleted file mode 100644
index b2b4863ee107..000000000000
--- a/dev-util/squashmerge/squashmerge-0.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
-
-inherit autotools-utils
-
-DESCRIPTION="dev-util/squashdelta delta merge tool"
-HOMEPAGE="https://github.com/mgorny/squashmerge/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-DOCS=( FORMAT )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
deleted file mode 100644
index 14b136be6184..000000000000
--- a/dev-util/squashmerge/squashmerge-9999.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
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-inherit autotools git-r3
-
-DESCRIPTION="dev-util/squashdelta delta merge tool"
-HOMEPAGE="https://github.com/mgorny/squashmerge/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-DOCS=( FORMAT )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-util/staruml-bin-2.8.1 b/dev-util/staruml-bin-2.8.1
new file mode 100644
index 000000000000..a58967716e27
--- /dev/null
+++ b/dev-util/staruml-bin-2.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A sophisticated software modeler
+EAPI=6
+HOMEPAGE=http://staruml.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=StarUML-EULA
+RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt:11 dev-libs/nss dev-libs/nspr gnome-base/gconf media-libs/fontconfig media-libs/freetype media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libX11 x11-libs/pango virtual/libudev
+RESTRICT=bindist mirror splitdebug
+SLOT=0
+SRC_URI=amd64? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-64-bit.deb ) x86? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-32-bit.deb )
+_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=f88703aaea0c8ba5f68dceb137f9216d
diff --git a/dev-util/staruml-bin/Manifest b/dev-util/staruml-bin/Manifest
deleted file mode 100644
index 6f7fe869d859..000000000000
--- a/dev-util/staruml-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST StarUML-v2.8.1-32-bit.deb 41755234 BLAKE2B 2963a3bd90d49aab3e62c94446d7d6fa113b54a7bec712f5ebb3cd97d4cee76b31a4229a9054ef993c55076244003d36fcd0e59f9b4bf3dd53c30922a1b54050 SHA512 c91251574c8b815e02eee63d616bb821178e3b1494e18accad74bd299e5321425f21435731dca3518aa57369788d6cde59dc2287f789701459242d55a92d5f29
-DIST StarUML-v2.8.1-64-bit.deb 43609354 BLAKE2B f0cbfb16ef36a7ff010a04f2919c7a9035dcddf98e1229e67dcb1e3321b1552baddb3edd26503b8ffa5442b0379a89f17ab9b4cd595b65c5d3730fa734403278 SHA512 97c2a33f437c043b5f236ec304a8329dfcf931f69080bb7e47ec1d9e881fe1bcac0f8a0497ad3f8d11dc4c17a887023f46edfa17a612c1a5a6785f3a580070f5
-EBUILD staruml-bin-2.8.1.ebuild 1241 BLAKE2B cfdbb6ade41d75bfdd74883e959232b544269edc447ab88bb1e5e5afc211fa6e56acaa533f444fe3bcd0976e9e29f47efd4775e25428bf9d7d38afddcf325666 SHA512 8068cc89d452d03fd411fdc6b07713da3af646c333d6a7ce685a469ddb1411ec685da26ab05e8b531513f4250a6144f5e65eb3ef81420e6988ac23f126772b2b
-MISC metadata.xml 383 BLAKE2B f3b107fa01c2b2424847e376abf1ab653cab845eedc35dd34f0613a47c513e71450c7ebcb6a42f68be6ce9002703b584f9e40fb19e6272a872430029501752be SHA512 43b9dc9d256d23f9fe81341771dfb4ad64776552c44ebbe3333f8b3136e9e37d0db4b90d0a2d962149f84e93a4fdc43ca0f65e955bbd7b2da9b41975a8849644
diff --git a/dev-util/staruml-bin/metadata.xml b/dev-util/staruml-bin/metadata.xml
deleted file mode 100644
index 3554bdb770b5..000000000000
--- a/dev-util/staruml-bin/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>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild b/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
deleted file mode 100644
index e554b4a392e7..000000000000
--- a/dev-util/staruml-bin/staruml-bin-2.8.1.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
-
-inherit unpacker
-
-DESCRIPTION="A sophisticated software modeler"
-HOMEPAGE="http://staruml.io/"
-SRC_URI="
-	amd64? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-64-bit.deb )
-	x86? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-32-bit.deb )
-"
-
-LICENSE="StarUML-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror splitdebug"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libgcrypt:11
-	dev-libs/nss
-	dev-libs/nspr
-	gnome-base/gconf
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/pango
-	virtual/libudev
-"
-
-S="${WORKDIR}"
-QA_PREBUILT="opt/staruml/Brackets-node opt/staruml/StarUML"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-MY_PN=${PN/-bin/}
-src_install() {
-	mv opt "${ED}" || die
-	dosym /usr/lib/libudev.so /opt/${MY_PN}/libudev.so.0
-	dosym /opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
-	newdoc usr/share/doc/${MY_PN}/copyright LICENSE
-}
diff --git a/dev-util/statifier-1.7.4 b/dev-util/statifier-1.7.4
new file mode 100644
index 000000000000..ff2f2a0e950c
--- /dev/null
+++ b/dev-util/statifier-1.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Statifier is a tool for creating portable, self-containing Linux executables
+EAPI=6
+HOMEPAGE=http://statifier.sourceforge.net
+IUSE=abi_x86_32 abi_x86_64
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/statifier/files/statifier/1.7.4/statifier-1.7.4.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b29c0bef308e564562599c3e7bc04727
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
deleted file mode 100644
index 9fbb2a7c62b5..000000000000
--- a/dev-util/statifier/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4.ebuild 1129 BLAKE2B 925e516a8711b4c71e39e0f77160f9f144d66139536a86a4daec55ee2debb29369d9cb87ea67463295ee0aa42c2ae8ca8ddcd7fe13a61ac0f58bfc0875b91914 SHA512 43321c83d8fbd0228f91f6dacdae168db1fe7fd1f73b5c41d42c731182e2bb5e7a9dd1508c1ccaea85bac16fdac3675e454bccfc637ce50682bbd337a3ced075
-MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/metadata.xml b/dev-util/statifier/metadata.xml
deleted file mode 100644
index 54d5423c4060..000000000000
--- a/dev-util/statifier/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>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
deleted file mode 100644
index 08b4f7afec9b..000000000000
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit multilib-build
-
-DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
-HOMEPAGE="http://statifier.sourceforge.net"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="app-shells/bash
-	sys-apps/coreutils
-	virtual/awk"
-
-src_prepare() {
-	# Respect users CFLAGS and LDFLAGS
-	sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die
-
-	# Don't compile 32-bit on amd64 no-multilib profile
-	if ! use abi_x86_32; then
-		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
-	fi
-
-	# Apply user patches
-	eapply_user
-}
-
-src_configure() {
-	# Fix permissions, as configure is not marked executable
-	chmod +x configure || die
-	econf
-}
-
-src_compile() {
-	# Package complains with MAKEOPTS > -j1
-	emake -j1
-}
-
-src_install() {
-	# Package complains with MAKEOPTS > -j1
-	emake -j1 DESTDIR="${D}" install
-
-	# Install docs
-	einstalldocs
-}
diff --git a/dev-util/strace-4.20 b/dev-util/strace-4.20
new file mode 100644
index 000000000000..5e2fd2e33d8f
--- /dev/null
+++ b/dev-util/strace-4.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=mirror://sourceforge/strace/strace-4.20.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_=06fe2b7e6a01c10fb1424ce5ce5e84a4
diff --git a/dev-util/strace-4.22 b/dev-util/strace-4.22
new file mode 100644
index 000000000000..500a05ba374e
--- /dev/null
+++ b/dev-util/strace-4.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v4.22/strace-4.22.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_=95b47e427f8dee983e6432126aeea397
diff --git a/dev-util/strace-4.23-r1 b/dev-util/strace-4.23-r1
new file mode 100644
index 000000000000..62185afa7c18
--- /dev/null
+++ b/dev-util/strace-4.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v4.23/strace-4.23.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_=9333b2727d4c0be7d4cd792dcbf2fafd
diff --git a/dev-util/strace-9999 b/dev-util/strace-9999
new file mode 100644
index 000000000000..6e24e870a785
--- /dev/null
+++ b/dev-util/strace-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers >=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 useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b53a375638824e025842609a890558f4
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
deleted file mode 100644
index f7bfe8adf85c..000000000000
--- a/dev-util/strace/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
-DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e136cc1cba1d83091445e2a3b64588c0578f0165ffec01dda1cb1824c29dbdab05bb409232edede953f2a5e78 SHA512 624c3f27921b6df2eb8ff409a35fa9153c4571cd5f703e6cac18f024bccd5ff4acb81f88ca33f81d1046d9718dec7b2705e8940e80bb8447ec3e62a6fd5f8350
-DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
-EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
-EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
-EBUILD strace-4.23-r1.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
-EBUILD strace-9999.ebuild 2283 BLAKE2B cf962151854597584f0fae1b649379c2ae6b7f448acc11042c56750ce401670f32ade92d142a2124c69a027d8147b8a5610877c5e3928826fec66447329a5b8f SHA512 0d200822ace7b03abbee2b03d2c997c129877400eea8828c4bc27d22e6b2131be04e5ae822241e633410059c531c67b5fff2bb8232d8a08a5585a40dea0e243c
-MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
deleted file mode 100644
index ed202ff2ec68..000000000000
--- a/dev-util/strace/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="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <use>
-    <flag name="aio">
-      Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
-    </flag>
-    <flag name="unwind">
-      Enable stack backtraces (-k flag) via <pkg>sys-libs/libunwind</pkg>
-    </flag>
-    <flag name="elfutils">
-      Enable stack backtraces (-k flag) via <pkg>dev-libs/elfutils</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">strace</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
deleted file mode 100644
index 4093a8fe8f0c..000000000000
--- a/dev-util/strace/strace-4.20.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	econf $(use_with unwind libunwind)
-}
-
-src_test() {
-	if has usersandbox $FEATURES ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.22.ebuild b/dev-util/strace/strace-4.22.ebuild
deleted file mode 100644
index 216395c678c1..000000000000
--- a/dev-util/strace/strace-4.22.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	econf \
-		--enable-mpers=check \
-		$(use_with unwind libunwind)
-}
-
-src_test() {
-	if has usersandbox $FEATURES ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-4.23-r1.ebuild
deleted file mode 100644
index a16ee1f785c0..000000000000
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	econf \
-		--enable-mpers=check \
-		$(use_with unwind libunwind) \
-		$(use_with elfutils libdw)
-}
-
-src_test() {
-	if has usersandbox $FEATURES ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
deleted file mode 100644
index bac8d4b752b0..000000000000
--- a/dev-util/strace/strace-9999.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	econf \
-		--enable-mpers=check \
-		$(use_with unwind libunwind) \
-		$(use_with elfutils libdw)
-}
-
-src_test() {
-	if has usersandbox $FEATURES ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/stressapptest-1.0.8 b/dev-util/stressapptest-1.0.8
new file mode 100644
index 000000000000..3a651eae293f
--- /dev/null
+++ b/dev-util/stressapptest-1.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libaio
+DESCRIPTION=Stressful Application Test
+EAPI=5
+HOMEPAGE=https://github.com/stressapptest/stressapptest
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~mips ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libaio
+SLOT=0
+SRC_URI=https://github.com/stressapptest/stressapptest/archive/v1.0.8.tar.gz -> stressapptest-1.0.8.tar.gz
+_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_=2a34d9bb33bb8d1c9ac08c29cb64b7c6
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
deleted file mode 100644
index 79d53a583b4c..000000000000
--- a/dev-util/stressapptest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stressapptest-1.0.8.tar.gz 218485 BLAKE2B a843330dfbf16b324a13e4156c819e8b9139288bd316d560410aeb704ff4e24c47d86dd3b1d1a65d325b86110015c6e893cd38aea99d59b7c68989ba2228f376 SHA512 b5fde353d15958052219c3e505a22aa914e03a7fe96c3a0ac5025a4c730643f6fbdd5088a7cc0dd4618d4998151e2374507845110af8f2cdb43ccd4c87d48916
-EBUILD stressapptest-1.0.8.ebuild 610 BLAKE2B e2c5db27457525327788a29e1b50a6f9e661e1807822e3374d41af2dbd3bb55af337506018b4d72c7838f2b4c9b126dfc6682cef5e8c0d1aeab8fed8d1e69d09 SHA512 36404057a349a6a5e66525235960becaafa4ef7013937170cb04eafd8e7202b19fa5e17be018e5c8cb540407c4c757154b0e4cfe00a89d16fa891611398cd969
-MISC metadata.xml 259 BLAKE2B bf2f588235ba1f20b67db1404be3652d18c003fc52012eca6ed8175524b805a9d168779856994a16cdd2fc049db4eb6c4f3a71b61b50806d53b654877a89d7db SHA512 13357765b1f978b966b3d556a606bda30467379b2c33bc24d2940af28906ca337e8da57e936ba55c26de06d39b48f6729b4d8d4193e178033ea1f2e13e50ad7e
diff --git a/dev-util/stressapptest/metadata.xml b/dev-util/stressapptest/metadata.xml
deleted file mode 100644
index 7037e8e08a5e..000000000000
--- a/dev-util/stressapptest/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-needed -->
-	<upstream>
-		<remote-id type="github">stressapptest/stressapptest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/stressapptest/stressapptest-1.0.8.ebuild b/dev-util/stressapptest/stressapptest-1.0.8.ebuild
deleted file mode 100644
index 927f546d91ed..000000000000
--- a/dev-util/stressapptest/stressapptest-1.0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="Stressful Application Test"
-HOMEPAGE="https://github.com/stressapptest/stressapptest"
-SRC_URI="https://github.com/stressapptest/stressapptest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Matches the configure & sat.cc logic.
-	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
-	econf --disable-default-optimizations
-}
diff --git a/dev-util/stubgen-2.08 b/dev-util/stubgen-2.08
new file mode 100644
index 000000000000..9e847c1ac63b
--- /dev/null
+++ b/dev-util/stubgen-2.08
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=a member function stub generator for C++
+EAPI=4
+HOMEPAGE=http://www.radwin.org/michael/projects/stubgen/
+KEYWORDS=amd64 x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.radwin.org/michael/projects/stubgen/dist/stubgen-2.08.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2ac546fd4102bc4ca4fb37747f10ffaf
diff --git a/dev-util/stubgen/Manifest b/dev-util/stubgen/Manifest
deleted file mode 100644
index b5546bd4db56..000000000000
--- a/dev-util/stubgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stubgen-2.08.tar.gz 104152 BLAKE2B d3e419cb2dcfe4dfc3f6c04cbf7bd4d0fb380804a1b42f66c7f2fb40ba5e581f1b9342666e008650beaa67a79c4acdb73a6c790bd8f2cbb467c1afe53d311cb0 SHA512 daf8a83963fbc8b6857036a3f67a25031fc9e5f032ffedb1e041246354ede2363f5324b6f52ffe69fb41caa177eeca0a1c120f235e460043da1db5fb78fa5e41
-EBUILD stubgen-2.08.ebuild 531 BLAKE2B a2cd9223a2be09989697630269bbde75eafbec809a131e774585c47622ba9560046079d1c93f4c085011e05742b9c51ee4fb8bdd01c3f68ed834549f31c17185 SHA512 3e64445ddb9037bdac22cbb4dc93bd7c2d1166de01e4dca09c51cd107a77ad810d28b960a0e97c875401d347065d24914fea8da49294850ab5f4099409b83482
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/dev-util/stubgen/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
deleted file mode 100644
index d830848e7908..000000000000
--- a/dev-util/stubgen/stubgen-2.08.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="a member function stub generator for C++"
-HOMEPAGE="http://www.radwin.org/michael/projects/stubgen/"
-SRC_URI="http://www.radwin.org/michael/projects/${PN}/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_compile() {
-	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog README
-	doman ${PN}.1
-}
diff --git a/dev-util/suse-build-2015.11.05 b/dev-util/suse-build-2015.11.05
new file mode 100644
index 000000000000..643d9e79ebc9
--- /dev/null
+++ b/dev-util/suse-build-2015.11.05
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Script to build SUSE Linux RPMs
+EAPI=5
+HOMEPAGE=https://build.opensuse.org/package/show/openSUSE:Tools/build
+IUSE=symlink
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long dev-perl/XML-Parser dev-perl/TimeDate app-shells/bash app-arch/cpio app-arch/rpm
+SLOT=0
+SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/build/obs-build-20151105.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a64bae7be44eecfa0f58d4521df261fe
diff --git a/dev-util/suse-build-9999 b/dev-util/suse-build-9999
new file mode 100644
index 000000000000..fbffc6033c1d
--- /dev/null
+++ b/dev-util/suse-build-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-vcs/git
+DESCRIPTION=Script to build SUSE Linux RPMs
+EAPI=5
+HOMEPAGE=https://build.opensuse.org/package/show/openSUSE:Tools/build
+IUSE=symlink
+LICENSE=GPL-2
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long dev-perl/XML-Parser dev-perl/TimeDate app-shells/bash app-arch/cpio app-arch/rpm
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-2	45ff482316b52b3f96ff6b7309b77f03	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a64bae7be44eecfa0f58d4521df261fe
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
deleted file mode 100644
index 313197ab3f0e..000000000000
--- a/dev-util/suse-build/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST obs-build-20151105.tar.gz 231249 BLAKE2B 76a61f986123644e97d5242a0280640d897cc94d1a4e459a422f4e86d0d09406d11d91cd9b848f6d53ede03a9d9ffeeffb45b340b4573fad998efae16b5df2bb SHA512 7b6be4a0d6cd82501c05e41e2a08fa2ad30fe28f28ed72d06b2e4acfdb4d5d6759254291510e8797d214e6330d5c186a85d0f104454d0cde2221d94451bbfb23
-EBUILD suse-build-2015.11.05.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
-EBUILD suse-build-9999.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
-MISC metadata.xml 398 BLAKE2B 5481a9444149a57b4119bf1d6097e3a76de447c0840f6c86d4195019af8c45b7db945126c3caacdac15ee5127d54a5f2461abcaecdf26b981046e62c680a066f SHA512 fc31096f9dddf4cd61a22b7b37fe9ccb7a853a8a77ca6cc1e0459ceabc9f1f9b5754b5ea68dc071b969f6cdf0206d21013ed5fb2b0fc3db42f76a4c1573bf87c
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
deleted file mode 100644
index 91f6a21b19a0..000000000000
--- a/dev-util/suse-build/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>
-  <use>
-    <flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
-  </use>
-  <longdescription lang="en">
-Script for building RPMs for SUSE Linux in a chroot environment.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/suse-build/suse-build-2015.11.05.ebuild b/dev-util/suse-build/suse-build-2015.11.05.ebuild
deleted file mode 100644
index 15f352f1e641..000000000000
--- a/dev-util/suse-build/suse-build-2015.11.05.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
deleted file mode 100644
index 15f352f1e641..000000000000
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/synopsis-0.13 b/dev-util/synopsis-0.13
new file mode 100644
index 000000000000..0c90617fa7b9
--- /dev/null
+++ b/dev-util/synopsis-0.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boehm-gc dev-libs/boehm-gc media-gfx/graphviz sys-devel/bison sys-devel/flex virtual/pkgconfig 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=General source code documentation tool
+EAPI=5
+HOMEPAGE=http://synopsis.fresco.org/index.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/boehm-gc media-gfx/graphviz 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://synopsis.fresco.org/download/synopsis-0.13.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_=3cc4a29bba3ee85837b98fbb9cf5d078
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
deleted file mode 100644
index b9ee6b2faad0..000000000000
--- a/dev-util/synopsis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX synopsis-0.12-gcc45.patch 482 BLAKE2B 4c35528e0a6265d14e7de30236d59eae363889909862aec09b03696e209863465e3bff5b608e972c060fbe3844efd904ad6d599261d713cf651c7eee3906e4cc SHA512 bccb0c6975d0763bf29f08de86349cb41aee1843e08201c7cd22455daddda1c9d419ab39ae67348d0566ae681fc1f90f777d3756b10e0fad2f72eee5fc213b9c
-DIST synopsis-0.13.tar.gz 10691494 BLAKE2B 8a41505eb77a64bb94b5794fc2a1161e8a23f2e2b3bbf9cebd8216e026a20a56f5036585cc9fc457a6bde980e891861dbf2beffa40ad55ead4e31aa2bb7379e7 SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54
-EBUILD synopsis-0.13.ebuild 1229 BLAKE2B f0dd4e7fa463025d12eddd818c3b128793a2587a00010cf2b013f91dd099eaa32b3f7814fb320e9a8cf23b5fb56a2fb9adb2a6c8d52cf71282cd9a0036141ef6 SHA512 a3467acc11f424adf0e140b1541ece9c0088a507795eb65f84b2e50f2825f211c93ae12c2f73d9d890f289f635ac25bdd86fc8770ae4d37331a8667bb4a601e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
deleted file mode 100644
index ff0fe2be5da8..000000000000
--- a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318429
-
-Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
-
---- Synopsis/Parsers/Cxx/Types.cc
-+++ Synopsis/Parsers/Cxx/Types.cc
-@@ -169,7 +169,7 @@
- // Class Types::FuncPtr
- //
- 
--FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
-+FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
-         : m_return(ret), m_premod(premods), m_params(params)
- {}
- 
diff --git a/dev-util/synopsis/metadata.xml b/dev-util/synopsis/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/synopsis/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/dev-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
deleted file mode 100644
index ebf368135bb7..000000000000
--- a/dev-util/synopsis/synopsis-0.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib toolchain-funcs
-
-DESCRIPTION="General source code documentation tool"
-HOMEPAGE="http://synopsis.fresco.org/index.html"
-SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/boehm-gc"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz"
-DEPEND="${COMMON_DEPEND}
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12-gcc45.patch )
-
-pkg_setup() {
-	tc-export CC CXX
-}
-
-python_prepare() {
-	rm -r src/Synopsis/gc || die "failed to remove bundled lib"
-
-	# the distutils script passes its options to a number of
-	# autoconf scripts, to not all of which these options are
-	# relevant. adding this option disables these useless warnings.
-	sed -e "/self.announce(command)/i\        command += ' --disable-option-checking'" \
-		-i Synopsis/dist/command/config.py || die
-}
-
-python_configure() {
-	local mydistutilsargs=(
-		config
-		--libdir=/usr/$(get_libdir)
-		--with-gc-prefix=/usr
-	)
-	esetup.py
-}
diff --git a/dev-util/sysdig-0.21.0 b/dev-util/sysdig-0.21.0
new file mode 100644
index 000000000000..a2070987ab50
--- /dev/null
+++ b/dev-util/sysdig-0.21.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=A system exploration and troubleshooting tool
+EAPI=6
+HOMEPAGE=https://www.sysdig.org/
+IUSE=libressl +modules kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.21.0.tar.gz -> sysdig-0.21.0.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8d004f38055e6bfdc9a162fd348936d3
diff --git a/dev-util/sysdig-0.22.0 b/dev-util/sysdig-0.22.0
new file mode 100644
index 000000000000..f8bb016df428
--- /dev/null
+++ b/dev-util/sysdig-0.22.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=A system exploration and troubleshooting tool
+EAPI=6
+HOMEPAGE=https://www.sysdig.org/
+IUSE=libressl +modules kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/jq:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.22.0.tar.gz -> sysdig-0.22.0.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8d004f38055e6bfdc9a162fd348936d3
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
deleted file mode 100644
index 8c2e606e0d4f..000000000000
--- a/dev-util/sysdig/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sysdig-0.21.0.tar.gz 756010 BLAKE2B 0dfcc3e7f5c830e8b250e4edd9d470764ea6be25804fefbc59b020f208edc313a51b3fb783e538d2acb520c56ad7c8555f224fb90999c87b89125394a90d54a1 SHA512 73c516c9fccb504d4ccd37384aee37ece542d29f82d696acf7c90df18b3a1538faf8d2b29065eae1f3dca7c04c6c2dbe93ed9369bc1340216482c4af2f61d23a
-DIST sysdig-0.22.0.tar.gz 824519 BLAKE2B 7d46376f4f3c346fb6e9ce55552a0377aea6dc258ce3487b1e5a970a25721fca95d731d7313d1dc4b72dbefd9ac37e4050d7a934b8b9bdce027b5b6774ea1351 SHA512 599195bce77f4c2d3f62b11c00361420ab15da5fda4553486a7f812a1a464927cfa4ead36bf046fb1cecd3cf03e5d80a261d4571405d6bc309383bd2b4ad0204
-EBUILD sysdig-0.21.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
-EBUILD sysdig-0.22.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
-MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
deleted file mode 100644
index d888c8211430..000000000000
--- a/dev-util/sysdig/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>
-	<use>
-		<flag name="modules">Build kernel modules needed for tracing local
-			events. Disable this only if you intend to use sysdig purely
-			to work with dumpfiles.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">draios/sysdig</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/sysdig/sysdig-0.21.0.ebuild b/dev-util/sysdig/sysdig-0.21.0.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.21.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.22.0.ebuild b/dev-util/sysdig/sysdig-0.22.0.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.22.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysprof-3.24.1 b/dev-util/sysprof-3.24.1
new file mode 100644
index 000000000000..da903b816a00
--- /dev/null
+++ b/dev-util/sysprof-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=>=dev-libs/glib-2.44:2 gtk? ( sys-auth/polkit >=x11-libs/gtk+-3.22.0:3 ) systemd? ( sys-auth/polkit >=sys-apps/systemd-222 ) app-text/yelp-tools >=sys-devel/gettext-0.19.6 >=sys-kernel/linux-headers-2.6.32 dev-libs/appstream-glib virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=System-wide Linux Profiler
+EAPI=6
+HOMEPAGE=http://sysprof.com/
+IUSE=debug gtk systemd kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44:2 gtk? ( sys-auth/polkit >=x11-libs/gtk+-3.22.0:3 ) systemd? ( sys-auth/polkit >=sys-apps/systemd-222 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/sysprof/3.24/sysprof-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=92190e0c3f0e1266fcc4e35add55b822
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
deleted file mode 100644
index bde6831c1a15..000000000000
--- a/dev-util/sysprof/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
-EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
-MISC metadata.xml 842 BLAKE2B a36dfd049b5a5307006e5189a46fff5b6de8f16fbb8fcaffa8d737895e9864974478c00007b452c350b673fdc735e809ace65fb31d9a7e21c4d4905d9e1d3574 SHA512 cf90f7e7b64c02bb8ca0ec210959c39e004b0c4f6707b2c489ef2a566fd8d62961b902c00deec95f2f762c55d142f5d706a944553cd8e37bcce3d62c9eff8a9d
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
deleted file mode 100644
index 2f805617ad1a..000000000000
--- a/dev-util/sysprof/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="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
-<longdescription lang="en">
-	Sysprof is a sampling CPU profiler for Linux that profiles the entire system,
-	not just a single application.
-	Sysprof handles shared libraries and applications do not need to be recompiled.
-	In fact they don't even have to be restarted.
-</longdescription>
-<use>
-	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-apps/systemd</pkg> running as the init system.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-3.24.1.ebuild b/dev-util/sysprof/sysprof-3.24.1.ebuild
deleted file mode 100644
index f15fb682bb21..000000000000
--- a/dev-util/sysprof/sysprof-3.24.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 linux-info systemd
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gtk systemd"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	gtk? (
-		sys-auth/polkit
-		>=x11-libs/gtk+-3.22.0:3 )
-	systemd? (
-		sys-auth/polkit
-		>=sys-apps/systemd-222 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.6
-	>=sys-kernel/linux-headers-2.6.32
-	dev-libs/appstream-glib
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	kernel_is -ge 2 6 31 && return
-	die "Sysprof will not work with a kernel version less than 2.6.31"
-}
-
-src_configure() {
-	# introspection & vala not use in build system
-	# --with-sysprofd=host currently unavailable from ebuild
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		--disable-introspection \
-		--disable-static \
-		--disable-vala \
-		--with-sysprofd=$(usex systemd bundled no) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
diff --git a/dev-util/systemtap-2.4-r1 b/dev-util/systemtap-2.4-r1
new file mode 100644
index 000000000000..cb90db324642
--- /dev/null
+++ b/dev-util/systemtap-2.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=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 linux trace/probe tool
+EAPI=5
+HOMEPAGE=https://www.sourceware.org/systemtap/
+IUSE=sqlite kernel_linux python_targets_python2_7
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=230ae690097c3d5f3f463ff895432be6
diff --git a/dev-util/systemtap-2.9 b/dev-util/systemtap-2.9
new file mode 100644
index 000000000000..62094f3d38d1
--- /dev/null
+++ b/dev-util/systemtap-2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=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 linux trace/probe tool
+EAPI=5
+HOMEPAGE=https://www.sourceware.org/systemtap/
+IUSE=sqlite kernel_linux python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.9.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e52be027bb50581d34427da648bca857
diff --git a/dev-util/systemtap-3.1 b/dev-util/systemtap-3.1
new file mode 100644
index 000000000000..ec2f1ca43ca3
--- /dev/null
+++ b/dev-util/systemtap-3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=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 linux trace/probe tool
+EAPI=6
+HOMEPAGE=https://www.sourceware.org/systemtap/
+IUSE=sqlite kernel_linux python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8bf480802bc56e56c64f29317c70ae0d
diff --git a/dev-util/systemtap-3.1-r1 b/dev-util/systemtap-3.1-r1
new file mode 100644
index 000000000000..e2cbcb2a39d9
--- /dev/null
+++ b/dev-util/systemtap-3.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=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 linux trace/probe tool
+EAPI=6
+HOMEPAGE=https://www.sourceware.org/systemtap/
+IUSE=libvirt sqlite kernel_linux python_targets_python2_7
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ada2b78a72e8d9728fa756caf3fb32c
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
deleted file mode 100644
index 16c9634c7e2f..000000000000
--- a/dev-util/systemtap/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
-DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
-DIST systemtap-2.9.tar.gz 3258026 BLAKE2B 92f4fcafcc3f4d517a631950593fc53e31ca25b0d956560e77e216d5522706cea58cb0d788cc3a579b7cc290eab4c1e8dbc295393e3b6444e99ce7235802f1f7 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc
-DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
-EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
-EBUILD systemtap-2.9.ebuild 2012 BLAKE2B 851defa24b90f2dcd2dd75317197b2d90933e1170d10fb51354091c204bdfaaab629fc889af8c79f9559e1eeba3f3f8432722e8d7adbe39bd814beed5a6cdf66 SHA512 dee651564fb1894dde6b900532a7d3c6c554161ebf573bd38dea24f9f54aba78b5cf2150c782105da59394bb5cb2b8d1daca8ba2f1698f0a3a7e82c917773a32
-EBUILD systemtap-3.1-r1.ebuild 2132 BLAKE2B 6e8a22cafbd49eb0f74aaccbc7b42d7aa675c1316f6560dfa93c14afc0914f0632597d97dab7fd3dd9a3bfeff7dec393e3082f4e62b5b620a898ee386886d34f SHA512 8b4a879a5e8653b231f0b2988b958b710734b3155bf20e0e1d2b6985ba04ae891ea83a7839fced9c0f0d92a5edde7f3c80fd91617c1e7755a48312b70ec50a30
-EBUILD systemtap-3.1.ebuild 2008 BLAKE2B 70a2c35653fe2e580de58e4d662f8124271444dfae7359eaa1d21430f66c2bb4d5398c989decfb4cbb76f8e1857a1dcaa3dc16f2d8a60cc8d14c05118fcd6dc4 SHA512 3becae4fb0226da05ae87e60151550c4b50d93948d0f699b6aff8d2680152e1c58aae944d5c7bb75f410f54bfe6d37dec3630e7824c2747da4d1c13b1b9fa2e3
-MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/files/systemtap-3.1-ia64.patch b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
deleted file mode 100644
index 832bfc1a47f9..000000000000
--- a/dev-util/systemtap/files/systemtap-3.1-ia64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Workaround build failure on ia64
-
-Avoid 'o' constraint to allow gcc to select register operand.
-That way instruction selector can satisfy all constraints
-for PROBE2 macro.
-
-Reported-by: Émeric Maschino
-Bug: https://bugs.gentoo.org/510134
---- a/cache.cxx
-+++ b/cache.cxx
-@@ -8,2 +8,10 @@
- 
-+#ifdef __ia64__
-+// Default is: nor
-+// We disable 'o' because gcc fails to select register
-+// constraint for second instruction in 'add_script_to_cache'
-+//     https://bugs.gentoo.org/510134
-+#    define STAP_SDT_ARG_CONSTRAINT nr
-+#endif
-+
- #include "config.h"
---- a/staprun/mainloop.c
-+++ b/staprun/mainloop.c
-@@ -1 +1,9 @@
-+#ifdef __ia64__
-+// Default is: nor
-+// We disable 'o' because gcc fails to select register
-+// constraint for second instruction in 'add_script_to_cache'
-+//     https://bugs.gentoo.org/510134
-+#    define STAP_SDT_ARG_CONSTRAINT nr
-+#endif
-+
- /* -*- linux-c -*-
diff --git a/dev-util/systemtap/metadata.xml b/dev-util/systemtap/metadata.xml
deleted file mode 100644
index 25ae3f091aca..000000000000
--- a/dev-util/systemtap/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>swegener@gentoo.org</email>
-</maintainer>
-  <use>
-    <flag name="libvirt">Support probing of libvirt domains.</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
deleted file mode 100644
index 330261410f40..000000000000
--- a/dev-util/systemtap/systemtap-2.4-r1.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 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
deleted file mode 100644
index 56e38eebf0f2..000000000000
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ /dev/null
@@ -1,72 +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 linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
deleted file mode 100644
index be6ed6219e46..000000000000
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ /dev/null
@@ -1,78 +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 linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
-IUSE="libvirt sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	libvirt? ( >=app-emulation/libvirt-1.0.2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-ia64.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable libvirt virt) \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-3.1.ebuild b/dev-util/systemtap/systemtap-3.1.ebuild
deleted file mode 100644
index c783078d0bb5..000000000000
--- a/dev-util/systemtap/systemtap-3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/tailor-0.9.35-r1 b/dev-util/tailor-0.9.35-r1
new file mode 100644
index 000000000000..42e17a9965f5
--- /dev/null
+++ b/dev-util/tailor-0.9.35-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A tool to migrate changesets between version control systems
+EAPI=5
+HOMEPAGE=http://wiki.darcs.net/index.html/Tailor
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://darcs.arstecnica.it/tailor-0.9.35.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b390470d44a584b179ba9679dc5c6fd
diff --git a/dev-util/tailor/Manifest b/dev-util/tailor/Manifest
deleted file mode 100644
index ab32c69149c2..000000000000
--- a/dev-util/tailor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tailor-0.9.35.tar.gz 228650 BLAKE2B 00f609b64f22f35791bcbced1d5e62aa38b3d00c88b5d96f525807991cc51e5e82e2312583c257fc039bf89d794bcf3dbe9580e582f0d3d638289399808194ed SHA512 184521adac681ccca279215c115913d98d1521aac41fe15ca65a35e3c5075419e1cb0f1b453bca6d5a56a15b09928c34738a264b44f666de7067b2aba0562bed
-EBUILD tailor-0.9.35-r1.ebuild 868 BLAKE2B f3209f65373063f0c7b2e1b3e2c1294010513b35962b5c2e78d326ab0f833f0c088c7acf9a4b0dffe67c6811afd2ec52d542d2c0e6b0053c5f3ee1533fdf93a1 SHA512 2047073ec9dbc72d66bc99d773769aa37ee4c7a2ba4d562ee0ffb7c8628d305d35820c7cfea95829943bc8673129033ef5e313c1d4c0b9c9aed7b53e5e9f11ea
-MISC metadata.xml 375 BLAKE2B 33ebd2d721501f15f3688440fea5ee396d7a2edc27f8c8443f71a2a21091db612bd7b1de7b5e811f624a49531081642292e4957fc52881a20663bcb470147773 SHA512 941495f6fcaf8a68c320ad045533fa95a7deab3ec1cf2b55113c67efe004045685464440eaaf4b879711389c9b4afd21eccc74c2be865ce59b1216c206bb8877
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
deleted file mode 100644
index 8dd954b0400b..000000000000
--- a/dev-util/tailor/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-needed -->
-	<longdescription lang="en">
-		Tailor is a tool to migrate changesets between ArX, Bazaar,
-		Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone,
-		Subversion and Tla repositories.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/tailor/tailor-0.9.35-r1.ebuild b/dev-util/tailor/tailor-0.9.35-r1.ebuild
deleted file mode 100644
index baf62a2442bd..000000000000
--- a/dev-util/tailor/tailor-0.9.35-r1.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=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to migrate changesets between version control systems"
-HOMEPAGE="http://wiki.darcs.net/index.html/Tailor"
-SRC_URI="http://darcs.arstecnica.it/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_install_all() {
-	local HTML_DOCS=( README.html )
-	distutils-r1_python_install_all
-	rm "${D}usr/share/doc/${PF}/README.html"
-}
-
-pkg_postinst() {
-	elog "Tailor does not explicitly depend on any other VCS."
-	elog "You should emerge whatever VCS(s) that you want to use seperately."
-}
diff --git a/dev-util/tinlink-1.0.0 b/dev-util/tinlink-1.0.0
new file mode 100644
index 000000000000..9cf64ddbe1fc
--- /dev/null
+++ b/dev-util/tinlink-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=a tool to create very small elf binary from pure binary files
+EAPI=0
+HOMEPAGE=http://sed.free.fr/tinlink/
+KEYWORDS=~amd64 ~x86 ~ppc
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://sed.free.fr/tinlink/tinlink-1.0.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=11be44d28538d97f8d65af468e939763
diff --git a/dev-util/tinlink/Manifest b/dev-util/tinlink/Manifest
deleted file mode 100644
index cb85486fadba..000000000000
--- a/dev-util/tinlink/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tinlink-1.0.0.tar.gz 4726 BLAKE2B 7760043a6ee54ba8d675d3fc7b2edcc0c3ad19f73d228c3b77ca278b6b58668d302e63335ef0fa03e184f2c68b27a5822c898143912bfd1c323bc7f009e88e1f SHA512 30e81ecba9850caaedc6d295d6ae88a24b8799e1ab74158a3f98da17d68dd6b0dd23a7076f887114f695f1023e832225bff8c4c2044dc105763ef47b0111ebef
-EBUILD tinlink-1.0.0.ebuild 584 BLAKE2B 10f7de628bd846f54b999bcc6824cd84f65c3d0bab3ae5b13e2a378cb0ac37526d80505d7087e0469cc640ecc00d7b06241349b45787c3d92736237dab872ec0 SHA512 50c46bc83cf04688822b04eb9c38379eeefd6b6d2a1f7c4f518f0a78a49b2d5a28f3b3d47e36c590bc30849fd3c74cdeb7b8a11b8165b0210a102c5c91a05ee6
-MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/tinlink/metadata.xml b/dev-util/tinlink/metadata.xml
deleted file mode 100644
index b4a27e94fc24..000000000000
--- a/dev-util/tinlink/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>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/tinlink/tinlink-1.0.0.ebuild b/dev-util/tinlink/tinlink-1.0.0.ebuild
deleted file mode 100644
index 114a484c3049..000000000000
--- a/dev-util/tinlink/tinlink-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="a tool to create very small elf binary from pure binary files"
-HOMEPAGE="http://sed.free.fr/tinlink/"
-SRC_URI="http://sed.free.fr/tinlink/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	rm -f "${S}"/Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" tinlink || die
-}
-
-src_install() {
-	dobin tinlink || die
-	dodoc AUTHORS README example.asm
-}
diff --git a/dev-util/tkdiff-4.2 b/dev-util/tkdiff-4.2
new file mode 100644
index 000000000000..09a143041a62
--- /dev/null
+++ b/dev-util/tkdiff-4.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Graphical front end to the diff program
+EAPI=6
+HOMEPAGE=http://tkdiff.sourceforge.net/
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=dev-lang/tk
+SLOT=0
+SRC_URI=mirror://sourceforge/tkdiff/4.2/tkdiff-4.2.tar.gz
+_md5_=9205eab9a33dcafda23ee1959365ffb0
diff --git a/dev-util/tkdiff/Manifest b/dev-util/tkdiff/Manifest
deleted file mode 100644
index 69069a7c0f02..000000000000
--- a/dev-util/tkdiff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tkdiff-4.2.tar.gz 92063 BLAKE2B 4c3d1fbbc4bc76c8a39dca454a6630b8022acf33aa11b899db8960534f3df91fa068162fd0a7f16a00c6dde697d8cfd6dbcc4157035a340e162e113ceaf102ac SHA512 6c16475b808a9ac4d51a3e0b348d12739d821743eb205281473408a722ef7329e7dee61b4e0536741fab0c88eb67b00080d84598fca5e3215d4b183a858f6984
-EBUILD tkdiff-4.2.ebuild 474 BLAKE2B acdf9395852bc4dfb3d5fd61ac4d29a702e91b036a9e4ace9cc4e7ac909fadfc63055f9e42e696d987416226f1e4a2a90483296e2611d25b5a70e02618271733 SHA512 d721ae135b7b59c989d2992603ba4999104e264f418f912a515162d014585cd8626396072c85d2ea3652beee268391bfd8738d1be19599171d1e752c61aefd90
-MISC metadata.xml 329 BLAKE2B d6b5ca29071f1300d73bcbf1108d5f6652c69622aef916262e938a2247c49b09f4957b5781e25e70c16f71e12727dfac975edcdf86ca480765919f6afa07bcab SHA512 b4d8e2c6df1cba67c191b95e7381da88c9d50715dcb2dddf74b91927bcf5509b2beecfac337a5e06657f3e3ec045808cb1f912c9ad9736b68ef3ed270b93c957
diff --git a/dev-util/tkdiff/metadata.xml b/dev-util/tkdiff/metadata.xml
deleted file mode 100644
index b2dc049fd070..000000000000
--- a/dev-util/tkdiff/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>tcltk@gentoo.org</email>
-		<name>Gentoo Tcltk Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tkdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/tkdiff/tkdiff-4.2.ebuild b/dev-util/tkdiff/tkdiff-4.2.ebuild
deleted file mode 100644
index cc4994205d46..000000000000
--- a/dev-util/tkdiff/tkdiff-4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Graphical front end to the diff program"
-HOMEPAGE="http://tkdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/tk"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-unix"
-
-src_install() {
-	dobin tkdiff
-	dodoc CHANGELOG.txt
-}
diff --git a/dev-util/tmake-2.12-r1 b/dev-util/tmake-2.12-r1
new file mode 100644
index 000000000000..49113908b79e
--- /dev/null
+++ b/dev-util/tmake-2.12-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A Cross platform Makefile tool
+EAPI=6
+HOMEPAGE=http://tmake.sourceforge.net
+KEYWORDS=amd64 ppc x86 ~x86-linux ~ppc-macos
+LICENSE=HPND
+RDEPEND=>=dev-lang/perl-5
+SLOT=0
+SRC_URI=mirror://sourceforge/tmake/tmake-2.12.tar.bz2
+_md5_=57d54c5820459193f42ea2be7668b958
diff --git a/dev-util/tmake/Manifest b/dev-util/tmake/Manifest
deleted file mode 100644
index be8489dda2d2..000000000000
--- a/dev-util/tmake/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tmake-2.12.tar.bz2 47558 BLAKE2B f5c4a590ec6077b12ffa6b37f00adc168d596466fa5ff30622e34b624eb931bef63af47b3c8eaa2d8c844b80d69cfc355adc4f0e965768e28efb31077515f0af SHA512 203a37aca7d391cf8bf7c27d9e5a9825472e9464f745d50b40343f71986ea5a48030372fa858ad5dade0807951f5c413145b9521ee1da416ff4952f8bb845ada
-EBUILD tmake-2.12-r1.ebuild 603 BLAKE2B 43ca0d6c1e8d548d3f44ac8aa1551df477bc35dcc9f5fb7026a29ac89ae1c8009aa51489e279aaca80047fca1d87aff36f4c83e7e4ab19ba101a8c30557dce51 SHA512 58b7ac43992ef84d86592fe645474c60c4442a6fb1d96ae8c8a7a319967f3efcc193dfce5feebbab2f92f2d665fd749dd3e6ce2e148df19f86f44937ef9ba959
-MISC metadata.xml 242 BLAKE2B 5b51e51743b76e23cca3fa6f94f415455bb8f2cffff01037ad7a864d2006ffbe59af69a9bdae6de30050ec49bf966725f36b5e0409ecf7f2ac41981df67c4a87 SHA512 6212facd652d416cf5e57a8607563f29573595984ffd05f5d0ce068fa48d6ad9155cf9fea6308702cc9f6ee36e27d38dd35c13ba3b47a3500c5d6124880b0869
diff --git a/dev-util/tmake/metadata.xml b/dev-util/tmake/metadata.xml
deleted file mode 100644
index 24c5c006abab..000000000000
--- a/dev-util/tmake/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">tmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/tmake/tmake-2.12-r1.ebuild b/dev-util/tmake/tmake-2.12-r1.ebuild
deleted file mode 100644
index 48958d9544cd..000000000000
--- a/dev-util/tmake/tmake-2.12-r1.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
-
-DESCRIPTION="A Cross platform Makefile tool"
-SRC_URI="mirror://sourceforge/tmake/${P}.tar.bz2"
-HOMEPAGE="http://tmake.sourceforge.net"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5"
-
-src_install () {
-	dobin bin/tmake bin/progen
-	dodir /usr/lib/tmake
-	cp -pPRf "${S}"/lib/* "${ED}"/usr/lib/tmake
-	dodoc README
-	dohtml -r doc/*
-	echo "TMAKEPATH=\"${EPREFIX}/usr/lib/tmake/linux-g++\"" > "${T}"/51tmake
-	doenvd "${T}"/51tmake
-}
diff --git a/dev-util/trace-cmd-2.5.1 b/dev-util/trace-cmd-2.5.1
new file mode 100644
index 000000000000..3b04847ed617
--- /dev/null
+++ b/dev-util/trace-cmd-2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-kernel/linux-headers python? ( virtual/pkgconfig dev-lang/swig ) gtk? ( virtual/pkgconfig ) doc? ( app-text/asciidoc )
+DESCRIPTION=User-space front-end for Ftrace
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+IUSE=doc gtk python udis86 kernel_linux python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/trace-cmd-2.5.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6410602cb3ed75565704de261dd615b6
diff --git a/dev-util/trace-cmd-2.6 b/dev-util/trace-cmd-2.6
new file mode 100644
index 000000000000..46c6b8b62770
--- /dev/null
+++ b/dev-util/trace-cmd-2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-kernel/linux-headers python? ( virtual/pkgconfig dev-lang/swig ) gtk? ( virtual/pkgconfig ) doc? ( app-text/asciidoc )
+DESCRIPTION=User-space front-end for Ftrace
+EAPI=6
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+IUSE=doc gtk python udis86 kernel_linux python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/trace-cmd-2.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f7e6f5b7354ac443045cfc4b666596d6
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
deleted file mode 100644
index 42e09ba53b6a..000000000000
--- a/dev-util/trace-cmd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX trace-cmd-2.5.1-makefile.patch 1152 BLAKE2B fc44b06f2d59d2c02ba7c1f9145d06c4b256177cf9cf2f1b9928b2f08d49a719e675a543ffcbdbe5c08e00d9f27eec01052d278d90fedb294296be68d61b1bf4 SHA512 e74742d3c050f9e7bdb566a82a5212e6474b34ee6fc46e9ffa313ad3f2c323f55b63521ec857ae44f39ef168135fcdf733314fb3e04709e51f03ef7aed99c416
-DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B 25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2
-DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B 42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5 SHA512 cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54
-EBUILD trace-cmd-2.5.1.ebuild 1519 BLAKE2B 85aa750902bd3d6ba16431f78c2ed2a829b3ec03e257a466e91f3a4e824256c32b41ae246dec989abab19fbbe92b4c3cfff14ee443c4262fcb5b1ff388e19a1d SHA512 564125aa45004c07e27a83d2e78fbbfd9670c4079c7d8afc679c9c3445ceca54370bd168dcccbf65101752bfb8a5b9b7f04264f172d7b12be917d1388d2e5c5b
-EBUILD trace-cmd-2.6.ebuild 1500 BLAKE2B 04764f54ccb207b141349af6a3d1c2e976eccb3eb80d24ce929c3964ebf3f9d4aa2a8be034e3f85284c96725de30eb901e999078e070fffe398c9d42b7121167 SHA512 866ac85fd69cac13215ca03f3044bf2214a46c0d711c6e4305acab224e7df6dd8258189a1c11155ab385c76d1592834b5ff79b1a6e8619c8940100c2c91c522d
-MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
deleted file mode 100644
index ec9fb1774a3a..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 186e245..9127f23 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins
- python_dir = $(HOME)/.trace-cmd/python
- else
- plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins
--python_dir = $(prefix)/$(libdir)/trace-cmd/python
-+python_dir ?= $(prefix)/$(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -98,8 +98,11 @@ endif # NO_PYTHON
- test-build = $(if $(shell sh -c 'echo "$(1)" | \
- 	$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
- 
-+ifndef NO_UDIS86
- # have udis86 disassembler library?
--udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
-+udis86-flags := -DHAVE_UDIS86
-+udis86-ldflags := -ludis86
-+endif # NO_UDIS86
- 
- define BLK_TC_FLUSH_SOURCE
- #include <linux/blktrace_api.h>
-@@ -242,6 +245,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
- 
- ifeq ($(VERBOSE),1)
-   Q =
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
deleted file mode 100644
index d0ed66266c6a..000000000000
--- a/dev-util/trace-cmd/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>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<use>
-		<flag name="udis86">Enable support for dev-libs/udis86 disassembler library</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
deleted file mode 100644
index c6acbd767956..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
+++ /dev/null
@@ -1,72 +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 eutils toolchain-funcs linux-info python-single-r1
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc gtk python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	gtk? ( virtual/pkgconfig )
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch_user
-}
-
-src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
-
-	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
-	else
-		MAKEOPTS+=" NO_PYTHON=1"
-	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
-}
-
-src_compile() {
-	emake all_cmd
-	use doc && emake doc
-	use gtk && emake -j1 gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
-}
diff --git a/dev-util/trace-cmd/trace-cmd-2.6.ebuild b/dev-util/trace-cmd/trace-cmd-2.6.ebuild
deleted file mode 100644
index 4187d0fdd2f3..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils toolchain-funcs linux-info python-single-r1
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc gtk python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	gtk? ( virtual/pkgconfig )
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-makefile.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
-
-	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
-	else
-		MAKEOPTS+=" NO_PYTHON=1"
-	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
-}
-
-src_compile() {
-	emake all_cmd
-	use doc && emake doc
-	use gtk && emake -j1 gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
-}
diff --git a/dev-util/treecc-0.3.10 b/dev-util/treecc-0.3.10
new file mode 100644
index 000000000000..677fc0fc5f4b
--- /dev/null
+++ b/dev-util/treecc-0.3.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=doc? ( app-text/texi2html )
+DESCRIPTION=compiler-compiler tool for aspect-oriented programming
+EAPI=0
+HOMEPAGE=https://www.gnu.org/software/dotgnu
+IUSE=doc examples
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=doc? ( app-text/texi2html )
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/dotgnu-pnet/treecc-0.3.10.tar.gz
+_md5_=c8cfe65985ff5e496406c25ee2f1202f
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
deleted file mode 100644
index 50cb52b5f08c..000000000000
--- a/dev-util/treecc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST treecc-0.3.10.tar.gz 375762 BLAKE2B 1d4fb6905226d79bef021808639f011731cd665b76db07efbf0ab4285c35986c1efa99381694ab5ddbb20131a8bef0d26b677d1b3e5311f2fe8fa99b1a575efb SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73
-EBUILD treecc-0.3.10.ebuild 1136 BLAKE2B 2ccfec687eb4d19811b7cdc3c46addf929050d65c52a09a26900fcad8687ff8f08707b4c1e2737f1ad7887309fe9cc34e390e214b2cd920b51123ad9662ec830 SHA512 7a8067318e17c4eea0262463ca1b1cb384caab13311f4d996ee0e1cc2b6723dd0f4ec3f3c6c81a5b5214b24d6b946fbbd4603a96d8280a29d14ad2b3dfbe9435
-MISC metadata.xml 251 BLAKE2B 102da490c04b5ec767aebd0f076ea9aa083ec51416f584daad83e4202bd51e7182e95b7c1c98125c2a9da29eaa6b97dd4d9825c9d72e9c89d85d209e89031f48 SHA512 9b3d8ef0e933c58ceeae768b5e07fec1aba98d2f0add71719bcdec0e571b503b102610c0c4cbc322cc15638547e2f26f149d80c1498edb10b16a874014ae20d0
diff --git a/dev-util/treecc/metadata.xml b/dev-util/treecc/metadata.xml
deleted file mode 100644
index c99669dda129..000000000000
--- a/dev-util/treecc/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>dotnet@gentoo.org</email>
-	<name>Gentoo Dotnet Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/treecc/treecc-0.3.10.ebuild b/dev-util/treecc/treecc-0.3.10.ebuild
deleted file mode 100644
index 5600422561cc..000000000000
--- a/dev-util/treecc/treecc-0.3.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="compiler-compiler tool for aspect-oriented programming"
-HOMEPAGE="https://www.gnu.org/software/dotgnu"
-SRC_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-text/texi2html )"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		if [ ! -f "${S}"/doc/treecc.texi ] ; then
-			die "treecc.texi was not generated"
-		fi
-
-		cd "${S}"/doc
-		texi2html -split_chapter "${S}"/doc/treecc.texi \
-			|| die "texi2html failed"
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/README
-		dodoc examples/{expr_c.tc,gram_c.y,scan_c.l}
-	fi
-
-	if use doc ; then
-		dodoc doc/*.{txt,html}
-
-		docinto html
-		dohtml doc/treecc/*.html
-	fi
-}
diff --git a/dev-util/trinity-1.8 b/dev-util/trinity-1.8
new file mode 100644
index 000000000000..1263f6f42a27
--- /dev/null
+++ b/dev-util/trinity-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=app-arch/xz-utils >=sys-kernel/linux-headers-4.8
+DESCRIPTION=A Linux system call fuzz tester
+EAPI=6
+HOMEPAGE=http://codemonkey.org.uk/projects/trinity/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.8.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=14e26b0795f71e2f62b205debbe46dc0
diff --git a/dev-util/trinity-9999 b/dev-util/trinity-9999
new file mode 100644
index 000000000000..034a813b8f00
--- /dev/null
+++ b/dev-util/trinity-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-kernel/linux-headers >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A Linux system call fuzz tester
+EAPI=6
+HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
+IUSE=examples
+LICENSE=GPL-2
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=cd7efeea84f6cdfcabc40c8fd61e139c
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
deleted file mode 100644
index 7f701cc1e3c7..000000000000
--- a/dev-util/trinity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
-EBUILD trinity-1.8.ebuild 824 BLAKE2B d98c9332cbdd60749c0a1bf3dd1277842fa543100e9681b5721f3477b24d4d70f7d9c6dd7e3ced2743a0bb743bf8fbd3f7adda5c41b8e9eb6f3ca907f11a215a SHA512 defbdf6d43dd3458fbf52bf4fbf9fc9b518ef0186f7f6662bea0014240dd0331db45563a9062c8b45adcaa021994ef28f2bada65c2e12c4cf71f6720b5db0f97
-EBUILD trinity-9999.ebuild 804 BLAKE2B 446dab373eaa541bcb57b407e64f737a4117f8ebc130bb83cd11f0e75ee85d9a60fc534208ff60efdee531b89691d5d8ba27d1b7c9d387355e95bad3d1c876fc SHA512 6183f9cba7341792b559fddc183027a7d80fdc7a5531ee26c94aa04ca82663492827b2ee1fb1986d136c69826e1a79183f6c2c6e9ee9b4c018d6af8fdb44c384
-MISC metadata.xml 253 BLAKE2B e7d65a21b41d6fee02d2ca3ed68a52450a11debfcdf7e029100f010f6bab26aded65447d29bf374ee41d224f8105b57a8b2b6b0400f8ee4844900e6f2025a5cb SHA512 c6d2490fa32bc6e044a6b051ba21210f47d7545271a7437b9ed16f49924837e1c88dffc33efb94557b818a508e068e1405fae056c881078c37a001e30947aa25
diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml
deleted file mode 100644
index 1d8df37aeeb8..000000000000
--- a/dev-util/trinity/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-needed -->
-	<upstream>
-		<remote-id type="github">kernelslacker/trinity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.8.ebuild
deleted file mode 100644
index 1072988366ec..000000000000
--- a/dev-util/trinity/trinity-1.8.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
-inherit toolchain-funcs
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-# We need newer headers to avoid compilation failures in the BPF stuff.
-DEPEND="app-arch/xz-utils
-	>=sys-kernel/linux-headers-4.8
-"
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_compile() {
-	# Enable a verbose (i.e. not quiet) build.
-	emake V=1
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc Documentation/*
-	einstalldocs
-
-	if use examples ; then
-		exeinto "/usr/share/doc/${PF}/scripts"
-		doexe scripts/*
-		docompress -x "/usr/share/doc/${PF}/scripts"
-	fi
-}
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
deleted file mode 100644
index 2e263c788cee..000000000000
--- a/dev-util/trinity/trinity-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs git-r3
-
-EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git"
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-
-DEPEND="sys-kernel/linux-headers"
-
-src_prepare() {
-	sed -e 's/-g -O2//' \
-		-e 's/-D_FORTIFY_SOURCE=2//' \
-		-e '/-o $@/s/$(LDFLAGS) //' \
-		-i Makefile || die
-
-	tc-export CC
-	default
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc Documentation/* README
-
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/scripts
-		doexe scripts/*
-		docompress -x /usr/share/doc/${PF}/scripts
-	fi
-}
diff --git a/dev-util/txt2regex-0.8-r3 b/dev-util/txt2regex-0.8-r3
new file mode 100644
index 000000000000..a793bbd51be5
--- /dev/null
+++ b/dev-util/txt2regex-0.8-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=nls? ( sys-devel/gettext )
+DESCRIPTION=A Regular Expression wizard that converts human sentences to regexs
+EAPI=5
+HOMEPAGE=http://txt2regex.sourceforge.net/
+IUSE=nls cjk
+KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=app-shells/bash-2.04
+SLOT=0
+SRC_URI=http://txt2regex.sourceforge.net/txt2regex-0.8.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3ce7f96e07485480cd8c57552c8ad306
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
deleted file mode 100644
index 1c7ab0c73e76..000000000000
--- a/dev-util/txt2regex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX txt2regex-0.8-disable-nls.patch 696 BLAKE2B fc29bbb2320f81cece70e9425d21a49abe03e9395c881e70bd23509388535fd56bcb38e8bc2a401a231a6dfd2902a70e0aa3714108164186f30d159d785d6753 SHA512 8b3fb8e37695d44078325687e8b7d4ac929578a03a46693f2854445a798f1ecfeae60d2da5212c395d00dae53eca63043865c8ea4a04d26a620d20c3a4aa1c7a
-AUX txt2regex-0.8-textdomaindir.patch 729 BLAKE2B 41971294ef8a693c72f00db26bf27ac85acbf9f1fb44869176107f29dffce9070a0e4662b2d1366e5806a247b7c61c86cd22db4dd8a8b6d52ca0e4d34f5b17ce SHA512 85178d5cb8cdf9b8faf11c4b66247c8c5102b8035825cb08a4aaf0d8a5148965260e4df85bf1ab5e3aeaa20dad9bbb5d6fa5a6ddc1576c9949eb48bcb6844aa0
-DIST txt2regex-0.8.tgz 40514 BLAKE2B 938f8ec41ec1319d96928ed38985626d906788a8c2959661c2338104527a0ade3a72e4d7e13f17b2f6f9abc2589ff2aaf88dc99077bf2fd6a82a82d186efc580 SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f
-EBUILD txt2regex-0.8-r3.ebuild 859 BLAKE2B b930a20755e952a9a2d7b6fbdb5970d8f9919344fec3e86c4ac7a96c2558f350d2c4476d3d0b0230b01ac79337a987c7d421f6e96f472d2447fe76eff8da2d09 SHA512 dc79e8737f3736b765915965d8e754d7d936c6b07e1836d2d55c173c3f73ded6776f7d2758bccda77a045e9565dedbabe08b6a933e6ba70f2a4d70bba988f622
-MISC metadata.xml 344 BLAKE2B 651b9be422dadc59659b2e27801d6413b181095d3921b086638765a965e0ca956cedf71e004dc63dd7d665f6e34fa2f627d69fc2bde658443ce6eaacc5750878 SHA512 b16ae2357ca3ea0aaa63733fc657cf348df2ff8dca5f4471c8a828c63b535f6c4b0b658935081e14c8e5f40affeea743e3c6028f8d673e1f037ab61e93278731
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
deleted file mode 100644
index 878b84a7e3ea..000000000000
--- a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2015-10-13 20:09:55.612486000 +0000
-+++ Makefile	2015-10-13 20:11:19.166486000 +0000
-@@ -81,15 +81,9 @@
- 	rm -rf $(DISTDIR)
- 
- #TODO install man page and README
--install: mo
-+install: 
- 	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
- 	[ -d $(BINDIR) ] || mkdir -p $(BINDIR); \
--	for pot in `cd $(PODIR) && ls *.mo`; do \
--		poti=`echo $$pot | sed 's/\.mo$$//'`; \
--		modir=$(LOCALEDIR)/$$poti/LC_MESSAGES; \
--		[ -d $$modir ] || mkdir -p $$modir; \
--		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
--	done; \
- 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
- 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
- 	chmod +x $(BINDIR)/$(NAME) && \
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch b/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
deleted file mode 100644
index 524f2af8b02e..000000000000
--- a/dev-util/txt2regex/files/txt2regex-0.8-textdomaindir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	2015-10-13 19:24:21.799486000 +0000
-+++ Makefile	2015-10-13 19:26:05.187486000 +0000
-@@ -11,7 +11,8 @@
- 
- DESTDIR = 
- BINDIR	= $(DESTDIR)/usr/bin
--LOCALEDIR = $(DESTDIR)/usr/share/locale
-+BLOCALEDIR = /usr/share/locale
-+LOCALEDIR = $(DESTDIR)$(BLOCALEDIR)
- MANDIR = $(DESTDIR)/usr/share/man/man1
- 
- TARGET=all
-@@ -89,7 +90,7 @@
- 		[ -d $$modir ] || mkdir -p $$modir; \
- 		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
- 	done; \
--	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
-+	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(BLOCALEDIR),' \
- 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
- 	chmod +x $(BINDIR)/$(NAME) && \
- 	echo "program '$(NAME)' installed. just run $(BINDIR)/$(NAME)"
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
deleted file mode 100644
index 5228121b668a..000000000000
--- a/dev-util/txt2regex/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">txt2regex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
deleted file mode 100644
index 4eba479be662..000000000000
--- a/dev-util/txt2regex/txt2regex-0.8-r3.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
-
-inherit eutils
-
-DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
-HOMEPAGE="http://txt2regex.sourceforge.net/"
-SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="nls cjk"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=app-shells/bash-2.04"
-
-src_prepare() {
-	# bug #562856
-	epatch "${FILESDIR}"/"${P}-textdomaindir.patch"
-
-	# bug #93568
-	use nls || epatch "${FILESDIR}"/"${P}-disable-nls.patch"
-
-	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
-}
-
-src_install() {
-	emake install DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 install
-	dodoc Changelog NEWS README README.japanese TODO
-	newman txt2regex.man txt2regex.6
-}
diff --git a/dev-util/uftrace-0.8.3 b/dev-util/uftrace-0.8.3
new file mode 100644
index 000000000000..a7550e748833
--- /dev/null
+++ b/dev-util/uftrace-0.8.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Function (graph) tracer for user-space
+EAPI=6
+HOMEPAGE=https://github.com/namhyung/uftrace
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/namhyung/uftrace/archive/v0.8.3.tar.gz -> uftrace-0.8.3.tar.gz
+_md5_=fbe75c601d123c19addc0984364207ee
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
deleted file mode 100644
index 3422f7211e68..000000000000
--- a/dev-util/uftrace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uftrace-0.8.3.tar.gz 894263 BLAKE2B cdd303eb3bb488bee24fcb8ea852b27cc1c8c8de6483d95a65618f8af7aa8c06af42b561cee3b18c5d58378fff49538f88bc9debb6e2452ebade23fc7f4a32ce SHA512 2c7155ef2053dddb6b2abbed28a0374b1c1c69898ecb85cd918a1e426b27f45a4a5f9dad4be512592c72ee80c2e131e2def2a9c7a45c3bc93d4cc0b13b0c2996
-EBUILD uftrace-0.8.3.ebuild 458 BLAKE2B 0f215e5ecb97f0dcef4cdc799459cca23d206b05e8ecd147572fdeca183c4093141f60884d331b74b9b23990163ad4dd8bf1c6cf9999442788adb2cdcf876b72 SHA512 3e8a8f696a1ddf4ef4c74bcd80e993f3d105d463d3987419d0dafc4ccc65e5a0785b0ce6c58207ed0e9d87a73892fe8848afb5ef347bf20d468acb0b1f8a5018
-MISC metadata.xml 248 BLAKE2B 839a984864aeb89b07996cf03470a078ae558a5b832690c25adea12868e54f82b950d52e391262da8649e40b97f400a7a45040d54365ee581743e5b61e85fa3d SHA512 047ffd8442624867a708f2a0473700fc91ddcf36aa9a0617308c7cdf956a63b8fc21e7d5a77779ca76ea6abafe89a9d8b7a1fba521f9ccb5b966ea1b5e716678
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
deleted file mode 100644
index 9be2c3f269d6..000000000000
--- a/dev-util/uftrace/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-needed -->
-	<upstream>
-		<remote-id type="github">namhyung/uftrace</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/uftrace/uftrace-0.8.3.ebuild b/dev-util/uftrace/uftrace-0.8.3.ebuild
deleted file mode 100644
index 6e00f70cedd0..000000000000
--- a/dev-util/uftrace/uftrace-0.8.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
-}
diff --git a/dev-util/umockdev-0.11.3 b/dev-util/umockdev-0.11.3
new file mode 100644
index 000000000000..0096514b15f7
--- /dev/null
+++ b/dev-util/umockdev-0.11.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=6
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=+introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.11.3/umockdev-0.11.3.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=196421a4e945f57415c593fb27860f5c
diff --git a/dev-util/umockdev-0.9.4 b/dev-util/umockdev-0.9.4
new file mode 100644
index 000000000000..b1e77efacbb5
--- /dev/null
+++ b/dev-util/umockdev-0.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure setup
+DEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=6
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/umockdev/trunk/0.9.4/+download/umockdev-0.9.4.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0c10dc493acb6cefa3bdf9ea4a02f9d0
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
deleted file mode 100644
index 09dcb0a4be14..000000000000
--- a/dev-util/umockdev/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae9ee9c84c52a02fe16aaa86a94c4b84bcdad6782be590b0f163f679281764595b2679ff0898f502621ea6c2427533138 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6
-DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
-DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1085 BLAKE2B 01d43b68297301bd5c4cf839202943f2da23d434ca46c1679bfba2f535f7e3da66068c2f2b765a7d895515b6b0c5f66349f63e6a94e1fb05b895dceef045e46c SHA512 83584d3a4cdea70aed750e5f3fa8a9c7bc09ad8d6abd5944f256893f646fb467d83e21d290c7d194541386f85a104647d583f1f58764741220c15dea43b60000
-EBUILD umockdev-0.9.4.ebuild 733 BLAKE2B cefe313e56cf836a624207c5f0fecf9b41400070ad1675404e34a84e6ca684ad3c3835d0af8eb5762b615f077945c126ee3afa8fc07366e3cca298f4df31c525 SHA512 585f9841137d1d74981e7d64d0bcaadf7834a0b1a5689458b8cff8462272e86a48b6878d289bb40a7c8a6b52cb696298008124f048eac9bf38619d0e145eef3e
-MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
deleted file mode 100644
index bfc8bc9ed535..000000000000
--- a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- umockdev-0.9.4/src/umockdev-record.c
-+++ umockdev-0.9.4/src/umockdev-record.c
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <glib/gstdio.h>
---- umockdev-0.9.4/tests/test-umockdev-vala.c
-+++ umockdev-0.9.4/tests/test-umockdev-vala.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <glib/gstdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <gobject/gvaluecollector.h>
- 
- #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
diff --git a/dev-util/umockdev/metadata.xml b/dev-util/umockdev/metadata.xml
deleted file mode 100644
index 445c8737eab9..000000000000
--- a/dev-util/umockdev/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>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">umockdev</remote-id>
-		<remote-id type="github">martinpitt/umockdev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
deleted file mode 100644
index f92f538192f4..000000000000
--- a/dev-util/umockdev/umockdev-0.11.3.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{2_7,3_4,3_5,3_6} )
-
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection static-libs test"
-
-RDEPEND="
-	virtual/libgudev:=[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-# Tests seem to hang forever
-RESTRICT="test"
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${S}
-	econf \
-		--disable-gtk-doc \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		VALAC="$(type -P true)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
deleted file mode 100644
index 56a4b358cf1e..000000000000
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +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} )
-
-inherit python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="virtual/libgudev:=
-	virtual/libudev:=
-	>=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch #579988
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/dev-util/uncrustify-0.66.1 b/dev-util/uncrustify-0.66.1
new file mode 100644
index 000000000000..49e137afb2e8
--- /dev/null
+++ b/dev-util/uncrustify-0.66.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
+EAPI=6
+HOMEPAGE=http://uncrustify.sourceforge.net/
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.66.1.tar.gz
+_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	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af541b4635ba523f7e0ecc5e714534f7
diff --git a/dev-util/uncrustify-0.67 b/dev-util/uncrustify-0.67
new file mode 100644
index 000000000000..cca29d93d25a
--- /dev/null
+++ b/dev-util/uncrustify-0.67
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
+EAPI=6
+HOMEPAGE=http://uncrustify.sourceforge.net/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.67.tar.gz
+_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	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=deb39c0090fe74dcde9eb8d1f6bcc050
diff --git a/dev-util/uncrustify-9999 b/dev-util/uncrustify-9999
new file mode 100644
index 000000000000..c0d1d92e38ef
--- /dev/null
+++ b/dev-util/uncrustify-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
+EAPI=6
+HOMEPAGE=http://uncrustify.sourceforge.net/
+IUSE=test
+LICENSE=GPL-2
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=081bcdc4409fb6d8c97a1a4a4366e21e
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
deleted file mode 100644
index f23a7dc3004b..000000000000
--- a/dev-util/uncrustify/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
-DIST uncrustify-0.67.tar.gz 1514735 BLAKE2B 15bce3c596bd09393aa5bfd4780d2ca5ebfddf3a880765b74beffdfd6b1c30e9a3296dcf3e90568741ce79d933174514a091566c1e8c182f5d4ae31a5bba955a SHA512 5f9677adba7a211c0b8797bad9debb6fa52658d6775048e86a9b928d8e84ee334497c1455a0bb3b19084a32e0fbad79a291cf7ca50fe817131dd28feb85d65ce
-EBUILD uncrustify-0.66.1.ebuild 775 BLAKE2B 64727ab17bc2c317acd512299a09308d97a253ee1bb6ce00f00e9857d3425a830b5087389dd4dbb1cab4f317ceb8c7993668f21ebaa685fe81ceea436ee6f149 SHA512 04ea97f08d9f2ecdc5ab773e2f0905f59915645786916743bb0b2a53c0b8ef384e75d309a79a3b0501a76e11a2dd15e97bb8cf0221fccaa98ffc477ae828e3ed
-EBUILD uncrustify-0.67.ebuild 779 BLAKE2B 0969e712647d3da3402b3c0abc2378364e45df3976ab50d43fbd38dd48f512c2f7975bee2dddd78f522a2d547e992d9eae7f07037df74f24c767139ade22f5dd SHA512 a1b82a6e4ae9d03fbea15e24ba22716811671eb20d4595d1e3dee690c33c4deaaa57c62aa92e0da51d7c37dca11e936ece6b53b1dafaf76b7551804f67cb4a6d
-EBUILD uncrustify-9999.ebuild 768 BLAKE2B e165cd2ee7f56a3244cd9b315d03203a549e5c33215e5d05c4a3fffdc4ca7eeb3146f36521cb82605dff7c131b51947536172b20541b85a6ca396182b534ed36 SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9
-MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
deleted file mode 100644
index 370ea023f4f0..000000000000
--- a/dev-util/uncrustify/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>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetosov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">uncrustify</remote-id>
-		<remote-id type="github">uncrustify/uncrustify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
deleted file mode 100644
index 27705c31b229..000000000000
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS="amd64 x86"
-	SRC_URI=""
-	scm_eclass=git-r3
-else
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.67.ebuild b/dev-util/uncrustify/uncrustify-0.67.ebuild
deleted file mode 100644
index 0b66873c7057..000000000000
--- a/dev-util/uncrustify/uncrustify-0.67.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI=""
-	scm_eclass=git-r3
-else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
deleted file mode 100644
index d0891fcae6c3..000000000000
--- a/dev-util/uncrustify/uncrustify-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=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	scm_eclass=git-r3
-else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/unifdef-2.10 b/dev-util/unifdef-2.10
new file mode 100644
index 000000000000..66a4c264286c
--- /dev/null
+++ b/dev-util/unifdef-2.10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=remove #ifdef'ed lines from a file while otherwise leaving the file alone
+EAPI=4
+HOMEPAGE=http://dotat.at/prog/unifdef/
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://dotat.at/prog/unifdef/unifdef-2.10.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6131e39192ec5ebb8833a1567388187b
diff --git a/dev-util/unifdef-2.11 b/dev-util/unifdef-2.11
new file mode 100644
index 000000000000..dec3c89a810f
--- /dev/null
+++ b/dev-util/unifdef-2.11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=remove #ifdef'ed lines from a file while otherwise leaving the file alone
+EAPI=5
+HOMEPAGE=http://dotat.at/prog/unifdef/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://dotat.at/prog/unifdef/unifdef-2.11.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8b525297aa016d1683aec25c9575eb9f
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
deleted file mode 100644
index 6b0370579395..000000000000
--- a/dev-util/unifdef/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
-DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
-EBUILD unifdef-2.10.ebuild 552 BLAKE2B 8c99246187b5c3e90cbbfc450083fff6b3770c1551d3fd04e7d2b65edd17b4f7cc0e4005aecb271838e9fcbfbf781f070d3e9237016df3d9a74cb06158cbde55 SHA512 8d3fc896dded85e9e2ac52376e8fee4fae726b403332d7af6e3750771c547cdc914adac25ccff906c474367d9a170ed913487df4690588d36a9dee5fcf8e11c4
-EBUILD unifdef-2.11.ebuild 574 BLAKE2B b7f2c61dc7a1c1deffcd2c24b065f6556a97dd92db37f9d91b55807dea70b7f77167638a9d288bcac156702f49be248cc35521e416e8c850fba5f98f389f77c8 SHA512 f815b777dd8aaec261bd19e3da43527c13314c8355bd25441f2b638f035eebadb51ac9dbd26dae309dc6d6061479d81ce28e92bd53dd5fdc9226c70b56dd63a7
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/dev-util/unifdef/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>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
deleted file mode 100644
index c552129e314f..000000000000
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i '/^prefix/s:=.*:=/usr:' Makefile || die
-	tc-export CC
-}
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
deleted file mode 100644
index 6eddb8283ecf..000000000000
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-	tc-export CC
-}
diff --git a/dev-util/usb-robot-0.2.0 b/dev-util/usb-robot-0.2.0
new file mode 100644
index 000000000000..4db32ff2108f
--- /dev/null
+++ b/dev-util/usb-robot-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile
+DEPEND=virtual/libusb:0 sys-libs/readline
+DESCRIPTION=USB Reverse engineering tools
+EAPI=6
+HOMEPAGE=http://usb-robot.sourceforge.net/
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:0 sys-libs/readline
+SLOT=0
+SRC_URI=mirror://sourceforge/usb-robot/usb-robot-0.2.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6e36676381414a902a78a3b6b77dc1d6
diff --git a/dev-util/usb-robot/Manifest b/dev-util/usb-robot/Manifest
deleted file mode 100644
index ed25e9d26712..000000000000
--- a/dev-util/usb-robot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST usb-robot-0.2.0.tar.gz 43682 BLAKE2B 10deb05b78781dd9d004b357af359de6713c0394dae741b544c501e32675b01719792b4e7ee787f7efe4dfdb255c0660f848a59ec9f35d88a59b3d1b6da5b518 SHA512 45d7332a10ba881ade03e1f927a6f36e13d31661ac85950c2f31534b313db4bb354e75404b98bdbe522ab22a08a18592a8ab3b4c73bd6cd902e97285b505e37b
-EBUILD usb-robot-0.2.0.ebuild 447 BLAKE2B 99089cae1653ef19562cf98b957eff199956aaec66ad141bdb6dca55f5e98459ba40f447077b1177293dadd28e453ae9887f1e35cd4b08623b4f10ebb6b7cf00 SHA512 2eed631028ec07463e279d52560d5751e0c8d466fbb015c9d6831b7d27b4108f6e7c85764634c21c0ee8f31a642b5c09bbb3313911ef9a772c7a3c007130b305
-MISC metadata.xml 329 BLAKE2B 1079bf19c0f237b84e3073fadf5d929ba2e37af27e224a843fbca34d103d76395ed49dfd27c49706c60dc4cfd01cc184a9af4e5db3478515e98739f7eef35c02 SHA512 0e3f571fe0ff42f145e6d2454ee9dcab22b58ad84c4fe058e90b52a2ec84d9eaf07a34aa4cb1a60efc76714d230c5481fc096b1b2edbcf64c4e7c638ab22db9a
diff --git a/dev-util/usb-robot/metadata.xml b/dev-util/usb-robot/metadata.xml
deleted file mode 100644
index 177384d92a1e..000000000000
--- a/dev-util/usb-robot/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>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">usb-robot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/usb-robot/usb-robot-0.2.0.ebuild b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
deleted file mode 100644
index fb7162d691be..000000000000
--- a/dev-util/usb-robot/usb-robot-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="USB Reverse engineering tools"
-HOMEPAGE="http://usb-robot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/libusb:0
-	sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/dev-util/valgrind-3.12.0 b/dev-util/valgrind-3.12.0
new file mode 100644
index 000000000000..eb726c88eed1
--- /dev/null
+++ b/dev-util/valgrind-3.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) >=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=An open-source memory debugger for GNU/Linux
+EAPI=5
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=http://www.valgrind.org/downloads/valgrind-3.12.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93800245ff27d751071fb559ccb5ee07
diff --git a/dev-util/valgrind-3.13.0 b/dev-util/valgrind-3.13.0
new file mode 100644
index 000000000000..cd97c7774d2a
--- /dev/null
+++ b/dev-util/valgrind-3.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) >=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=An open-source memory debugger for GNU/Linux
+EAPI=6
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e72593bf5e806b95beedc4711cef1df
diff --git a/dev-util/valgrind-3.13.0-r1 b/dev-util/valgrind-3.13.0-r1
new file mode 100644
index 000000000000..aae82c16ab31
--- /dev/null
+++ b/dev-util/valgrind-3.13.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) >=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=An open-source memory debugger for GNU/Linux
+EAPI=6
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=964b809532c1be7bea072cd9efb191d4
diff --git a/dev-util/valgrind-3.13.0-r2 b/dev-util/valgrind-3.13.0-r2
new file mode 100644
index 000000000000..1a0fa3bcb762
--- /dev/null
+++ b/dev-util/valgrind-3.13.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) >=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=An open-source memory debugger for GNU/Linux
+EAPI=6
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8b316c576e87e4fdf1eaf72b423a5eba
diff --git a/dev-util/valgrind-9999 b/dev-util/valgrind-9999
new file mode 100644
index 000000000000..67beca1ed3bb
--- /dev/null
+++ b/dev-util/valgrind-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=mpi? ( virtual/mpi ) >=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=An open-source memory debugger for GNU/Linux
+EAPI=6
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3ecd76cf1e6a019cc24c84921a58de47
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
deleted file mode 100644
index cb00ec01168d..000000000000
--- a/dev-util/valgrind/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX valgrind-3.13.0-test-fixes.patch 929 BLAKE2B cf0316cc3637785bfa57cd2277ad7669ab968b28424bdcf56c47219c90d00915f51293bfc90f5319785752bcebbde7b011dbac964f9538ac2f4208ec7709047f SHA512 1cff77e987e2d20ce1563c96d76431c60c142c42afa978e32d3a8c8dda17d0f3c1ba29fe3d0fcf0e7445fa5ca9558690ecdaad259fb9d23f435dcdc0baa9175d
-AUX valgrind-3.13.0-xml-socket.patch 934 BLAKE2B 151db92f36623a27a6798eb0e559211613fb70e6847985446f4d3cd2a31f9930377e66efc46ae86116f8bcec855cfef2640111bce543ecd3a3e92914f0fa04cb SHA512 a250d6c395a6a02f3898ca94edab92785a720024ce0555c0b48cfe6c96c3bfcc088c5c67242019cb7d89f68066cffde18efe2c74f9b7f8e068b012173c3ec189
-AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbbaddbbbb2773c6f1223e725898dfd5d0ae9078948642c4f2b9deca2bded676230bcfa20d39071f69e640a64dc254759115971374a82 SHA512 4f9573fd68a0e1e209518fb4100c27b697ccd28e7a39abaa921f1949cd87ffb79a6784d2d1f6e006d68a08c7217cee77cba378c18aab48b87a3824eedb53ed5e
-AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
-DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009
-EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
-EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
-EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
-EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
-EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
-MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch b/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch
deleted file mode 100644
index 9bdd29013ba7..000000000000
--- a/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-See:
-https://bugs.gentoo.org/637488
-https://bugs.kde.org/show_bug.cgi?id=387686
-
-commit 2b5eab6a8db1b0487a3ad7fc4e7eeda6d3513626
-Author: Mark Wielaard <mark@klomp.org>
-Date:   Thu Jun 29 15:26:30 2017 +0000
-
-    memcheck/tests: Use ucontext_t instead of struct ucontext
-    
-    glibc 2.26 does not expose struct ucontext anymore.
-    
-    Signed-off-by: Khem Raj <raj.khem@gmail.com>
-    
-    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16457
-
-diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c
-index a978fc2b0..7f97b90a5 100644
---- a/memcheck/tests/linux/stack_changes.c
-+++ b/memcheck/tests/linux/stack_changes.c
-@@ -10,7 +10,7 @@
- // This test is checking the libc context calls (setcontext, etc.) and
- // checks that Valgrind notices their stack changes properly.
- 
--typedef  struct ucontext  mycontext;
-+typedef  ucontext_t  mycontext;
- 
- mycontext ctx1, ctx2, oldc;
- int count;
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch b/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch
deleted file mode 100644
index 56039c48bc27..000000000000
--- a/dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ivo Raisr <ivosh@ivosh.net>
-Date: Thu, 3 Aug 2017 05:22:01 +0000 (+0000)
-Subject: Fix handling command line option --xml-socket.
-X-Git-Url: https://sourceware.org/git/?p=valgrind.git;a=commitdiff_plain;h=34dd8493de39314033509bb7ad62673f33dcf3db
-
-Fix handling command line option --xml-socket.
-Fixes BZ#382998
-Patch by: Orgad Shaneh <orgads@gmail.com>
-
-
-
-git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16467
----
-
-diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
-index d66c67d..f6ba202 100644
---- a/coregrind/m_libcprint.c
-+++ b/coregrind/m_libcprint.c
-@@ -526,7 +526,7 @@ void VG_(init_log_xml_sinks)(VgLogTo log_to, VgLogTo xml_to,
-          break;
- 
-       case VgLogTo_Socket:
--         log_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
-+         xml_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded),
-                                       &VG_(xml_output_sink), True);
-          break;
-    }
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
deleted file mode 100644
index 6af455319567..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
---- valgrind-3.7.0.orig//Makefile.all.am	2011-10-26 17:24:45.000000000 -0400
-+++ valgrind-3.7.0/Makefile.all.am	2011-11-10 16:18:18.000000000 -0500
-@@ -82,7 +82,7 @@
- # performance and get whatever useful warnings we can out of gcc.
- # -fno-builtin is important for defeating LLVM's idiom recognition
- # that somehow causes VG_(memset) to get into infinite recursion.
--AM_CFLAGS_BASE = \
-+AM_CFLAGS_BASE = -fno-stack-protector \
- 	-O2 -g \
- 	-Wall \
- 	-Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
deleted file mode 100644
index 860e09c86ed3..000000000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
---- valgrind-3.7.0.orig//mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
-+++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
-@@ -7,9 +7,6 @@
- CC = $(MPI_CC)
- DEFS =
- DEFAULT_INCLUDES =
--CPPFLAGS =
--CFLAGS =
--LDFLAGS =
- 
- EXTRA_DIST = \
- 	mpiwrap_type_test.c
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
deleted file mode 100644
index 31d1b4f644dd..000000000000
--- a/dev-util/valgrind/metadata.xml
+++ /dev/null
@@ -1,28 +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>
-	<maintainer type="person">
-		<email>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
-	</maintainer>
-	<longdescription>
-		Valgrind is a GPL'd tool to help you find memory-management problems
-		in your programs. When a program is run under Valgrind's supervision,
-		all reads and writes of memory are checked, and calls to
-		malloc/new/free/delete are intercepted. As a result, Valgrind can
-		detect problems such as
-
-		- Use of uninitialised memory
-		- Reading/writing memory after it has been free'd
-		- Reading/writing off the end of malloc'd blocks
-		- Reading/writing inappropriate areas on the stack
-		- Memory leaks -- where pointers to malloc'd blocks are lost forever
-		- Passing of uninitialised and/or unaddressible memory to system calls
-		- Mismatched use of malloc/new/new [] vs free/delete/delete []
-		- Some abuses of the POSIX Pthreads API
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild b/dev-util/valgrind/valgrind-3.12.0.ebuild
deleted file mode 100644
index a759d9c53e77..000000000000
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Changing Makefile.all.am to disable SSP
-	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
-	# Allow users to test their own patches
-	epatch_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.13.0-r1.ebuild b/dev-util/valgrind/valgrind-3.13.0-r1.ebuild
deleted file mode 100644
index 1abaadfd6092..000000000000
--- a/dev-util/valgrind/valgrind-3.13.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Fix test failures on glibc-2.26
-	eapply "${FILESDIR}"/${P}-test-fixes.patch
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
deleted file mode 100644
index 0ef938d860fd..000000000000
--- a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Fix test failures on glibc-2.26
-	eapply "${FILESDIR}"/${P}-test-fixes.patch
-
-	# Fix --xml-socket command line option (qt-creator), bug #641790
-	eapply "${FILESDIR}"/${P}-xml-socket.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf+=("--enable-only32bit")
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.13.0.ebuild b/dev-util/valgrind/valgrind-3.13.0.ebuild
deleted file mode 100644
index 14799cb92f5c..000000000000
--- a/dev-util/valgrind/valgrind-3.13.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Changing Makefile.all.am to disable SSP
-	eapply "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
deleted file mode 100644
index b7152e95dc5e..000000000000
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf+=("--enable-only32bit")
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/vbindiff-3.0_beta4-r1 b/dev-util/vbindiff-3.0_beta4-r1
new file mode 100644
index 000000000000..3b906b1f4ae3
--- /dev/null
+++ b/dev-util/vbindiff-3.0_beta4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Visual binary diff utility
+EAPI=6
+HOMEPAGE=https://www.cjmweb.net/vbindiff/
+IUSE=debug
+KEYWORDS=amd64 ~arm x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://www.cjmweb.net/vbindiff/vbindiff-3.0_beta4.tar.gz
+_md5_=701f39dd01ef0744cff3fb1f65fd27ac
diff --git a/dev-util/vbindiff-3.0_beta5 b/dev-util/vbindiff-3.0_beta5
new file mode 100644
index 000000000000..8146fa1c25f0
--- /dev/null
+++ b/dev-util/vbindiff-3.0_beta5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Visual binary diff utility
+EAPI=6
+HOMEPAGE=https://www.cjmweb.net/vbindiff/
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/mrdudz/vbindiff/releases/download/3.0_beta5/vbindiff-3.0_beta5.tar.gz
+_md5_=4d74496b814b082dd5c357eb5df0f650
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
deleted file mode 100644
index 469d3d55aaf9..000000000000
--- a/dev-util/vbindiff/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vbindiff-3.0_beta4.tar.gz 121538 BLAKE2B 2d9d548461497d27eeb26a96135ff0c9e60e069b8bea8f640ae526267bb53d0da3550b8b251cd922b131d1bf499d6c2c0c6353a9e75a94af61256340944afb5a SHA512 6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da
-DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
-EBUILD vbindiff-3.0_beta4-r1.ebuild 512 BLAKE2B 0b23603fd9d90585ab62bea8e128b206fb877b221fdef67aa2a266098755ebb9aa3ebd870d0c3f53fb5c48853153823240a79a9f5cd046893a7ab372a7204fbd SHA512 cccc8ba05665680717ee48ff6f38eeaa12ac8e7eaab1c88f969b0667a027aa10f5c55fa37cd8cf2a0dfe3e8fb6b0e4c300ee022e1ea5d322239d31988ee385db
-EBUILD vbindiff-3.0_beta5.ebuild 412 BLAKE2B be00bf6d380fc6c1cc7051f6c7297ffdd377a8195561916485ca4d7f309e7797fdbd74c84a0c4d900f0d96f978ae19f59a133a78318280cd07a5cc0f07d918c6 SHA512 384faa243aac444b2eefdb9a0d0b623cd9f377a02b0c6d371a518691573eb68fae15e75d5876bde0691e5f023116c4059197394ed870c2d9d469c5c78ffb89d1
-MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
diff --git a/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
deleted file mode 100644
index f842cb0feb5f..000000000000
--- a/dev-util/vbindiff/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>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mrdudz/vbindiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
deleted file mode 100644
index a27438a4c301..000000000000
--- a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Visual binary diff utility"
-HOMEPAGE="https://www.cjmweb.net/vbindiff/"
-SRC_URI="https://www.cjmweb.net/vbindiff/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	has_version 'sys-libs/ncurses:0[tinfo(-)]' && \
-		local -x LIBS="${LIBS} -ltinfo"
-	econf $(use_enable debug)
-}
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
deleted file mode 100644
index 1c713d3f2daf..000000000000
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Visual binary diff utility"
-HOMEPAGE="https://www.cjmweb.net/vbindiff/"
-SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
diff --git a/dev-util/vint-0.3.18 b/dev-util/vint-0.3.18
new file mode 100644
index 000000000000..578ff7680d66
--- /dev/null
+++ b/dev-util/vint-0.3.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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/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(-)] test? ( >=dev-python/coverage-3.7.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(-)] >=dev-python/pytest-2.6.4[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/pytest-cov-1.8.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-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Lint tool for Vim script language
+EAPI=6
+HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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/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(-)]
+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/Kuniwak/vint/archive/v0.3.18.tar.gz -> vint-0.3.18.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_=76df36e451d5d33d4527a5064bab4f86
diff --git a/dev-util/vint-0.3.19 b/dev-util/vint-0.3.19
new file mode 100644
index 000000000000..c09172bdd70d
--- /dev/null
+++ b/dev-util/vint-0.3.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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/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(-)] test? ( >=dev-python/coverage-3.7.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(-)] >=dev-python/pytest-3.3.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-python/pytest-cov-2.5.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-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Lint tool for Vim script language
+EAPI=6
+HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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/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(-)]
+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/Kuniwak/vint/archive/v0.3.19.tar.gz -> vint-0.3.19.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_=c1677dfa8c74d018d58f0569844a3e06
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
deleted file mode 100644
index fbb4a1cb8e47..000000000000
--- a/dev-util/vint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
-DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
-EBUILD vint-0.3.18.ebuild 1322 BLAKE2B 5a55a92987bf5877f828f09dd922c16a7b7a1206033e251975bdc949edc1d27d502676bf678da006a8f100209081c7b1e69fd610ee8eea64ede7d09732ecdba9 SHA512 6e54367dc5746fe60d15ff4c80fa97feb4d0cf14ed4631625c1959192c17dd4de9b61336637b829460e2b70d3587f90ddc1a3609999ff32ff55f715561d16742
-EBUILD vint-0.3.19.ebuild 1086 BLAKE2B 2e1389dec9087b8197e87a892c7a7f0666eb92b8cfc2c6973bd87b67af3c9c065e968efb6acc364ed6e1ca27bf7eacc4065af46e9f7e79c4b99c8515272de26d SHA512 050e66af6d9cdc080425d28fec5305d71a6564af82368bb34411ed2cd52fb753d716f2d24f0f615c005278c1e63988ab6fa8345c7ee59414f9067b4f04cec6c2
-MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
deleted file mode 100644
index b2d24cbd66c5..000000000000
--- a/dev-util/vint/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>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<changelog>https://github.com/Kuniwak/vint/releases</changelog>
-		<remote-id type="github">Kuniwak/vint</remote-id>
-		<remote-id type="pypi">vim-vint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
deleted file mode 100644
index 8dbdf65404af..000000000000
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ /dev/null
@@ -1,47 +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="Lint tool for Vim script language"
-HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/"
-SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Don't try to use an installed vint executable.
-	# See https://github.com/Kuniwak/vint/issues/22
-	sed -i -e "s|'vint'|'bin/vint'|" test/acceptance/test_cli{,_vital}.py || die
-}
-
-python_test() {
-	py.test -v || die "Test suite failed with ${EPYTHON}"
-}
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
deleted file mode 100644
index 1e5cc17ad27c..000000000000
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ /dev/null
@@ -1,39 +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="Lint tool for Vim script language"
-HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/"
-SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.3.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.5.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-python_test() {
-	py.test -v || die "Test suite failed with ${EPYTHON}"
-}
diff --git a/dev-util/visual-regexp-3.0-r1 b/dev-util/visual-regexp-3.0-r1
new file mode 100644
index 000000000000..dc32624f4f73
--- /dev/null
+++ b/dev-util/visual-regexp-3.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Type the regexp and visualize it on a sample of your choice
+EAPI=5
+HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/tk-8.3
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar http://laurent.riesterer.free.fr/regexp/visual_regexp-3.0.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_=862e63ce38148f73cb8b72cebffa99cc
diff --git a/dev-util/visual-regexp-3.1 b/dev-util/visual-regexp-3.1
new file mode 100644
index 000000000000..1f28cad35f12
--- /dev/null
+++ b/dev-util/visual-regexp-3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Type the regexp and visualize it on a sample of your choice
+EAPI=5
+HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/tk-8.5
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar http://laurent.riesterer.free.fr/regexp/visual_regexp-3.1.tcl
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1225e3ec8caeba9d031b29500aabff5b
diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
deleted file mode 100644
index 8b68f753d4a8..000000000000
--- a/dev-util/visual-regexp/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX visual-regexp-3.0-help-font-fix.patch 994 BLAKE2B f4ff38c2b27be32b06f8bab8d96f17dc73ee13868a9bdc8ce7d9dd4b9db75e2e3db6af1e58bed75d72dfc3ca38ad3e26d091d547c251f408cfee4991b0d5fef1 SHA512 806c870cbe76dfb6d5a23a169f5f4e1a79e6d6915ae941c950b9b7f91e30783670276cd247698b176f5a6e21f7eb8147cd1fd71e99e969d720de81d39c36dbd4
-AUX visual-regexp-3.0-home-conf-fix.patch 1792 BLAKE2B 319a636d0d3442a4d71f0dfeade3da082a275f174be1cdf19b386d300c53c6362b2505228d1c062a0113364fb97c4283c3c59330849d37522850b9481421a985 SHA512 be77ca9ef0d484991a665dbc2f59f1030f69edc9be3e0b3f973afcbb19ea424fdf3c9099797391ac6eb6c4943809394f877949240eefd542791ca43815fb3dc6
-AUX visual-regexp-3.0-pattern-load-fix.patch 891 BLAKE2B 01b48a3625ffc37a45db6c5a2729f8f757c256b2317a6eb8d062e19fd31e7273d7115048700783b929a8d79e455b8013c96754a66664499de386a4ea3ac28bd6 SHA512 9b9cc5275852ebcb5a68b8583eee75936d871c8bbd931462e14a56db7e71769d58a9934da17e1eaf806ae9eaf1fdc9836dab113911ac65f9f5a13bcb47ecd6df
-AUX visual-regexp-3.0-wish-fix.patch 405 BLAKE2B 7d13312ee03d4552017fc30d37967e8dc327400de2d562d6325d0498dac2e428c75d327d93b53f347b2c92f1c841e3ebae0664f0ad939ad76b9e72843aaa388b SHA512 5e51a9627e86778cca27b37663086c7e80e9d49d1bd53b669b76963e9dcbb42838c7334479efabbd8ca85f980ff4f4cadd2de92e6026586c8bdaa62fd096324c
-AUX visual-regexp-3.1-help-font-fix.patch 1264 BLAKE2B 82aea140a83ff96e2e947a10db54af0486be08b37bc68b3ccebd3524d68ca7e7fd757266c7ed3dff2b913004f7d7fe4cef1107f67240af82563fe96ac72ff0cc SHA512 2ec777e5bd3a401f99fa387bb0b015596fcdcf39c11bb214daaf94f56759320d1d36bd9cd36b2cbd634a1c1eccffba1b1d1fb7736981a31528a7752447c74b13
-AUX visual-regexp-3.1-make-regexp-fix.patch 411 BLAKE2B e5bb199f3606bea073ae6cca4673864d3a13587c485d37b3d51ec95dc910d9e811fa7a91e4d39dbb31fb0c426adee0cb97eb7cf9382ff783db21e96d93c795fb SHA512 6d8522788a6ddc4d1cac2a66be4b2c24fbd596927303b58be3e3cabe920e4150a574bb53d588618d096a833b063c197498250abe2d12b8997f278d90747cdf58
-AUX visual-regexp-3.1-wish-fix.patch 383 BLAKE2B 42fc8f5f342e2ca0f566235c013e3ab012a2f306d88be74120f6840e874fb7ed408ca9fe2159a87325ea386c277f2857342cba4ad0805419f0d46631ceb56999 SHA512 eae72720bf064245b4e1076b7a2e4f02dd42e727ca897bb30a6da0a07305e51bd7571b28e6d1e0e251ec9fc5d9724f0a7e2feac306f89c6e7ef2f313f1c6d78d
-AUX visualregexp.desktop 166 BLAKE2B c9b2868b32040b17c134c79986ed05880c12b2d4d90157360c1d7b56adf7af8357bad59d6b482947fdfd9e1ac923a656b5583353ca803de5ef21c8b11bf3b107 SHA512 9f80b55123c781749e078c2c6c0117fcc4dbe8e15536e5b4d98683e67de1f5637a3c1e73b109f661765d042f76f71dcd8e633cc9d363de21b5b3ff27db21c1d1
-DIST visual_regexp-3.0.tar.gz 25659 BLAKE2B 3633e0cc908b04fb95320efc65955b40b6f162986de5e0f3a695771950026b516a69bbb9ec8803a4ab757e70d1e9406c38656f51af92edafb955e4956303b5c3 SHA512 3c8b3e44d20f8cdc69fdb501ac82a44f6b755715c9bd6309bbca01193acc72a97595d6012ad889c957adba587c3f8f1f888c0f42993bb81bf3f730adff42c655
-DIST visual_regexp-3.1.tcl 71183 BLAKE2B df6541179cf06c49f6bb40a0bc186ad45aaf535734df6d88d84adcfcb4c3a41a3be842f05e69bb7d378cb04f59cc6f0860f0d4c46dffa7ba91256f3dc14a80ce SHA512 f36729800e0e66ee22339614b47f068eeb440cac501f73898250ddda9865cd5c3cc09bd57a8ea601ef7a3240bddbe524a69b704ae58b8e56decb81b25166818b
-DIST visualregexp-icon.png.tar 20480 BLAKE2B 589ea0480f68c442cfecc2638f87a901cc2d75237deefae49616b6626bc1073f14ff9c009c09a28c2e93b2f8c1ae3e4123a05e24aa73f2f6e0bd9fb53bfad15f SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2
-EBUILD visual-regexp-3.0-r1.ebuild 935 BLAKE2B cb5066717a3ae6af48b7071e556e8ae1f42a8f7cdc4a8e529ae6ece3dce0db594677be95fc974e142daeab59f81d2fe66c920a3d20bd23a0f06d38bf60c4bbf8 SHA512 19f39420f473fb8a9b049c4fd377abf1ff230c9eeae397d583afb0065851660413ff2c339e9f9b82cd5c62018dc8d9435e0b596f662bc4cbb830071f1de19078
-EBUILD visual-regexp-3.1.ebuild 1237 BLAKE2B 4acfd1028cc591f2ee852a845aa43f0fe3928ff3bfcaee16b552de4794309a59b4360a73f65529b33bc80bf4891ce8c922c260831052d82b5e9d496f1081df35 SHA512 532ecc703222531147989096acbee3523aa39ce79148bb46a0c2ebcf0b5aa7cfe760fe1773dc4b0837f41f7ced5517373bef2b4d43687f92269834cc1c711dea
-MISC metadata.xml 365 BLAKE2B ea9b3d852fce83839d993c8118c21d945a2944fbbdd476cea7635b2e7361ba030d33a433fce6c6ce2bc44e0a250d2d0dbc9f6e30d1c1c692252251cfc9181971 SHA512 9556a7d272b95bfde71df2994d8ac26639f3252cd743f9caeeea8b516a70dfd031dacf42dd56df19394c03223001e09bacb094b68256641764d139b3880e9ff1
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
deleted file mode 100644
index ec3763cc9dd1..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-11-10 01:35:49.959609478 +0100
-+++ b/visual_regexp.tcl	2013-11-10 01:34:10.491151352 +0100
-@@ -494,15 +494,18 @@
- 	pack .help.l -side top -padx 10 -pady 10
- 	# help text
- 	if {$tcl_platform(platform) == "windows"} {
--		text .help.t -bd 2 -relief groove -font {Courier 10}
-+        set hfont {Courier 10}
-+        set hbfont {Courier 10 bold}
- 	} else {
--		text .help.t -bd 2 -relief groove
-+        set hfont {9x15}
-+        set hbfont {9x15bold}
- 	}
-+    text .help.t -bd 2 -relief groove -font $hfont
- 	pack .help.t -side top -padx 20
--	.help.t tag configure bold -font "[.help.t cget -font] bold"
-+	.help.t tag configure bold -font $hbfont
- 	.help.t insert 1.0 "Version:" bold " $::version
- 
--" normal "Usage:" bold " tkregexp <sampleFile>
-+" normal "Usage:" bold " [file tail $::argv0] <sampleFile>
- 
- " normal "Key bindings:" bold " Alt-q               exit
-               Alt-a               toggle 'all' flag
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
deleted file mode 100644
index c86202ae05fb..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
-+++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
-@@ -1062,27 +1060,38 @@
- #==============================================================================================
- 
- # try to get customization from 'visual_regexp.ini'
--puts "[file exists visual_regexp.ini]"
--set filename [file dirname [info nameofexecutable]]/visual_regexp.ini
--if {[file exists $filename]} {
--	source $filename
--} elseif {[file exists visual_regexp.ini]} {
--	source visual_regexp.ini
-+set localfilename visual_regexp.ini
-+set homefilename ""
-+if {[info exists ::env(HOME)]} {
-+	set homefilename [file join $::env(HOME) .visual_regexp visual_regexp.ini]
- }
--
--# try to auto user patterns
--set filename [file dirname [info nameofexecutable]]/regexp.txt
--if {[file exists $filename]} {
--	regexp::pattern:load $filename
--} elseif {[file exists regexp.txt]} {
--	regexp::pattern:load regexp.txt
-+set binfilename [file join [file dirname [info nameofexecutable]] visual_regexp.ini]
-+foreach filename [list $localfilename $homefilename $binfilename] {
-+	if {[file exists $filename]} {
-+		source $filename
-+		break
-+	}
- }
- 
--# buld the GUI
-+# build the GUI
- regexp::history:init
- regexp::gui
- regexp::go
- 
-+# try to auto user patterns
-+set localfilename regexp.txt
-+set homefilename ""
-+if {[info exists ::env(HOME)]} {
-+	set homefilename [file join $::env(HOME) .visual_regexp regexp.txt]
-+}
-+set binfilename [file join [file dirname [info nameofexecutable]] regexp.txt]
-+foreach filename [list $localfilename $homefilename $binfilename] {
-+	if {[file exists $filename]} {
-+		regexp::pattern:load $filename
-+		break
-+	}
-+}
-+
- if {$argc > 1} {
- 	puts "Usage: $argv0 <sampleFile>"
- } elseif {$argc == 1} {
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
deleted file mode 100644
index 18dbf509f45a..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
-+++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
-@@ -380,19 +380,17 @@
- 	}
- 	# do it
- 	set in [open $file "r"]
--	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
--	while {![eof $in]} {
--		set name [gets $in]
--		while {$name == ""} {
--			set name [gets $in]
--		}
--		set pattern [gets $in]
--		while {$pattern == ""} {
--			set pattern [gets $in]
-+	set contents {}
-+	foreach line [split [read $in] \n] {
-+		if {$line != ""} {
-+			lappend contents $line
- 		}
--		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
- 	}
- 	close $in
-+	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
-+	foreach {name pattern} $contents {
-+		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
-+	}
- }
- 
- 
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
deleted file mode 100644
index bfb7478d1fec..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur visual_regexp-3.0/visual_regexp.tcl visual_regexp-current/visual_regexp.tcl
---- visual_regexp-3.0/visual_regexp.tcl	2002-09-01 08:24:56.000000000 -0500
-+++ visual_regexp-current/visual_regexp.tcl	2004-03-29 23:20:43.000000000 -0500
-@@ -1,7 +1,7 @@
- #!/bin/sh  
- #-*-tcl-*-  
- # the next line restarts using wish \
--exec wish8.3 "$0" -- ${1+"$@"}
-+exec wish "$0" -- ${1+"$@"}
- 
- 
- set version 3.0
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
deleted file mode 100644
index 1dd7e7021b4f..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-11-10 01:49:14.987065220 +0100
-+++ b/visual_regexp.tcl	2013-11-10 01:49:04.177341077 +0100
-@@ -740,10 +740,13 @@
- 	frame .help.text;
- 
- 	if {$tcl_platform(platform) == "windows"} {
--		text .help.text.t -borderwidth 2 -relief groove -font {Courier 10} -yscrollcommand [list .help.text.sy set];
-+        set hfont {Courier 10}
-+        set hbfont {Courier 10 bold}
- 	} else {
--		text .help.text.t -borderwidth 2 -relief groove -yscrollcommand [list .help.text.sy set];
-+        set hfont {9x15}
-+        set hbfont {9x15bold}
- 	}
-+    text .help.text.t -borderwidth 2 -relief groove -font $hfont -yscrollcommand [list .help.text.sy set];
- 
- 	scrollbar	.help.text.sy \
- 		-command			".help.text.t yview" \
-@@ -755,10 +758,10 @@
- 
- 	pack .help.text -side top -fill both -expand 1 -padx 20
- 
--	.help.text.t tag configure bold -font "[.help.text.t cget -font] bold"
-+	.help.text.t tag configure bold -font $hbfont
- 	.help.text.t insert 1.0 "Version:" bold " $::version
- 
--" normal "Usage:" bold " tkregexp <sampleFile>
-+" normal "Usage:" bold " [file tail $::argv0] <sampleFile>
- 
- " normal "Key bindings:" bold " Alt-q               exit
-               Alt-a               toggle 'all' flag
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
deleted file mode 100644
index 6610b16e76ff..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-11-11 12:11:34.256631106 +0100
-+++ b/visual_regexp.tcl	2013-11-11 11:50:46.614881803 +0100
-@@ -1437,7 +1439,7 @@
- 		set output [text	$f.output \
- 			-wrap						char \
- 			-undo						1 \
--			-background				white 
-+			-background				white \
- 			-font						$::font_regexp \
- 			-selectbackground		lightblue \
- 			-selectborderwidth	0 \
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
deleted file mode 100644
index 3fae9d095025..000000000000
--- a/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
---- a/visual_regexp.tcl	2013-10-29 03:42:43.443932232 +0100
-+++ b/visual_regexp.tcl	2013-10-29 03:35:35.441951822 +0100
-@@ -1,7 +1,6 @@
--package require starkit
--starkit::startup
-+#!/usr/bin/wish
- 
--set version 3.0
-+set version 3.1
- 
- ###############################################################################################
- #
diff --git a/dev-util/visual-regexp/files/visualregexp.desktop b/dev-util/visual-regexp/files/visualregexp.desktop
deleted file mode 100644
index 1d66181bc2c1..000000000000
--- a/dev-util/visual-regexp/files/visualregexp.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=visualregexp
-Icon=visualregexp-icon
-Name=Visual Regexp
-Comment=An interactive regular expression editor
-Categories=Development;
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
deleted file mode 100644
index 61d19ccc4a52..000000000000
--- a/dev-util/visual-regexp/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>quentin@minster.io</email>
-		<name>Quentin Minster</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
deleted file mode 100644
index 6de44bc09c0e..000000000000
--- a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
-HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
-	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/tk-8.3"
-
-S=${WORKDIR}/visual_regexp-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-wish-fix.patch \
-		"${FILESDIR}"/${P}-help-font-fix.patch \
-		"${FILESDIR}"/${P}-home-conf-fix.patch \
-		"${FILESDIR}"/${P}-pattern-load-fix.patch
-}
-
-src_install() {
-	dodoc README
-
-	newbin visual_regexp.tcl visualregexp
-
-	dosym visualregexp /usr/bin/tkregexp
-
-	doicon "${WORKDIR}"/visualregexp-icon.png
-
-	domenu "${FILESDIR}"/visualregexp.desktop
-}
diff --git a/dev-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
deleted file mode 100644
index 3920d2a42ab5..000000000000
--- a/dev-util/visual-regexp/visual-regexp-3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
-HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
-	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tcl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/tk-8.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# Manually copy the source file since unpack gets confused by things it can't unpack
-	cp "${DISTDIR}/visual_regexp-${PV}.tcl" "${WORKDIR}/visual_regexp.tcl"
-
-	default
-}
-
-src_prepare() {
-	# File comes with DOS newlines
-	edos2unix visual_regexp.tcl
-
-	epatch \
-		"${FILESDIR}/${P}-wish-fix.patch" \
-		"${FILESDIR}/${P}-help-font-fix.patch" \
-		"${FILESDIR}/${P}-make-regexp-fix.patch" \
-		"${FILESDIR}/${PN}-3.0-home-conf-fix.patch" \
-		"${FILESDIR}/${PN}-3.0-pattern-load-fix.patch"
-
-	epatch_user
-}
-
-src_install() {
-	newbin visual_regexp.tcl visualregexp
-	dosym visualregexp /usr/bin/tkregexp
-	doicon "${WORKDIR}/visualregexp-icon.png"
-	domenu "${FILESDIR}/visualregexp.desktop"
-}
diff --git a/dev-util/visualvm-1.4.1 b/dev-util/visualvm-1.4.1
new file mode 100644
index 000000000000..663ab0192fe6
--- /dev/null
+++ b/dev-util/visualvm-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
+EAPI=6
+HOMEPAGE=https://visualvm.github.io
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+SLOT=7
+SRC_URI=https://github.com/oracle/visualvm/archive/1.4.1.tar.gz -> visualvm-1.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ad796a5a588d93961cb30b1069779e4f
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
deleted file mode 100644
index b43aed57a5fd..000000000000
--- a/dev-util/visualvm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704db044e12614c997e9648ae9c087caaed89c2632dde7a09a1eb3b158d4227a1e2cd94214ba25d61eef SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397
-AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
-DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
-EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
-MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
diff --git a/dev-util/visualvm/files/visualvm-r1.conf b/dev-util/visualvm/files/visualvm-r1.conf
deleted file mode 100644
index fce7cfece13f..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-visualvm_default_cachedir="${HOME}/.cache/visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J-XX:+IgnoreUnrecognizedVMOptions"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm-r1.sh b/dev-util/visualvm/files/visualvm-r1.sh
deleted file mode 100644
index dd6956da0697..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# source the configuration file
-. /etc/visualvm/visualvm.conf
-
-# launch visualvm
-exec sh /usr/share/visualvm/platform/lib/nbexec \
-	--branding visualvm \
-	--jdkhome "${visualvm_jdkhome}" \
-	--userdir "${visualvm_default_userdir}" \
-	--cachedir "${visualvm_default_cachedir}" \
-	--clusters /usr/share/visualvm/cluster:/usr/share/visualvm/platform:/usr/share/visualvm/profiler \
-	${visualvm_default_options} "${@}"
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
deleted file mode 100644
index 619755c9c84e..000000000000
--- a/dev-util/visualvm/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities.</longdescription>
-	<upstream>
-		<remote-id type="github">oracle/visualvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
deleted file mode 100644
index a33b5289f774..000000000000
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=90
-NBT=24042018
-NBZ=nb${NBV}_${PN}_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-DEPEND="
-	>=virtual/jdk-1.7"
-
-S="${WORKDIR}/${P}/${PN}"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	# unpack ${NBZ}
-	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{platform,profiler}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/vmtouch-1.0.2 b/dev-util/vmtouch-1.0.2
new file mode 100644
index 000000000000..7cce0621edca
--- /dev/null
+++ b/dev-util/vmtouch-1.0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
+EAPI=5
+HOMEPAGE=http://hoytech.com/vmtouch/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/hoytech/vmtouch/archive/vmtouch-1.0.2.tar.gz -> vmtouch-1.0.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6e6b9bc1b18e65a07f598e46c6c9c002
diff --git a/dev-util/vmtouch-1.2.0 b/dev-util/vmtouch-1.2.0
new file mode 100644
index 000000000000..52b5685b6db0
--- /dev/null
+++ b/dev-util/vmtouch-1.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
+EAPI=6
+HOMEPAGE=http://hoytech.com/vmtouch/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.2.0.tar.gz -> vmtouch-1.2.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ebb3cf9bbd65bede90d4adc25393718
diff --git a/dev-util/vmtouch-1.3.0 b/dev-util/vmtouch-1.3.0
new file mode 100644
index 000000000000..e3b253f2a1b7
--- /dev/null
+++ b/dev-util/vmtouch-1.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
+EAPI=6
+HOMEPAGE=http://hoytech.com/vmtouch/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.0.tar.gz -> vmtouch-1.3.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ebb3cf9bbd65bede90d4adc25393718
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
deleted file mode 100644
index 07fe67533aa4..000000000000
--- a/dev-util/vmtouch/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST vmtouch-1.0.2.tar.gz 13404 BLAKE2B e144bd27afa3dcddc7de936ab723fde4b15d9f026218dd894b0b29a3bbe44604c585d78f4b69d677d6129e06ce07f39a38c4750c23ca95b3fe645d1813020ed1 SHA512 df0d8a1599c970540e70e050dab33327589f0dd64548640c7d44607c3ef3397c7b1d2184fe80195ec5cb9a73d7218d7fd1b2cda2cee227ce84a8c20e8874f489
-DIST vmtouch-1.2.0.tar.gz 15993 BLAKE2B 0a8db0e1515a080b7990e38dfafb3f9e26d95b9c489ee90d6de88102ef59ddd28e19e975073700f191e90735fd99a5c4d3b0c9ce73366d3951e2a2ef10827e3f SHA512 cc13688c1b8bee38495ed3b9295d0066e33f4242b6bb70c4547cb99c1403c15b71ae1c739a8f7dc718f760c40ff4e7ba3dd55691900b501305d9263797c3b5cd
-DIST vmtouch-1.3.0.tar.gz 18733 BLAKE2B 558561302f2fc4fd9ba940d766f999bbed0f471ca15b174900457aead0a5c61ff7ea40a0b71e2e471e1613af38d657367282cde21525aa0841cd595824c89d85 SHA512 ddb86b764dffea6c43a2dc5c48dc91fa862c104a2e5ee7beefb45815b60aba14d255936082593cec97534f7231d65f91f23b0cab3f985695af365c34341a8a19
-EBUILD vmtouch-1.0.2.ebuild 670 BLAKE2B 4d29eb8f74907ad1222f0342559e5b913fcba7690a6a4136dd32cd144b980bbb2382b4999bb076e01731b171df443609a76452ce3a1a46930dd898ab00d50ac1 SHA512 c4b9d5ebdb65432371fc60faa53c1aba4d9332e1363f1ff1e4fc2246270f06c6e76eefabc22ada07261474fc97c55881e276e21695d80620ff51a379ac03ef3f
-EBUILD vmtouch-1.2.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
-EBUILD vmtouch-1.3.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
-MISC metadata.xml 554 BLAKE2B 461453a6c800b43ef294f3e1f9abf012aca9f09f29431184228ebadfa67fba74b6de87402499260b4f5dfe944e93f431be70547aa96a556fb1cdc242f645155e SHA512 b2ea2c6e314fa0f849ae17461352372b583a5b1f52ce64ea07fda64d21147b649854f54b43788396bf35b91f625389337912f31b80f8428d94fcc44d20896b18
diff --git a/dev-util/vmtouch/metadata.xml b/dev-util/vmtouch/metadata.xml
deleted file mode 100644
index d4b6bb25c496..000000000000
--- a/dev-util/vmtouch/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>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <longdescription>
-  vmtouch is a tool for learning about and controlling the file system cache
-  of unix and unix-like systems. It is BSD licensed so you can basically 
-  do whatever you want with it.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">hoytech/vmtouch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/vmtouch/vmtouch-1.0.2.ebuild b/dev-util/vmtouch/vmtouch-1.0.2.ebuild
deleted file mode 100644
index 9678761838e0..000000000000
--- a/dev-util/vmtouch/vmtouch-1.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
-SRC_URI="https://github.com/hoytech/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local my_prefix="${ED}/usr"
-	emake PREFIX="${my_prefix}" MANDIR="${my_prefix}/share/man/man8" install
-	dodoc CHANGES README.md TODO
-}
diff --git a/dev-util/vmtouch/vmtouch-1.2.0.ebuild b/dev-util/vmtouch/vmtouch-1.2.0.ebuild
deleted file mode 100644
index e043a354abd7..000000000000
--- a/dev-util/vmtouch/vmtouch-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
-SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local my_prefix="${ED}/usr"
-	emake PREFIX="${my_prefix}" MANDIR="${my_prefix}/share/man/man8" install
-	dodoc CHANGES README.md TODO
-}
diff --git a/dev-util/vmtouch/vmtouch-1.3.0.ebuild b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
deleted file mode 100644
index e043a354abd7..000000000000
--- a/dev-util/vmtouch/vmtouch-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
-SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local my_prefix="${ED}/usr"
-	emake PREFIX="${my_prefix}" MANDIR="${my_prefix}/share/man/man8" install
-	dodoc CHANGES README.md TODO
-}
diff --git a/dev-util/vtable-dumper-1.2 b/dev-util/vtable-dumper-1.2
new file mode 100644
index 000000000000..3d7928459940
--- /dev/null
+++ b/dev-util/vtable-dumper-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/elfutils:0=
+DESCRIPTION=A tool to list content of virtual tables in a shared library
+EAPI=6
+HOMEPAGE=https://github.com/lvc/vtable-dumper
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils:0=
+SLOT=0
+SRC_URI=https://github.com/lvc/vtable-dumper/archive/1.2.tar.gz -> vtable-dumper-1.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=aa68e15bfc2897b9b65617efee65f0ca
diff --git a/dev-util/vtable-dumper/Manifest b/dev-util/vtable-dumper/Manifest
deleted file mode 100644
index 48e1512c14b8..000000000000
--- a/dev-util/vtable-dumper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vtable-dumper-1.2.tar.gz 16033 BLAKE2B 5674918fa91f7dc266da2a0fe9d4bfea1fc6643fa6dba5a031add4a758b7e6d729cad0c1be72ef3f374887bda3cbdfa3e5a0e68a9ab8f502dd29c711f5a5b55c SHA512 b1e052b95af1fa557e2e2eb4faae79afd9b7a87c664c546d43ff92de0f118d6f5fa9e792671e546a5c05364af6149b066705f94c2c590dd103e0067004a7543f
-EBUILD vtable-dumper-1.2.ebuild 551 BLAKE2B f80ccdd061181b47c0aa840504a6ea1631a1b26a6784670412c7e0bd270874667b2bc368b96535dd3e04717cb853894280529f36427a4b8b89d88547e3466933 SHA512 c4d83121a25b48d69e3738b12b350a2f77334cca40670f9b5a93a2a4a3d968cebbe4b807d0d7f4383f80ba7d11b039a346baa755cfda3d41a040aecb587f4471
-MISC metadata.xml 436 BLAKE2B 7b226efbd5fed222de490c97d8eef802dca2acc22e644cd4c13ae25175ace4ecd6aaec117a0b0117aa5540159197dbf256302262b62dd8980786e9f8b7ad394e SHA512 e3070f8ddc5ad65ec16e6d8b49b1d71f48a459d5e12cee08d4a1bc12eac903918842bcd4434de4a0a2c77a37be95e3691c8ba94a2cec0f1857665f464b907e55
diff --git a/dev-util/vtable-dumper/metadata.xml b/dev-util/vtable-dumper/metadata.xml
deleted file mode 100644
index fac2ebc49305..000000000000
--- a/dev-util/vtable-dumper/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>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lvc/vtable-dumper</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/vtable-dumper/vtable-dumper-1.2.ebuild b/dev-util/vtable-dumper/vtable-dumper-1.2.ebuild
deleted file mode 100644
index 420b8915e24f..000000000000
--- a/dev-util/vtable-dumper/vtable-dumper-1.2.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tool to list content of virtual tables in a shared library"
-HOMEPAGE="https://github.com/lvc/vtable-dumper"
-SRC_URI="https://github.com/lvc/vtable-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/elfutils:0="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake prefix="${ED%/}/usr" install
-	einstalldocs
-}
diff --git a/dev-util/vulkan-headers-1.1.77.0 b/dev-util/vulkan-headers-1.1.77.0
new file mode 100644
index 000000000000..1d4e47aadc79
--- /dev/null
+++ b/dev-util/vulkan-headers-1.1.77.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/b1577d5fbd5424c863710aa156aaafa77cae3de8.tar.gz -> vulkan-headers-1.1.77.0.tar.gz
+_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_=a28b9639ebb64bb93d1b3e44cef4a706
diff --git a/dev-util/vulkan-headers-1.1.77.0-r1 b/dev-util/vulkan-headers-1.1.77.0-r1
new file mode 100644
index 000000000000..f13effee5c6a
--- /dev/null
+++ b/dev-util/vulkan-headers-1.1.77.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/b1577d5fbd5424c863710aa156aaafa77cae3de8.tar.gz -> vulkan-headers-1.1.77.0.tar.gz
+_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_=2391806315a909e2b8b7aa9afb9764b1
diff --git a/dev-util/vulkan-headers-9999 b/dev-util/vulkan-headers-9999
new file mode 100644
index 000000000000..cb6ca9b747ef
--- /dev/null
+++ b/dev-util/vulkan-headers-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a28b9639ebb64bb93d1b3e44cef4a706
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
deleted file mode 100644
index 371de401c985..000000000000
--- a/dev-util/vulkan-headers/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
-DIST vulkan-headers-1.1.77.0.tar.gz 459383 BLAKE2B 4c08cb5264d2cae036e7a5c9260915186ba237067a003f69300ef550f1d944123223dce3c1084cf2e2a44f571b957928771e4d907e5714415841cda60dd5387d SHA512 097d6d532215751715c9ce0d97f4e7793318c5e37633754cda2f451201ef34121e14e99ecbf8d3281a417d1ece11f1065852ac5409d7b16a1370e27f065c3a78
-EBUILD vulkan-headers-1.1.77.0-r1.ebuild 798 BLAKE2B f9e8dd53cea3c090bd4fec3db52a74ef465890b67faec0c6cb949ca944a2a5a4c9551dbea3f9b5ddeda5c3047eef3a294c20e9c7150d0d63055f87f8388889f5 SHA512 8be8f391a31ce52ee5eb780972da4cec319e46c01b98ef5cc7e36d500945225c45cc433752f98e5289d0ee1809b0437ff40fbc9a80d25b372243a610a9c330be
-EBUILD vulkan-headers-1.1.77.0.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
-EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
-MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
deleted file mode 100644
index 9cf443a22444..000000000000
--- a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Mon, 25 Jun 2018 13:59:47 -0600
-Subject: [PATCH] headers: Remove loader/layer dependency
-
-The header vk_layer.h included vk_layer_dispatch_table.h, which is not
-present in this repo. Instead, it had to be generated from either the
-Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
-that dependency.
----
- include/vulkan/vk_layer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
-index e8300c3..823c88a 100644
---- a/include/vulkan/vk_layer.h
-+++ b/include/vulkan/vk_layer.h
-@@ -35,9 +35,6 @@
- #define VK_LAYER_EXPORT
- #endif
- 
--// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now appear in externally generated header
--#include "vk_layer_dispatch_table.h"
--
- #define MAX_NUM_UNKNOWN_EXTS 250
- 
-  // Loader-Layer version negotiation API.  Versions add the following features:
-@@ -50,6 +47,9 @@
- 
- #define VK_CURRENT_CHAIN_VERSION 1
- 
-+// Typedef for use in the interfaces below
-+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
-+
- // Version negotiation values
- typedef enum VkNegotiateLayerStructType {
-     LAYER_NEGOTIATE_UNINTIALIZED = 0,
-
diff --git a/dev-util/vulkan-headers/metadata.xml b/dev-util/vulkan-headers/metadata.xml
deleted file mode 100644
index 830c78812893..000000000000
--- a/dev-util/vulkan-headers/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KhronosGroup/Vulkan-Headers</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild
deleted file mode 100644
index b41d734e0bbf..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-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=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.1.77.0-r1-Remove-loader-layer-dep.patch )
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild
deleted file mode 100644
index 0e2db9636138..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.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
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
deleted file mode 100644
index 0e2db9636138..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-9999.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
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-tools-1.1.77.0-r1 b/dev-util/vulkan-tools-1.1.77.0-r1
new file mode 100644
index 000000000000..78e5ba9df368
--- /dev/null
+++ b/dev-util/vulkan-tools-1.1.77.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) cube? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/vulkan-headers media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
+IUSE=+cube +vulkaninfo X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/384fff68c802a10b5d7f4f352a4bb43b3efe5f23.tar.gz -> vulkan-tools-1.1.77.0.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=422a5fb8d24478d4deedb728866d8609
diff --git a/dev-util/vulkan-tools-9999 b/dev-util/vulkan-tools-9999
new file mode 100644
index 000000000000..409aa37f6cc1
--- /dev/null
+++ b/dev-util/vulkan-tools-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) cube? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/vulkan-headers media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
+IUSE=+cube +vulkaninfo X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0
+RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
+REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=422a5fb8d24478d4deedb728866d8609
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
deleted file mode 100644
index 911300042526..000000000000
--- a/dev-util/vulkan-tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
-EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278
-EBUILD vulkan-tools-9999.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278
-MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
deleted file mode 100644
index bee42ed5665e..000000000000
--- a/dev-util/vulkan-tools/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sarnex@gentoo.org</email>
-		<name>Nick Sarnie</name>
-	</maintainer>
-	<use>
-		<flag name="cube">Build the cube/cubepp demos</flag>
-		<flag name="vulkaninfo">Build the vulkaninfo utility</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
deleted file mode 100644
index 043d52de1fec..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-DEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	   )"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			  vulkaninfo? ( X )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-			-DVULKANINFO_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	default
-
-	if use cube; then
-		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "The cube and cubepp demos have been renamed to"
-	einfo "vulkancube and vulkancubecpp to prevent collisions"
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
deleted file mode 100644
index 043d52de1fec..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ /dev/null
@@ -1,89 +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} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-DEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	   )"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			  vulkaninfo? ( X )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-			-DVULKANINFO_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	default
-
-	if use cube; then
-		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "The cube and cubepp demos have been renamed to"
-	einfo "vulkancube and vulkancubecpp to prevent collisions"
-}
diff --git a/dev-util/w32api-3.17.2 b/dev-util/w32api-3.17.2
new file mode 100644
index 000000000000..0a597152980b
--- /dev/null
+++ b/dev-util/w32api-3.17.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Free Win32 runtime and import library definitions
+EAPI=0
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/w32api-3.17-2-mingw32-src.tar.lzma
+_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_=a0f9dff504ceb68584a5f716f0dccbd8
diff --git a/dev-util/w32api-4.0.3.1 b/dev-util/w32api-4.0.3.1
new file mode 100644
index 000000000000..0a72e0393578
--- /dev/null
+++ b/dev-util/w32api-4.0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Free Win32 runtime and import library definitions
+EAPI=4
+HOMEPAGE=http://www.mingw.org/
+IUSE=headers-only
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw/w32api-4.0.3-1-mingw32-src.tar.lzma
+_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_=7dabd7b697fc63fe67d7ba56ae007fce
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
deleted file mode 100644
index 7740d6eb6b29..000000000000
--- a/dev-util/w32api/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
-DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
-EBUILD w32api-3.17.2.ebuild 1498 BLAKE2B 66f97f967519205d73a8d4a4d14e2b7f8fee1d3c26486fc64e01f9dd8435e968704c613912a126b97a7de1692e41d7d8e067d7c760c5a1d0bf2bcfcf896821dd SHA512 7a6ecfd504b3c82ce7eb7231848680aa00c94c2faea38eb5ab77c039f7716b46aa61a143a876555c57afd80fdd08069a8ffb95511ac750ddee0309aa8034b613
-EBUILD w32api-4.0.3.1.ebuild 1598 BLAKE2B a7039078b084d49eb8438bcd3f3f4df18ded5e0ef8ae10cb976ad9e20b5a50b36bf2303d4d0e0b28fb2ff89fcb7d6b34a1e330aee81e5b451b451371dcd0a212 SHA512 02c252e36293780ff567cfc59dffb93f8ef914bd2eb396e4f40d7880d515ee77a2b5a007baf6e2167715c86c3482f6ba656e2f81bb6b5acc0745335c27e0e622
-MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
deleted file mode 100644
index 6c377f90be9b..000000000000
--- a/dev-util/w32api/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>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mingw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
deleted file mode 100644
index 02fce8e4df78..000000000000
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit eutils flag-o-matic
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration; do not emerge this directly"
-	fi
-}
-
-src_compile() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET}/usr
-	emake || die
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		emake install DESTDIR="${D}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
-
-		# Make sure diff cross-compilers don't collide #414075
-		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-	fi
-}
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
deleted file mode 100644
index 26a1f1cb5bf2..000000000000
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with mingw-runtime-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-m/.m}-src
-
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration; do not emerge this directly"
-	fi
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	filter-flags -frecord-gcc-switches
-	tc-export AR
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET}/usr \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/*
-	else
-		emake -j1 install DESTDIR="${D}"
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
-
-		# Make sure diff cross-compilers don't collide #414075
-		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-	fi
-}
diff --git a/dev-util/waf-1.9.14 b/dev-util/waf-1.9.14
new file mode 100644
index 000000000000..16225c62fed2
--- /dev/null
+++ b/dev-util/waf-1.9.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=|| ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
+DESCRIPTION=piece of software used to help building software projects
+EAPI=6
+HOMEPAGE=https://waf.io/
+IUSE=examples
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://waf.io/waf-1.9.14.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5f72002af402e2579d1e813dde109ca5
diff --git a/dev-util/waf-1.9.8 b/dev-util/waf-1.9.8
new file mode 100644
index 000000000000..97e2c07c7a74
--- /dev/null
+++ b/dev-util/waf-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=|| ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
+DESCRIPTION=piece of software used to help building software projects
+EAPI=6
+HOMEPAGE=https://waf.io/
+IUSE=examples
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://waf.io/waf-1.9.8.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5f72002af402e2579d1e813dde109ca5
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
deleted file mode 100644
index 22a6c20deb96..000000000000
--- a/dev-util/waf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-DIST waf-1.9.8.tar.bz2 620795 BLAKE2B d7c3ad5cf0c1b16aef84b311d7fe2d26e7e6fe0438373e19387cade0356469100063059e6900398c7bb4993d9440f79933ba59d1bdd1b71e41364d1659b18d55 SHA512 a86d29d32257ee5b82db28f20ef3056a995c4a47404ee47f216899c76332c6586bde83397db907b51c8d3d38efaa3e2f4befbf8f27d17d1f58e6b0808f070fdc
-EBUILD waf-1.9.14.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
-EBUILD waf-1.9.8.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/waf/metadata.xml b/dev-util/waf/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/waf/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/waf/waf-1.9.14.ebuild b/dev-util/waf/waf-1.9.14.ebuild
deleted file mode 100644
index e37a34205025..000000000000
--- a/dev-util/waf/waf-1.9.14.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
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="piece of software used to help building software projects"
-HOMEPAGE="https://waf.io/"
-SRC_URI="https://waf.io/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-DEPEND="${PYTHON_DEPS}"
-
-DOCS="ChangeLog README.md DEVEL"
-
-src_prepare() {
-	rm -v waf || die
-
-	default
-}
-
-src_configure() {
-	${EPYTHON} ./waf-light configure
-}
-
-src_compile() {
-	${EPYTHON} ./waf-light build
-}
-
-src_install() {
-	default
-
-	#point waf binary to waflib dir and strip payload
-	sed -e "/INSTALL=/s:=.*:='${EROOT}usr':" \
-		-e "/REVISION=/s:=.*:='${PR}':" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "/^#\(==>\|BZ\|<==\)/d" \
-		-i waf || die
-	dobin waf
-
-	insinto /usr/$(get_libdir)/${PN}3-${PV}-${PR}
-	doins -r waflib
-
-	if use examples ; then
-		dodoc -r demos
-	fi
-}
diff --git a/dev-util/waf/waf-1.9.8.ebuild b/dev-util/waf/waf-1.9.8.ebuild
deleted file mode 100644
index e37a34205025..000000000000
--- a/dev-util/waf/waf-1.9.8.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
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="piece of software used to help building software projects"
-HOMEPAGE="https://waf.io/"
-SRC_URI="https://waf.io/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-DEPEND="${PYTHON_DEPS}"
-
-DOCS="ChangeLog README.md DEVEL"
-
-src_prepare() {
-	rm -v waf || die
-
-	default
-}
-
-src_configure() {
-	${EPYTHON} ./waf-light configure
-}
-
-src_compile() {
-	${EPYTHON} ./waf-light build
-}
-
-src_install() {
-	default
-
-	#point waf binary to waflib dir and strip payload
-	sed -e "/INSTALL=/s:=.*:='${EROOT}usr':" \
-		-e "/REVISION=/s:=.*:='${PR}':" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "/^#\(==>\|BZ\|<==\)/d" \
-		-i waf || die
-	dobin waf
-
-	insinto /usr/$(get_libdir)/${PN}3-${PV}-${PR}
-	doins -r waflib
-
-	if use examples ; then
-		dodoc -r demos
-	fi
-}
diff --git a/dev-util/webstorm-10.0.4.141.1550 b/dev-util/webstorm-10.0.4.141.1550
new file mode 100644
index 000000000000..8bb594e5726d
--- /dev/null
+++ b/dev-util/webstorm-10.0.4.141.1550
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
+EAPI=5
+HOMEPAGE=http://www.jetbrains.com/webstorm
+KEYWORDS=~amd64 ~x86
+LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
+RDEPEND=>=virtual/jdk-1.7
+SLOT=10
+SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-10.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60c12d345bc2bb0c2873b90e8979b443
diff --git a/dev-util/webstorm-2016.2.2.162.1628.41 b/dev-util/webstorm-2016.2.2.162.1628.41
new file mode 100644
index 000000000000..202c35cb435e
--- /dev/null
+++ b/dev-util/webstorm-2016.2.2.162.1628.41
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/webstorm
+KEYWORDS=~amd64 ~x86
+LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
+RDEPEND=>=virtual/jdk-1.7
+SLOT=2016
+SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2016.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c405e381d84de01a79f0c48bbe6bb333
diff --git a/dev-util/webstorm-2017.2.4.172.4155.35 b/dev-util/webstorm-2017.2.4.172.4155.35
new file mode 100644
index 000000000000..f8e616010a75
--- /dev/null
+++ b/dev-util/webstorm-2017.2.4.172.4155.35
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=JavaScript IDE for client- and server-side development with Node.js
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/webstorm
+KEYWORDS=~amd64 ~x86
+LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
+RDEPEND=>=virtual/jdk-1.7
+SLOT=2017
+SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2017.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53e70f6d86c77f59936239036c24bdaf
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
deleted file mode 100644
index c40aab8787aa..000000000000
--- a/dev-util/webstorm/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST WebStorm-10.0.4.tar.gz 130242508 BLAKE2B e41158360fbab65ad90e81661becce4044f7609ff3532a1f45e65443e0e125f39e9d02c9a29f7dece5260738dce641d7342873dc34bc0ef493ac3acb3a8be594 SHA512 2523795dc3cc4395549313584e8e597b2782eb2c6ad577d0aae81b72656f00a2cc2f9bbac77f83f9e1f74350aaa762d8b7ba873558a37af316839784e506c6ec
-DIST WebStorm-2016.2.2.tar.gz 215535491 BLAKE2B 36e87c604f7e7d1d7d2c01ae7cc1872cc264577935c1693e96625bf659d4ad2c59137faa3eacb6b10350bc816fac472e011c617165df68c1a0fbb5cdc7811816 SHA512 84123bd5e169e87490f3b71f7259b6b13a7885b5a66b912957cd6e869b6f985db0f0a0f3a232436b1894096ec8d74c2b907c4162f2fdd212f96cb0a3d5f41f48
-DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-10.0.4.141.1550.ebuild 813 BLAKE2B ec251523438f6fdd460d572f4d0a8c5cdda176bf78e6f44b6facb7fc1855273fc550d250f50c2a4f5a4808798cb7cc3be31b767baa9e27fb7911299141c982d9 SHA512 6800b2d9cffc552e2bf2813898b5d03a33a8344bbf8c242a4d778f73a9a739be724a5b23980763d237a4f44ea769a9dd80b34097f8fd46fdec5cbbe247dfe8c3
-EBUILD webstorm-2016.2.2.162.1628.41.ebuild 813 BLAKE2B 490fd1a1fea77a0d6da3cfbd77ac55922c41284229c20167c427343cf30f1d47a7586b5b0493d9b633e326805dbd733218bf05f3746149c6063149376f30cd8d SHA512 a82f4821d479c824947f24f8bcb9d2159c57f9f624f27d4a4de188b05294fd7310e0a847a2d156d4b134eec277234470e314a093e7f25ffb743ce1ca93a83829
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 867 BLAKE2B 67f797ecb788bdf201e794d6df96487245bbd9c008fe07f8544f85a456a589344fb7bf20a8db51e80e96dffb3a48636e490ab972308eb4be802cea8a2554ca93 SHA512 27673ce1fe7ea8cc047b9bdb3a07852f992dd36461ce022ef050cbf57c5ef23b2c0092c603f881133cd0a4f7ce2246797f99aff85590776f286111c3a042f22a
-MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
deleted file mode 100644
index 1866cf4b1397..000000000000
--- a/dev-util/webstorm/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-needed -->
-<longdescription lang="en">
-WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
deleted file mode 100644
index d281ef919c9f..000000000000
--- a/dev-util/webstorm/webstorm-10.0.4.141.1550.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 eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-5)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild b/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
deleted file mode 100644
index c01948942f74..000000000000
--- a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-6)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
deleted file mode 100644
index d7dca526f308..000000000000
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.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
-
-inherit eutils versionator
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/WebStorm-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-SLOT="$(get_major_version)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jdk-1.7"
-
-S="${WORKDIR}/WebStorm-$(get_version_component_range 4-6)"
-
-src_install() {
-	insinto "/opt/${PN}"
-	doins -r .
-	fperms 755 /opt/${PN}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "/opt/${PN}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "${PN}" "${PN}" "Development;IDE;"
-}
diff --git a/dev-util/weka-3.7.13 b/dev-util/weka-3.7.13
new file mode 100644
index 000000000000..175431f3eebd
--- /dev/null
+++ b/dev-util/weka-3.7.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Java data mining package
+EAPI=6
+HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.6 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/weka/weka-3-7-13.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c46dbb28d362ee494a805de1bc9ca256
diff --git a/dev-util/weka-3.8.0 b/dev-util/weka-3.8.0
new file mode 100644
index 000000000000..18ecd65578b1
--- /dev/null
+++ b/dev-util/weka-3.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Java data mining package
+EAPI=6
+HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.7 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/weka/weka-3-8-0.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c5158bbf71027224721724572d44c2fc
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
deleted file mode 100644
index 53e05263416a..000000000000
--- a/dev-util/weka/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX weka-3.7.13-build.xml.patch 576 BLAKE2B aa7535a003410f9ec6aa091e3fd98918206803b1cba85684739648790ace23b4de82f5f07911983deebc91f64ed2882254179eaba490516c1fc11d537f5e180f SHA512 7d187da1ebd6f2e774ff8441d742eed37c9e804da2b9f6df905c02ceea2a5fdc2c210b7a195b052e7b4eeb062225b8bed315ad38ac9323adf8a3cf11fc29e143
-AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
-DIST weka-3-7-13.zip 42159458 BLAKE2B ede4e225dac3d2eb875eaddfee8209a8c50b0095a885c4c9384703aa476d75ec9f1bc4dfcdc2e2874b623f0cf4090f281fe77d8363c1fb5300409c4a6e119f44 SHA512 aa15b857d3b3b35720468206e42a157cc8c63d6bf3f4fdda93845da7e4e4ffca0201b2b92056486a2245681f7e0052dc75959194be954d84b391e812bd49ce5e
-DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
-EBUILD weka-3.7.13.ebuild 1468 BLAKE2B 1082a67e52f5425ca08b2664b8203f59b48639dbb025541e8b934e1f8390e202e5e48ab711643a2eb4ab9d4a1ac9a6ff2dbb5dd26a079cced1c6e88e2a80c987 SHA512 2f746f8e8874497a66650d5561412ee92996fd97adb9282a423a34452a261845a9a2d9d6370f01cbd7d6af3c188ac885eb1210058e4722eefa02f87adc54e733
-EBUILD weka-3.8.0.ebuild 1776 BLAKE2B 233d1f1d2e51086bc78a5b8c6d2b99dea0eef5a998f8ba99a6c5ceccf22e99b243cae5c171fb69acac04a751d1115fe398615c51c2bdfd37d0348e44820c552c SHA512 f684824f58f527210c932662124d3ab3e3ff77398c4e592bf5e238a3caf57329d8536155a1a54e0efe14a9def8306325ef524ee5d00c1703d6bf1dc7448d80b1
-MISC metadata.xml 388 BLAKE2B 5f655f856c468f07f1b65024d9f86466f633b94f57f8ab384a47959975a8a96ebe910e6c7220c3226c83c90e6ebf3d3128c6d354517b100eb018891a02c3bb69 SHA512 db8902561c4e18c56a16e2445822e5f8592822f911c4f098c444f5345599956d877b8d0a9982c2cd143443231d78bc7931e635657ccb9880a54f8631055d8c54
diff --git a/dev-util/weka/files/weka-3.7.13-build.xml.patch b/dev-util/weka/files/weka-3.7.13-build.xml.patch
deleted file mode 100644
index 05da33df23d6..000000000000
--- a/dev-util/weka/files/weka-3.7.13-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2016-04-11 16:45:18.592385569 +0200
-+++ b/build.xml	2016-04-11 16:48:01.756389582 +0200
-@@ -603,13 +603,6 @@
-          <include name="**/*.default"/>
-        </fileset>
-     </copy>
--    <rmic base="${build}/classes"
--       classname="weka.experiment.RemoteEngine"/>
--    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
--      <patternset>
--        <include name="java_cup/runtime/**/*"/>
--      </patternset>
--    </unzip>
-     <unzip src="${lib}/packageManager.jar" dest="${build}/classes">
-       <patternset>
-         <include name="org/**/*"/>
diff --git a/dev-util/weka/files/weka-3.8.0-build.xml.patch b/dev-util/weka/files/weka-3.8.0-build.xml.patch
deleted file mode 100644
index ca8264dc2291..000000000000
--- a/dev-util/weka/files/weka-3.8.0-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2016-05-15 10:56:04.011409745 +0200
-+++ b/build.xml	2016-05-15 10:57:43.971411711 +0200
-@@ -618,13 +618,6 @@
-          <include name="**/*.default"/>
-        </fileset>
-     </copy>
--    <rmic base="${build}/classes"
--       classname="weka.experiment.RemoteEngine"/>
--    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
--      <patternset>
--        <include name="java_cup/runtime/**/*"/>
--      </patternset>
--    </unzip>
-     <unzip src="${lib}/bounce.jar" dest="${build}/classes">
-       <patternset>
-         <include name="org/**/*"/>
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
deleted file mode 100644
index 1a7ed67ed610..000000000000
--- a/dev-util/weka/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>amynka@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">weka</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild
deleted file mode 100644
index 7f39cee56198..000000000000
--- a/dev-util/weka/weka-3.7.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-$(replace_all_version_separators '-')"
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	>=dev-java/javacup-0.11a_beta20060608:0"
-RDEPEND=">=virtual/jre-1.6
-	>=dev-java/javacup-0.11a_beta20060608:0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
-
-EANT_BUILD_TARGET="exejar"
-EANT_DOC_TARGET="docs"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-weka_get_max_memory() {
-	if use amd64; then
-		echo 512m
-	else
-		echo 256m
-	fi
-}
-
-src_prepare() {
-	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
-	rm -v weka.jar || die
-	rm -rf doc || die
-	java-pkg_jar-from --into lib javacup
-
-	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
-	default
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
-
-	# Really need a virtual to list all available drivers and pull the ones
-	# instaled
-	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
-
-	use source && java-pkg_dosrc src/main/java/weka/
-
-	dodoc README || die
-
-	dodir /usr/share/${PN}/data/
-	insinto /usr/share/${PN}/data/
-	doins data/*
-}
diff --git a/dev-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
deleted file mode 100644
index 134f1ad611ba..000000000000
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-$(replace_all_version_separators '-')"
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	>=dev-java/javacup-0.11a_beta20060608:0"
-RDEPEND=">=virtual/jre-1.7
-	>=dev-java/javacup-0.11a_beta20060608:0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
-
-EANT_BUILD_TARGET="exejar"
-EANT_DOC_TARGET="docs"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-weka_get_max_memory() {
-	if use amd64; then
-		echo 512m
-	else
-		echo 256m
-	fi
-}
-
-src_prepare() {
-	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
-	rm -v weka.jar || die
-	rm -rf doc || die
-	java-pkg_jar-from --into lib javacup
-
-	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
-	default
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
-
-	# Really need a virtual to list all available drivers and pull the ones
-	# instaled
-	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
-
-	use source && java-pkg_dosrc src/main/java/weka/
-
-	dodoc README
-
-	dodir /usr/share/${PN}/data/
-	insinto /usr/share/${PN}/data/
-	doins data/*
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from weka 3.7 to later"
-	elog "and your package manager does not start please delete"
-	elog "file installedPackageCache.ser from packages folder"
-	elog "in wekafiles located in your user home."
-	elog
-	elog "rm \${HOME}/wekafiles/packages/installedPackageCache.ser"
-}
diff --git a/dev-util/wiggle-0.9-r1 b/dev-util/wiggle-0.9-r1
new file mode 100644
index 000000000000..ff2f5be523b8
--- /dev/null
+++ b/dev-util/wiggle-0.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0= sys-apps/groff test? ( sys-process/time ) >=sys-apps/sed-4
+DESCRIPTION=tool for applying patches that patch cannot apply because of conflicting changes
+EAPI=5
+HOMEPAGE=https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle
+IUSE=test
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://neil.brown.name/wiggle/wiggle-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f35896e3918122fe7ed8c57abd48dae7
diff --git a/dev-util/wiggle-1.0 b/dev-util/wiggle-1.0
new file mode 100644
index 000000000000..1458b9b28b06
--- /dev/null
+++ b/dev-util/wiggle-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0= sys-apps/groff virtual/pkgconfig test? ( sys-process/time ) >=sys-apps/sed-4
+DESCRIPTION=tool for applying patches that patch cannot apply because of conflicting changes
+EAPI=6
+HOMEPAGE=https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://neil.brown.name/wiggle/wiggle-1.0.tar.gz
+_eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5ccc6a4d0d69ee2efb640b258abde05e
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
deleted file mode 100644
index 16e0105d30da..000000000000
--- a/dev-util/wiggle/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5
-DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
-DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
-EBUILD wiggle-0.9-r1.ebuild 1690 BLAKE2B f0e67336f89a41e05db5bf0d39d58a7bf57a83e80463fae544f19ea85673a1c9300a8f4fc2ed213b194fb12a198a68f7c00f0e565331a6328fbce68d7c0a258d SHA512 37d5bc901fbfa267d77f6a2eb5cdf32fc24b311c85166de17156f08d4b699e79e69d88ae49031a05efe32cf7b6235c25b0454904400f0390693614c2e27fb1cc
-EBUILD wiggle-1.0.ebuild 1468 BLAKE2B bc428b50db001c2323daec804a317536c9fc63755a4da06135940fb69050e7fe65103f7ae3204d7f860550172ad4480a0ca284ebfe34467243edeb082f33b631 SHA512 9e7a0ebf4d70ce014b2c87dfb87e2d3f7c1766aa7bc67144115fb30c259f4537ffe324a990d6967bd951e28aea224d171ba4cf88af6724e491e248b5f8d21bd9
-MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/files/wiggle-1.0-cflags.patch b/dev-util/wiggle/files/wiggle-1.0-cflags.patch
deleted file mode 100644
index ce5defb7bb89..000000000000
--- a/dev-util/wiggle/files/wiggle-1.0-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Respect user CFLAGS and use pkg-config to get ncurses libs.
-
---- wiggle-1.0/Makefile
-+++ wiggle-1.0/Makefile
-@@ -3,7 +3,7 @@
- #OptDbg=-O3
- #OptDbg=-O3 -march=pentium2
- OptDbg=-ggdb
--CFLAGS=$(OptDbg) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CFLAGS += -I. -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
- 
- # STRIP = -s
- INSTALL = /usr/bin/install
-@@ -12,7 +12,7 @@
- MANDIR  = /usr/share/man
- MAN1DIR = $(MANDIR)/man1
- MAN5DIR = $(MANDIR)/man5
--LDLIBS = -lncurses
-+LDLIBS = $(shell pkg-config --libs ncurses)
- 
- all: wiggle wiggle.man test
- 
diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml
deleted file mode 100644
index 483ee9fe5899..000000000000
--- a/dev-util/wiggle/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>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
deleted file mode 100644
index 4c583165574c..000000000000
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fixheadtails flag-o-matic toolchain-funcs
-
-DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
-HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle"
-SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# The 'p' tool does support bitkeeper, but I'm against just dumping it in here
-# due to it's size.  I've explictly listed every other dependancy here due to
-# the nature of the shell program 'p'
-RDEPEND="
-	dev-util/diffstat
-	dev-util/patchutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	virtual/awk
-	sys-apps/grep
-	sys-apps/less
-	sys-apps/sed
-	sys-apps/coreutils
-	sys-devel/patch
-	sys-libs/ncurses:0=
-	"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-	test? ( sys-process/time )"
-
-src_prepare() {
-	# Fix the reference to the help file so `p help' works
-	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
-
-	# Don't add Neil Brown's default sign off line to every patch
-	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
-
-	# Use prefixed time binary
-	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
-
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i Makefile || die
-
-	ht_fix_file p
-
-	append-cppflags -I.
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN}
-}
-
-src_install() {
-	dobin wiggle p
-	doman wiggle.1
-	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
-	insinto /usr/share/wiggle
-	doins p.help
-}
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
deleted file mode 100644
index 22f8dc34ed81..000000000000
--- a/dev-util/wiggle/wiggle-1.0.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
-
-inherit fixheadtails toolchain-funcs
-
-DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
-HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle"
-SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# The 'p' tool does support bitkeeper, but I'm against just dumping it in here
-# due to it's size.  I've explictly listed every other dependancy here due to
-# the nature of the shell program 'p'
-RDEPEND="
-	dev-util/diffstat
-	dev-util/patchutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	virtual/awk
-	sys-apps/grep
-	sys-apps/less
-	sys-apps/sed
-	sys-apps/coreutils
-	sys-devel/patch
-	sys-libs/ncurses:0=
-	"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	test? ( sys-process/time )"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
-	default
-
-	# Fix the reference to the help file so `p help' works
-	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
-
-	ht_fix_file p
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" ${PN}
-}
-
-src_test() {
-	# Use prefixed time binary
-	emake TIME_CMD="${EPREFIX}/usr/bin/time" test
-}
-
-src_install() {
-	dobin wiggle p
-	doman wiggle.1
-	dodoc ANNOUNCE INSTALL TODO DOC/Algorithm notes
-	insinto /usr/share/wiggle
-	doins p.help
-}
diff --git a/dev-util/wsta-0.5.0 b/dev-util/wsta-0.5.0
new file mode 100644
index 000000000000..cca94d6b5913
--- /dev/null
+++ b/dev-util/wsta-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/openssl:* virtual/rust >=dev-util/cargo-0.13.0
+DESCRIPTION=A CLI development tool for WebSocket APIs
+EAPI=6
+HOMEPAGE=https://github.com/esphen/wsta/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/openssl:*
+SLOT=0
+SRC_URI=https://github.com/esphen/wsta/archive/0.5.0.tar.gz -> wsta-0.5.0.tar.gz https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/byteorder/0.5.3/download -> byteorder-0.5.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/config/0.1.3/download -> config-0.1.3.crate https://crates.io/api/v1/crates/cookie/0.2.5/download -> cookie-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.40/download -> gcc-0.3.40.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/hpack/0.2.0/download -> hpack-0.2.0.crate https://crates.io/api/v1/crates/httparse/1.2.1/download -> httparse-1.2.1.crate https://crates.io/api/v1/crates/hyper/0.9.14/download -> hyper-0.9.14.crate https://crates.io/api/v1/crates/idna/0.1.0/download -> idna-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.2/download -> lazy_static-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.18/download -> libc-0.2.18.crate https://crates.io/api/v1/crates/libressl-pnacl-sys/2.1.6/download -> libressl-pnacl-sys-2.1.6.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/matches/0.1.4/download -> matches-0.1.4.crate https://crates.io/api/v1/crates/mime/0.2.2/download -> mime-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.26/download -> net2-0.2.26.crate https://crates.io/api/v1/crates/nom/1.0.1/download -> nom-1.0.1.crate https://crates.io/api/v1/crates/num_cpus/1.2.0/download -> num_cpus-1.2.0.crate https://crates.io/api/v1/crates/openssl/0.7.14/download -> openssl-0.7.14.crate https://crates.io/api/v1/crates/openssl-sys/0.7.17/download -> openssl-sys-0.7.17.crate https://crates.io/api/v1/crates/openssl-sys-extras/0.7.14/download -> openssl-sys-extras-0.7.14.crate https://crates.io/api/v1/crates/openssl-verify/0.1.0/download -> openssl-verify-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.8/download -> pkg-config-0.3.8.crate https://crates.io/api/v1/crates/pnacl-build-helper/1.4.10/download -> pnacl-build-helper-1.4.10.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/solicit/0.4.4/download -> solicit-0.4.4.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/time/0.1.35/download -> time-0.1.35.crate https://crates.io/api/v1/crates/traitobject/0.0.1/download -> traitobject-0.0.1.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.0/download -> unicase-1.4.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.2.3/download -> unicode-bidi-0.2.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.2/download -> unicode-normalization-0.1.2.crate https://crates.io/api/v1/crates/url/1.2.4/download -> url-1.2.4.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/websocket/0.17.1/download -> websocket-0.17.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xdg/2.0.0/download -> xdg-2.0.0.crate
+_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=3f1d4bd47139b20a9acf60d5bcef8958
diff --git a/dev-util/wsta/Manifest b/dev-util/wsta/Manifest
deleted file mode 100644
index 55c971139f87..000000000000
--- a/dev-util/wsta/Manifest
+++ /dev/null
@@ -1,51 +0,0 @@
-DIST argparse-0.2.1.crate 18969 BLAKE2B 68e4b5502409b2d2b8d2891164d114bde6b65babca241f8c881b07483dd78b114594c1450c06124f04946022303fa41d8b108122757ff2117ca6be3a0e619ad3 SHA512 f12aea4ddc0d619d40194f8d3db3c4d952521d1dfad6bc21b5b7cf8db91c30f70c5259bd6a0cf40d521e4d0cbaf3e4d59ae0bd40554772c79a4b200ebcfa73fe
-DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
-DIST byteorder-0.5.3.crate 8643 BLAKE2B 938104ec31c8e0282bf3aac9e3c624633ad4d9d4b0700abf91480b519c5dfab2f29b547213f34d0ff36a39b5029a79dc5b349eb9f2337ac20079722251facf94 SHA512 c6134458bc5b05529cef261c519b1d1e515fde37143690cf365dfb7a65d1fa91f1689bec1d1d04dff7f6417ed1eb2e70aef40c78400d7f1bc90c12eac085496b
-DIST cfg-if-0.1.0.crate 2758 BLAKE2B 8ba4ea4deb8cfeb4927edcc9112346650eb9b2f5ced13e4130aed6c030f8f7bafdb50ca4b25f2124636058f09ab76f70f6a5820cdf31186b5f5699d7da4db03a SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb
-DIST config-0.1.3.crate 29564 BLAKE2B eb6e6981f5b67530cbfd5deaf96457e36cda59561c77a9509a7a5fd8b19a1d9b675184d4f85218e24280c03c1dd9d64790918a19a1acd5b582f1577a201c349a SHA512 c2acf4ab9976b11bd99d8b3b7c0f8bddcf16b91ff4979aad8db79733b2ea8073f5e96d8333238eb1e2418ce07605311907aed59920b5a578a7efa23fe53ca641
-DIST cookie-0.2.5.crate 12969 BLAKE2B a0802e466be4cb9a83f41b67e14d41ae79acde83661ab4e7144a4137b268c0f7a102dfb5b8b2143ba3f8f66f39d123bd0164e6006a5c1c686a4c266fb8eb9784 SHA512 41705087506d3bf7d8de839245eabc032c79c712e6b1fda111139afd92b267c0e2aa61013020b8b5a3a679aa779861fa2ef9397b9bbb3c5705ba2585ea02afaf
-DIST gcc-0.3.40.crate 25010 BLAKE2B b1a46ec7e7076f3acb29d31ce94d397672a680f28e35d74270d49b525ff3c651d9a6b05d2831a19c6f029ddceb55019fba1289127fe188be47bf52098aa0d1c1 SHA512 8facf1c0f85642047386ae41f7dad525007ef8a3e898e6f21985200fa564bac54af9c97f2340c094d05b04bb8741352f71583ae8c2186e6abcb2ec8286e5dbe6
-DIST gdi32-sys-0.2.0.crate 7643 BLAKE2B f6e54cb186437c400eb4625a242cbb96c212b5978943b761f3cd524d8d55bed4962cafd036a2a61bb71d2fd71400352f5d6ec827f5634de2a3eb30f9a5a4bf14 SHA512 009f51899ecf9c8a6c688c3b087c294482c9d4c09b9c2b7fd5d949ed269bed9dea7ab5ff95ba9524c3402e4299d944205187f99ce0d0300a1646ff021030f19c
-DIST hpack-0.2.0.crate 26932 BLAKE2B eda1c86cc97ed92708d08c901cf8c16e1668d383f27893e6f60ef45a43fbe8a75915d640f5aea18821e6ef637925f65a7569ce4dd877cf7fbae576bb3d917f04 SHA512 d77b4329d2bed10fc00b49e5f9228a03c6f95e7bab5fabe02a6f88e3bde8bffed34c2f12c11fbe6283697f473543cdff37dbda10b159185c7a13a47142e168ff
-DIST httparse-1.2.1.crate 14239 BLAKE2B 1fba0a5ee9beb7262521644200fd94697d284b0124798e254a058d2c9532a62bd3b7c1d4adee864279f851ded2b9c53e3ba76fba1218a1cd7f0c01393f222713 SHA512 ac74673ed9420bbf483e920a256e3625b5c3da8a7668de7aead5fa14cfc0334910c838356af711ddefedb32edf86aae68c2d72850dfce345eb3f05927c37cc9f
-DIST hyper-0.9.14.crate 133777 BLAKE2B 499dce371ca65622485c9be6107bab829d5c31617b6a82b61dd36088fdd0fbe4e6532f75d3eb134deff3c7dd6597e51236eb58221f986090e743bf4c8da4d51c SHA512 86f7f69105a1c0083061265bf689478241b9e854c11182cf5ffb40b30a7e1d59762f57eda1f614391957f11aec44536070c5092439550ae488d98217c59b23df
-DIST idna-0.1.0.crate 234027 BLAKE2B ab59c9574c1c7c830ae9e183795511b9a9bfe2300e631952edd09927845457f1d5eb36a71271d50678e8e4219e230c472b24c78e192550fabf5f1eb49e710a60 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
-DIST lazy_static-0.2.2.crate 5026 BLAKE2B 9840a70456cc52c40c983ab1f516dd8a3667ba94e3758a14f92b29717adab6e9072de254d378f8702d461879694a0d3f313a941afc6d56ce6431efc0dc6d7f2b SHA512 d151405da0ff2305cb9556325c783c3214f57f7d905a9de9e41aabfcfa3921a402957b71e48b307feff4c34372e04075864d3eef3b44098df3f8015264eead09
-DIST libc-0.2.18.crate 114209 BLAKE2B dfe3d850c4d5ec14ce1acbee4f8ff50c098b269c064279ac639195fb67da0c5a1c7f75dee7c79657a41a8ca34efaeb0b1517b59fda4262cfab82489e1247f759 SHA512 d99e0db6fcc6538ee88109c2857a9e24641326c399f604d9704b9fc9e1d3e79eec8dfb10291499b1900a9a40f0d3d00f50d4709808683032f10fc3bdddebc2bf
-DIST libressl-pnacl-sys-2.1.6.crate 2697179 BLAKE2B bdb6f9bc7927e6ea5580b0b90928eefdda75cae4539c26c1d6aee6792d3bfed464e92176240631229a5b14fc8e292e1bb05b24b444f98596f3c190f02d6d49ad SHA512 b4e315900e88d4e00b99c76388658f1b1e6761dc4b9de72804dc9ab946a2fb1bcdb8711de0c99a123f3180143c55625cafbec9db69837d2d5e1a79b2df87d983
-DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
-DIST matches-0.1.4.crate 1530 BLAKE2B 1c823cfa18f896d490f0a5a03bcd3afe735418a13334d8d0f76bb2f2d2903659729f399725ff20392834566aa2d8605f670cd8f9474ae62464ebd95662cbf850 SHA512 a0248296a155fd3132150dcd95d3e51b62cf7b99a8530f0c2ea34455a224613bd7a2d1803fbbe1627aedf826e82e746495df319b62f1189e361c9fa1cd8a380e
-DIST mime-0.2.2.crate 6391 BLAKE2B 1ee62a92416d47f04b3199c5c20c4e231f1867c13df8f3b847a39d45ce57c01a260d302b0d5772fdcebe2511201257808420d1bf22795202faf13f581689dbda SHA512 4e214b0314e0a5863bf359f15cc47fa80e4e69c852b89b8d839825cc926488382f209cd3fdcbd4aa71e8514c5537578f4c12b678f97276fbdb059af51f5d053e
-DIST net2-0.2.26.crate 18489 BLAKE2B 702431b884b99212b6cb00125d4de249754512685d14b10e21161e4d619943c4262cede67efc49b782fe324b38da651cbc57ac1d8478a24b16a75d837421763d SHA512 60c6c3b0b9dbfd844c7b52565bf3ed4977394be6396c19aa872d9377bf1961ae3e2cdf87da3822a81d78d453369d740b0477dc48ee62834bd6be4ead6cc92fb7
-DIST nom-1.0.1.crate 46800 BLAKE2B 50a8c3bcedd140d1dd8ca7d2af2535c37a30e818841ceeac7efffcc09e45f2b73117017be738c71d67415ebe2a07460543afc6b2ba3c848927ec9a4192dd8ee9 SHA512 906a6ac89caa0530c18d8ef1ecad3b1b6a21364c539254fb45f369f05f55dc2d8af470d80b528c0158a72e664b2113e10e69d2db5ce155ca776fa88fefc3240c
-DIST num_cpus-1.2.0.crate 6463 BLAKE2B 396a33ad820966d8e17b37923b92db86bc9f684b605a1120d1fe9f3912ce72838d458083a73ab8bad7e0ede3eabe4202b8fd9c5b66a0beff9ee9840d3f204868 SHA512 f72842d71324638b7be2fe2f40f917cd792d83707480bf4d1f8c7f896689297c5e6b521a1643d4a77e1c2e91e18a3106bf065104592e2fcf0b2d06a587e4dc35
-DIST openssl-0.7.14.crate 63824 BLAKE2B 1b2f923a7bd388feba3d129590d9a8e94d3ff82c3a3db63de8653f2375e57b3735ffcbfc271da849ec21c6b0b983edd3bce39070c806cd68007102540e900dee SHA512 e36943d907d1846a619250de6db1b3e48ca729a34bcb21ee7f47ab1ee5535682ba8b8f73e60e3321e6ae321114891c9e98bdf0af1685175c1fa342b84e9ce33d
-DIST openssl-sys-0.7.17.crate 12097 BLAKE2B cab9acb838d5aa7caf27be1300aa9edddb74a42dfd7b328e6b67081701ea04b3ae7fc32b0baa8199d2d6bedcc4b36f1feed2efe418be2e8d1ccb7e14bd7c1305 SHA512 4ba167b098bc7b30d1d839e4e5a11267c2d54221fc7c6b1de03875f501fa3de6b71110e4af52d6e7d71b5342969a58fb4961050744c19bfb995ae7b74736de31
-DIST openssl-sys-extras-0.7.14.crate 3871 BLAKE2B 6cca7be0b0449e7083cf129c0b36b1705e94d5bdd11a2d95ad5c9a9c60827f10df6769f3b1a7e0649442e4911441257a4d91140af063d4694e3a6994e8553c51 SHA512 3fdbb09fff2e75cbb2a7e8e279930010df0ca478376afc15c9b2e15259ee7167ac7d59c36c209f95a17b284b42352d4527302ba1118ecd70295afa84422269f8
-DIST openssl-verify-0.1.0.crate 19367 BLAKE2B bd502fe3ade49ce1c28d6685fb5b315de009da988673129e38c63590f1b9cf926c0f4e23343edd107da0c38f6c493fa4e203b21d56b8ba59b08061b2df5f2cc4 SHA512 e5ea4c3201dfae719dc5f021d86cb868a4c7e818fd131ea31b3229b41c57eb63352c14f75e7eeff44e803ac87e0170a4eaa7203182d6a33d07fcbca344561eed
-DIST pkg-config-0.3.8.crate 10814 BLAKE2B fc0778d1544269a6aa82701c3664b50046969883aa632967af08517d1a82cfc145f4f0790a4d4c9309d490f4b77ee23eb67ee64220a8f1a7f0f1ff3348fc75d4 SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77
-DIST pnacl-build-helper-1.4.10.crate 5470 BLAKE2B 2c51589e1a97b5f761938e086d00800fba5eab3590b35488a05cfeffdf9a9654a2e2deb9cc006c755b4544c2327e885f707c42237554bfaaf58c46149dca19fa SHA512 c170589b379378a4f33ee1ae40de6f649d573e9c9288ad9603a958c9dedf04f09b268539e922a91c060f40374bb697f190fde055ea057de57bfae2308b512707
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
-DIST rustc_version-0.1.7.crate 8816 BLAKE2B 1c3cd80bc3204d27a9a09f4ea8dbeb1624decf9b39ec9e78276fd50362354e59a5c31250c01d136cccb7c717655765d6f2781ab7e04a614f55bfaf334962784f SHA512 f7ceb913f93444bf98ff8113beb96fbd013ecd6c0f31c49aeb738f418f2e5a958c54afcce6e5d017d66a2b47e07fee032aa07b0aa748cd3be67e672cf48f2b48
-DIST semver-0.1.20.crate 15876 BLAKE2B 33cd644289ac054c0b2423373e4539d95c494f21e5c3a8290d9a8521b25e86222e7abe697f504a4acad0e6caf72754c211f0fd0b3feae69f7dfa98d020158968 SHA512 d24401aa4a1e12472c799fd9d2f50f5965e4d2d4a5eccbd244a3f817797fd58cb073b933d45415a1a8d71084deebe04c2277c435da7f359e510c52133bdaa08d
-DIST solicit-0.4.4.crate 61955 BLAKE2B 2ca0c4fd5a6f6aaaed43c67c85709c7f0a5e6b75f07e0d9fee427f1e14c51bb0638056fc3b3d811aed36610ed7e68ccee3b35cdf0e8e3d8fe15e846b1541060a SHA512 46ebf883d8c162747bc1b477209a746d28085325097cbfeced93c52cdc5edc3b7c98b3e0b4770b554ed1dc7189eb02b9d7d7c2e3f5ad785cb208f8b21744f908
-DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
-DIST time-0.1.35.crate 27419 BLAKE2B b96ee21361bf3b1283d3e2ef6b493659442b54957678523bc20b7fc576d03de9a6b331947b841e9e6343082147ce90777b4dac99bde551f66f5e6d50722c4ddc SHA512 2681e38885273109b9e274b033b9d4a9f88d5c49b8d5d1872bb75ccb8a7e6c368e4580534f6b76d7edebc5680314e6dceb6ed087b10d5f2f5a6271fa2ba699a1
-DIST traitobject-0.0.1.crate 1389 BLAKE2B 8c5454ce74e365a2cb1b6e9e0d3e4dd8bcf747327581f3a5171917b64a82f7d626ab0f1f15d13d430bfa3320f85cab674880e83f5cc6be8facf14aa1b8ad1450 SHA512 acf10ffb1d47ad9182fe981b021818724c7de2aab3cc40edd608a98409d24b181e3e2333b034d96e87454438ca6951738ec976ef449fcc36958f9ade38ea2eac
-DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9
-DIST unicase-1.4.0.crate 3385 BLAKE2B 14ab4975c695455093dafe03ec67238d04450c0b4ccdfc2d94010677c7526f1531013302bb64af0cb5dd07b8ac24c1ee5285c0246c4e178aaf0838d6ed1c3d06 SHA512 d5b0c005d81c587fc90e9c5bbb8421575cd14ed74c512ce17d7ebeb5a538bde9ac5bc6e8a96b080de03f13271a97a83aaef21fd98552703dd7d24f8a2ed065ac
-DIST unicode-bidi-0.2.3.crate 1744003 BLAKE2B e6a5a5cba379ea3eba12b42808148d8013cc99e4fbcea345e94b9cbe3b6fa4da5a41f72f4a3dc4ea4e6c5cc0eeef6230fea8868b2a31891c7e234b277d9c6608 SHA512 fb067746b4788c7110bc2687850dc11183c7e596453b42c0c4764c59c1686faf4d03a52b6c147c6578d88b8a2f3f1257d88010874b6ff0bb942b41e055c00a08
-DIST unicode-normalization-0.1.2.crate 612931 BLAKE2B f58526a5ac064203f19858edb5677644c7f05bec8d0fe3f53506d9a72d2824f75591e3a46b58f6836b3a1204b7609a56ba5f2ff55d45670b87c38949133198c9 SHA512 b6dc4316a875de59ee00f89ac0e9b255d0111dc2e2e45395ed726282502ab7b6cfcd56acff7f409b97a2f36d5278e16936359791be6bc8fba1213ca6c8a888df
-DIST url-1.2.4.crate 69521 BLAKE2B 66eea3ed6517c6c0fa4f589d782f49e954c998a24023b28a32fcc770f039af224a8a9796826aec24f1c2b6cebd3dd7d30426d0664c2c09fb7e26799a7b6fe19a SHA512 4108c59476ae35be6ca8018f81106f2981cb0be235a92d79182f15c40f5a4147383b3a3261979cac1db587b4a419ad50207f54d754765dc3b03d0f9e99dafe5f
-DIST user32-sys-0.2.0.crate 10624 BLAKE2B 76e57ff5dcaf533f7087073d85b3ac9a5825ca5c7251c1e8729cd35c9c3bc3c0cfb6a4d7586c3490fccf1aa581a6ce7c58696b161073bb23e524a20ca5c30be3 SHA512 75fa43621acff70425ca40a132a25fc67923526c895c51edb6b49ef507d1d461383e1d92b5dbb5c5aee9207cc76b9a9e43d27efa0b65476bc5ae0c122a2dcc19
-DIST websocket-0.17.1.crate 30977 BLAKE2B 6898cc46441a4c9a6e5c8ed631dc9309e4cbe035535ec4d90cf9643a7e15b29af11c9fc52cac61b1a69f66b03c0f88c0f58ed1a097dcd4bcb4c75db1586f6636 SHA512 7d2493531ee89fc95cbe31a0f523ab3814480bba27174c80bdee13fa9321c434080186e7f6e0adb9818e97f88d42c07cf170a65842848c054d9deb3649397417
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-DIST wsta-0.5.0.tar.gz 43058 BLAKE2B c569dfcaf76fdbe7d1122eff2231f4168ebb4517a87db367503dfdf37d4bde5d39ba5b71b846c876c1f04c2bea2e73ab0be0c385c178b0c538a25ffb498431a3 SHA512 6d1b5aa65f70d78e47cad91d84ada9129076fb9714e2add173f965503d8c12829702f4ef29592015e7e06f126f7518199430f1d2f076cdff640c05db5c42b130
-DIST xdg-2.0.0.crate 12301 BLAKE2B b058d3445df3f1e12a4c06a1aecdf20b5469214cb48fb9b81d0506a4c06792c4757ea83a24e0511764ba84dbc901f47f9155317d0ffc37d7d3a919bcde17f415 SHA512 9acf7c2210148227000ad837551344366650f5f05eeebf3d69da73bf215e1f66fddcb21c57371598db85d8b669e6f337c5eeff9650e2c7ce9b75cd133f9a3a4a
-EBUILD wsta-0.5.0.ebuild 1460 BLAKE2B c327fcb6052901616f9aed246e7b25b481c3320cd595540e0510c151ca3c2c692c4c6d3444f1e546324d69690519a4097a3e2a845032c3c6793a70d266d9163e SHA512 5f113489813459b85563c1b641f9ac6b593aa376cad65fc7a8efad2f12faa0657ae1340fdb517eae5e89d2aabf6c8079d91b98dfe97cb2ae78264f99d7da0bd0
-MISC metadata.xml 696 BLAKE2B c3a645d00cd208a052a01399f27812adec35c54378c119a92be61adf5b1082f40fd0a45329085371b9703996acd60fd77be9ad14e20afad83cd58a6137b0089b SHA512 660fa12550676a342b4e650964959bafb511d00bc6ccfc51981e6695034cb78de347b58ff49e96bc353f9a682b87c191573f1d5cf6d4d494e437fc09b6ea613c
diff --git a/dev-util/wsta/metadata.xml b/dev-util/wsta/metadata.xml
deleted file mode 100644
index 04683970c888..000000000000
--- a/dev-util/wsta/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-needed -->
-	<upstream>
-		<remote-id type="github">esphen/wsta</remote-id>
-	</upstream>
-	<longdescription lang="en">
-	wsta is a CLI tool written in rust for interfacing with WebSockets. wsta has
-	the philosophy of being an easy tool to learn and thus gets out of your way
-	to let you work your UNIX magic directly on the WebSocket traffic. The way
-	wsta does this is to be as pipe-friendly as possible, letting you chain it
-	into complex pipelines or bash scripts as you see fit, or just keep it simple
-	and use it as is.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/wsta/wsta-0.5.0.ebuild b/dev-util/wsta/wsta-0.5.0.ebuild
deleted file mode 100644
index 17d043436473..000000000000
--- a/dev-util/wsta/wsta-0.5.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=6
-
-CRATES="
-argparse-0.2.1
-bitflags-0.7.0
-byteorder-0.5.3
-cfg-if-0.1.0
-config-0.1.3
-cookie-0.2.5
-gcc-0.3.40
-gdi32-sys-0.2.0
-hpack-0.2.0
-httparse-1.2.1
-hyper-0.9.14
-idna-0.1.0
-kernel32-sys-0.2.2
-language-tags-0.2.2
-lazy_static-0.2.2
-libc-0.2.18
-libressl-pnacl-sys-2.1.6
-log-0.3.6
-matches-0.1.4
-mime-0.2.2
-net2-0.2.26
-nom-1.0.1
-num_cpus-1.2.0
-openssl-0.7.14
-openssl-sys-0.7.17
-openssl-sys-extras-0.7.14
-openssl-verify-0.1.0
-pkg-config-0.3.8
-pnacl-build-helper-1.4.10
-rand-0.3.15
-rustc-serialize-0.3.22
-rustc_version-0.1.7
-semver-0.1.20
-solicit-0.4.4
-tempdir-0.3.5
-time-0.1.35
-traitobject-0.0.1
-typeable-0.1.2
-unicase-1.4.0
-unicode-bidi-0.2.3
-unicode-normalization-0.1.2
-url-1.2.4
-user32-sys-0.2.0
-websocket-0.17.1
-winapi-0.2.8
-winapi-build-0.1.1
-ws2_32-sys-0.2.1
-xdg-2.0.0
-"
-
-inherit cargo
-
-DESCRIPTION="A CLI development tool for WebSocket APIs"
-HOMEPAGE="https://github.com/esphen/wsta/"
-SRC_URI="https://github.com/esphen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl:*"
-DEPEND="${RDEPEND}
-		virtual/rust"
-
-src_test() {
-	debug-print-function ${FUNCNAME} "$0"
-
-	export CARGO_HOME="${ECARGO_HOME}"
-
-	cargo test --release || die "Tests failed"
-}
-
-src_install() {
-	cargo_src_install || die "Installation failed"
-
-	einstalldocs
-	doman ${PN}.1
-}
diff --git a/dev-util/wstool-0.1.13 b/dev-util/wstool-0.1.13
new file mode 100644
index 000000000000..07bdbf548cab
--- /dev/null
+++ b/dev-util/wstool-0.1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[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-python/vcstools-0.1.38[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-python/sphinx test? ( dev-python/nose[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-python/coverage[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 dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) 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=Commands to manage several local SCM repositories for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/wstool
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[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-python/vcstools-0.1.38[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(-)] 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=http://download.ros.org/downloads/wstool/wstool-0.1.13.tar.gz https://github.com/vcstools/wstool/archive/0.1.13.tar.gz -> wstool-0.1.13.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_=73b9664af76e3400e7677173e5a7fad3
diff --git a/dev-util/wstool-0.1.17 b/dev-util/wstool-0.1.17
new file mode 100644
index 000000000000..2c58aee9cb60
--- /dev/null
+++ b/dev-util/wstool-0.1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] >=dev-python/vcstools-0.1.38[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/sphinx test? ( dev-python/nose[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/coverage[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 dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) 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=Commands to manage several local SCM repositories for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/wstool
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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(-)] >=dev-python/vcstools-0.1.38[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://download.ros.org/downloads/wstool/wstool-0.1.17.tar.gz https://github.com/vcstools/wstool/archive/0.1.17.tar.gz -> wstool-0.1.17.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_=7f01edbb324b7c940bf1c8afd083c4e1
diff --git a/dev-util/wstool-9999 b/dev-util/wstool-9999
new file mode 100644
index 000000000000..e3b50ab29bad
--- /dev/null
+++ b/dev-util/wstool-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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(-)] >=dev-python/vcstools-0.1.38[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/sphinx test? ( dev-python/nose[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/coverage[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 dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) >=dev-vcs/git-1.8.2.1[curl] 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=Commands to manage several local SCM repositories for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/wstool
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=BSD
+RDEPEND=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(-)] >=dev-python/vcstools-0.1.38[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_=7f01edbb324b7c940bf1c8afd083c4e1
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
deleted file mode 100644
index 32fa552af5e0..000000000000
--- a/dev-util/wstool/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
-DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
-DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
-EBUILD wstool-0.1.13.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
-EBUILD wstool-0.1.17.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
-EBUILD wstool-9999.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
-MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch
deleted file mode 100644
index 934443f98707..000000000000
--- a/dev-util/wstool/files/prefix2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: wstool-0.1.13/setup.py
-===================================================================
---- wstool-0.1.13.orig/setup.py
-+++ wstool-0.1.13/setup.py
-@@ -26,18 +26,11 @@ def _resolve_prefix(prefix, type):
-     # issue: https://github.com/vcstools/wstool/issues/81
-     osx_system_prefix = '/System/Library/Frameworks/Python.framework/Versions'
-     if type == 'man':
--        if prefix == '/usr':
--            return '/usr/share'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local/share'
-+        return os.path.join(prefix, 'share')
-     elif type == 'bash_comp':
--        if prefix == '/usr':
--            return '/'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     elif type == 'zsh_comp':
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     else:
-         raise ValueError('not supported type')
-     return prefix
diff --git a/dev-util/wstool/metadata.xml b/dev-util/wstool/metadata.xml
deleted file mode 100644
index 8df7d893c82b..000000000000
--- a/dev-util/wstool/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vcstools/wstool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
deleted file mode 100644
index 68bf771bb166..000000000000
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-PATCHES=( "${FILESDIR}/prefix2.patch" )
-DISTUTILS_IN_SOURCE_BUILD="yes"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
-}
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
deleted file mode 100644
index 0c19d47c0322..000000000000
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-PATCHES=( "${FILESDIR}/prefix2.patch" )
-DISTUTILS_IN_SOURCE_BUILD="yes"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
-}
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
deleted file mode 100644
index 0c19d47c0322..000000000000
--- a/dev-util/wstool/wstool-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=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-PATCHES=( "${FILESDIR}/prefix2.patch" )
-DISTUTILS_IN_SOURCE_BUILD="yes"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
-}
diff --git a/dev-util/wxglade-0.6.3-r3 b/dev-util/wxglade-0.6.3-r3
new file mode 100644
index 000000000000..1926590485f1
--- /dev/null
+++ b/dev-util/wxglade-0.6.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC code
+EAPI=6
+HOMEPAGE=http://wxglade.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=MIT
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.6.3.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d85b5db27da75ce5b1ef24b17e3cabfa
diff --git a/dev-util/wxglade-0.8.2 b/dev-util/wxglade-0.8.2
new file mode 100644
index 000000000000..cb2ebdc99bb8
--- /dev/null
+++ b/dev-util/wxglade-0.8.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC code
+EAPI=6
+HOMEPAGE=http://wxglade.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~ppc sparc x86
+LICENSE=MIT
+RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f6ada5d30cc62bfed8acc4b6584be432
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
deleted file mode 100644
index 717457158fc4..000000000000
--- a/dev-util/wxglade/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
-DIST wxGlade-0.6.3.tar.gz 595243 BLAKE2B 748369ab08cb114c9fabf046a981dd955532b7752b176c616e9660fc74eade1db3b6bf08669f5373586880fe7798ff96a7ce588878ea129a7c9d7c76a8bc2e3e SHA512 7cb8cb99f2a3d97c2aa43a6ad5cbb8c1b6aafff0e5d120fca1760acbb44d2c8fb3bf8a4d5b42055e1b4bef061bfdbe8eee884f4e087b9d6572874b5b818a61f9
-DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.6.3-r3.ebuild 1127 BLAKE2B abd1d19ce4d1668354f3e1c4607efa6b446d5af0703ab60cdb583d0807596327a2bf68fcf15726a424b620148aa8032c2b8025f7a6abd42be6da1d9e32ffc743 SHA512 60d54c5d1d36570b65a0319f99bb0921ef1f35c5e742d0cf060871ed36a58a178e37858d087c4be14540a48564bbc1dd6f774cd6a5a0523928a8711057171c6c
-EBUILD wxglade-0.8.2.ebuild 1101 BLAKE2B 25326cd03c46e54954bf83618bf898439115977fcf191a135522acd3b8aaab437d483545bf53a507da067abaf24f0347055584c843b4e7b1b65256a4424ea71f SHA512 9609d6234b87d9f7c39bdfa24b9858fd538b3b1ea941e14875871384ff294339355dbd520abf6230b24320872896035ffe5e600b7bc1a684985d8e8a65493aec
-MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
deleted file mode 100644
index f788e0bff492..000000000000
--- a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxGlade-0.6.1-orig/main.py wxGlade-0.6.1/main.py
---- wxGlade-0.6.1/main.py	2007-10-25 01:03:22.000000000 -0600
-+++ wxGlade-0.6.1/main.py	2007-12-04 09:36:20.000000000 -0600
-@@ -7,7 +7,7 @@
- # THIS PROGRAM COMES WITH NO WARRANTY
- 
- import wxversion
--wxversion.ensureMinimal("2.6")
-+wxversion.select("2.8")
- 
- #from wxPython.wx import *
- import wx
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
deleted file mode 100644
index a2cf0a120bb2..000000000000
--- a/dev-util/wxglade/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>wxwidgets@gentoo.org</email>
-		<name>Gentoo wxWidgets Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wxglade</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild b/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
deleted file mode 100644
index e307c940a1e8..000000000000
--- a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_P="wxGlade-${PV}"
-
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:2.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-wxversion.patch )
-
-src_compile() {
-	python_fix_shebang wxglade.py
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt TODO.txt
-	newicon icons/icon.xpm wxglade.xpm
-	doman debian/wxglade.1
-	dodoc -r docs
-	rm -r debian docs || die
-
-	python_moduleinto /usr/lib/wxglade
-	python_domodule .
-	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
-	fperms 775 /usr/lib/wxglade/wxglade.py
-	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
deleted file mode 100644
index 98df5e4d387e..000000000000
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ /dev/null
@@ -1,51 +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 eutils python-single-r1
-
-MY_P="wxGlade-${PV}"
-
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" #656934
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	python_fix_shebang wxglade.py
-}
-
-src_install() {
-	einstalldocs
-
-	# Install a bigger icon
-	newicon docs_old/html/mondrian_200x200.png ${PN}.png
-
-	dodoc -r docs
-	rm -r docs docs_old || die
-
-	python_moduleinto /usr/lib/wxglade
-	python_domodule .
-	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
-	fperms 775 /usr/lib/wxglade/wxglade.py
-	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
diff --git a/dev-util/xdelta-1.1.4-r1 b/dev-util/xdelta-1.1.4-r1
new file mode 100644
index 000000000000..5abf0bcd6842
--- /dev/null
+++ b/dev-util/xdelta-1.1.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Computes changes between binary or text files and creates deltas
+EAPI=0
+HOMEPAGE=https://xdelta.googlecode.com/
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2 >=sys-libs/zlib-1.1.4
+SLOT=0
+SRC_URI=https://xdelta.googlecode.com/files/xdelta-1.1.4.tar.gz
+_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_=cb1fa5c7e67755b1ec208a58b599d881
diff --git a/dev-util/xdelta-3.0.11 b/dev-util/xdelta-3.0.11
new file mode 100644
index 000000000000..69d4d16d55d0
--- /dev/null
+++ b/dev-util/xdelta-3.0.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=lzma? ( app-arch/xz-utils:= )
+DESCRIPTION=Computes changes between binary or text files and creates deltas
+EAPI=6
+HOMEPAGE=http://xdelta.org/
+IUSE=examples lzma
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=lzma? ( app-arch/xz-utils:= )
+SLOT=3
+SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.0.11/xdelta3-3.0.11.tar.gz
+_md5_=62c0a7dcd3d85916f7cce39848a668da
diff --git a/dev-util/xdelta-3.1.0 b/dev-util/xdelta-3.1.0
new file mode 100644
index 000000000000..7355cb7df41d
--- /dev/null
+++ b/dev-util/xdelta-3.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup test
+DEPEND=app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.14* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Computes changes between binary or text files and creates deltas
+EAPI=6
+HOMEPAGE=http://xdelta.org/
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=app-arch/xz-utils
+SLOT=3
+SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=14a01e537d2aa95b5479d2dc7de8a661
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
deleted file mode 100644
index 9f04284992ce..000000000000
--- a/dev-util/xdelta/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX xdelta-1.1.4-glib2.patch 4545 BLAKE2B ea73867aa9f09ee70c5bd6708c2cc2eeb9a8de1878168641e517744dabcb9f49ed62bbac1d9cfb1704d06acc32285741a3a4076a7f8a1e383967ef70f4ac2410 SHA512 563a99d6007228ef2e0f838cc66251918b875ce779f12fa03015dc97d14379951fd9d2a165b7562e97ad41931ac8ca0a535941cbd4605b5f67e176d1f9d31288
-AUX xdelta-1.1.4-m4.patch 458 BLAKE2B 802797681fcee8a7f07babe3e4598677704ca43548e4a88b1bbfa364cede17bcdca68e2fe7dad7c5e4f01c1bcdf88ec47879ec89352b7ab0765043b2579cefe7 SHA512 f932359b311cffbe711a006a670dbeb2ebcea2386f04bcd3ce38ffd0d743f7c0aa4138b5a781942dc02c40950982b2f295b9a79935dce3666c4ae1dd7d068fd3
-AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3dfe96d61c3cf62b57c85f0b697612473355775008ac224192e6800a3cff447357a1e24961f86b5615f8c7cb4cc5c0f SHA512 08428227f9aa15e373f2fc81a097e3aad7df2d53d65172da9d1da3c81c52b9d646ad8d1f0f69533e4486cf72e4cf8ec106e948dc0c9a1cd1aad8732ceb4aeeb5
-DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
-DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
-DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
-EBUILD xdelta-1.1.4-r1.ebuild 896 BLAKE2B b6b0f32c7c4b2571258628b756dda26f5128ca366ddb1914bb3bed3982dca080a8db05fef23bd42456ef1ca27ab5cef8c1659902754905f883dcf31c1fa251d0 SHA512 b4952b33ee40c5cbc73e1e959b7a8b595c6e0a43497f7e178e28901a0e3b417f06df03c123fcbfc3b42c8419cff0b135d59702af7f321f85feac623dc9550ece
-EBUILD xdelta-3.0.11.ebuild 862 BLAKE2B a151c595a7422c0d90386ccce7094ce244f4c4c268550a4b2905a6e5cab9dddb6a5e1c1fac16e5d1b86155101393fc91eb46585177ff137863f8a0c9ab5a7d1d SHA512 6d408819074a0c469a5400bb9d6efac06db1da7b5730340aac61a29c3eb8d0c8b902e6c547090beaef54f4caa3fb41453bea1c985b8bc0a644bd9c0a00352a0e
-EBUILD xdelta-3.1.0.ebuild 1134 BLAKE2B 26ad2f326edca11f9da317de66aa45278fd6bd9db99567695b405af244ebc1940dece6ff0d5d766f83bea901df5f4151940f3bf57c4eb7eeed5bee7864f308c2 SHA512 5e38e5fd5548ac6aa9eb2aab8c81539f99e7e1fc4940019888354dd78c769ef6be8ac7e38b624b4c95acf1d45d532ab58ffb7d92f3e0b60f2d1b9d73cea1d0e6
-MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch b/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch
deleted file mode 100644
index 916b3ee2c007..000000000000
--- a/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/xdelta-1.1.4-glib2.patch
-
-
---- xdelta-1.1.4pre1/libedsio/edsio.c.glib2	2007-01-29 14:55:10.000000000 +0100
-+++ xdelta-1.1.4pre1/libedsio/edsio.c	2007-01-29 14:56:52.000000000 +0100
-@@ -179,9 +179,9 @@
- 		    }
- 		}
- 
--	      while (g_queue_get_size (queued) > 0)
-+	      while (g_queue_get_length (queued) > 0)
- 		{
--		  DelayedEvent* de = g_queue_pop (queued);
-+		  DelayedEvent* de = g_queue_pop_head (queued);
- 
- 		  for (i = 0; i < all_event_watchers->len; i += 1)
- 		    {
-@@ -211,7 +211,7 @@
- 	      de->def = def;
- 	      de->msg = out->str;
- 
--	      g_queue_push (queued, de);
-+	      g_queue_push_tail (queued, de);
- 
- 	      g_ptr_array_add (free_strings, out);
- 	    }
-@@ -1482,129 +1482,3 @@
-   g_free (source);
- }
- 
--/* Missing glib stuff
-- */
--
--GQueue *
--g_queue_new (void)
--{
--  GQueue *q = g_new (GQueue, 1);
--
--  q->list = q->list_end = NULL;
--  q->list_size = 0;
--
--  return q;
--}
--
--
--void
--g_queue_free (GQueue *q)
--{
--  if (q)
--    {
--      if (q->list)
--        g_list_free (q->list);
--      g_free (q);
--    }
--}
--
--
--guint
--g_queue_get_size (GQueue *q)
--{
--  return (q == NULL) ? 0 : q->list_size;
--}
--
--
--void
--g_queue_push_front (GQueue *q, gpointer data)
--{
--  if (q)
--    {
--      q->list = g_list_prepend (q->list, data);
--
--      if (q->list_end == NULL)
--        q->list_end = q->list;
--
--      q->list_size++;
--    }
--}
--
--
--void
--g_queue_push_back (GQueue *q, gpointer data)
--{
--  if (q)
--    {
--      q->list_end = g_list_append (q->list_end, data);
--
--      if (! q->list)
--        q->list = q->list_end;
--      else
--        q->list_end = q->list_end->next;
--
--      q->list_size++;
--    }
--}
--
--
--gpointer
--g_queue_pop_front (GQueue *q)
--{
--  gpointer data = NULL;
--
--  if ((q) && (q->list))
--    {
--      GList *node;
--
--      node = q->list;
--      data = node->data;
--
--      if (! node->next)
--        {
--          q->list = q->list_end = NULL;
--          q->list_size = 0;
--        }
--      else
--        {
--          q->list = node->next;
--          q->list->prev = NULL;
--          q->list_size--;
--        }
--
--      g_list_free_1 (node);
--    }
--
--  return data;
--}
--
--
--gpointer
--g_queue_pop_back (GQueue *q)
--{
--  gpointer data = NULL;
--
--  if ((q) && (q->list))
--    {
--      GList *node;
--
--      node = q->list_end;
--      data = node->data;
--
--      if (! node->prev)
--	{
--          q->list = q->list_end = NULL;
--          q->list_size = 0;
--        }
--      else
--	{
--          q->list_end = node->prev;
--          q->list_end->next = NULL;
--          q->list_size--;
--        }
--
--      g_list_free_1 (node);
--    }
--
--  return data;
--}
---- xdelta-1.1.4pre1/libedsio/edsio.h.glib2	2007-01-29 14:54:38.000000000 +0100
-+++ xdelta-1.1.4pre1/libedsio/edsio.h	2007-01-29 14:55:00.000000000 +0100
-@@ -481,49 +481,6 @@
- 
- #endif
- 
--/* Missing glib stuff
-- */
--
--typedef struct _GQueue		GQueue;
--
--struct _GQueue
--{
--  GList *list;
--  GList *list_end;
--  guint list_size;
--};
--
--/* Queues
-- */
--
--GQueue *	g_queue_new		(void);
--void		g_queue_free		(GQueue *q);
--guint		g_queue_get_size	(GQueue *q);
--void		g_queue_push_front	(GQueue *q, gpointer data);
--void		g_queue_push_back	(GQueue *q, gpointer data);
--gpointer	g_queue_pop_front	(GQueue *q);
--gpointer	g_queue_pop_back	(GQueue *q);
--
--#define g_queue_empty(queue) \
--	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE)
--
--#define g_queue_peek_front(queue) \
--	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
--		((GQueue *)(queue))->list->data : NULL)
--
--#define g_queue_peek_back(queue) \
--	((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \
--		((GQueue *)(queue))->list_end->data : NULL)
--
--#define g_queue_index(queue,ptr) \
--	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
--		g_list_index (((GQueue *)(queue))->list, (ptr)) : -1)
--
--#define		g_queue_push		g_queue_push_back
--#define		g_queue_pop		g_queue_pop_front
--#define		g_queue_peek		g_queue_peek_front
--
--
- #ifdef __cplusplus
- }
- #endif
---- xdelta-1.1.4pre1/configure.in.glib2	2007-01-29 14:58:06.000000000 +0100
-+++ xdelta-1.1.4pre1/configure.in	2007-01-29 14:59:18.000000000 +0100
-@@ -71,8 +71,8 @@
- top_srcdir_absolute=`cd $srcdir; pwd`
- AC_SUBST(top_srcdir_absolute)
- 
--AM_PATH_GLIB(1.2.8,,
--  AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
-+AM_PATH_GLIB_2_0(2.10.0,,
-+  AC_MSG_ERROR(Test for GLIB2.0 failed. Download it from ftp://ftp.gtk.org/pub/gtk/v2.10/))
- 
- dnl AC_CHECK_LIB(z, gzsetparams, */
- dnl   AC_CHECK_HEADER(zlib.h,, */
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-m4.patch b/dev-util/xdelta/files/xdelta-1.1.4-m4.patch
deleted file mode 100644
index ad8c99de5970..000000000000
--- a/dev-util/xdelta/files/xdelta-1.1.4-m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
-+++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl
- dnl Get the cflags and libraries from the xdelta-config script
- dnl
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch b/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch
deleted file mode 100644
index bb509b8d4356..000000000000
--- a/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/xdelta-1.1.3-pkgconfig.patch
-
---- /dev/null	2006-05-17 14:47:01.398050000 +0200
-+++ xdelta-1.1.3/xdelta.pc.in	2006-05-30 16:00:55.000000000 +0200
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+pkgdatadir=@pkgdatadir@
-+
-+Name: xdelta
-+Description: A binary file delta generator and an RCS replacement library.
-+Version: @VERSION@
-+Requires: glib-2.0
-+Libs: -L${libdir} -lxdelta -ledsio
-+Cflags: -I${includedir}
-+
---- /dev/null	2006-05-17 14:47:01.398050000 +0200
-+++ xdelta-1.1.3/xdelta-config	2006-05-30 16:04:22.000000000 +0200
-@@ -0,0 +1,60 @@
-+#!/bin/bash
-+#
-+# Simple wrapper around pkg-config to replace /usr/bin/<foo>-config scripts
-+# 
-+# Copyright 2006 Red Hat, Inc.  
-+# Jeremy Katz <katzj@redhat.com>
-+
-+CFGPATH=$(basename $0)
-+MODULE=${CFGPATH%-config}
-+
-+usage() {
-+    pkg-config --help
-+    exit 1
-+}
-+
-+if [ $# -lt 1 ]; then
-+    usage 1>&2
-+fi
-+
-+ARGS=""
-+
-+while test $# -gt 0; do
-+  case $1 in 
-+      --version)
-+	  ARGS="$ARGS --modversion"
-+	  ;;
-+      --cflags)
-+	  ARGS="$ARGS --cflags"
-+	  ;;
-+      --libs)
-+	  ARGS="$ARGS --libs"
-+	  ;;
-+      --libdir*)
-+	  ARGS="$ARGS --libs-only-L"
-+	  ;;
-+      --includedir*)
-+	  ARGS="$ARGS --cflags-only-I"
-+	  ;;
-+      --prefix*)
-+          ARGS="$ARGS --variable=prefix"
-+          ;;
-+      --exec-prefix*)
-+          ARGS="$ARGS --variable=exec_prefix"
-+          ;;
-+      --module*)
-+	  if echo $1 | grep -q '=' ; then
-+	      MODULE=`echo $1 | sed 's/^--module=//'`
-+	  else
-+	      MODULE=$2
-+	      shift
-+	  fi
-+	  ;;
-+      *)
-+	  usage 1>&2
-+	  ;;
-+  esac
-+  shift
-+done
-+
-+pkg-config $ARGS $MODULE
---- xdelta-1.1.3/Makefile.am.pkgconfig	2006-05-30 16:00:55.000000000 +0200
-+++ xdelta-1.1.3/Makefile.am	2006-05-30 16:00:55.000000000 +0200
-@@ -27,6 +27,9 @@
- m4datadir = $(datadir)/aclocal
- m4data_DATA = xdelta.m4
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = xdelta.pc
-+
- ## $Format: "libxdelta_la_LDFLAGS = -version-info $LibCurrent$:$LibRevision$:$LibAge$" $
- libxdelta_la_LDFLAGS = -version-info 2:0:0
- 
---- xdelta-1.1.3/configure.in.pkgconfig	2006-05-30 16:00:55.000000000 +0200
-+++ xdelta-1.1.3/configure.in	2006-05-30 16:00:55.000000000 +0200
-@@ -63,6 +63,8 @@
- AC_HEADER_STDC
- AC_PROG_MAKE_SET
- 
-+PKG_PROG_PKG_CONFIG
-+
- AC_CHECK_FUNCS(gettimeofday)
- AC_HEADER_TIME
- 
-@@ -83,7 +85,7 @@
- 	  doc/Makefile
-           test/Makefile
-           djgpp/Makefile
--	  xdelta-config
-+	  xdelta.pc
- 	  libedsio/Makefile
- 	  libedsio/edsio-comp,
- 
diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
deleted file mode 100644
index 132ebadbee23..000000000000
--- a/dev-util/xdelta/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>
-		<remote-id type="google-code">xdelta</remote-id>
-		<remote-id type="github">jmacd/xdelta-devel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/xdelta/xdelta-1.1.4-r1.ebuild b/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
deleted file mode 100644
index c28337de165e..000000000000
--- a/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="https://xdelta.googlecode.com/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=sys-libs/zlib-1.1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-glib2.patch
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
deleted file mode 100644
index 2f2e7eb8bc51..000000000000
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=xdelta3-${PV}
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="http://xdelta.org/"
-SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-fbsd"
-IUSE="examples lzma"
-
-RDEPEND="lzma? ( app-arch/xz-utils:= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_with lzma liblzma)
-}
-
-src_compile() {
-	# avoid building tests
-	emake xdelta3
-}
-
-src_test() {
-	emake xdelta3regtest
-	./xdelta3regtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-binPROGRAMS install-man1
-	dodoc draft-korn-vcdiff.txt README.md
-	use examples && dodoc -r examples
-}
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
deleted file mode 100644
index a3f444acd4c2..000000000000
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WANT_AUTOMAKE=1.14
-inherit autotools python-any-r1
-
-MY_P=xdelta3-${PV}
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="http://xdelta.org/"
-SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="examples test"
-
-RDEPEND="app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	# huh
-	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
-	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
-
-	# only build tests when required
-	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
-	eautomake
-}
-
-src_test() {
-	default
-	./xdelta3regtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc draft-korn-vcdiff.txt README.md
-	use examples && dodoc -r examples
-}
diff --git a/dev-util/xesam-tools-0.7.0-r1 b/dev-util/xesam-tools-0.7.0-r1
new file mode 100644
index 000000000000..9f982c76f51f
--- /dev/null
+++ b/dev-util/xesam-tools-0.7.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Development tools and examples for the Xesam desktop search API
+EAPI=5
+HOMEPAGE=http://xesam.org/people/kamstrup/xesam-tools
+IUSE=examples python_targets_python2_7
+KEYWORDS=~x86 ~amd64
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://xesam.org/people/kamstrup/xesam-tools/xesam-tools-0.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08672d8b5060b81f344a2187d14c528e
diff --git a/dev-util/xesam-tools/Manifest b/dev-util/xesam-tools/Manifest
deleted file mode 100644
index 27a10b045b10..000000000000
--- a/dev-util/xesam-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xesam-tools-0.7.0.tar.gz 73173 BLAKE2B f1d8f69d18bd72db4ca40131be8c2e9eac8752d18d8958e343e0c6dd5e49b7a6d89399aec4e4306d2f3c35fddbf4530deff4f9fd09ed0c47b2cc59694ff6baec SHA512 3428e18eb52fa205bca872c8b0b1f12f01f58a8fb43239bc2cc78fe52f9903940702dae4116d4775340b69ec949ad2198b57c0c1246fe58dd8ed8b7a6562bf71
-EBUILD xesam-tools-0.7.0-r1.ebuild 882 BLAKE2B 25d449d3fcdaa598d46480b6cb4d297de08bf89a6af925b604cae89735dc45e6a6100d0b7da10c9785611e2032733a36fc115f2c1d838cce85cb9d4ed0d964d8 SHA512 ed796ebb4d4698fe04c6f8d5b88a969238018789fa1a7088900ea6856ec68b27b83f0e3d502911aed45113cc21de624e051fe52824ab264e24ff2c816ced849e
-MISC metadata.xml 392 BLAKE2B 3ae2a8f256053d6fa0322ea781210ecc3e225bb0eb67e53edfca71a6dc57fb8e5bd283a1b839f25f8bc3bfaf526a88acc4f1d8c83a8cfabc5a90d0883a995a61 SHA512 10e2dafc4fdaa7f851db74280e47df4f37885d2919383d15f9d51004858d3221178052d55c6fe53fcab101389c1ed028c1d9c4e7ca72360c4620c563ae2a7cdf
diff --git a/dev-util/xesam-tools/metadata.xml b/dev-util/xesam-tools/metadata.xml
deleted file mode 100644
index 9c8fd938d1b4..000000000000
--- a/dev-util/xesam-tools/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-needed -->
-  <longdescription lang="en">
-    xesam-tools provides a set of tools and examples to help developers
-    who are working on servers or clients which implement the Xesam desktop
-    search specification
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
deleted file mode 100644
index c3a780d7fb7e..000000000000
--- a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Development tools and examples for the Xesam desktop search API"
-HOMEPAGE="http://xesam.org/people/kamstrup/xesam-tools"
-SRC_URI="http://xesam.org/people/kamstrup/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto "/usr/share/doc/${PF}"
-	doins -r samples
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/demo"
-		doins "demo/demo.py"
-		insopts -m 0755
-		doins demo/[^d]*
-	fi
-}
diff --git a/dev-util/xfce4-dev-tools-4.12.0-r1 b/dev-util/xfce4-dev-tools-4.12.0-r1
new file mode 100644
index 000000000000..9a8b54f6c3e5
--- /dev/null
+++ b/dev-util/xfce4-dev-tools-4.12.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=dev-libs/glib-2.30 virtual/pkgconfig
+DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
+EAPI=6
+HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.12/xfce4-dev-tools-4.12.0.tar.bz2
+_md5_=881afccc99cd4ab49c0c50f174736634
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
deleted file mode 100644
index 5e34d771950c..000000000000
--- a/dev-util/xfce4-dev-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
-EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 636 BLAKE2B 15bf5d8a506fdeceb514136f361e6acf9ad689f7f101a9e807142af2c47b52d873d6f4a012e7ef5e6084d502bb69f7a5edfbb53fe0b9943fae81370bf7dd6bae SHA512 916e923df35f61c3b4333411273241bc0b3ef74be4a9231ff247d6cde9b8ef87ebf4868b3e8d4711072e7cc4ba70757b802d71d181202046f0b65566bbc5acac
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/metadata.xml b/dev-util/xfce4-dev-tools/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/dev-util/xfce4-dev-tools/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>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
deleted file mode 100644
index b5f323b6aaf0..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
diff --git a/dev-util/xmlindent-0.2.17-r2 b/dev-util/xmlindent-0.2.17-r2
new file mode 100644
index 000000000000..59f8fd248b31
--- /dev/null
+++ b/dev-util/xmlindent-0.2.17-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-devel/flex
+DESCRIPTION=XML stream reformatter for ASCII text, but not UTF-8, written in ANSI C
+EAPI=6
+HOMEPAGE=http://xmlindent.sourceforge.net/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/xmlindent/xmlindent-0.2.17.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a5b455f07743e2f3acd2e63a58b6a399
diff --git a/dev-util/xmlindent/Manifest b/dev-util/xmlindent/Manifest
deleted file mode 100644
index 7930f8777c2e..000000000000
--- a/dev-util/xmlindent/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmlindent-0.2.17.tar.gz 18333 BLAKE2B 5d72679e95cfa9528a94222b31b320993b32588ea18c48b251ceb24147eed57a5308f6ed2ae68a9a2d620107c21b512f16ebc51caa834225b138700f66e2a3d5 SHA512 ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716
-EBUILD xmlindent-0.2.17-r2.ebuild 611 BLAKE2B 6ac161b5a804c642bf270e6f8675ecd5a51c759ed828dee70c456d2ebffffb9c814da56a8940ebe56756d5cd7033df1854a26ae8105dbf56087ed10bf39c9d43 SHA512 201330b1e86adb054dd5863d8c5d07fe2f70d3eac18edd8ae1262b710db1162784a1da0f8e3b1f5ec87de67e8c51ee8f845bdbe884043e9dc000db7687285eab
-MISC metadata.xml 330 BLAKE2B 4e83d8f1654b617fc1e2dd887e2523e7e8fdee3ec0cec2b3196f15576a9992c42601f630033da60555ea153a83fd80f7c2ddefb6bac9cfb31eb58e0fe0168d84 SHA512 0b23db5bd25122e4498effc8a36b9015e619b68cebacc103849c9827ebc9e73c790334b7bc90e771f5da8946ba3ac41aff9458a5dc13784fe1ffbfd0379476f5
diff --git a/dev-util/xmlindent/metadata.xml b/dev-util/xmlindent/metadata.xml
deleted file mode 100644
index 9cd695dbdcf0..000000000000
--- a/dev-util/xmlindent/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>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xmlindent</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
deleted file mode 100644
index 3b038a3ca663..000000000000
--- a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="XML stream reformatter for ASCII text, but not UTF-8, written in ANSI C"
-HOMEPAGE="http://xmlindent.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlindent/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-	sed -i Makefile \
-		-e 's|gcc|$(CC)|g' \
-		-e 's|-g|$(CFLAGS) $(LDFLAGS) |g' \
-		|| die "sed failed"
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin "${PN}"
-	doman *.1
-}
diff --git a/dev-util/xxdi-1.0.0 b/dev-util/xxdi-1.0.0
new file mode 100644
index 000000000000..ef4ffb921426
--- /dev/null
+++ b/dev-util/xxdi-1.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Simple alternative to vim's 'xxd -i' mode
+EAPI=5
+HOMEPAGE=https://github.com/gregkh/xxdi
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/File-Slurp
+SLOT=0
+SRC_URI=https://github.com/gregkh/xxdi/archive/v001.tar.gz -> xxdi-1.0.0.tar.gz
+_md5_=eb2e4dfeb33559d6596c4fb921a8745f
diff --git a/dev-util/xxdi/Manifest b/dev-util/xxdi/Manifest
deleted file mode 100644
index b956dbaf0924..000000000000
--- a/dev-util/xxdi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xxdi-1.0.0.tar.gz 8039 BLAKE2B bc881ea566e5f34f03a9c9f2adb42294cf75fb5f663537491a14d393d5e55ba571afe211277bab2f5dfb3128f98b20832430295a71cce255b0196e2448a0b853 SHA512 ebf026f61f0b0a339e3dfa5c9dd6a819ef23f0d29948073cbf5f6ae9668e68a7dd903f695ab5a824494f8424dad8b79aace5742bc23484a25303a15aa32ab698
-EBUILD xxdi-1.0.0.ebuild 524 BLAKE2B df32d03eeb37f01060d9fd573d656ad23ff05ec8128203859b6e80bc6eb5ad0803c934b0f8f567c6220b8884b845bc3d4607d6045d8df37804ced92a9a78bd7d SHA512 fb0557381100c993af68928e186c007f216ea0eb1a9ddab2b1f6da3c8ed6ee9ff502ab555d8d40c9be4a08870e7450f363775b8abbaabd99632fd44839213d21
-MISC metadata.xml 725 BLAKE2B 33538c0cfbeba53623ea742ff310ec5221ba0eb344a000029d65735dc86b968e5d769c6dc80220a02607c80c08b6dd3c65adfb6b4d395d50fe0893b99f4d98e0 SHA512 e123546a703ba283f8f4cebdf737d911d88405fd7a36b991939497891eef66ca2253711dba21b67a3ce58bf1fadb21054c20464c05e2cf42295cd1eef8cb6626
diff --git a/dev-util/xxdi/metadata.xml b/dev-util/xxdi/metadata.xml
deleted file mode 100644
index 2e483a030941..000000000000
--- a/dev-util/xxdi/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		xxdi.pl is a perl script that implements vim's 'xxd -i' mode
-		so that packages do not have to use all of vim just to get this
-		functionality.
-
-		efitools is an example of a package that uses it in this manner,
-		and in some build configurations, mediastreamer also does.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>gregkh@linuxfoundation.org</email>
-			<name>Greg Kroah-Hartman</name>
-		</maintainer>
-		<bugs-to>https://github.com/gregkh/xxdi/issues</bugs-to>
-		<remote-id type="github">gregkh/xxdi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
deleted file mode 100644
index e5a189229eee..000000000000
--- a/dev-util/xxdi/xxdi-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_VERSION=001
-
-DESCRIPTION="Simple alternative to vim's 'xxd -i' mode"
-HOMEPAGE="https://github.com/gregkh/xxdi"
-SRC_URI="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/File-Slurp"
-
-S=${WORKDIR}/${PN}-${MODULE_VERSION}
-
-src_install() {
-	dobin xxdi.pl
-	dodoc README.md
-}
diff --git a/dev-util/xxdiff-4.0.1_p20170622 b/dev-util/xxdiff-4.0.1_p20170622
new file mode 100644
index 000000000000..2a8146bb1a8d
--- /dev/null
+++ b/dev-util/xxdiff-4.0.1_p20170622
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/yacc 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 graphical file and directories comparator and merge tool
+EAPI=6
+HOMEPAGE=http://furius.ca/xxdiff/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 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/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e6f7f7a0c16fd412036ecc332428efb
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
deleted file mode 100644
index 4f45b318764b..000000000000
--- a/dev-util/xxdiff/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
-AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
-DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
-EBUILD xxdiff-4.0.1_p20170622.ebuild 1249 BLAKE2B 90dbc2261d04e017fcf4a251c2964483da5e31cb2215ffb43b9971a0c377eeca3b62460d67521ba0594a78af98bd9106e358c4af9c6af5ed370d7d28993482dc SHA512 9b68deff4c16d1b76c1161a23a656dea72b0622bc9fd7b0679e751e1efcdf10748d41cfb3eb27df3c872123b082947fb4dc290c2f3653244a108a9f4ce88757d
-MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
deleted file mode 100644
index 93162cc615b4..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Build failure triggers on CXXFLAGS=-Werror=terminate
-
-  cmdline.cpp: In destructor ‘virtual XxCmdline::~XxCmdline()’:
-  ./defs.h:121:43: error: throw will always call terminate() [-Werror=terminate]
-      { throw XxInternalError( XX_EXC_PARAMS ); }                                           ^
-  cmdline.cpp:369:7: note: in expansion of macro ‘XX_ASSERT’
-
-https://bugs.gentoo.org/601018
-diff --git a/src/cmdline.cpp b/src/cmdline.cpp
-index 8cb0ac9..174b9a4 100644
---- a/src/cmdline.cpp
-+++ b/src/cmdline.cpp
-@@ -368,3 +368,2 @@ XxCmdline::~XxCmdline()
-    for ( int ii = 0; ii < _nbQtOptions; ++ii ) {
--      XX_ASSERT( _qtOptions[ii] != 0 );
- #ifndef WINDOWS
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
deleted file mode 100644
index b16a7c4072f9..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-In gentoo qt5 already requires c++11 features:
-
-diff --git a/src/xxdiff.pro b/src/xxdiff.pro
-index 32b106b..16fcd1f 100644
---- a/src/xxdiff.pro
-+++ b/src/xxdiff.pro
-@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000
- # auto_ptr deprecated in C++11, removed in C++17
--linux: QMAKE_CXXFLAGS += -std=c++03
-+linux: QMAKE_CXXFLAGS += -std=c++11
- 
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
deleted file mode 100644
index 95131383c5a8..000000000000
--- a/dev-util/xxdiff/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>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xxdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
deleted file mode 100644
index fc8ccfa8156b..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.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 )
-
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-# generated as 'hg archive xxdiff-${P}.tar'
-# from https://bitbucket.org/blais/xxdiff tree
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
-	"${FILESDIR}"/${P}-cxx11.patch
-)
-
-src_configure() {
-	pushd src >/dev/null || die
-		# mimic src/Makefile.bootstrap
-		eqmake5
-		cat Makefile.extra >> Makefile || die
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	emake -C src MAKEDIR=.
-
-	distutils-r1_src_compile
-	HTML_DOCS+=(
-		doc/*.{png,html}
-		src/doc.html
-	)
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
-}
diff --git a/dev-util/yacc-1.9.1-r6 b/dev-util/yacc-1.9.1-r6
new file mode 100644
index 000000000000..dbcf8f1028df
--- /dev/null
+++ b/dev-util/yacc-1.9.1-r6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postrm preinst prepare
+DESCRIPTION=Yacc: Yet Another Compiler-Compiler
+EAPI=6
+HOMEPAGE=http://dinosaur.compilertools.net/#yacc
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/yacc-1.9.1.tar.Z
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fcb0112607288d1fbcafdb2b701c8dfb
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
deleted file mode 100644
index 4431f3cfd38b..000000000000
--- a/dev-util/yacc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX yacc-1.9.1-CVE-2008-3196.patch 1199 BLAKE2B 665c89923dd7e9860518cff582390b74fafbed00b206d972455a46ceea90c7231e52dfbe41fdfc5f09d92a8e50655e9df3b180a5146ade4c3ec6cb68fc9b4257 SHA512 7c636f5b6d98d4bf33b60ae1c49079fc849c35ca9f84e3277bafc58d9689c7b8021af34c3d7411d8637b1c821036105e73b6d5770241de72d5358718a052abf3
-AUX yacc-1.9.1-ia64.patch 504 BLAKE2B b9733e07639ce5bc456576237be7623cae2f488f13bbc203dd0f81e7174c4f51e23ae498d80278ff1fc7873af456844087c72096ec05d621598362c048c68357 SHA512 6525f6c3f9d0011fea00781a24fb0f2d4f80a13835746d8ea8b05a762d789d5f17984da04f32178dbdd73ab098be38fe044bf108ed2e145888cf5ebfe84bb1ec
-AUX yacc-1.9.1-mkstemp.patch 417 BLAKE2B 1413aab68d930593c707723683a1a7938b4bf9d09671cb3539785ec163aa09a0e0bbbd1fee0657e34a8ac03fb9d71a97f1d1dda1af7329f56cda79f93fcb6de2 SHA512 c36d07d4fafc363fcb0173fc17cf4e37dfe20fcfe7df7faaa11d5cc47f9b933a4f192c55f738d1cdcf7f87ddb07311bbc54aa502d8e68b8e7831bf1daba8da03
-DIST yacc-1.9.1.tar.Z 64805 BLAKE2B 3eeebea1dad52a26c8e90ae6aec99fe3643f040100af4516faed02295b203f717a41aec0231ecee97aa31b14c9c29cae6704e875a03e8b18a71255be9859dd09 SHA512 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80
-EBUILD yacc-1.9.1-r6.ebuild 1550 BLAKE2B 74ae2b08beff20bd7bc5732b4b4f0b0418c3d017ba7d525745c55dabfb91aef2d9d7662efb5fac40b8ef285763b2ddee85c387f131a39ddd20158329ef3f55bf SHA512 b3beb6e9a2fc0d09044bcf4cd4b22ac4496659e518633a0ca7caaec91f933405fbb06c0571ecd557fc8496e4940ef6f09b4b1368775210e4d3e7d53e9fee6af6
-MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch b/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
deleted file mode 100644
index 2fbb83cfc6b1..000000000000
--- a/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Tue Jul 8 15:06:50 2008 UTC by otto
-
-Fix an venerable bug: if we're reducing a rule that has an empty
-right hand side and the yacc stackpointer is pointing at the very
-end of the allocated stack, we end up accessing the stack out of
-bounds by the implicit $$ = $1 action.  Detected by my new malloc,
-experienced by sturm@ on sparc64; ok deraadt@
-
-
-Index: yacc-1.9.1/skeleton.c
-===================================================================
---- yacc-1.9.1.orig/skeleton.c
-+++ yacc-1.9.1/skeleton.c
-@@ -18,6 +18,7 @@ char *banner[] =
-     "/*static char yysccsid[] = \"from: @(#)yaccpar	1.9 (Berkeley) 02/21/93\";*/",
-     "static char yyrcsid[] = \"$Id: yacc-1.9.1-CVE-2008-3196.patch,v 1.1 2008/10/04 18:57:18 rbu Exp $\";",
-     "#endif",
-+    "#include <string.h>",
-     "#define YYBYACC 1",
-     "#define YYMAJOR 1",
-     "#define YYMINOR 9",
-@@ -226,7 +227,10 @@ char *body[] =
-     "                YYPREFIX, yystate, yyn, yyrule[yyn]);",
-     "#endif",
-     "    yym = yylen[yyn];",
--    "    yyval = yyvsp[1-yym];",
-+    "    if (yym)",
-+    "        yyval = yyvsp[1-yym];",
-+    "    else",
-+    "        memset(&yyval, 0, sizeof yyval);",
-     "    switch (yyn)",
-     "    {",
-     0
diff --git a/dev-util/yacc/files/yacc-1.9.1-ia64.patch b/dev-util/yacc/files/yacc-1.9.1-ia64.patch
deleted file mode 100644
index c10e88541287..000000000000
--- a/dev-util/yacc/files/yacc-1.9.1-ia64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- byacc-1.9/defs.h.busted	Sat May  6 21:10:56 2000
-+++ byacc-1.9/defs.h	Sat May  6 21:11:22 2000
-@@ -1,7 +1,8 @@
- #include <assert.h>
- #include <ctype.h>
- #include <stdio.h>
--
-+#include <string.h>
-+#include <stdlib.h>
- 
- /*  machine-dependent definitions			*/
- /*  the following definitions are for the Tahoe		*/
-@@ -280,10 +281,3 @@
- extern int errno;
- 
- 
--/* system functions */
--
--extern void free();
--extern char *calloc();
--extern char *malloc();
--extern char *realloc();
--extern char *strcpy();
-
diff --git a/dev-util/yacc/files/yacc-1.9.1-mkstemp.patch b/dev-util/yacc/files/yacc-1.9.1-mkstemp.patch
deleted file mode 100644
index 5c72a6e9bc14..000000000000
--- a/dev-util/yacc/files/yacc-1.9.1-mkstemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/main.c.orig	2002-12-17 14:28:54.000000000 -0500
-+++ b/main.c	2002-12-17 14:29:31.000000000 -0500
-@@ -264,9 +264,9 @@
-     text_file_name[len + 5] = 't';
-     union_file_name[len + 5] = 'u';
- 
--    mktemp(action_file_name);
--    mktemp(text_file_name);
--    mktemp(union_file_name);
-+    mkstemp(action_file_name);
-+    mkstemp(text_file_name);
-+    mkstemp(union_file_name);
- 
-     len = strlen(file_prefix);
- 
diff --git a/dev-util/yacc/metadata.xml b/dev-util/yacc/metadata.xml
deleted file mode 100644
index 294c350c6960..000000000000
--- a/dev-util/yacc/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>monsieurp@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
deleted file mode 100644
index 0462eee56053..000000000000
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
-HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-PATCHES=(
-	# mkstemp patch from byacc ebuild.
-	"${FILESDIR}/${P}-mkstemp.patch"
-
-	# The following patch fixes yacc to run correctly on ia64 (and
-	# other 64-bit arches). See bug 46233.
-	"${FILESDIR}/${P}-ia64.patch"
-
-	# Avoid stack access error. See bug 232005.
-	"${FILESDIR}/${P}-CVE-2008-3196.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use our CFLAGS and LDFLAGS.
-	sed -i -e 's: -O : $(CFLAGS) $(LDFLAGS) :' Makefile || die 'sed failed'
-}
-
-src_compile() {
-	emake clean
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors. See bug 90089.
-	if [[ -L "${ROOT}/usr/bin/${PN}" ]]; then
-		rm -v "${ROOT}/usr/bin/${PN}" || die
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# let's restore the /usr/bin/yacc symlink.
-	if [[ ! -e "${ROOT}/usr/bin/${PN}" ]] && [[ -e "${ROOT}/usr/bin/${PN}.bison" ]]; then
-		ln -s yacc.bison "${ROOT}/usr/bin/${PN}" || die
-	fi
-}
diff --git a/dev-util/yuicompressor-2.4.8-r2 b/dev-util/yuicompressor-2.4.8-r2
new file mode 100644
index 000000000000..2de7d123b85d
--- /dev/null
+++ b/dev-util/yuicompressor-2.4.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/jargs:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaScript and CSS compressor
+EAPI=5
+HOMEPAGE=http://yui.github.io/yuicompressor/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-java/jargs:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/yui/yuicompressor/archive/v2.4.8.tar.gz -> yuicompressor-2.4.8.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d05a22d116882719b8a59f4036086ea
diff --git a/dev-util/yuicompressor/Manifest b/dev-util/yuicompressor/Manifest
deleted file mode 100644
index 88a914e3824c..000000000000
--- a/dev-util/yuicompressor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yuicompressor-2.4.8.tar.gz 1254322 BLAKE2B a8918c10549fd48c758752611e270eb1ce3f8f6f86cf6f40d7644e985c7453cb11175ef290eeb5a538d3a7e4aca7ed8587448b3f9d67463548002859bfaaeb37 SHA512 cb955fc3677f930403f4f97aaad5d6ca5ec6ee834f464005ddfd8d83c4a532180859b72d55a4025b13f05a6a0146a1391d93668452e57035d4fc4f4d7f20d00b
-EBUILD yuicompressor-2.4.8-r2.ebuild 1071 BLAKE2B 12ed964d63d185097faee2244ace7c928b9b7c0a97f2428659aa30ba36ab09f5f38aa7893003fb11b003a35367fbcb0dcd24262305b0fab0378e901a454826a1 SHA512 e050c2ccee9e34294c8be404a74f977f0f81d0c28491f94dd51fee63e835acbd5cca6a1d42500e1e1a3b6292f5d51f8c952fc89112c0d35c5199f9a5d2dca051
-MISC metadata.xml 249 BLAKE2B 317a7ad08993b3fc77231256e935dfbbe20f94fc2ac0f9b7e1aeb74cb7a7afd0f07bd90c6675a7a959281397391083606fa10a3f2c2e0599941ead5d1efe48b6 SHA512 2c9e99cd364ab8b765bdf6191fd68333d2113755116d785a8354484218d93d5251607cd8752418b813aa4168b55479087a5da41ae819eb2ad23b720eac43adab
diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
deleted file mode 100644
index 9d4fd737cf39..000000000000
--- a/dev-util/yuicompressor/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-needed -->
-	<upstream>
-		<remote-id type="github">yui/yuicompressor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
deleted file mode 100644
index c3ae956f568b..000000000000
--- a/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RHINO_JAR="lib/rhino-1.7R2.jar"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JavaScript and CSS compressor"
-HOMEPAGE="http://yui.github.io/yuicompressor/"
-SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/jargs:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="jargs"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${RHINO_JAR}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	# Rhino must stay bundled for now.
-	rm -v lib/jargs*.jar || die
-
-	# Normally build.xml does this.
-	sed -i "s/@VERSION@/${PV}/g" \
-		src/com/yahoo/platform/yui/compressor/YUICompressor.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_newjar ${RHINO_JAR} rhino.jar # Install this last!!
-	java-pkg_dolauncher ${PN} --main com.yahoo.platform.yui.compressor.Bootstrap
-}