gentoo resync : 13.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
commit: a1392efe64137262023d92492396ca9156d22396 (patch)
tree: de438b2711c7697c4597fb04f07e988586f34233 /dev-util
parent: e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)
111 files changed, 338 insertions, 2808 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7f5c3e406a1..2fced03efa4e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 03f9702b8fe4..a4d1b83d47a0 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -29,4 +29,4 @@ EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aed
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
 EBUILD android-tools-8.1.0_p1.ebuild 4012 BLAKE2B 9c0a75fefed96a2e86fb9d76c4897789d61eeba3434db61a7e3c0041b7dafa9f8919fb9ff20c14e90d070746d2e077cf9de86e0ecfc6ab55991bc4e01e210d77 SHA512 8ae858338e3c73666ca3aa2c1fcc831ea3902b0da5f91a7df01cc401c9917a7e10eaf7a5353e1f358fce0aed6e5a45c7a75b0de533dcb344f4fc4425ae114374
 EBUILD android-tools-9.0.0_p3.ebuild 4561 BLAKE2B 9c975e4be98866b9fe5156bc4a90b1c787e73f3160fc97bc70ff2f89d0a537b5bf97c25236d8e6e28a96742a14796f11cafb067b7d38cf90a7845505f6394d65 SHA512 c381cf35048c7f40b519670064ab803bc879f5edf6b75e23e9089b01c0d5b421ef49e365cad881755537a8f979e0888fa396dc5b7df94200ea066de8bf3a0958
-MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
+MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 27a6743c2701..b64b92754f3f 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -5,6 +5,7 @@
 		<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="cpe">cpe:/a:google:android_debug_bridge</remote-id>
 		<remote-id type="github">android/platform_system_core</remote-id>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index c35d84babd3a..90d25bbfa3cf 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -1,28 +1,7 @@
 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.11.2.zip 96724749 BLAKE2B 832fba6bec97e2974e3cb9e21542a76a3d10c1c6c600692cbd73b6452a50276b12b5081dbcb4a4fc0102e297657f58c77aa3eb0537e7423a480b79a8a1f957b8 SHA512 8c6d6305799631f430f7f7d74c4ef37e9a4cea50b5c3d50d44b37346a2296bd99cf96d09752006e61c97a6d6fea684183dc2b52d383810f06b3cbeabf41189ef
-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
 DIST artifactory-6.3.3.zip 98166641 BLAKE2B 33d760bc0f763ba0d8e091ce5484b3a90df4e57f291ea7a96a69bed13579c3c17af0005f95dbda847b2ab428d7dc36ddbee594d008f6e3badbb04e45c3b5dd89 SHA512 12f545d5e66b70e35d8b9967baadcfb503df7457bc48957a80b38d447cc9f024ce8f33b2463da65f5616161906bc64652fdd042446c5e8615e24ecc7f23a527b
-EBUILD artifactory-bin-4.16.0-r1.ebuild 3333 BLAKE2B 57d2c6c0d7d7121d939418d9decab2bf10cc4478dfbd24ecdc08677a4e19c7a2b33c1fe0088ae99674fbccab16f464ca3f41534d4f5d41d38e8fbd570359c936 SHA512 b6b3f2c577275c2732ade5bd69efd168f93e7609e9e959577018f9bafbe159cff0b5324d9f2599e9aa5262d1206ae08c10c4651fce6e5752105f2b78439ad896
-EBUILD artifactory-bin-4.16.1.ebuild 3333 BLAKE2B 57d2c6c0d7d7121d939418d9decab2bf10cc4478dfbd24ecdc08677a4e19c7a2b33c1fe0088ae99674fbccab16f464ca3f41534d4f5d41d38e8fbd570359c936 SHA512 b6b3f2c577275c2732ade5bd69efd168f93e7609e9e959577018f9bafbe159cff0b5324d9f2599e9aa5262d1206ae08c10c4651fce6e5752105f2b78439ad896
-EBUILD artifactory-bin-5.11.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.3.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.4.4.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.4.6.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.5.1.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.5.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.6.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.6.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
 EBUILD artifactory-bin-6.3.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
 MISC metadata.xml 279 BLAKE2B 6e75b275009b71b76ac58588f1283d30718a910a3a6ca8d289ed313645a0a16683d8a308ed9129da37967f3a903b692290c0b03c3a7441098632a32fe9a74641 SHA512 2948e82a333d27863551e8e4d0f1943c53da2e5eb72ce8128b0b90b5a07a011d32fa0108eb9f91d7e2b14e108c11ba36df3efe3e196df9c0abd1fe862e087c97
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 c0107b449a6e..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 c0107b449a6e..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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.11.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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.3.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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 b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="~amd64 ~x86"
-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/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/bazel/Manifest b/dev-util/bazel/Manifest
index 0e3b4b1a6c9b..189b460bbed6 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -5,6 +5,7 @@ DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67
 DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
 DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
 DIST bazel-0.28.1-dist.zip 256641169 BLAKE2B 489dfb1a27f83ff244cd05c11ec206689c12319a48f000379277073a108a79ad2dff61ed159efcbb1405531114ccb2d749e974004f969623cd4e9470166609f0 SHA512 640d3a9644436379e989d5993b5de9f2dc14d651a9f444c8795853989fdded7a62d71ab7cfa491d2aaf6402020c4931c8dc190d4dae63727b172ccb48ed55931
+DIST bazel-0.29.1-dist.zip 265744999 BLAKE2B 8495ab96947b02ec827cc2b5f542454e0d631eb077514c740d8be813495644f0be1020e706e2dbd321fa6f39af3060c4a7b2e68499201eaffc197704c1ecf760 SHA512 4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d
 EBUILD bazel-0.20.0.ebuild 3072 BLAKE2B e357ef6c41a91ecd538250fd47830076db961e2234c7c734d24ae3c501517d0f16bf5934896a0e7efe271af926953b083c47c924c581b7ef208af2c4d53bf623 SHA512 982ca89595f13670dc117ba3504e8de6f3d5f4a7ec2af3a11bfadc3ce25bd75c85387b53464bd0348b0842d25454a1c1398ecc4f1146f9eb2fafa857e2193487
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.24.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
@@ -13,4 +14,5 @@ EBUILD bazel-0.26.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd
 EBUILD bazel-0.27.0-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.27.2.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.28.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-0.29.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild
new file mode 100644
index 000000000000..84224be11667
--- /dev/null
+++ b/dev-util/bazel/bazel-0.29.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+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[*]}"
+}
+
+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() {
+	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
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	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
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 1fc178640749..59f970253e0a 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580
 EBUILD buildbot-console-view-0.9.12.ebuild 1141 BLAKE2B 0f0e870f4063f2062efac2bc573d5e9dea7568ac2e4064299aa22eada3fba565ce1045f39c3c26918cba874125cf42233177c4b8cdf09236806de30cd2b307dd SHA512 e2b853c3c6039a9a70f2319c498f1ff2ca1ee2a9ee1016f55ba8a5cf5d6ccf9a550ba60e68e90180c51a3f1d1f3915cd8732ca5dfcc837d6e38d7cd238afca47
 EBUILD buildbot-console-view-1.1.2.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
 EBUILD buildbot-console-view-1.3.0.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
-MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
+MISC metadata.xml 582 BLAKE2B 7b70e690ee782b2e32a79def5816c289e258339bd94aa5001297406ad9075e8dbf2623119c717a937a5dc42c034396700b1943e845cf7d7c4797714018280a56 SHA512 28aa58be60e1ce0675809fddfc84e864d801bc5438a9212b714a684cfbe97c9dcea40a74853656b5000de58e81c6babc5997ed3e354bc6d478071f968b379778
diff --git a/dev-util/buildbot-console-view/metadata.xml b/dev-util/buildbot-console-view/metadata.xml
index 0ac5c019b302..c45630a197bd 100644
--- a/dev-util/buildbot-console-view/metadata.xml
+++ b/dev-util/buildbot-console-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-console-view plugin is the user interface code used to
 		display information about the builds to the console.
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index f5b064a66a82..5ccc42633b0b 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d7
 EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1110 BLAKE2B ee3ffc432b8844906ded608e3eb7cf01c8a9c303c111f8fb8c1bd728c9f32e0cdb4b1f04c70156576848e6443b2dbc80bd32ac6a43a02f1ab4b420f7cff74cb3 SHA512 775e3bcbc9643aa6e7bbdc70a53eb6cedbb66f3acec99e6fdb313a41ae39baf6c6f69e26311d8de3730892bcf999e8e04ae5442ae9207dafb2ff8e1625048c26
 EBUILD buildbot-grid-view-1.1.2.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
 EBUILD buildbot-grid-view-1.3.0.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
-MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
+MISC metadata.xml 561 BLAKE2B be04eb0a5ba4b476810f1f53459ac6839ef9d83871c8e415ca09b3f6927aef34f6ebbcba8f67b6460b9ed940613fc9d754512e7e3d1deca401936c29a88856e2 SHA512 57e18994b8280d38538b93af66ecc756abbb8bbc70117cb1b89f0b30fde66fe5241faf9bad84cb2f8e11ee67d29ae30eeec435e0b6a9af7c178b2bf58d966b27
diff --git a/dev-util/buildbot-grid-view/metadata.xml b/dev-util/buildbot-grid-view/metadata.xml
index 876330a1b4c0..a43f9bff6dea 100644
--- a/dev-util/buildbot-grid-view/metadata.xml
+++ b/dev-util/buildbot-grid-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-grid-view plugin is the user interface code used to
 		display information about the builds.
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index c4dfc177c85d..d23b3793d320 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -5,4 +5,4 @@ DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7b
 EBUILD buildbot-pkg-0.9.12.ebuild 1068 BLAKE2B 2db6c1832fd1305ac8a44b7c644d01a93b6c6f845bccce20c014986b6ec85824c505f758489b58c6432bf4d8007f85010f9415d8115039bc9b530bbb5432d0a4 SHA512 68f406a27589210f237334b11186d4d3ea56fbc0d18083923b119c0e22523f468a1f41998edabbf47e2b6fc44176aa953f22d8b67282e89a98b4bfe4dc44d5fe
 EBUILD buildbot-pkg-1.1.2.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
 EBUILD buildbot-pkg-1.3.0.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
-MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
+MISC metadata.xml 1120 BLAKE2B 04e28b3993f21c0ec80375dc377079dadeb00e51e071958806505985bd3b10647e0a8396ff4a06f2f635f08d1cc802071b33ca1e6ffbadb712c0be49f81ef47f SHA512 f384c87c8bdc67372bad64103155dac6f7bf7d91b1f3f962e1b1c08cbfe648c8becc21e8af7d7b96c9096073215cb1bab87978132deafa94ce6370eaa027590c
diff --git a/dev-util/buildbot-pkg/metadata.xml b/dev-util/buildbot-pkg/metadata.xml
index f15869d650cd..3c1d80ae6865 100644
--- a/dev-util/buildbot-pkg/metadata.xml
+++ b/dev-util/buildbot-pkg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index a7fa1c732ef7..ac6ad5efc891 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa6797
 EBUILD buildbot-waterfall-view-0.9.12.ebuild 1145 BLAKE2B b04cf48ed5b4849436b4ea7e6414131307a1a3ffb9524543a6801b69df0ffc63282290d4b2ecedd88459d221e352d4e62f46bda68af1406466ba05a069166103 SHA512 6b6180ed60a93200a86adae7a006de353c9dad0ab8f5846896e4e76f255ecb2ff57e0431068288c3ff3daa01aa03992fd3be4246777ac12bcb6c2678c27dd819
 EBUILD buildbot-waterfall-view-1.1.2.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
 EBUILD buildbot-waterfall-view-1.3.0.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
-MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
+MISC metadata.xml 602 BLAKE2B 345536cb04360976a1851b9979c40c8b487b7fecea7936dda78fdecdddc6aadf454aacf83f41406ea031ed22e4243ada64847acdeb0e011a839bb7c8757c82c4 SHA512 218340a7d39d3a7a7f410d18911ebfc4412dcef9041db41160619c6c77c855abf56e877c1d7976329c3017ee4462922735a3e3aee329f23ab1b6e4b4a7c2ffd5
diff --git a/dev-util/buildbot-waterfall-view/metadata.xml b/dev-util/buildbot-waterfall-view/metadata.xml
index d5c5ab57b9a9..6362c20133d1 100644
--- a/dev-util/buildbot-waterfall-view/metadata.xml
+++ b/dev-util/buildbot-waterfall-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<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.
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 6f7804ed66fa..e95a583f9e2c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-worker-0.9.12.ebuild 4808 BLAKE2B 56e8fb43e57c6a90054296637223fc
 EBUILD buildbot-worker-1.1.2.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
 EBUILD buildbot-worker-1.3.0.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
 EBUILD buildbot-worker-9999.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
-MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
+MISC metadata.xml 402 BLAKE2B 8ae4401e82aeac4b9e28c94cbfefaaf2f15d15dad0771fda3e1447dc98ef99fd4578b6dbc8e475eb3354ae781f481dd8c6422c06a67d0612ea89e7f39a1d33ab SHA512 a47717971189510d5781fa3ea41de026fe2518d32619eb6830cdc1cbad89182dc01dc2c57877c9689565fcea713ac08dd36af9f51ef47888319ea2380b488deb
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 04061719612a..02cba1b8df4a 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>devel@buildbot.net</email>
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index d0f98cf387bf..f3642dbf9108 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71c
 EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1150 BLAKE2B e9354da5dc2bcb0ed8570ba566a483c75c5d99616c36a897d429a55b3ddf8106acfa8552ad00da622c74e7f9fda20b6bbdbf5ea692d68c9e5fbcb70dabfc2e21 SHA512 c5f35d782a8f6b642d28ebd0c4038a89a0efe89f16a0581c2769c03f03655b618dfaf0a9aad5e616662e3dc99f2447e514897c6d87a51eaab82492650c641548
 EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
 EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
-MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
+MISC metadata.xml 601 BLAKE2B eeb2a7e4d63561b48e7eb2e77fcae315008e4a567baff579bc086623118fba8675590e059ea3a6437d158e9e9992eea7ed8c0fa46a778d5dc333786dc70a58aa SHA512 2bd94cca6be055e75c5f772913570f01ef07eba909c8ab79c21df89a806548a8920016fb6fb139ddfc9c613101432e51bc9dd2600e3c6f01a6986d06107844b2
diff --git a/dev-util/buildbot-wsgi-dashboards/metadata.xml b/dev-util/buildbot-wsgi-dashboards/metadata.xml
index b97bf609846d..3ea7eeda80ab 100644
--- a/dev-util/buildbot-wsgi-dashboards/metadata.xml
+++ b/dev-util/buildbot-wsgi-dashboards/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<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.
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index df990b1c41a4..870297b2296e 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c
 EBUILD buildbot-www-0.9.12.ebuild 1182 BLAKE2B 15e5f4e434388e046289db3cdab2419cff90b6878e2f206b33ee0add43709c1519a23d1bc9bb98f6538d16939e95b24f3e94a8f69045f1c34227effb42f6ef70 SHA512 040ec4dba0f0e5e15d64f368063a78244dbaa58ab1ba5ba12969d9e29a69a4c2a00d8dca1f42c84f08825c7f3a7aff682d34f8305df10b50d024201ca839ae9c
 EBUILD buildbot-www-1.1.2.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
 EBUILD buildbot-www-1.3.0.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
-MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
+MISC metadata.xml 588 BLAKE2B b50149f2f21f5ddb5dfc4bbff2830c3a6f047ab04df1487fb1a462b403d6d4201eb7945a069ce662fb6682782e98720970c58fd3b27c4252d2b7843ae083599b SHA512 a215b7802240ef70f0c64e6fb511913aa83f514a79e79e24da98c36b68ed0105288f4515b0b016bda96ff3ce187694b41e508b4d22fa5a42ab57306fb8511491
diff --git a/dev-util/buildbot-www/metadata.xml b/dev-util/buildbot-www/metadata.xml
index 1f4ae627be1c..0ba9d3ff6c0a 100644
--- a/dev-util/buildbot-www/metadata.xml
+++ b/dev-util/buildbot-www/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<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.
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index f44f809fa2d6..c142dfeedfe2 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -13,4 +13,4 @@ EBUILD buildbot-0.9.12-r1.ebuild 6434 BLAKE2B c5d990555a23357803c9e6dfdaf5694671
 EBUILD buildbot-1.1.2.ebuild 6545 BLAKE2B 4047c82720ee5495ed62a90a6059aece3b21605983cebdb654db29c3ab2121a8e384f8b4a249141f0ab2611108059ebf597191a6600fd16483b769d801fbb12b SHA512 1ef262f9231a59a30ac907e631c7fd415d0b5a0cbb387309feb0bec672e505ad714a1ee1f35b31b4c38e640d2cde0c3dfe44d98a62de9e3b48eb93e16513d6d8
 EBUILD buildbot-1.3.0.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
 EBUILD buildbot-9999.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
-MISC metadata.xml 1505 BLAKE2B d07e69e8ef573b7cf2a5575a19f3bd875058903e1fc59c4100a4300e72825c1fb137eb4b804a505a7ec1877b7fae91621e35e611964abea4062fad37a9c6cc29 SHA512 795f29b373d7fa6190fa61f2ffe986e1e1857b11cf68a787a09c7d5ea485c1e55cc7f745d2bf84de3c431e8e29f6176d094df92f760432e808ba2abe12c065bf
+MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 924d82319f5d..6bb44137e07a 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 7610f797e4a4..4a6c1cd35fe3 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,6 +1,8 @@
+DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea331b2d7c78945ebc1051d1b49d28069e47bd8aa3f12d57b646fc6764ccd4f365cda9fdfea15f5a3a4334b6e9b17e SHA512 baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
 DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
 DIST catfish-1.4.9.tar.bz2 182247 BLAKE2B 343a9a83bed73a5f0416fa2ec61869dd3fdb13b8bc45a46dba7d4901c36d97b17e9f32f616baae8cceece566f4e529d34e55f81cb071504b750f4edda048185b SHA512 c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d
+EBUILD catfish-1.4.10.ebuild 1089 BLAKE2B eecfd11133132625e85709f77c28e3d9ebad74b2061773369542f0e470532be320a1d25df825c5863ac89c1ca68023dd32b890f47c317f67d6b96416b9393f79 SHA512 9733034aac8ab0e60a4dd74684754a7f8e924fed1ff21c2559ff239848060760dfc54b368bb20aebddd021f2a1e479cb097aed8e1b7268800bcaa6f200e23edc
 EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
 EBUILD catfish-1.4.8-r1.ebuild 1071 BLAKE2B 99e71a14716847ec22defeca8824dde5abd2cded8a423f29b7a55e35c3bebd5e0592cad3a912036382fbf27d17b84ac07e407b09de7dae60f32483b7a8ea767f SHA512 5e3ee490a3dcd677c983b7f90c9a3d35f15d022d7125adf644ddc0e4989a5fc91d076e560649bd9ff56480d7ec8d61bedb3ed5541219e2bdcd31a1c459a49977
 EBUILD catfish-1.4.8.ebuild 949 BLAKE2B f07556d8a90c1f5fb0510ddfd10ed5721871be076199e51fb5caa2bcac541e85b1202c336fbc0febf1ea34792c259647b0216c6a74554f027a6e755947fd55de SHA512 dc32d008d3620f787b21013a454021290e7e5ed45f5fc299a75361ceb2b48f4870824aaeacd10c238eeba06a1630560e2655f0bd456aa2b8208e220541fab890
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
new file mode 100644
index 000000000000..8833b3e29740
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index a4c5e66ea17a..a9f7f465efe7 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,7 +6,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
+DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
 EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2139 BLAKE2B 240194a3f617a5ee2915220504a7c5a61c2f086c07c595bf58b0e9338870da5a4467bf871c25a6d5ee2b31b6c3ba379d656eab26272c087461caf35d32a72f41 SHA512 a000a04d0ddf031e7b6ebbd5094a2394cf7a0e09dba7d6e7fe2df1924b7c9ce61f92cfe104a58281875b8254da537e142b5da6dbe2338577878156cef97b142d
+EBUILD ccache-3.7.2.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
 EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
+EBUILD ccache-3.7.4.ebuild 2219 BLAKE2B 88d9c491f7fd7f177b1e170b1e79365838e05ee1b84ac236360ea650e0c584bc2311788a3ef9d94267cef3ef6e1469d04eb1f6abf8baf18429c45f958ba4c14e SHA512 f2e6c2b87b789c8a8e7c5801033bd9224af44e72365bf9ae352fdccb1b0bb9542a5ca64299fc5a2c416c2a233137e32f3adf9d4766e495492fae912d66f311b4
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 9b42e14bf5fa..7e0c22e120ad 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.4.ebuild
new file mode 100644
index 000000000000..084b27b64c6f
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use it to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md 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 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/clair/Manifest b/dev-util/clair/Manifest
index b5e8fb83d1d0..7d0ae72a4444 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,7 +1,5 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb3004c7a667b9134105815171fb34b99d86f7fbb7b9a3f69ff6061a7419a63ceb23a07280eedba36b9046a401ad6 SHA512 7d996200e9a30fb569243592f88a9ef4b3a7b32852abb953518e3b6b2833bdb8e81fa8528f35feda0a16d514e48714fa60b716d038fdeafd5f3398cbccec145a
 DIST clair-2.0.8.tar.gz 5196242 BLAKE2B 9daa91599f9fe98f9a30a043fd261882b36abde5fe985097b47b48a9630db528d978f90f6bd68b32bae9d20a92f598199054cf188b1514a42876666703937b3e SHA512 000ba7c10ca540aaba34de91cf8060f6d28b704060457d320791d188871bf10ea1a8b5eb0526ae0aeebf6b6a307b096c2cc4038ddd5f955d200d20b96f1a725b
-EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 EBUILD clair-2.0.8.ebuild 1048 BLAKE2B b5c1bcef67e5bcf097d7ce2c4f9a1718a67291934ce94b2ad7ae28b45cf79efe23be1b2be3bb8d6ff4cd89ed3b3ee4e1decf2d721e268995604f44e8e41695c0 SHA512 51105ad82d34ade4612ea52b0d71d0413d4742a17d50244f7040099275be8b2c46823ac6884282c09de0368d1ae975f6466e99d553686da1e047f74ccc5bff96
 MISC metadata.xml 244 BLAKE2B ce0da14c65df5bf7fc2cae4430ffd0987a290bca46fa277b567e19ea1ac70833236a8979926777633066649665f2c816fbc4b602bc61d26672265436ff67fbdc SHA512 7f3452112634a3eed755c069728dbd8e6f79c52195acb4fa4a6caf7d44764e24bc37fd59daa394823b436adec9a99c932d253fafef7384cc25f0f7b3fb66fe0b
diff --git a/dev-util/clair/clair-2.0.6.ebuild b/dev-util/clair/clair-2.0.6.ebuild
deleted file mode 100644
index 1cb27791309a..000000000000
--- a/dev-util/clair/clair-2.0.6.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 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/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/cppunit/Manifest b/dev-util/cppunit/Manifest
index a80bef95b58f..52ba4cbee899 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,8 +1,4 @@
-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 1723 BLAKE2B 669773bfcd5343b03f4b23f3a39299d405ae686cc7c077f82d73c6b9e2778628648614b206e0ff81260c0b05237053a84b0f20dfa5ed40b4599fd9434b8d2b0e SHA512 97e501aabb9c2ed2589b3f7566b0990955816ecf7d052d6765d1e219677c08a8c75eb2f4486ab7090d51ac1123cdd0a67363b2dad3cd3891fb002405405ab2d4
 EBUILD cppunit-1.14.0.ebuild 1722 BLAKE2B ea258759c776266c6db28b138f60b31c60c628be29ccbb23afbe6dea75c0137d8c43f12742f0df12516e0016d5c62979c7170d975337b6b27cb3d4e7871b139a SHA512 713f4a0b7ed0c565744af7512cc0772976b1dbba81b46cb2aebe230a6497f5e75ed59f5d518de6578150e6d54e62392f43bffa5c554ef84b1c0d815989313097
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 9c300614235f..000000000000
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/crash/Manifest b/dev-util/crash/Manifest
index a49ae243e2bb..b5839931ea24 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,19 +1,4 @@
 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.5.tar.gz 32214678 BLAKE2B 1d19bdb0ead372b4df6f4715f9fc26218d7060ad2a3f774cdf6069d6fe7a85a24968766e6eab19042c1208716e871318bbc44be04012b7ef8527a7f536edd5d9 SHA512 6d07c4aa2bccafafe66567e2022250208ffdd5f0e64aad1aefb4c8d7c10df49464ad772e2ffe0d1067f324dd351e9186841d501680a181c79d7b9b58464d6987
-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.5.ebuild 584 BLAKE2B 23361a8f51416c016d84ca434bf09750004b51f6da06d32cff7ada13c1cae930799c90da216e68090722f575028e6f9ef395a4d4647cd575db2bb41d862b7eaf SHA512 f36e973e2ec92795c85dd1ccc77b2afaa795fc58112d6336e8cb5861212b502ef119c26db6fee4d7abca706fd0dbcd1062aaf139a7082b24da6c7b3a1fa4838b
-MISC metadata.xml 647 BLAKE2B d88035e0778e0f8e6af171e7bfcd3eff14ee964f2521e00ec2d8b978ab560a4e321a60cce49775dc2f34187107309aea657f55bde348cfc4a830be4aff60463c SHA512 4e5b97c2f7306f4113f842e4683a2f4c3ed684c229c8e21483d08889e4a1d8656bfda699300cd71c70389510816f19d5eb93a37715c5861b669b285bff61ef78
+MISC metadata.xml 567 BLAKE2B 146285d4713a120dd476acb4b032e7d68179aade464b4657642af03c4bb92cfc1a41a4c73757f0cdb32dfbe119de4fd0f3daae5b3ac4452e1f7644de4f1900f4 SHA512 e726e4cda51e9a904662a9c1c0946a421bf5a350d9057a3cb0df080441892ca6399998f78b37dab883d34250380b5bc8d8ef5565a1adeccd1a8085d67f877f1f
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/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
index bfe00424921c..c81bcd9e0c3a 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<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
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 4540fb968c56..e4e47e09060d 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,11 +1,8 @@
-AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
 AUX creduce-2.8.0-link-libs.patch 1038 BLAKE2B d28b790141a898c72e2102d25cb14a48c1a4ed6e0902e413510932be66b224ec28caf23c7bb3741c07be0ee6e3efbcd4c7bb9cd774d4239eeaec84bcde652d9b SHA512 1ce357c17cebdc9f81692c545c020358d52bf542f5235c8a7c6ff3c1740b08089909204841eb1e93035c8f069d372656fba4026fa8ee848d837228a2b7f7e20e
 AUX creduce-llvm-7.patch 4046 BLAKE2B 013685de9ad7f364cfff647a6f6783615dcd2289af8ab602f4119401373b6422385e63e1c5aaeec65dd6e922fae945f44f29f18bfe02b581b0a12f129f83e0b9 SHA512 9a0cd0373fa8e0bd14907e5522b97c3c4cdb89a3350e38316edfa6a75dbc5bbe53756c4b605385b1feda5674bbf17d92b4d2e21c58b4a937bd2c61e76e322b0a
 DIST creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz 724597 BLAKE2B 9d7a57349b8e14599c795a27bdf2cb4536f5b41f02faf10263c3d883bf94efd83ce7483bbf72aee0c2fe00d8515490e5f5a9c8df575abe80e90231a4373c9318 SHA512 a317bae5e47ee85b4be401d8dae490bd0ba86640aff6e7b0e9d6fe14d1f87199b4e12edbfa3eddcb5341b926a753dae17131f5e571362849c01377eda00407fa
-DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
 DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
-EBUILD creduce-2.7.0-r1.ebuild 784 BLAKE2B 093f61657be92f1efd7dcb1abea1a79ba13def8c3ec013572c648357b1bdbeb4a39be827eafcac9763f8fd2a24ca90b8609924b27c45f32a8e95c7eaa3acbaf4 SHA512 a73b178134f28b22bcd070682f9d656fe8fb8dc05ba956c8ca5e25a18b1127ee85bf32614bb77350413afd884bd46d6bfd1b17536cfcfaddebc934a40b9067fa
 EBUILD creduce-2.8.0.ebuild 814 BLAKE2B 2fa4ada35468979232ad1fe3fc6624d09df764454188933dea519ac1adac1cbec5c839ddcc71fbe569c80b74ef5cba199bc912c88ae090cbbaf68ee3983a4dee SHA512 0ade02bd6ba2c664940bb5971e71d973132ca6708cd887daad785b911b2b0e0523a7316c23bac612c75b5475b52df670a1a7714be6faf36a63ff8dda2d5acb2f
 EBUILD creduce-2.8.0_pre20180411-r1.ebuild 935 BLAKE2B 7aa0a8ca0800a216918a65bf00fa6926f2210d688b2e6385e4a6147f9b913d365971923dff7a2df8d1da442ebebc9c6befb4e243175ceaab29572d0ed57411e4 SHA512 403502450479f91306f97d3462a5f5b300a71d5d618e8bc735189031c0a630cfecdc86d568b712fc2e50e8feeb504be4ebd58bbe84698e363d174a9e900a5a7c
 EBUILD creduce-2.8.0_pre20180411.ebuild 886 BLAKE2B 0e7f8cfab414f998d5b8a3872c14d680b6848f17107a77cf00738f3b3a4961289862a44571888c125db3dc3bd9a7805a5a72ca4641abdc3f7e79cf353f8f6544 SHA512 500c0b3462147f872fab9a1b27266a848adb2cabc39a40c591bc057176a78c23b785da6e37acbbd5a6c3bf8efd30ec3e3faec39bee9c1c9b7044d16edeecdb34
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 617b8e64e48d..000000000000
--- a/dev-util/creduce/creduce-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-5.patch
-)
-
-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/d-feet/Manifest b/dev-util/d-feet/Manifest
index eae3239b37e5..fd7f44ef590b 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
 EBUILD d-feet-0.3.14.ebuild 1042 BLAKE2B 0e24e26b8661c47987dc1765ac5e6b7c6caf7961f119ea29e41af307a8d76e74188d44b44372fbe45fc3c3ce71339ffd0f68b6a131406fe98d40490e975b2c4a SHA512 fe348cfc705e238a49852647785be482a10b88f90000e664be6a9795c32e1d8c04c11003780d992811957b9098207e2d8a5b72408e14dec92f13ed64c9a43131
-MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
+MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
index bac79bab471d..52f14ba32077 100644
--- a/dev-util/d-feet/metadata.xml
+++ b/dev-util/d-feet/metadata.xml
@@ -1,11 +1,6 @@
 <?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>
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 13b7b803daa2..a8e4db2dadc4 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-AUX debugedit-4.14.2-no-reorder.patch 2225 BLAKE2B 03bac95d316855a9a8e2b78cb7530c5de746b462a32a4fb0887bddf039b371198ea77a0b85b69b6501504e9583832a7f7b055b3c22e3e3b309ecaf995fb164d6 SHA512 7f665c8c985d622e52e87996f1719900131fa7d6455e548cb2cd00b2223231b54b4fc9c24ed3079c93dd5e3c287c03f37aa17072e2e1e5d4f0cd8ee695bf08bc
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
-EBUILD debugedit-4.14.2-r1.ebuild 1862 BLAKE2B 7298cef549ff97777f748cb871d01d959ed5b680cf693e4c42b0a7826c13d42df121243788f7c965cf56ef2297a00119dcab40a5914315cb1353bf587eb6971f SHA512 951edb87d4e6c55d73d3837140747ce098562787333198ee0cb35c06418b75d4f4e82b54bb6f23c01a0c98cb6999b402ec307fc35e7d78720713dc25d6df919a
 EBUILD debugedit-4.14.2-r2.ebuild 1725 BLAKE2B 7897371964b247c6076d629b6ae6f01473c41d71356c1447bd6f991449320ccda71b6f86b42a3c82c491efec20d2ebf2e4ad559940ce748f4e40f3cd4dac86d9 SHA512 4e36e020e4aada2c378466818763c5b49d888f76627692bf40074ac154678225e77921627ccb2b398026603dfef403548657c1f0068508e309207f41ab097f79
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
deleted file mode 100644
index ad6b532ec6c8..000000000000
--- a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="http://www.rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	dev-libs/elfutils
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# do not reorder sections, ever; otherwise it breaks gcc
-	# https://bugs.gentoo.org/666954
-	eapply "${FILESDIR}"/debugedit-4.14.2-no-reorder.patch
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-nls
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch b/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
deleted file mode 100644
index 0c196a842b4c..000000000000
--- a/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0779d60cb5941610dd1f31632aa1655bf2cc447a Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 6 Oct 2018 17:56:00 +0100
-Subject: [PATCH] debugedit: don't reorder sections
-
-In https://bugs.gentoo.org/666954 debugedit processed
-crtbeginS.o from gcc-8.2.0 and turned into invalid ELF:
-
-```
-$ cp crtbeginS-ok-7.3.0.o.back crtbeginS-ok-7.3.0.o
-$ debugedit -i -b $(pwd) -d /usr/src/debug -l ./foo crtbeginS-ok-7.3.0.o
-$ export LANG=C
-$ readelf -a crtbeginS-ok-7.3.0.o.back >/dev/null && echo ok
-readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
-ok
-
-$ readelf -a crtbeginS-ok-7.3.0.o >/dev/null && echo ok
-readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
-readelf: Error:  bad symbol index: 54495f00 in reloc
-readelf: Error:  bad symbol index: 656c6261 in reloc
-readelf: Error:  bad symbol index: 62615465 in reloc
-readelf: Error:  bad symbol index: 69665f61 in reloc
-readelf: Warning: local symbol 11 found at index >= symtab's sh_info value of 11
-readelf: Warning: local symbol 14 found at index >= symtab's sh_info value of 11
-readelf: Warning: local symbol 15 found at index >= symtab's sh_info value of 11
-```
-
-Ths fix is not to reorder sections as debugedit does not
-account for offset change.
-
-debugedit already does it for final executables and shared libraries.
-
-Bug: https://bugs.gentoo.org/666954
-Closes: https://github.com/rpm-software-management/rpm/issues/423
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- tools/debugedit.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/tools/debugedit.c b/tools/debugedit.c
-index 84568dd29..a723283c0 100644
---- a/tools/debugedit.c
-+++ b/tools/debugedit.c
-@@ -2347,10 +2347,9 @@ fdopen_dso (int fd, const char *name)
-       goto error_out;
-     }
- 
--  /* If there are phdrs we want to maintain the layout of the
--     allocated sections in the file.  */
--  if (phnum != 0)
--    elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
-+  /* We maintain the layout of the allocated sections in the file:
-+     https://github.com/rpm-software-management/rpm/issues/423  */
-+  elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
- 
-   memset (dso, 0, sizeof(DSO));
-   dso->elf = elf;
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 0d205c93e8bd..c824c41b5396 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -1,8 +1,6 @@
-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 1120 BLAKE2B 9e492d187622a734ad37d59613ba99bfcd063d7625a636eb11b56bb2063919c477cc556f6fa00af63e2244cdaeb8e4bdbf60374801e20c3bf24eeaa6c9bdbd26 SHA512 fbd5d795bded29338f0bac374717c20a7153436fff55c50164eab245c4fa518c52173321c633506501b4570da1531e06f63b78a9b7b9f08028fe0b0bcaba75c9
 EBUILD ftjam-2.5.3_rc2-r2.ebuild 820 BLAKE2B 827b71923e06e10a237dddcef36c6b32b0b825045b0cfd2b15c005b652b780b00e76d72bf806033a5936bb41b8148e5a48d294fa249800a9f2c5d788ca066e3d SHA512 002d9e21ecc3413d75fd227203da2553852202659a9846db6b60ba09478330b22022fbaead7ff0e3ce8efd7ea7139acd73f89b500c9d9360b550f058237d4b22
 MISC metadata.xml 243 BLAKE2B 08246d6c76c2720c2feb89cba6d9c817718a9910f19ae5b0e90da4c8bfe7fb25616e02b46c860fe81b93ce71a78c341093062cfcfddd449bdaba1aa4497fd9ab SHA512 2e71aa0db138811dd97cc5d3e5fcadc54dd877ee5adb9d8988c30680e55e764e1391b0628e8a298fb2679bee30061d7a0f9a4678d29ce248183d5b9a25f8a343
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/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
deleted file mode 100644
index 2e8142c44fce..000000000000
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ad39c69dc5b3..1b6457f9109c 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2048 BLAKE2B a50962cd741be429374ca1854199c02ae0fee5deba37903da653376cdf395bde1e44b2afde0795154f5038760ede015cb5614ca8fe0d0d819850e2ecd708a079 SHA512 2203f69b88acfa0192f646826ae9ce41822cb25f7e2793fbb2ed295efca575023d23cbdc7e9d266afc183c478fa04eb7cbef2f610cd48b371d2742c3b7b494b9
+EBUILD gdbus-codegen-2.60.6.ebuild 2047 BLAKE2B 8735748fb0c72ec01750e343f3bde9bc46a9da51dd26a2f50caae5e271091a4d3e2e693894440a63c39ad60ca13322b64aeec52ea8391760ab791d1654a9fda8 SHA512 581cb8941547c80b792565de4db486bdfe02f830471977e11408eab13006ffa8e71d319a51e4bae011c04a32e6f3d05d0601eb58594e137a1e95695dc57268ab
 EBUILD gdbus-codegen-2.60.7.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index eb44d7ca49dc..0f4c4cd28673 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5336dbf236aa..5ac858c9d35e 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2329 BLAKE2B c7fb05647f04c8a74e85703873620680bee94cfa5f43f227602386eec4b9cbc97745ac2d9786fb61527d93fa2f03eb0640475433f9fb4bdbb56ed20884b25a47 SHA512 f86f398a1f87d6debe5407f5b6ca6d5bc4114d0d937464260ff4174123052ac70207153c81e50b4754524dd573eebdac93060104c920a57032f6a29ae9df8284
+EBUILD glade-3.22.1.ebuild 2328 BLAKE2B d000831404e21ed73ae1619776bf8357ae17f0c11c0de43d898234f2fe8c168d9c308c4f53fa912d29e47983f0e283313b337100aad5b58107e609e8a8e3d9c5 SHA512 2194a5479c5bdcc8094743e0aae4c2aa29420b70b5df9121927171d734802c90cd7cdbc7ca615318b5bb81d601ae382d03a216ffbf649ce4b5eaa3e8a3d0af5a
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 77500747cd9e..68c852cb93e0 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 61c138aa20e7..b0081bd6b1c1 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2423 BLAKE2B 8e274dae1e4bcdc765dc8e47cd0fa6d03d824d8b3ec0d32f131460ba4703fdbbc52195dd3e73fc5d8359db560cb1589cdfb31d3837cf3c005d61558841cf1b5b SHA512 312b5c2d139b7c334452b47caa066603ef281e792e0937324ad193e5a637e0a54f449c719d1ebbd09d1cdb3d2155a9cbbe4496b739b918126c3eb50b9c8222e6
+EBUILD glib-utils-2.60.6.ebuild 2422 BLAKE2B 305e6170b340fcb4ec66008b5be054391f3bbb9aa88fbafa61e662f32a041a70d25f62aaa0f7e02c638dd74fea103c7972bc0a74b080010cabbce36e7de004cd SHA512 7fd710acc86f4e75f0762e0a3469f11261bd14af3f964c542c77461f9db9b4dc0b14ef50e5baadfcc7e0a3a66837d406afeb7295300357aa837fdda8cc15b414
 EBUILD glib-utils-2.60.7.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index 16b0d8f4047b..b40aa0f9de23 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index f042409a1dfb..29f9f60a0b8c 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
 DIST goland-2019.1.2.tar.gz 312490907 BLAKE2B 9cc0abdb9d86b1bd9cdf67e3e65548bce229d3575a62ed153435585d0d82489b193cc775341e194107cc09e4e6e2ee84f4639259c998a7191b765edb6f5695ee SHA512 fb5c597634cc2a84f2abaeae9d0a31e332ba0123d44a5cbbf1587e05cd8da0358794ab80bb873d3395385aeb87d1d92ca4dd7e606523a621fab16aeec85aaeda
-EBUILD goland-2019.1.2.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
+EBUILD goland-2019.1.2.ebuild 1063 BLAKE2B f4014580858fb07afe158c8d3b129b99cfbf2f6b05ffa64c59f0e893d52646f193d6f06bab01c138f3557548119e870afe4c296a61ae32c5c907d904062ce599 SHA512 540b767ec045af21d59915000952758356265d1bc7d8812fbeb5885c30de5403b88a6fde921e9b37eb61ee35104f4eb59aea1f4f0ca10cefcc2f70b6ecb76fa5
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2019.1.2.ebuild b/dev-util/goland/goland-2019.1.2.ebuild
index 824cf5bfe3d6..28875598ec42 100644
--- a/dev-util/goland/goland-2019.1.2.ebuild
+++ b/dev-util/goland/goland-2019.1.2.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://www.jetbrains.com/go"
 KEYWORDS="~amd64"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="opt/${P}/*"
 
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index f69facfbff33..9c1d9b243d43 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,7 +1,5 @@
-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.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
-EBUILD google-perftools-2.4.ebuild 2294 BLAKE2B 1aaa5d14010c35af89fbe126a6c9d24a2a6921300e273be96868a7254dbedc97e5012ac5d7353e3555b2777268cb299ca576452c7d406234f597d010e6577926 SHA512 8a0d186e63ee7aed584cee1d0897c02eda37b7a0f980a11c715e38513ae684cc0c78675aaf6c8c5ebcfc77da4b1f88f8fc364f38fc856a61ae7365a52f802750
 EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
 EBUILD google-perftools-2.7.ebuild 2353 BLAKE2B 20cf4d3c719658c6172fb116966932cd976fd8d008f0fa50a1a1d1ff4c91050c9d9bdc733fe231189af292ef7a0b53ef6f2c169ae989471533ad68916773a9a9 SHA512 ef93ac049915cb17ac6857b309532c6fb5117ea1bf088d2569bd9cca8b2551102d36d88fa2a5e7eef9541c4e3b8b10804658977a1f5e2cd7f449439ba378c0af
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
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 da07048b388b..000000000000
--- a/dev-util/google-perftools/google-perftools-2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/gyp/Manifest b/dev-util/gyp/Manifest
index 52334b18529e..406180c38309 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
 EBUILD gyp-20170904022846.ebuild 917 BLAKE2B 80903a671bf2f4839514d0078fa44cb7b99461f08f09974c1892bd42cc445a72f5a577d9ae508bd5b635e2dc213b789b18452bc4b9c19b58d545cac5d66b7ff3 SHA512 2e725f98f1bac4af1b8f8519f178335ba111a8831b110c8137d152d777efe6fb35f85413f086e566f2e3c00ed98737085b3b4a35f07e473e7660aac29515a72a
 EBUILD gyp-99999999999999.ebuild 901 BLAKE2B 7796a9f7cdbc7bb7742e5637246a393214a149fc81d3be3e928b637ce3000bfd7fa629e8e1c4f735f6a63abe56d029535327d8f53528e48f9cea14bf5a6e8822 SHA512 723a2c6be5dd7e4b0032462eee18949cbfb8596d158c37fb08220020bceae4070ba6db3a037e23b6b5479291d54451923aba8834f272afc530f63f8a8418d34c
-MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
+MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
index 7b9c409fca7e..db283761922a 100644
--- a/dev-util/gyp/metadata.xml
+++ b/dev-util/gyp/metadata.xml
@@ -5,4 +5,9 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 8c576884ef5a..881fc90aef6b 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,5 +1,3 @@
-DIST hadolint-1.10.4.tar.gz 39126 BLAKE2B afec4a6308ac19d31207ad9cc89f3d75c24ae1bc7d09e89c9437863e117ffaf0041df7a110cb0264a4b76a67ff6c2901fdfb372a5ca7660a806f059db95cf572 SHA512 ca0dad6f64247a514b562cacd5744ba9b5ab87353144b8075bbcfbfbe8893228f08bd45b6c9885c2be1f3a3a12c4afbe4d8f6afa0031405b5958836a8b415021
 DIST hadolint-1.12.0.tar.gz 39932 BLAKE2B 1d7f7acaf5a8ebacb9b0555e60a31e2bf70474045b33f1a8fefded796c455d9ab6587acdcfdfddf23b78585cf69cd4f609320c4ac39f956bfff62322595f026b SHA512 306eeebc357352d50c48b30d424ed50e0b89deff059a61b78ae0f7493c0ac2099bf32caaf84cdb2620ff6abecb69d3e6d61ad9e5223c42cce73923cb1da376c6
-EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
 EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
 MISC metadata.xml 286 BLAKE2B 28047949bae509153b03e8627389845792a69fce265c8c90e9cbd14f05aae3dcf91777ef0a3e657f4c7f4ab4f26b92739fa12b313bfcf986a285e0135722079f SHA512 cfc6ff695eb5112d9be7f5cce18103ab0ba258147d98c31d7446305372bda8dc02f598e52098dbf4630189b7469427b179f71983f00b89c92c5e29bd50f2739d
diff --git a/dev-util/hadolint/hadolint-1.10.4.ebuild b/dev-util/hadolint/hadolint-1.10.4.ebuild
deleted file mode 100644
index 4c740b4d0998..000000000000
--- a/dev-util/hadolint/hadolint-1.10.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.4:=[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/hfstospell/Manifest b/dev-util/hfstospell/Manifest
new file mode 100644
index 000000000000..073ee8117e24
--- /dev/null
+++ b/dev-util/hfstospell/Manifest
@@ -0,0 +1,3 @@
+DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
+EBUILD hfstospell-0.5.1.ebuild 589 BLAKE2B 442221f168f9c7378130bc5e23a795246cfbe4504cd9af4e008bc82349bbf403d52c3ff590eea374fa8c0b937674fa5e0a2ca195d194c6260c902a19d446a802 SHA512 d98f860d6f9a5a11c1d6caa34ab19c065f4b1a841c76fb61cdcdbcfb53940ad9da0ce07ba89a9b2c7c13ff7d1b5e6ebc54f35aa95db033b5972173c55a7fdb78
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-util/hfstospell/hfstospell-0.5.1.ebuild b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
new file mode 100644
index 000000000000..7aac0223c0d7
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/libarchive
+	dev-cpp/libxmlpp:2.6
+	dev-libs/icu:=
+	dev-libs/tinyxml2"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-util/hfstospell/metadata.xml b/dev-util/hfstospell/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-util/hfstospell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 49e359df5f3d..5941b382ad8f 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,7 +1,4 @@
 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
+EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2648 BLAKE2B 2e2e4d18dc878a3a331967d456fa209a44924fc7be1160263326e586161040da3aeb5c0824ad0fcfaf0c156fd2d89338a1f48c3517093fa10ba69d878ed583de SHA512 0b958ef10e508299ec28a46c9cc23a74802dba4e7ccdb021696bd6d78efba0e1b61d4fcf8989b9d097b02b9d0b36bf77e5f2f8f41cde3663a171cd63d1973ffa
 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
index 6a53389fc5c9..abad0541b71f 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ HOMEPAGE="https://www.jetbrains.com/idea"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
 IUSE="-custom-jdk"
+RESTRICT="bindist mirror"
 
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
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/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 23cf5860b895..a0c3a56b7b37 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,8 +1,6 @@
-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
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
-EBUILD include-what-you-use-5.0.ebuild 1319 BLAKE2B 9e80fbe8541e9a2179a3c3a16ff1664b5ba15ff35723b298a8ffc5764591c2d4508c724341e6989a5e9425008cae3bdad41cec78c5387ca43f2c1fb8982543f1 SHA512 38ef2977761377c078553619960d4fcb71f0d141d08191421eb2f0f3b9e3a01f758ddc22b65d50bb97661b98e42be65905a911de02655e5c73234a4076f10695
 EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
 EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
 EBUILD include-what-you-use-8.0.ebuild 1216 BLAKE2B 09b50d9d452f36bb3d044e42af3952f2612813251209875404847cf4f0d065991b7eef3a31577a876a769263680c9559beba838a2cce97f00876dc17e03d2d48 SHA512 173540c5ca5c145bb3764a9c13fc601e7121be7039a1ec45f0bd9dd6aa91b70a998939b10628024f679b69e267242bd989baba97d9fffd547d800f73a1a78300
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 9a0851f65682..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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/kcov/Manifest b/dev-util/kcov/Manifest
index f00ce105b6af..cf807e62f8ed 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,6 +1,4 @@
-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 250 BLAKE2B 4aa2c984b48b686831ccaa542ffffed7eb9bbdbc41d1f4ede551845768fdf0f2a3443502037db80e77e6105f97c0932d4512a84b244d67e6e8aab8e1dcbb83f2 SHA512 aabb9dd0e703f923f2d03a759fbdb731e6c07b2149cea06d1215cb8e282cdddf0a1f9b7bee7adcc391583566bd7962d7e4f2c7d61286bac56c0c2549bfadbc7c
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/lldb/Manifest b/dev-util/lldb/Manifest
index ac6f13823bd6..0a114b333694 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,6 +7,6 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 EBUILD lldb-10.0.0.9999.ebuild 2712 BLAKE2B 6b0d5bed2bad575925e888236e82084a3388e28a9434ac711a1fbcd67fc94a040b3fd7d80788c2e6d55ce37fe3173c4bc0d710d05f7c7599215dce2d38cd0076 SHA512 afca689ce2424be93db8500c407efed77f98eb27b28f7d427c143d04395714d371c5fb8a2a7169315f06a3964390bb0ff3f8837d407326355e7d989bdac159cc
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.0.ebuild 3011 BLAKE2B c4d28d2f72f001ccfeb108732d073e6c8c52db8dcf7988f4ac282981bc7317c723cd6e4afa695fb072cb321b976a05869f03a8a9062bb06f80e4ebac11bc892a SHA512 86fbe8fb7402865ffb8410751325bcd71fa0d830c562855042fb2029da24026879df77b2f974139a2e3b49bf539a1ab789becaa8342b94f70038f5c60be92e4e
-EBUILD lldb-8.0.1.ebuild 3077 BLAKE2B af58b86667a4d76c8838a083d30af8f2fb77cfc0c2907067a56bc4253be96ee44e3748e7c9bf7c20914163cc78b86614dba045ef3284cf55c44511815627c980 SHA512 d2db4b4e6598f46230120b76b5e384b89f5ef346e385b723903023eff6ed97942c4588be3d0fc70ca1bbb7af6c981da1115fb9f2314fb5f01b0a58436db1a7dd
+EBUILD lldb-8.0.1.ebuild 3075 BLAKE2B ee8747662ca211e9e132232efef761776f02de37cc0b489d394374445bad31e7071b58ce574a4f1816d962026724b50a50c4185b33f2d6a3b421affcdaee0cde SHA512 e622c89b3a60713fb2c6fc0326506f9090571fd5fd30443ff10a5e0b355e36a07af073b4b02a1198a7d01c9a7b6d91db2a48ad452c18f09eebade62e9ee0e22a
 EBUILD lldb-9.0.0.9999.ebuild 2737 BLAKE2B a768532e7ff0e18e2ba779054f20bdc04da7571cf1ba66277734c5e11aed22c224763f4b61f2166c3014ea36b6ecd7f9cd5e56304e1c3aa50ada8be76e33a68a SHA512 c61ca46f688826fd96ab8284ec1ec86f861255efb0c401c680c9f4817ddd22d8e5e94889cb122762832e0db3fe4aea2b018837a08621d3a34b8bda72b7506326
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
index 4b8d996e1767..6ddd76f22182 100644
--- a/dev-util/lldb/lldb-8.0.1.ebuild
+++ b/dev-util/lldb/lldb-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libedit ncurses +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index f0904ecc1968..d6dc5cdc65f5 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,5 @@
-AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
 AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
-DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793 SHA512 fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
-EBUILD mdds-1.3.1.ebuild 977 BLAKE2B 64845034c53e9357dc66ac7cddb6724863df6d946797c72f1bd99e0ee1300d01cb8dedd0cffbe72ad7fb65e3bf3435ce500e0d2ec6504d9e40862950830f46bb SHA512 99373e8ad499222f9937661a5689e81f8b658733cbacd10d963dac46fbbdf1ef1b44c6c5bf209fb074009ff42760cd9cd0363e4ce583844151c964de5b4e5ee2
 EBUILD mdds-1.4.3.ebuild 944 BLAKE2B c3b0165e5f6c8448f8a4290c89e44fec9cb29aa5dcc27ea9f7a8882096e92b7d581fff7c648cd9451b4e96672508c29e757c9591ea1b0f55fd4395508b1c8b1c SHA512 686065fb349ab4a5ecd908ecb02ee1d6bd6d034168b46ecb30071f9bfdc68117de482daaa7dca20954e6eaf3afd21b7149285790cf1cf0b036e6e0583a17382c
 EBUILD mdds-9999.ebuild 954 BLAKE2B 46fcd2e4458f073a7142bdbe1df979ea80b9f6b341b5cf0ca7b493652a83763bdd2c9616a2be9a7cb1fbaac94f578af48e5f5520752ee1237d0bb8391152c002 SHA512 b8df297d8988d5310d218737adea9d98c2353dacb541f605fd99dde7cafacb7cd6a148592d6670b5ce6b14f7869a360309dcc7586d4357d0fb03996d499c5c4f
 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 d2a33d885ee0..000000000000
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
index bbcb1c56ad4c..c5555af0df77 100644
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -1,6 +1,5 @@
 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 277 BLAKE2B 4e2570bd81b94d1f9e5b33eb615a8bd632cfd09de51be61f755b5ff9fbf8023a31317be1a04051aaa9a02d56df8a2417c7b46e62df2a0b926409ee3b31955181 SHA512 d1acb1b992610407fafa7341abc0a042a3ccdd04f155a62e0280d7ed4bc403109a6937943d878851966f1c4295a6abf868c71de0f2c32989971b8f00c57fd4a5
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/rebar/Manifest b/dev-util/rebar/Manifest
index 49ddf63df5fa..894556d8bf2f 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,3 @@
-DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6bfe4a2b278e58828781217c203d2dfc9c39a19bdc3b9fc6bc7f4d9ca85b6d0019057a2841d8b394cc39bdd84 SHA512 0baa10aac65ad78c05d6ecd180327b8752a31bbc51f3b3aa6060f4d2adf9269de83c6481767d9abc8a599e231f569c0496edc6c47f43d1e2892c4e98de6ccd85
 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.4.ebuild 628 BLAKE2B c8b961179e05c6d4a393336772342f227fbfec9ae6b70bc2dabfe798cfc656003329edd96c3b139b6116c5041b314dac050f9047e77b36908e4c4a0ba2d988e5 SHA512 e511d5f6eda6646fd8b15c786c766d76e436d2ff6046fd9283c2e85cbc3e344d70595a52825be43e1c74f96d86e66d333a21c511241b70ccae07379e2baaeb5e
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
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/scanmem/Manifest b/dev-util/scanmem/Manifest
index d7451b336ec4..6ffd448e3c7a 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,5 +1,3 @@
-DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.16.1.ebuild 984 BLAKE2B c069e8b0389b74d19120d7646fc686b4eb91d487a5f44e24f3d5d7a09048a7135b27992171d804cc092941f93342531d7ccab0ef4f20c614e554c62ce0c012c9 SHA512 621af86f741b3e24a0a6db83380909b246973c12ed1c2ec1fa565edcc371fc72a581f8f8f7fbbf76112f64631b8f204a420e6fe12f4f4809a0893637b261de3e
 EBUILD scanmem-0.17.ebuild 1085 BLAKE2B 6845287ac7ac73c9325552fb4d7d103b287a80c1c16fc6c43d263e00bb0f6c79cd19530204408a1124a7196603503c6c0752eec0c9ed7fe6809a47413e270a86 SHA512 849fb77928c61c5b0faf2a04096df8df71543f2f66eab498ca002f8237947c143d40a25d5ea6ba2967a8eb4d546706c628e0bf88a3a06beb2e70d669ad26295d
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
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 d46dad01e3a3..000000000000
--- a/dev-util/scanmem/scanmem-0.16.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,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/scons/Manifest b/dev-util/scons/Manifest
index 7c1a63400e64..0341bcec102c 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -3,13 +3,6 @@ AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d2649
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
 AUX scons-3.0.5-jdk-include-path.patch 878 BLAKE2B 7fb21bac419af3a74c6323d02082fedd80221102f87d87781bf2eafac1b877a96e11b992016b97556e24245faee85b67bfd75dcd4f5aab9b9fbdacc4c37788a1 SHA512 9cf4b31387c6630f7a6574913966cfdf355885d6f1e0c5d74951a5e69c187a768931db097e8178db0ec73201b0062a5a9c8c497cec30e9cdd6170c49610c35ff
 AUX scons-3.0.5-jni.h-include-path.patch 875 BLAKE2B ff8e4fc290dd3afc2593fa56d737f3fa1867ae02e7f128fc6316cb2c272db9e90bb345b243a29462dcdfff60f03c75f7e4106713367c988df5f406989b4005f2 SHA512 443297e374f053c0dbc66df50a53556bb3bf68ae372bd8f2150bd4ad21ee1cae22afd24fca62ce528e1d82ca13b8856dc20685711685e89aae144a14315a9ae3
-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.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
-DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
-DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
-DIST scons-3.0.4.tar.gz 652334 BLAKE2B 742909dcc598780c7ca7884c2403d9fa0cab44228c6597975157148f460dadf789d3c6aaa36125815ea8fc5ba70538ede56542cbecc656c2918341e2827657b3 SHA512 064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
 DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
 DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
 DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
@@ -22,10 +15,8 @@ DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34
 DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
 DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
 DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
-EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
-EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
 EBUILD scons-3.0.5-r1.ebuild 2934 BLAKE2B da024a78f8779bb9acd0def27c39285145745553902af6df29ee0b88e9d70b164fc129cb548bab7ef0f6bad1b832c037bf26866f0af36941071756626e7a1d8d SHA512 09364d9f64c8003c7b363859f0bd99c1f1d084ba3c2b96ce6d973017f5b9a9e77c07529c66d5aaa29027bf4ae990a3c2451b5df3453923a3df0f05f063c24415
 EBUILD scons-3.0.5.ebuild 2112 BLAKE2B 17dc37551614e235adbf199ea6a7a1400f2fb2e5b6f0597598c898aab63d03ec45ca30d30d2efd163819c6d9f4f7dda7c0a9414752c7711728a47f4ada631c3f SHA512 e47023c29074d2dc3f3cd028be53a5e579274d607aceb6fd1060b5a4d9f595f662b2369d794763077025f2d69832c3fadd3f4bb348bb5fa01b5185ba50459fb0
 EBUILD scons-3.1.0.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
-EBUILD scons-3.1.1.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
+EBUILD scons-3.1.1.ebuild 2658 BLAKE2B c6a1862049b329d9124166eb6bd3f1c521842b4d367010274fa78b0cad6feca7882e8aa77df67685f63d194aa22d5ccc98a028e7a6d5e6a6680800bccae024f9 SHA512 d4613f388316c0f9244990b7863405ffd34af2259e5e63290a40def24ebb7beddd4ba2cc2af6306bfb0329ae0a470688108ecb14ea76e868911aa78f2c840c47
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
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 bb60b4875ce3..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 ~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.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
deleted file mode 100644
index 78790a3eb13e..000000000000
--- a/dev-util/scons/scons-3.0.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-# unresolved & unpredictable test failures
-RESTRICT="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.3-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.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 4da9718eabcf..742084aa3701 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index 2286f17c3a11..319645fe7363 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -3,5 +3,5 @@ DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6b
 DIST shellcheck-v0.7.0.linux.armv6hf.tar.xz 2502980 BLAKE2B 5e8281a9a8bd7105bb852f917cb2fb252b7d5abdda26da8fc8a5d9aca2a3543fcaf88707ae3aae277578a4fcf973d66e1d457c1769ca4838e3131a1928b56437 SHA512 3cb41d339b0da7790b8451b9fb8c6e6d52444ab0f3115871049dbe04968ce88868b305d2be267af627991949f346ee1a8eb95dce4cb0e46c81a24b01d4f18f74
 DIST shellcheck-v0.7.0.linux.x86_64.tar.xz 1545588 BLAKE2B 30f4cfacdf9024a4f4c8233842f40a6027069e81cf5529f2441b22856773abcd716ee92d2303ad3cda5eaeecac3161e5980c0eedeb4ffa077d5c15c7f356512e SHA512 84e06bee3c8b8c25f46906350fb32708f4b661636c04e55bd19cdd1071265112d84906055372149678d37f09a1667019488c62a0561b81fe6a6b45ad4fae4ac0
 EBUILD shellcheck-bin-0.6.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
-EBUILD shellcheck-bin-0.7.0.ebuild 634 BLAKE2B 44203d313988c05afd88316c3811b28ee53f30a8b62434a2e6e5ee5ea815effa72b3f9c7e0067bbc4315dde9dd0c7b48fb2b2fb5d094915c1f32a5f6c6734874 SHA512 437cdaaf0450eadcf69d94be971e576824c83797522c6481f403160bb3f5a2d9b5bd22c5427aff44a34ce72a8da470f345c6e537a850f3a324044d83ce6d8a28
+EBUILD shellcheck-bin-0.7.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
 MISC metadata.xml 469 BLAKE2B 639f0079f57c613dff06b282358be8cdd287fbf2d361b053ebc62ede4efa2f4c17d9b27f420e97cde73f085446ded30d488e6f7efdec2584384688d68781ff34 SHA512 296cd96c77ffd3e87877ca773954954a08723d274ef91e7a292fc95f0b5a8d10f1d981a9c9ba2ed7c239347e3cd8eb47df2984071a58274a452e10abc2a58ad2
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
index 8b6f2c39aa76..77b8ddc5654e 100644
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 
 DEPEND="!dev-util/shellcheck"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index bf0111f327b7..8dde81df4776 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -7,5 +7,5 @@ EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
 EBUILD shellcheck-0.5.0-r1.ebuild 926 BLAKE2B 87532d0d1a95dafc036ebeccd92c3fee9aa48b37dc6eaf60ddab0b2afa4a046006ee861c7d972c2e8127740161ff596fa06c972f41fce4a47a2a4caec2608a6e SHA512 2b3e2d8f164c29091f28247a0db505e12ee81cef2d3295df17c4431606601fa82c9ed3389592732a284ff68f7bedb2f41b6d1bc19b19cc6d16369df6630e09fa
 EBUILD shellcheck-0.6.0.ebuild 923 BLAKE2B b2064e8e8a7dee1a7a04522f75477e2fb01be248d51757b7c41f2a9ca96c71f79a49861109e5d7901c69707c4ba97780840ae691b47de6f6a33b843ef9e19f95 SHA512 a9cc09599bf55687e9b1e99d3b66a8c9700f46f239ef845db9a2d06a8475eccf603bb51588d9af89d94bca1ab5271c867ec54fc5588d158901d6129494d94ff6
-EBUILD shellcheck-0.7.0.ebuild 930 BLAKE2B f648e205a8948a6cf29db3cafe6943ac456744400cd6d2972f335efecf38eaf351708fd58f8ab60aa88fc816dee53bc32fe8f64d19b8dec55eac4822bf5395ca SHA512 f7e3bdae11ab89167d4911339ce5cca49a7fe2c815cc240fb5d6677f4bc9b6addcefcd2cefbfde0228d84b68a08cb89a1d40bcf5803bc9f95b5b91b9de4b75bb
+EBUILD shellcheck-0.7.0.ebuild 928 BLAKE2B b1ead285dd5cf59c68aaabf76d7ecda67d3d6139bcce2ab27a758e1424770393e2ae2519e87c4e048fa77bd7b74e7f917738cfe3373f5b46a346846ecd760979 SHA512 8ed271669dc7829a7ee6a2357bb96353389523013b80086fcdfbda4d064ce6f00cb90667a14c6321e8fecb13480121e1634a38f904bc1c6b6a6c15ab2ebdeec8
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
index cafe13dbaa67..848d0d21e3c9 100644
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 9676f91dc4f4..6950ab2b5a50 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,3 @@
-DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
 DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
-EBUILD sysdig-0.26.3.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.3.ebuild b/dev-util/sysdig/sysdig-0.26.3.ebuild
deleted file mode 100644
index 2d4c0de2f51f..000000000000
--- a/dev-util/sysdig/sysdig-0.26.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/grpc: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:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}
-
-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/webstorm/Manifest b/dev-util/webstorm/Manifest
index e628809df85e..e9885a23f406 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,3 +1,3 @@
 DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 962 BLAKE2B 4d02ab25da40ac32e7f459000739b4c7790bb8ed668afe4782877316750387634d4a9b26420e7d6ac61caaad164d968e97103b23d4ac77773d204cae8c18db97 SHA512 efa137495db4eeb93f46494bc00f2c5695f31ab58891efc0baa7ad048ce993eb7e3e020c121090cfd23d12ad533ab9216b2bd0b5b9af635a603b918fa9e97c1b
+EBUILD webstorm-2017.2.4.172.4155.35.ebuild 977 BLAKE2B 3a64256b0e9e8e86e622e6d0deefe74c3114aa2eb28e6ff93001989955baaf596f51a18a17020672cd58fb86338b5bd28eab11c58e315a4754e39e95b9e124fa SHA512 6accbba6b2d80ee5ecedd03ad2aed982fdd1bbf531bba3603b20ff427107abaead0c0a886bd68b5b29eab5b183693c8ac2dadc620e9065c14e9644c0284be6aa
 MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
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
index 4171a9a4f433..29f6a26054a5 100644
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
+++ b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
@@ -16,7 +16,7 @@ SLOT="2017"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT="splitdebug" #656858
+RESTRICT="bindist mirror splitdebug" #656858
 
 RDEPEND=">=virtual/jdk-1.7"
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
commit	a1392efe64137262023d92492396ca9156d22396 (patch)
tree	de438b2711c7697c4597fb04f07e988586f34233 /dev-util
parent	e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)