gentoo resync : 25.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
commit: a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree: 4aa7483cd0ad7de54338afc8e7971417abe1dd81 /dev-util
parent: e8f81810baa21f490d6910e8e2d424546b72a333 (diff)
81 files changed, 260 insertions, 902 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fd1e76935cc2..dc3d0d942e9d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 0b90b0d83f4b..72a6e350a575 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,8 +1,6 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d
-DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f
 DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
-EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3246 BLAKE2B bb1d2ddc1275e9a3bf805e569434789ff6a7ebcbc41e0fff1a9546e80f830f37d56c33b9f4cb5c731715c492d289c565c2bc813218c6ac095f2240f76f05a0b1 SHA512 7d76cfaff9b061dad50e371f0bc9ce7d0679b99439c7dfcddc91f9a38aaada98879148fdd7b385d9fcd8397555d7ba838fd3681ac2766ba00676d060d5500075
-EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3830 BLAKE2B 831f1991c2591c797838516608dfecf2ef73b923e9bb1b3436ea81e742f46019f59c1638247f1619bd751dffae057c4b3156e8e4e0b306e57b74e465e4686f5f SHA512 6a2408ebacbb96b3edac57d665bef8202d73f3f3f6a42a2cec89dc7557ce5cf94c1b35abd1e1fb9862522dc3c66a5216192be6446f8c874d3421b1b4e8e7ec6c
-EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3832 BLAKE2B cb726335042d2062d09b7619bbd28f3fc12d7b12774adac49c14a2c84f5bfb17d85660e1f5a2a1e8a698f7e27c1a4aae145b65ef3c34d8b024121508e0cf4192 SHA512 ffc2209130bf34057c60367e46584df4822eb55c93a8070938431aa7291985980faeeb978c12558139e4ffa2ce691b09072e9e6dfc080feed2112e62234c2df9
+DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
+EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3830 BLAKE2B 831f1991c2591c797838516608dfecf2ef73b923e9bb1b3436ea81e742f46019f59c1638247f1619bd751dffae057c4b3156e8e4e0b306e57b74e465e4686f5f SHA512 6a2408ebacbb96b3edac57d665bef8202d73f3f3f6a42a2cec89dc7557ce5cf94c1b35abd1e1fb9862522dc3c66a5216192be6446f8c874d3421b1b4e8e7ec6c
+EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3662 BLAKE2B e597482d96d872a725753752995b09c23d4aad63d95f3fc86e5aaa2e85b4f0a9d9e30f8dd458e3cdbc2aeafa747053a1ffa69e17ab5342ccb6666c163ccede75 SHA512 c2e8ab0f00849c0171cb235468c76ec85d634648355ecb66481582be354b011e180aa19cd85a9f4d92897f7e9ad1fd7369e183db7df5c2c705a4f0e003bc0e89
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
deleted file mode 100644
index 09471fbd5607..000000000000
--- a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 eapi7-ver
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/zip
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# Replaced bundled jre with system vm/jdk
-	# This is really a bundled jdk not a jre
-	rm -rf "${ED%/}${dir}/jre" || die
-	dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-
-	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	chmod 755 "${ED%/}${dir}"/bin/*.py "${ED%/}${dir}"/bin/*.sh || die
-	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
index 239a3b30918e..060c081b0e81 100644
--- a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -35,7 +35,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-java/commons-logging:0
diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
index 060c081b0e81..e76c9a4ef8b1 100644
--- a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
+++ b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
@@ -10,13 +10,12 @@ QA_PREBUILT="
 	opt/${PN}/bin/libdbm64.so
 	opt/${PN}/bin/lldb/*
 	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/x86*/libpty.so
+	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
 	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*/installer
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf
-	opt/${PN}/plugins/android/resources/simpleperf/*/libsimpleperf_report.so
+	opt/${PN}/plugins/android/resources/installer/*
+	opt/${PN}/plugins/android/resources/perfetto/*
+	opt/${PN}/plugins/android/resources/simpleperf/*
+	opt/${PN}/plugins/android/resources/transport/*
 "
 
 VER_CMP=( $(ver_rs 1- ' ') )
@@ -35,7 +34,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="custom-jdk selinux"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-java/commons-logging:0
@@ -123,7 +122,6 @@ src_install() {
 		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
 		fperms 755 ${dir}/jre/jre/lib/jexec
 	fi
-	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
 
 	newicon "bin/studio.png" "${PN}.png"
 	make_wrapper ${PN} ${dir}/bin/studio.sh
diff --git a/dev-util/atomic-install/Manifest b/dev-util/atomic-install/Manifest
index 1ddebc697780..112c75683fc4 100644
--- a/dev-util/atomic-install/Manifest
+++ b/dev-util/atomic-install/Manifest
@@ -1,4 +1,4 @@
 DIST atomic-install-0.1.1.tar.bz2 279555 BLAKE2B 7665cf291243f208f809a5a22508df122ddeb2e2206431c6fe601f0db19e5c1991a3e1277259666fdef2ed08ccb2384c0af93efe71a4c6b9ae3b7395e3520d69 SHA512 6614b47ab24f3ce480dd977983c2117836418915a13689e301922dce3091cfbb4dfec412402fa4c68f77d15c7dc297f14d70c12aeccab98d77af0a3534f29c8a
-EBUILD atomic-install-0.1.1.ebuild 610 BLAKE2B cf5f492631a6b50e51cab008c49496753b74b6e2433fd07bf7885bc4071faddafb1f6780a2a1df5b2b135704b4eef62413ae5c38fc978b9375b8f0488b19d14b SHA512 10e44dbe933675968f207f4914f5e887a08807f7aa75a0da57b0a4bc5b070693c8b49fbcf22776fad36800d7d0ce17720a45e981e62747935231da3266454836
-EBUILD atomic-install-9999.ebuild 799 BLAKE2B 0bbcfdcf12f511211770892332429cfd75f825bff77adbd3eddd27cd5b05fbfec8ef6aed63a92ba4dd4c2738ad65960ced13eaeb96a630d311dea3a6c0c04259 SHA512 8615d57d85455021b77e3d75993691b7acd2dd587172b7e7b3171fe3d0141bbe76e694276f28f11e059ee3d0732d622146cd6bf81b72acb2aaff7e5967899c2e
+EBUILD atomic-install-0.1.1.ebuild 623 BLAKE2B aa99c3494ad4b1ffe954d8eaadc19c4b7a65668b5e1e81094f8852b404ca3d15123c40b75be54f3133e65a7904e035a855ee06858397aaf278285210b7c1e789 SHA512 a5c57a88a9f1ca7e51e1c45350c7f3e9cc110cd3b7407011e353217fb2ed5b284aec879d6b1010842a559ff0479e6c11c9525eb050151343a7ae03408ea01c48
+EBUILD atomic-install-9999.ebuild 812 BLAKE2B f0371b60af28f1cb699b40b0213db657da9ce9af057f79cfb4e76dd915eabff7e9fcf502c446779adc660bb814baa43b1b7774d06a4f85481ae03e26e72e5718 SHA512 796d4f841614c9a9fe5342cf6beb245da010d9eec0ca66f41fe61aade7e0215c3466f896c181cacf2cd5c5e84c2da3f9771bd4bff418f3fa1b680e8485027003
 MISC metadata.xml 517 BLAKE2B 3ac8353d6bdac253a9787dce4ce6645122345bc7603be533bcf63c2b8bed8b3b0820d38e9e92f02dc901cebd530b9da5002798812688e679250f74ac7d87f405 SHA512 713871c6f0f876eadce53dfe9bfb1e8792b02bac46f88a9a79d00bd9b08c6155ae97f23dd4bb20ba6a060e441c2abf3bce38fa6329fe3d502d9c63c2deabbdbb
diff --git a/dev-util/atomic-install/atomic-install-0.1.1.ebuild b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
index 6ee38de78ef3..7328e3d55b9f 100644
--- a/dev-util/atomic-install/atomic-install-0.1.1.ebuild
+++ b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 DESCRIPTION="A library and tool to atomically install sets of files"
 HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
index 824d3967cbff..c8ad8483d1af 100644
--- a/dev-util/atomic-install/atomic-install-9999.ebuild
+++ b/dev-util/atomic-install/atomic-install-9999.ebuild
@@ -14,7 +14,7 @@ inherit autotools-utils
 
 DESCRIPTION="A library and tool to atomically install sets of files"
 HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/bin_replace_string/Manifest b/dev-util/bin_replace_string/Manifest
index ef192d3774aa..4650415ff301 100644
--- a/dev-util/bin_replace_string/Manifest
+++ b/dev-util/bin_replace_string/Manifest
@@ -1,3 +1,3 @@
 DIST bin_replace_string-0.2.tar.bz2 69287 BLAKE2B 214c3a0b36971d22e5a2801334c6e3d6a8f25bb8c9293d78c4b4adcf9bcf5acfc73e39cf6e863bb135d3674eccbc48f69c090cdf5344cff7d84fb2b4123b708c SHA512 1dc369a036df48afb199d90438db34139c58ddb9bff61ccec11b78ff2173130bf8124eac784088b3ec3f376a515a543df22e81f8bbac201abc3e3e5dec8d1a92
 EBUILD bin_replace_string-0.2.ebuild 562 BLAKE2B 9724307f9ac5c2f3efdb5dab83b02f3a1c8193842cd3f6143d11c2d2007b69aeb114be62d1225ed81353c738bfdb2660695b3645755d812de7f5456635a185dd SHA512 5e963ac669d4f94864d078f174a47e697e3a6e2fdc78261da39737d02c9a29f6cbc3595fe0819fc90a26176e6fd14e30e7ebcb4e5c52003b7deb24c0891eb673
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bin_replace_string/metadata.xml b/dev-util/bin_replace_string/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/bin_replace_string/metadata.xml
+++ b/dev-util/bin_replace_string/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index 7570b8edc244..016e97375c6e 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -2,6 +2,8 @@ AUX bless-0.6.0-docpath.patch 2250 BLAKE2B ff47974243983f00bd1b17aa3df7d3649da2b
 AUX bless-0.6.0-mono-4.patch 969 BLAKE2B 63799c54f2fdd18017d619b97603d15d9b6302f84d6fcfa4e4fa7b4aa4044d57bb3b5cba3e8f290c0379abc303f0f3836d5fef0910018011b27ac45e633d72e6 SHA512 729efc197b66a53931079b5e4969b62dda3842a0d13358b62fa53cfbf673351c9622908976651d343d060d7ac37e35968733243719e76bd5f066e842ac641f84
 AUX bless-0.6.0-pixmap.patch 493 BLAKE2B 25ebbf9d3f6be6d928354dd33289ce84315c002c954cc454af1f3aff0fcdc033569d7cd0fa69c5972489887e0d8bad5007f40f014aeb9a854301689d8283294d SHA512 0fc6281e8cb6b981f5a73e98bf86a93bf635cd77133c7d3e964ef0b2ce7e855f38cb4db6216bc876f9435d5b2f4293a39cb859cb443381569e5b56a364ac30ee
 DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c22444426bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb
+DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
 EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
 EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968
+EBUILD bless-0.6.2.ebuild 1089 BLAKE2B 9f655705a567c69a2918ae0af95a2e3f7862eafa2a4d808606ad75c83dbb6ad69e3abdd34a72e9f8e74a119442905bab41b1648047ffdcc5568bf12407d77310 SHA512 480cc2c321892ee1d49325a4b2686c607a314dd347d3218ae7992fe9af770b3545f8af77bbdeb370166fbc2e4b11a21cc542b15121987e6406c652d36136ae0f
 MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.2.ebuild b/dev-util/bless/bless-0.6.2.ebuild
new file mode 100644
index 000000000000..d2f0d9b79759
--- /dev/null
+++ b/dev-util/bless/bless-0.6.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 mono-env
+
+DESCRIPTION="GTK# Hex Editor"
+HOMEPAGE="https://github.com/afrantzis/Bless/"
+SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
+# EGIT_COMMIT="v${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=dev-lang/mono-1.1.14
+	>=dev-dotnet/gtk-sharp-2.12.21
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=sys-devel/gettext-0.15
+	virtual/pkgconfig
+"
+
+# See bug 278162
+# Waiting on nunit ebuild entering the tree
+RESTRICT="test"
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	eautoreconf
+	# The autoreconf expects INSTALL to have been copied over by autoconf
+	touch "${S}/INSTALL"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-unix-specific \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific."
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 911b055cfc73..0867d32ef2c8 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -115,5 +115,5 @@ EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
 EBUILD cbindgen-0.9.0.ebuild 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
-EBUILD cbindgen-0.9.1.ebuild 1101 BLAKE2B 1d231b294240977a06ee362ce8b030fa6fdd734c1d548d83f2b34422b73be5f1eef730f84abb86e5f91a09daf4406c19eb7adc0419ef59098ba370f0922ab1d3 SHA512 95a262545f94dbd1b7724a910065922926de8bfb568e179788eacdfa449393b444494d556b55abe3ff44474caf57b6de1ce7ecb0e22c2634f2fa22e9b5aae0c5
+EBUILD cbindgen-0.9.1.ebuild 1100 BLAKE2B f8b37e2e595f60cb3fb6f7b05d8aa8ceffd2335b043a0eb30cfbdec556f68914cbf04a227b451a5f444abce09847bfe241925a08d4efe0b5e29bb0ec816ddf2d SHA512 60269c6cef4d82415d1258dbbdef6b97133c8c22986d62389f8aa7943854daa439126f7efe0aff74e3d72e8fe9d85f40df074daf0e413622a8489215dd262ba2
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.1.ebuild b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
index bab975edbd9e..fa7d6c1634b0 100644
--- a/dev-util/cbindgen/cbindgen-0.9.1.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
@@ -58,6 +58,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index f032dfb84151..89ce84ed1a99 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,3 @@
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
 EBUILD cgvg-1.6.3.ebuild 424 BLAKE2B 14165382e79cf4f22c987ed3109c5d05ef72af4201fbb7955b3197285f2f5b7beea9df5d3765cc290e11d2c428aff1989a834e043183826904bb906132575275 SHA512 7ed1eeff0411f0b9492e983dee2740875e45b426fe96b79f457deb43747a38b41baa8fc3154fb5f005dbbb8ac1fa9ed47e8902425d54a8ed5a5916c9292ef0dc
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cgvg/metadata.xml b/dev-util/cgvg/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/cgvg/metadata.xml
+++ b/dev-util/cgvg/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 74f53bdd473d..fe046c054b60 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.2.tar.gz 485913295 BLAKE2B db723c1785cdf09f35299f89bb89f21c4f4ea96cc89de73484e31d042088cf613f634fc16e4c9d927f6903be3c401002836c0628cb80be7b029c4b28a67515ee SHA512 eb0a1acb9f267fa36f3cb2924cd9caa2f84367401c271d99458fc90b40cd62f97f566270ef1cd03bd0ce4160ab4bc92182fd468b860c67f2358e3c6adb021ddb
-EBUILD clion-2019.2.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642
+DIST clion-2019.2.1.tar.gz 493159056 BLAKE2B 8264befab42af1a73f9332a9a1bbfc91e9bf09108b0a544d18296feafd200f6c0013be768a5f7dfba29da689903945d81e54b95291d0952c2336be98b0f6357f SHA512 ed96df5872f0c3d911df15b3d00e045df5726d0d4d70225ace2b41b2e8e7ab3c04f22a8f00e9232472853a5ff5baa62b8b2363fbb6d68ba785a74e34c05d4abc
+EBUILD clion-2019.2.1.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.2.ebuild b/dev-util/clion/clion-2019.2.1.ebuild
index b3360455dab5..b3360455dab5 100644
--- a/dev-util/clion/clion-2019.2.ebuild
+++ b/dev-util/clion/clion-2019.2.1.ebuild
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 1f644b11a0dc..8ae3662d6b08 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.5.3.tar.xz 500304 BLAKE2B c73d0aa6069b3c85511196e50afa73c3303a23503ff13f748fbc58ee26911b3845742ff9d37189a5373b4d05958912b76681f8fe1e02b44256cf29c161ee14c7 SHA512 920fbb44f1ec63a90d85f4814f5826a446262a54a2e5209adef902f32965e88080908445586bbac86ba1aa1152f894e5e33369d4fa604084aafb4666b7f3cd38
 DIST debhelper_12.5.4.tar.xz 500788 BLAKE2B ce562d57a0f96de13499a6aa78993dc40dacb94ce34c18d8ac81c7345f25e74407b4368c207b6837382540ecaf943bc1e51bc0032fde3d30d1988906d9fe8b12 SHA512 411dd16b779cf7e9cac76aa571d44e3c78cdc2de129d861eb6e30867ab92642f0ae070b3df8990cf02f37f3e24e127743ab92fd85f05a8b705a43a543c81e4ab
+DIST debhelper_12.6.1.tar.xz 501180 BLAKE2B 2d3382dc87eb8964dad81bcd03e15893c059a93ca4c39589cf9b41847840ee2c1ba25a73e6cf24b7e4da166e37f088b5e6e61a721f7504b7df44186ad044b944 SHA512 83f816abb522b13a98cfdc9dd2ad68c2f23a0d45b4acc55a2ce098066db2c83b52c47f2cc999da467634276a558d84960017247f0d23628fe4a35bd5ba0a2b88
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.5.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-12.5.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.6.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.5.3.ebuild b/dev-util/debhelper/debhelper-12.6.1.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.5.3.ebuild
+++ b/dev-util/debhelper/debhelper-12.6.1.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index b158d86d432a..690c767763a7 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,4 @@
-DIST debootstrap_1.0.114.tar.gz 75613 BLAKE2B e080ed62bceb4a37b5340357160f8364ee12377f6b0b0fc7ca517d786760061f8091dba4040984b6fc4d6a9b9c50639e851e04db2d8c1ed5a7dfc60e306d9188 SHA512 3eb6c3d50a403c6edde229a2da3840117f603e3e9c211f89c8b1aa759bdcf8001b5f115ddcd345601087886b6ee838972f377f3f244cf26879ca87445d2a895a
 DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb99725066562bc4a717ab42b436dcab3e5e3a2148c9e6eeaf7b6135e4bde836ee01101e7158ebc0472c08329ae0152d0845b8b SHA512 635e4feb1fb2bc247968127dc86bf0956243c8058f99e66ede177da84f0258cfc2de51873f347c099217b07e679527aeac08e7263d31b4112fb0708edb3deeb9
-DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.114.ebuild 1198 BLAKE2B bae17c6b5280b0980acec1796b4d3974f7dc8b4be709642379cb53eeea1d9dc98de059109ab30501ab0510e617af9c2d467a1aef01114af1b71be1134e06b868 SHA512 1f9a40f3fd3a275da0184488833e3161fc017eaf439aed8a50b2c6a14ffa8218e0ab1ad90d0094fbec5f46f712a0b150a26abfbe774e3a2905ccab025af9f1c0
 EBUILD debootstrap-1.0.115.ebuild 1170 BLAKE2B 8ce1a0ce29d8a1a930348fa5ec8fb078868514eb478398c4dc7197f3d6b78f7682963783da86b3e2f5fd74a81534b72783c9ae3e7287a1a512c378e43aba3731 SHA512 a08ccf79356784effd1b02369dbd582369fb05c3dbb1b0ec932ebd38295dd3aafd2d65b88fb1997c60d40833aa34b7d84f02258737582968b98c2d3975d21957
-EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.114.ebuild b/dev-util/debootstrap/debootstrap-1.0.114.ebuild
deleted file mode 100644
index 32d6ffccafb9..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.114.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.89.ebuild b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
deleted file mode 100644
index bcc76a47559d..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.89.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-S=${WORKDIR}/${PN}
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 532648e7268e..18e240ad4892 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 2046 BLAKE2B 54504fa0837d4d59ca081e9b6c84a8e984468ebd26a5477729e2067636d121f35a0fa746a28d00ef4779c8eb53029aa2d56c5c555a909824052398959415dcd4 SHA512 926ec928384e4513bacfb4da63ff1d57bbe5e8e042d62ff532c7980237f2033efcff7ce773e45fb863eb3b033afe32fc8e863b80afe5311b41d0ea63910103a7
+EBUILD gdbus-codegen-2.60.6.ebuild 2045 BLAKE2B 6a97ad7b8cce50ec8da4009da2836fa234099b2133180bc5ae2f10aeba8a2fc46a275c2ae7a640454aee9268e5d3607c0e14655cc3783bb822082aa5651c64b7 SHA512 39862fa01ce7112ed1300a8c270810bb2364a12006e480230e855a396df14d3e5fa65ffffb65b336c489785fdb1b4dcfa1735dee362b5e979767ad63890e72a7
 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 e02e3364e5df..c895e11b3db4 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/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 3243204085a1..ae847f4320b8 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 2421 BLAKE2B 77ee7f51feb66d60a6be63e5d640a8c7360a9c8ebb7d872071a8853abb09e87ece37e6ee0f290de9a0999791a38a1143ac5cdec25af4db84622de4b8d34a385a SHA512 8505199c52fec11dabc66fc74d1b7dbb88871e134c1f40f13c398484143a38c153aa90fdcc122d32f6223be769fc37a04218919055dc2fe91c5aa57d36882f15
+EBUILD glib-utils-2.60.6.ebuild 2420 BLAKE2B f148412fbbf883148792b920fa50454a04d88b703e0793e0682f1534b287d48830ef9dddb8a6d2280d9dadc9a553f6cc30db396deb9b7355ae96450f67d0c626 SHA512 6c4509669f5ad74c345cc60ed5b612004513167d78d468fbb75cc7a2315604bacb5d1ceb90df48a6809ca67f297914c137367b30eef226f9a2727fcba4679a24
 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 122bb56cd487..a80b63063dd6 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/hxtools/Manifest b/dev-util/hxtools/Manifest
index 80f812caab43..f324402fd779 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,3 +1,3 @@
 DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
 EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index ab0a4210ca1f..116f7a0d84f5 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0ce572db9bb6856141eedf8e3ba1b1d6f50e5ef9166047d610bbef49e72e44618d3761dc5cb828537a14dc7b66256968943238808a620a8533ef SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
-EBUILD intel-ocl-sdk-2.0.31360.ebuild 1444 BLAKE2B 840ce46bd4e9cf54e91a58e2f4385ec7940fa62991342969970431f0d7cb015bb8f08eaebf2e8f96ab996fa544113f4cf2e9b60952a3732870221cbf8dd5362f SHA512 a5c5875f45bc572131cf9b6b4fa0b5f819fac2795a60a8ebcf459c0735337752f7ed367efabbe7a95b7744b97a8766c03bbdcd7a813c6a8d9b6d491bbf3ea36d
-EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2189 BLAKE2B 5be44e0d2491f98cb8cf4aae5b07a9976ad5c2d1b4d650f3a76184e51480ee5c18a7bba2b919f9f6d812e358245c73aa95b3ec377ac831b871f594679486c432 SHA512 695252305d781e6b61250096a8e84fc04a82d154472b90571d3a3609a64219825bd0a7723afbe6929342825f397099a82a571f68758ec0d0d6432312ea9d648d
+EBUILD intel-ocl-sdk-2.0.31360.ebuild 1449 BLAKE2B cb0cc8870171f8eae58ce7acd3af4642c65836c71ae6ece4a58b7319e02b6e734c45c4acbc206048652b5145c3d41393f310e44652a6fa9757b9382d13115bd6 SHA512 63850e50ca33eb422e5ec9d401672188db6749fd70df2b6f99f6f09c8192c08655cc3726def1c35ff93486d9a6dfcddb656faa5cc7aa90a211538aac9aba7059
+EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2194 BLAKE2B 807b3d15f16547aa78f8391836cd2128dc838f4d8be70137e6f4831c3c41cf08ed372d05b866f3328b3582b7323c5a812ec8e1d4358c9f94fcfd417f3135c82f SHA512 d0f5af13de03b73ebc1aa35f7ac64f18b72087eee83e2f4911b375ce8d5140a0c492a776bfb86018a43a5c60a5252d744e6b2dbc1fc70d0c95b48b24858d4908
 MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
index fdf2132e3533..b2153e78d160 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -27,7 +27,7 @@ RDEPEND="app-eselect/eselect-opencl
 	)"
 DEPEND=""
 
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
 	${INTEL_CL/\//}libOclCpuBackEnd.so
 	${INTEL_CL/\//}libtask_executor.so"
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index 9310497d34a5..df63eebf81fe 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="Intel-SDP"
 SLOT="0"
 IUSE="android +system-tbb system-clang +system-boost"
 KEYWORDS="-* ~amd64"
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 RDEPEND="app-eselect/eselect-opencl
 	sys-process/numactl
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 62510b00322c..c1d6c9e9436f 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,7 +1,5 @@
 DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
-DIST kdev-php-5.4.1.tar.xz 1042236 BLAKE2B 58c0e2c1d8cf0732bd4114e2c20c35076233ca1d1b6920de43abfd804f03468496596e2b061fcc8b9b8a0e9e7a10630a1f6b2f2271b33b702dc91852dfbccb48 SHA512 a6dc4447be0148956fa805a45a73bfd05311b08f6fb3beda486f2703753a1825de97b81f67ebe6e178acf5ad238f6d6708704c04ede3bdefad19ec36d467ff7a
 DIST kdev-php-5.4.2.tar.xz 1042248 BLAKE2B dbdbd12de37a3d37b96530a25db46daca7ad7c09854ba08417abe19f5136331091ef6ba977e2eca46b423ace167bea0082e71f57d9d9b41b2f9908856883f3c1 SHA512 c805431aa4efda12d15898dfe33d8c096e042fbf3077d377eb524c59b9da14c0930fbc2c456e5760452ca238b5269f360741998af0b429096ccd57fbe6575a0a
 EBUILD kdevelop-php-5.3.3.ebuild 1184 BLAKE2B d0ba9ef4a008f121bd3254b7588868161cad6c0f6687d38928241eb08f70d0f6efad87871ba83bde7c41428983f1f6aa72dc36b7765ddfea10fb053d878d4214 SHA512 70939ab2e3b29b4370ef5b7916149f4a87aefd201110581b7c8821d25593cd602bf3f147a9ebc8e9366061886c1f15e8413c042f006afec146970eb68c752887
-EBUILD kdevelop-php-5.4.1.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
 EBUILD kdevelop-php-5.4.2.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
deleted file mode 100644
index 736a5e6971ab..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	kde5_src_test
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index ed24d6ca3b80..3d35fa57c5d2 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,7 +1,5 @@
 DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
-DIST kdev-python-5.4.1.tar.xz 1074132 BLAKE2B d2f21849e14ef9828085b4fa9fe8a9af85e71f59263be7295a76932801700730ec3bac147c287ed400515e0552ee79a5f48ae96398820f0000951abf82fc83c8 SHA512 156ad0af9fbd3e5845979abfa68329de4228edabe68e0765ebde2821289d2bb027d46623be2bc805cea6988450d594d94c1b497ce4ee1b8d86a88cd7ff1eebcc
 DIST kdev-python-5.4.2.tar.xz 1074220 BLAKE2B c2c6c1bfc0ebf3d0950740f11dd881830a3d5d9e0b331fbb16f14995b2f49f3a86293189409f005c582b9c0ed9de4a92682c53ef0145cd3200310092792f022f SHA512 fef69a4afa9539e719d4808c272d1c34f4b56c33eba355f3bd0de87a6614912e30233ae7f48e9821acb9f25f2c3bd3776f4965f777fabdde21fe48d0b7baefc8
 EBUILD kdevelop-python-5.3.3.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
-EBUILD kdevelop-python-5.4.1.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
 EBUILD kdevelop-python-5.4.2.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
deleted file mode 100644
index 4329abd3e932..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index c553d07b9bcf..f5b53fca1759 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,8 +1,6 @@
 AUX kdevelop-5.3.3-missing-header.patch 752 BLAKE2B 1932cc385d7de6f45160215e243e978248dd07abfcf6b4ff162b4cc056713d40c6f80b84b2582cd0600100444e006b0b378bba8d93d3190d5d28a010e982d227 SHA512 d511f6d393c5189fdd2e980f8ad1be96e8b6ce7d19e4f51bf8a85ce79d9bdbe1a0e9f8bcd5ca8609b907344bcaded083851a1bd5ed1fe96782091d94d6df89d0
 DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
-DIST kdevelop-5.4.1.tar.xz 7006564 BLAKE2B 98e76daca0f124f0786a0cab5a3575548ad0d2e157c72ccbe2ebee2dc1f2fd98f6d7d803991b4c426e65d16c5feb41f818440443c00b9bcf472d9c42fbdbd2fd SHA512 096d6e1d93b4faff5988d92381bea9c31048cc686cb71c52c66d54249c8cdae50dce03f63b6cd2a6ee1f15898f619ab7307fad58281186fb6d410b2ace2041d0
 DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
 EBUILD kdevelop-5.3.3.ebuild 3796 BLAKE2B f0dd1488afb9408bcf6f44f1dcb0c948ad69e2f6c89e2328a9fc00c43295acef256d1d9527a0e576d8141ad32d99502e26944dd1d2d4942b1753e404b2a38455 SHA512 98fbd77a30b1e1623116c36f0098527126119cf27e982ea02c3bc9d4cd1e9a344eeb8e01853ce4cb9fb468dcf087ffa92b6c15afec38eecadb6385aefe9a24dc
-EBUILD kdevelop-5.4.1.ebuild 3841 BLAKE2B e8fa0d79c9fbee238100926098fc5c79d7f6a732f67772bf7721472a21694cdec2cc09bb64ac6f4b8c99f6d2afe886f866782e0398016778a8aef44e24a3a480 SHA512 91d50b6cf5f6e0391e104b5156ea0a9e919e720aa16972d98a5132573c466300a4c44a8998da6626c874c19c58dcc8495ca58b344a8a311c89f8a3791c7eb2f8
 EBUILD kdevelop-5.4.2.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.1.ebuild b/dev-util/kdevelop/kdevelop-5.4.1.ebuild
deleted file mode 100644
index 6fae88586b63..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop-clang-tidy
-	!dev-util/kdevplatform
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 35adc6b5b653..10297ffc9efd 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,12 +1,15 @@
 DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
 DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
+DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bfe7c834e1e50e15be1c53dc8003cc6ed8ad4c83eef662b775997395bdb7e70835f94eca3768288fcbfeece68356b SHA512 86455d9d9866cde75e8d9bee7ddeb2680088dbc671e7d0c7bfff4c68ac963bc293bcaaf1a595db2b5529ddeee0dd0057ece37c90ee4ea194ac5e3fdb3122de01
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-EBUILD lldb-10.0.0.9999.ebuild 2712 BLAKE2B 6b0d5bed2bad575925e888236e82084a3388e28a9434ac711a1fbcd67fc94a040b3fd7d80788c2e6d55ce37fe3173c4bc0d710d05f7c7599215dce2d38cd0076 SHA512 afca689ce2424be93db8500c407efed77f98eb27b28f7d427c143d04395714d371c5fb8a2a7169315f06a3964390bb0ff3f8837d407326355e7d989bdac159cc
+DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
+EBUILD lldb-10.0.0.9999.ebuild 2722 BLAKE2B 613f34b11a3efd0ed6dbd2ee20e24f52be5cceed7194fdb15035492974bbe346e42706755a80608f0b1db7a06bbaade1de61dfc275bbd9d3effb635b61be4649 SHA512 258536299fb962763c5105edfd816b446d4109038d8f4e61d868346d8609928fac51c20b6814e8a019d8b7f3481ed15a511494e9a2c7aee8abece312d446c473
 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 3079 BLAKE2B 2e8f895fc0481d490279cbbe6d30c847b31abc1a02f34d9f51cbca3c4ec3ea5d18c5f6e68b71eb64c4054c40dc93ef5d09ea704b4373fc2c109692b8bb419a4f SHA512 6525739c5de7e365340582b222c28404142de968776a4acf05b771f41246874eeefa5a37e0336669567f2bf3c9d518065b27a6ba259ffb290692a4d9743b5df7
-EBUILD lldb-9.0.0.9999.ebuild 2737 BLAKE2B a768532e7ff0e18e2ba779054f20bdc04da7571cf1ba66277734c5e11aed22c224763f4b61f2166c3014ea36b6ecd7f9cd5e56304e1c3aa50ada8be76e33a68a SHA512 c61ca46f688826fd96ab8284ec1ec86f861255efb0c401c680c9f4817ddd22d8e5e94889cb122762832e0db3fe4aea2b018837a08621d3a34b8bda72b7506326
+EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
+EBUILD lldb-9.0.0.9999.ebuild 2747 BLAKE2B c6c14740393f0808556912230587d4299ef22bac4e9e632b364e8e01413059cd5bf2e2ea715362ed676217661cbcf4553bde7ca4c34608169ffe55e75b6d457c SHA512 a8d059545a68ca487c6e3cab6e9cfc64444f504527db1d8f9921102e5b4ff03d6970fd745ff888af8770db98eb2fbce291a540c77ea6f751725e4ca0b7674075
+EBUILD lldb-9.0.0.ebuild 2791 BLAKE2B 96d09991c69e8835a557d0e49c0eb005b1c4202646031fd601fd5b1fcba5d48c02b4997cad7ed5fd201d5b216afb5dffb68393061f7304b19cec6975cb14b831 SHA512 3cc0b03a73fdd16c2a3f575e0b5b046c36b564fd7964431d27c16d09aff3a5b86fa40e5beb9bc2551eb07b34507741bf420f9953d4fbc9c2d7328d010cd0bada
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 5a0c6f7f6ed1..43495df7f2fd 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -31,15 +32,14 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
index e41221629992..2adb8cdb9ad3 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 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libedit ncurses +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/lldb-9.0.0.9999.ebuild b/dev-util/lldb/lldb-9.0.0.9999.ebuild
index 0a3d3cede2c2..9389776f49b5 100644
--- a/dev-util/lldb/lldb-9.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.9999.ebuild
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,15 +33,14 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
 		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/dev-util/lldb/lldb-9.0.0.ebuild b/dev-util/lldb/lldb-9.0.0.ebuild
new file mode 100644
index 000000000000..84fc69b2d438
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 5bdf321a41e3..e1f3f2f6433a 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,5 @@
-DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
-EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b
 EBUILD meson-0.51.1.ebuild 1952 BLAKE2B bca35de4afc867607193bee7fc66d2c03f006efc296b666c2983cf576a8a41a8ab66e5139dd5cf0998f54c775b29b76345d3b018a6a457ba225457aabe4b043a SHA512 2ad5fdebccd48b42302e8c1a10a7d7143229396479ba60a4531c632eeada1631d32c89eada26d9c5e4ee0a2d22ed479bf3522fc8ff2523cd6f09f9ba90f29f64
 EBUILD meson-0.51.2.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
 EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild
deleted file mode 100644
index d124d341dd71..000000000000
--- a/dev-util/meson/meson-0.50.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 1d06b93d85aa..6ca7d08acd06 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -2,5 +2,5 @@ DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb5
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 EBUILD mingw64-runtime-5.0.4.ebuild 2548 BLAKE2B 82805af12130881e40369c5c2074bd622f4ce19e3d1ca1b845d6f03bfe84c271b22ee55d1ba639827d67506262a05f917509df2d632b34cca141d62a02487539 SHA512 bc4fdf9844d0b09ac4045cd51529b14ecf9fe8bb4f2fa428d141bdcb6352a0b1912d471ac133b768dcd26c65c05d345594123fade22f525b8fd803b234b9250d
 EBUILD mingw64-runtime-6.0.0-r1.ebuild 2862 BLAKE2B b10758329649069509ca617a9b1159f480eb1b84c89bf9130004b2d1e089dcdb02ac6a896b376dd7486c6fc86c12468162f089377ba2fc5390549476957ef83c SHA512 4dc7a111aab0b5a01cb1559efe7ca4126b32f77e88852ff2940cfe23fb78ade8561653c3f9d08a1e0530e875227ab50f51d820c887737454491306fc29b12ca5
-EBUILD mingw64-runtime-6.0.0-r2.ebuild 2903 BLAKE2B a9724a30a903a58e48916030c66e43d63c442bc6d75e955e692884804295bb4743feb36ffb906a9709026d57004c8a91677f52497558095933a10c965314431a SHA512 ef1747e6243e5f104d69452e56b16cc2e8c88dce1522acb5d07d6f063b67c8150eed77adb178701e78889b81f903376418595227bacd0d946eed950be89be6d8
+EBUILD mingw64-runtime-6.0.0-r3.ebuild 2958 BLAKE2B 8f91f93b5cf45c52dd8750eacf640a76d56115710a5e58930a6176db7c54a67a42ad59ad74c5503235fa946473bb8c1bbba68b5fd939640768e22375f95696b8 SHA512 30cc5cb2e975a0048007734836b8ef0052ea9470622d71fcc4c2e343996f564b9f402fc273a8bdd03961148a8156c6e38fd8eff6b26c1d830d47d6c619a81bbd
 MISC metadata.xml 643 BLAKE2B a66741716a2729da314650e4435c616a0a3912cedcc142f23ce74b23c59e21b8a456697a7d38880c1b7d876909ba4b3617a0c72c9f054fcbcbe68841d76c5903 SHA512 fd9528a194bcda889d719ba7f4759414b86cc0d75d9790a9478c46e2abf62b01355e4e01b8e05b7accda0ff0dab94607182671f367cf600e47443b0d4a0bcd53
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild
index 9dc20f91b732..0e78df25705b 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild
@@ -75,9 +75,11 @@ src_configure() {
 	# By default configure tries to set --sysroot=${prefix}. We disable
 	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
 	# That way we can cross-build mingw64-runtime with cross-emerge.
+	local prefix="${EPREFIX}"$(alt_prefix)/usr
 	CHOST=${CTARGET} econf \
 		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--prefix="${prefix}" \
+		--libdir="${prefix}"/lib \
 		--with-headers \
 		--enable-sdk \
 		$(crt_with crt) \
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 404ff472f552..267a2286993c 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
-DIST pkgcheck-0.6.4.tar.gz 174315 BLAKE2B 147745f8dc7df3c47302b2b48a1ed0bbeec348cafbe4c7ca247c688db25b248a6d079c73e4ffc28fead4a06fc2f09aa57e8dbffffcbc765602e8d433141eaeaa SHA512 94cceccd5b184c5b810c298faa1071ec77b8ca2a618e7620dec933ea5da7beda3cb5f96a4efaf7ceb2f2059040e9ef0cbd974613011b816c10f28e59c5d32a00
-EBUILD pkgcheck-0.6.4.ebuild 1344 BLAKE2B 6cd5445b9bf9d28887160bce64cc69903401d6b4ac0478a1615ef127c84f9e18e6037c328da85f758c7f2587851d956b8a7313ae9a8a8abe44da0bf5603e3977 SHA512 670d9e8f4ac92d47853046741c63f3fa1888b6539203dc1d38bec7e990e57d3318be3d7476016b3a01b46416607599058df16b9e7fe3a300a0266ff891480fc7
-EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6cd5445b9bf9d28887160bce64cc69903401d6b4ac0478a1615ef127c84f9e18e6037c328da85f758c7f2587851d956b8a7313ae9a8a8abe44da0bf5603e3977 SHA512 670d9e8f4ac92d47853046741c63f3fa1888b6539203dc1d38bec7e990e57d3318be3d7476016b3a01b46416607599058df16b9e7fe3a300a0266ff891480fc7
-MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
+DIST pkgcheck-0.6.6.tar.gz 186971 BLAKE2B 474bd3ddd6b0a4d4b242c631bd01bdd1351990500c1e9a3b97ae43064ea5ae4c3de57e2ea9e4574c30e52dbe1d10b35f71b2623336f42bac4af5e7e26290a208 SHA512 ef9b2126e3d295c9166f0b57902e62f8791ebe90e1dce333e787c45841a87acb0aa7e1b4ad7436d885a53aed9ce6c7d0619817e28c52b3195be49110bea8d39f
+EBUILD pkgcheck-0.6.6.ebuild 1344 BLAKE2B 1615f6d58748fccda11be940c4b5db1fcd023236b2e67ce09e56e182b7a72214365d75c85dcc0f8e9ee5fda639c72a2af19b858b11d48aafabccf0a92f1261f8 SHA512 95f6d648b4b7407f694ccdb0fe73c8cced9f1e29a47b5dee70ae37eca4fb7376d8d7710f5dfc893a712776746c5e34ab6b8418c459f53a47634389aaadc1bbb2
+EBUILD pkgcheck-9999.ebuild 1404 BLAKE2B e0189de8e9cbf2d811bf073cd5e7b3310a5da819750be45e33483453c0dc12e049ac2bb8d81dea06e2e6705d8adb9584527f76a4669eb0c1b91f106e3ca98b9d SHA512 b208d0e7d1102c0e491714fda766d7728aace9b033338aa0a027603af94020b41aba3725b16cd89eb4929bee7986728bb8858da024c5d0757a29677e081129e3
+MISC metadata.xml 443 BLAKE2B 396392d1a167c32f589867da690566a92b290e1311ab159688cdd8889e84ed0380c1bea107c7457447f22f48830df9341f9fdfea1514a82255f37ea2647dce4e SHA512 5c7189d329a06617753d3dbdb96765a7c3941b90584173bf45c1047fa08dbbc8ed85f1c8f38929fb0cd11b16daa074427accaab079d135ecf038e3d0a162a727
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index a43b6993fd17..81566c254d1c 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pkgcore/pkgcheck</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="network">Enable support for network checks using <pkg>dev-python/requests</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pkgcore/pkgcheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.6.ebuild
index 3d30a06c6c24..773ee0cdb919 100644
--- a/dev-util/pkgcheck/pkgcheck-0.6.4.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.6.6.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.3[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.5[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 3d30a06c6c24..999998e6345b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc test"
+IUSE="doc network test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -29,11 +29,12 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.3[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.5[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
+	network? ( dev-python/requests[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index d65b10723612..e3efb8c5c8df 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-1.6.3.ebuild 1666 BLAKE2B ae9f9e8f8fd64fdb4553bc901118daa43d4dfc5a4c7e3451196e6f70bbc29ef7a3f91cfc504d3e2aff0e0b0d3cdda9896b38d14170a113d208bd423f93eb8381 SHA512 07de0fb755c85d4ebb5c20f27de30306ab150db6e2b98fe234d94e2e0d00239b2027dd058546e01fa0679a4add25fc3046f1fd11f87092a24a71d5880c7d30e0
+EBUILD pkgconf-1.6.3.ebuild 1665 BLAKE2B 351fd2fcfd9ff25e31a0d3ff7e703ef1182869ad3976f74f2961e91f68ad7d167ef41f35e2d68ad9e12c618c75f504e2cd32b6d4bbeaf90314eaa8f02430372c SHA512 970fc2c306bdb298bb19eb422136293f619325648a72ae0815bc30b4534f99fde19a90b2f9780724ee60c5484b58574fed3f93505637b1a61c875e0da14d519a
 EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 4346444fe6a3..1cb6417d77ca 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index f0c19c8fde7d..3d6124b5616d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,15 +1,8 @@
-AUX radare2-3.5.1-mount-free.patch 733 BLAKE2B bd5301947fab85f68e65e2ed69138df18cef42b1728804f09e4003cf6d633a744660aa89a60569e229928180e4fc3f82a1c5568cfbbc04042774062ad3e17f67 SHA512 d91e75f418c0b3e2e7f76a858b34cae81babaf27829b553d40c9e64d94bd74e2bd529bf43107ff648223648939172c9a98e1b6e0e12467ee474e2dc6c6ca5560
-AUX radare2-3.7.0-with-syscapstone-p1.patch 676 BLAKE2B 888e934d8cf9a14692aebb18ca22e18346b967f9f568dfcc0b3caa8f0b6c4cf9efbf773d07e7e0ddeb4af7b26201a94630a0aefb8031022791a2910c6f57ab42 SHA512 089d8b5f093bd1c884667a00e52f881074343ff8862165a8821094ecacc48522391457bf6393c07bb72a6d08d6791dd2759a3efeccdc5aa80341d6d38da4e42c
-AUX radare2-3.7.0-with-syscapstone-p2.patch 544 BLAKE2B cf29374334a81a7cd4e48951083fcc5f9240b4672b87454b013f859beb32120666fe79239bc0f76168668d471e7efec159503892782ac38246b873df61c69ba2 SHA512 4741d0f7f51e9efcfb6a313451c1ea1c8cdb003c5c160c4a717b16598ccbb2020e10e23b588a9d2c792abc98d23eb5567e5c1e92e31d287b3210a664e28bbb3e
-DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328bf7da8c2871924f9520ff87252d4df18a1239793c70f4b800bb7d5c4aef923e63c93aa15d86ae685ddda205da2 SHA512 24c2a45ed539830dcb8dc1585c27e45515c70989132f500527db0ca6795027eaa82ea54d1cd7fc73ddc49641a73148be963ade1648e92b5336d2e86335e2497a
-DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
-DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
 DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
 DIST radare2-3.8.0.tar.gz 7510078 BLAKE2B c3dcc28c0cda8c7c5f8dbc6d35c3d15fa73fec8402acfd5de0b3ea85ef0295608d2332efbb29a41e75239acafb66b1c3b946f58523d9e5bb605b70ddce3ce38d SHA512 c9a1a4e7743b54026990d7473f05fb8eb25d7a7f0fd985172587ce82b8f6fefb53dd181b0bdb8463d2460c71e4a9eb377ead4ef7379615c90aa858d8fcadeadb
-EBUILD radare2-3.5.1-r1.ebuild 1210 BLAKE2B 8bbc76b7d1097416f53e8d70c12e5460d1c2971ff2d3cbf05718be0397b014f9b456dfda8411048d48ccd28de37919a9e79e6d8970228c8a9de91ff993c73ecb SHA512 9b54f5aa235c1b693235833618e822a67790773cde3847a65216dd832ef29fba8a43db7ca770d5791f03c976fe5a8b11ab9f64c79ad374947af8b34d6e4bfb0b
-EBUILD radare2-3.6.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
-EBUILD radare2-3.7.0.ebuild 1220 BLAKE2B b47051fd9c3a4f0b819f86daaaecfbb95747cda74811c73d788ea055a611eb2e9248e6c80026b0f2a2958397a49b73e20f305b9cf5967522c89c26a35f32e322 SHA512 f423501872f7e672de464ad9f46d06f1fb07511c85939c015c37d89b1a44bcde0e934e324b47aadb446c6e5f8a8044fa73b751f234e1dddb64294a36e36efc84
+DIST radare2-3.9.0.tar.gz 7519146 BLAKE2B cc64567c3ce4c0c764f288fcd8110a7ce25cc15fb6a977fc489ce7ad9b697d628d87ff9280601fd00a53a79fb8de3b7fdc83dff56463addfa80f3528ccb733ab SHA512 7198c6fb35778d93fdbba5dd3dceddb7af21d555fb42f22752c8898ccba44fdcba92a6c502ddc8bdda71b883df392168ece807325b53cf75537b4ec59d86e42a
 EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-3.8.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.9.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch b/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
deleted file mode 100644
index ad27596fc124..000000000000
--- a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/688336
-
-From 40453029179d230cf02ffed205f2d63e33981b8f Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Mon, 17 Jun 2019 11:34:49 +0200
-Subject: [PATCH] Fix #14334 - Double-free in ms command
-
----
- libr/core/cmd_mount.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/libr/core/cmd_mount.c
-+++ b/libr/core/cmd_mount.c
-@@ -471,7 +471,7 @@ static int cmd_mount(void *data, const char *_input) {
- 			rli->completion.run_user = rli->user;
- 			r_line_completion_set (&rli->completion, ms_argc, ms_argv);
- 			r_fs_shell_prompt (&shell, core->fs, input);
--			free (cwd);
-+			R_FREE (cwd);
- 			r_pvector_clear (&rli->completion.args);
- 			memcpy (&rli->completion, &c, sizeof (c));
- 		}
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
deleted file mode 100644
index 3f87d606bba4..000000000000
--- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Thu, 1 Aug 2019 05:23:56 +0200
-Subject: [PATCH] Add capstone dependency with the mk
-
----
- binr/rabin2/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
-index 0ecb48629..33219020b 100644
---- a/binr/rabin2/Makefile
-+++ b/binr/rabin2/Makefile
-@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
- include ../../shlr/bochs/deps.mk
- include ../../shlr/qnx/deps.mk
- include ../../shlr/ar/deps.mk
--LINK+=../../shlr/capstone/libcapstone.a
-+include ../../shlr/capstone.mk
- 
- LDFLAGS+=$(LINK)
--- 
-2.22.0
-
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
deleted file mode 100644
index 1ebb74efb36d..000000000000
--- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
-From: Slava <slava@bacher09.org>
-Date: Sun, 4 Aug 2019 04:00:12 +0300
-Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
-
----
- shlr/capstone.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/shlr/capstone.mk b/shlr/capstone.mk
-index b3cc42d24..f1a2de04d 100644
---- a/shlr/capstone.mk
-+++ b/shlr/capstone.mk
-@@ -1 +1,5 @@
-+ifeq ($(USE_CAPSTONE),1)
-+LINK+=${CAPSTONE_LDFLAGS}
-+else
- LINK+=$(SHLR)/capstone/libcapstone.a
-+endif
--- 
-2.22.0
-
diff --git a/dev-util/radare2/radare2-3.5.1-r1.ebuild b/dev-util/radare2/radare2-3.5.1-r1.ebuild
deleted file mode 100644
index 781c3273fe47..000000000000
--- a/dev-util/radare2/radare2-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.1-mount-free.patch
-)
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-3.7.0.ebuild b/dev-util/radare2/radare2-3.7.0.ebuild
deleted file mode 100644
index 5d70b601195f..000000000000
--- a/dev-util/radare2/radare2-3.7.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=7
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${PN}-3.7.0-with-syscapstone-p{1,2}.patch)
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-3.6.0.ebuild b/dev-util/radare2/radare2-3.9.0.ebuild
index 0b3f4cfb432b..0b3f4cfb432b 100644
--- a/dev-util/radare2/radare2-3.6.0.ebuild
+++ b/dev-util/radare2/radare2-3.9.0.ebuild
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index f34cc617fb72..e7d642d8d898 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,7 +1,5 @@
-DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
 DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
-EBUILD redo-0.31.ebuild 995 BLAKE2B 72a133c595067f48172332b0277ac024a4058f18d8bf55bcabac23bfd3ca73b252049cc733fd0f76343d2586f152eb631632c2e849b826e29157483a82a539d5 SHA512 70f456c9cbc12a69adb8a3c4e418ea6de321f00c0a14cd908681a989dad14aac2caac18ca23c7c4ecaabf5a6bd9fef106cdba3b464929046be1594fde7d06a37
 EBUILD redo-0.41.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
 EBUILD redo-0.42.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
 EBUILD redo-99999.ebuild 992 BLAKE2B fc28366bcc74fcc7e5ba7968681be93535524ee2be30490bdd00b8c7821629c6faf07b215015192ff65b3b151eec3df4a1d51d068074754eea3be0f0d5c24f39 SHA512 d79fdce3442042bfc67c9151c075c44fe18f55cf33d4f028e69fe4708bc3cf6a0b91ddcf9d41a731c04257258ab7fc48561432c61ac6857003da45400c396a46
diff --git a/dev-util/redo/redo-0.31.ebuild b/dev-util/redo/redo-0.31.ebuild
deleted file mode 100644
index 50d08c2d1df5..000000000000
--- a/dev-util/redo/redo-0.31.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib multiprocessing python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-BDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() {
-	./redo -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	./redo -j$(makeopts_jobs) test || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./redo -j$(makeopts_jobs) \
-		install || die
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index aa559e2fed10..3307641cd238 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
 EBUILD reswrap-4.0.0.ebuild 596 BLAKE2B b1c0737764d8d9c003c2bbc01fa2d6de73ef7a9ef99daefbbb61fbbf463b470c6f0826fc4ce1706f33ede10c87e8d1031b6d9f791fbea08350c75087c1d690e6 SHA512 e8ddd6f5719265854f033dc1b5e3069927b712b3337b000c72bb8138ba6d696203eaad12076b6b6b2b7807276452362cf6be555f392daa27c6db5be777a8eafe
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/reswrap/metadata.xml
+++ b/dev-util/reswrap/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index 66d865f42ece..a27e18b44d52 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
 DIST smem.pl.20071119_p1.bz2 794 BLAKE2B eb48d3ed41d0261a94381da5795764a78d95abcb23fe9d46755e7c4a6672931a972bca8f188a359b7bb4a52afcfe177098c048e3dddc910a7423f5c2bf5d37ac SHA512 452d10b2e3dda5d4167e62e3fd541f89f90cb07c431876e0fb671f30e224b8cd14a0268ab14243342c2188f3d3826e7a8303b3fd2eda393fdc8e31d0f1b1d575
 EBUILD smem-20071119_p1.ebuild 499 BLAKE2B c94bac5be5a10cd218ce0312b830861fea822b9998e9e3a764c99c250317fb42472166eaa05ad600b350bcef23c72021c0278f3d8ccbbfa3f409d1a8b854ac41 SHA512 bdae13b9445d5aafeba05945b1a7c169953c3073da104e1f3990fcc7f7a4528219a5bf7512d7b430bbb3ac6e055063dbbb0fe75225e2d72c8b36c8b2c10ee46c
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/smem/metadata.xml
+++ b/dev-util/smem/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
index cd4645d6c5ac..78e27259007d 100644
--- a/dev-util/squashdelta/Manifest
+++ b/dev-util/squashdelta/Manifest
@@ -1,4 +1,4 @@
 DIST squashdelta-0.1.1.tar.bz2 78504 BLAKE2B f9aa13b3af35bd97650b31fac718837763b73c2817548a3fde75841993092d717ea78826a3e29d472290d4f9164f8cfcc9f9999613f199c21251080584dbd9f7 SHA512 efe90831e412ed6627d44390054dc89339e85bcd3be452f16fb32d00989bbdc9480dbefcea624941b4866a686a356b0371c33de31903afa70af26eecbe902844
 EBUILD squashdelta-0.1.1.ebuild 783 BLAKE2B 6905a7965dbd483b95770ee99d820dd2a813ff2502e686417d8805ea8e7227da4e52dc4f6cf6af1ae803171367b0d9570800efe440fdae183193db41a755d8d4 SHA512 0c7a13325141e16c869744174c448b4d1a8656dbb9e25f540a6397c69d5e970d400ca5fe7531ddeca8aaaade21fba952b382a16c6fd1bad8bec657da56a06e32
 EBUILD squashdelta-9999.ebuild 812 BLAKE2B 87a425b61222a714e4a4868d5c86ca37ef58c1840137214edb349b1fdf3b94175ee65ece4252be5af89f992b5be4675c2f6b3e92b2133e974b0fe0427bea1748 SHA512 d3551e272526a4c105623bce97879012d998fe57d2bf31d795d9051da3427a7900916f0f8b90d5a725e45fbf3e1282413c13eb32c6eb0ba2faf6ad6fcc799ee0
-MISC metadata.xml 617 BLAKE2B 1a732150f235099533beb0b3672648f3d4e501509d754bc54f1cb9093df38b2c411519417433b1b485c922844814923c2925d699881f07cb0512b5edeb5f93a8 SHA512 a08f732876cfc4455ddd980eb04cffbe73b4bd56426d420777782a93b1229277463f85c71f05699f152f2edaa4ee8e029e1e5185b5c7b47204a9e9b9ba5120a2
+MISC metadata.xml 511 BLAKE2B ed694fc6151e4965dd07c0f9970339340e26c4a813ccd2077a8eca039934d6a82ae7be0be97279887de58c15070cc5e3ebc94a7dd533d1fa7ab0e273ae39bbcc SHA512 2faf5a923e1912bddff4074ec8871cd0b9990d397e83e6d244774a8f9d8445423b0ea629b424cdfd9b8a10e012bfd588c0792408e44770d0a403f5ea635db154
diff --git a/dev-util/squashdelta/metadata.xml b/dev-util/squashdelta/metadata.xml
index 1001cf9123ee..ef0fca903aa9 100644
--- a/dev-util/squashdelta/metadata.xml
+++ b/dev-util/squashdelta/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-	</use>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
index 4614852f08ed..28c4f47a9f2d 100644
--- a/dev-util/squashmerge/Manifest
+++ b/dev-util/squashmerge/Manifest
@@ -1,4 +1,4 @@
 DIST squashmerge-0.1.tar.bz2 76678 BLAKE2B 01e1a286081af8ac4f19c0c40c206f5d41c287b612e48750a6900d2a182dac31fbf1831e5e85891366c2edce6851f3d0128eda22b2e01f3b45594a06ee656b8b SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683
 EBUILD squashmerge-0.1.ebuild 762 BLAKE2B fa7ffc72dde14fee3a9ffd1086f2ebfaafca66a13b628ffa0c8eef0f80ee0f27651883d05fe127f0fdfcacbaadca58712429ec4f3ff504ffb1337113974cfb65 SHA512 45c8283e5b02e98cbd071d90b0b859d685c67ad13005846a1b3aa979e70d0e66e14b9e49ec299dac3118f31dc1d19eb9145c04937c43afe040d0de795252f66f
 EBUILD squashmerge-9999.ebuild 758 BLAKE2B 0d11cfa67239e6d928cd95534728a9574437f8851780969dec850feede9462b26431a960041311ea88eb548c0f365af1ea2aad9731f478a6414ef62cbee3aae2 SHA512 f62e8b4ff613c37a7f0446fdd24939cef4c40a1f836fce827d58451f2585166054d2220344f806e39f6fc4e3ef18044b28e8187f1a3228feb00b22fbb34a267a
-MISC metadata.xml 617 BLAKE2B 145f8cab4c01afb4fe99d51e1e714dd26a9c9a3dc68ffa92588b11e29d326723bab1730ce1fce7708951e362f71ed1bfadae58d122ecadb1d6134423935bbd4e SHA512 3fd67397e969a42017f09a6833b0ee2fefefb9c9fdb16c75312f579991f7025ff7284779f01fd7b6f7ebdd491c85d7b26aad24c6fefd2dddac3c868fd0df1b3d
+MISC metadata.xml 511 BLAKE2B 47b35730a38890b46d8f5b7eb5edb2f3825cceb5f14d662f2c0751a93ff0bbd1411ad6a12983caf5726791cc4a32ae0bc42e1a955970c1492c6679ddde89ffa4 SHA512 c9a260116a954e182965420724da8099b6b01857ba27895fe209308f8d1c0231cc468ca43794139abcae7bb2c403af339d21b98b193f40bfdbe23ae24efc119e
diff --git a/dev-util/squashmerge/metadata.xml b/dev-util/squashmerge/metadata.xml
index 8c6675d140f4..0823857e76f4 100644
--- a/dev-util/squashmerge/metadata.xml
+++ b/dev-util/squashmerge/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-	</use>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 633f0b6db0f0..0946b7e95d22 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,7 +1,7 @@
 DIST stripe-mock-0.34.1.tar.gz 340357 BLAKE2B 127d39b01bbd883141c75e63dc5e0b8834dbc86f375058768072b3de75d3f9e3fabebdfdd9d872c51ad52fec3e2057ae342887c25b496b987d64652c93b204bd SHA512 c9e35867c44bd7d127f91d0f668d39ff67ca9bb2937428f808122555360a77b91f9f5d5648478dc2c4fc04a7b9195fed0a927868fdd22b852022ae2fe0f1e695
 DIST stripe-mock-0.47.0.tar.gz 371383 BLAKE2B 0d619e62c9d071cd0706f0deeab5cb659d994f02df87fc638e319b346cda83548bec9a6068814b7c17a8f62e8f9c2206003bd62f66f844e8f38ee96b10f099fe SHA512 b387556526eea8b02fb3df74b345f5447bc81d7cc9e7f9fe9cd59dfdef7895bd31c882bc3c96c6815c69cc1e1fc3bed8390beb107ecfeb79e69aba4bc115a17e
 DIST stripe-mock-0.63.0.tar.gz 453992 BLAKE2B ece5c4b4141fedd4dc896e5505047c1138a27cea63b4df1ce96b12a41e6e4ddb636ec181bcd1063819a0aa0247302171181d86bd962d0a2063289339c35105c2 SHA512 0e23493808643326e91599620c481130df3b2c50f1d39c64f9f404c54708f71a61a48630f0e3cf4c924e53d29f21d442be5323925fa0096c3bea3e1582676578
-EBUILD stripe-mock-0.34.1.ebuild 579 BLAKE2B bee1b559fd7bd252da8bc9cf95b221c3359841d9653d83add51098699e2a5e44cee1f16d30278270ca6dd5a0a1721b1757be88ce498bfe09622d8c81ac39047e SHA512 c94a200b1976687bf500a5f9a11ab0dc21eaf06aaec2a3d469f2275f3fc20779677c7d679ea220a6f7a8b72061734d215cdfe6bf2f39f6cd79a7b28b10b011aa
-EBUILD stripe-mock-0.47.0.ebuild 579 BLAKE2B f34d8724d7b65618e078fc5dc038619fe5b7c911993bb4699819aeb815689c5dde30f7cd143f2005d393549632e3635482d279ad1d469ac795ed9298c08c4327 SHA512 4ba06e10f94e1923fba546f1963d4c4e6c6d29d2c7f039e8bb529b1b749aa69befc338a79a5e4a2e7b7df258fbce4174ea683209216b0110925901520c0230f3
-EBUILD stripe-mock-0.63.0.ebuild 576 BLAKE2B 51ef90927184d70398224fd7415b9019134e401f5f71697476eb280b16a73484cff8be0f232105bcf975d326303602c6890acd0e84b25e72a9274aa2947b37fd SHA512 c56d9a6ed78b63fafab0a31f744bdda57fd2e111d18204b8f464d6cd9ad8c0ad4cd4e58363aa129664c39e7e4583c26fbc85886c107ab70b1dcd70dd32436284
+EBUILD stripe-mock-0.34.1.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
+EBUILD stripe-mock-0.47.0.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
+EBUILD stripe-mock-0.63.0.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
 MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
diff --git a/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild b/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild
index 9e701cfd247e..e3231b8082cf 100644
--- a/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="MIT"
+LICENSE="MIT ISC BSD-2"
 SLOT="0"
 
 src_install() {
diff --git a/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild
index 466e59347a0b..e3231b8082cf 100644
--- a/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="MIT"
+LICENSE="MIT ISC BSD-2"
 SLOT="0"
 
 src_install() {
diff --git a/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild
index 1261b354014f..e3231b8082cf 100644
--- a/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="MIT"
+LICENSE="MIT ISC BSD-2"
 SLOT="0"
 
 src_install() {
diff --git a/dev-util/stubgen/Manifest b/dev-util/stubgen/Manifest
index a69160ec3c9d..0b286e23e9e7 100644
--- a/dev-util/stubgen/Manifest
+++ b/dev-util/stubgen/Manifest
@@ -1,3 +1,3 @@
 DIST stubgen-2.08.tar.gz 104152 BLAKE2B d3e419cb2dcfe4dfc3f6c04cbf7bd4d0fb380804a1b42f66c7f2fb40ba5e581f1b9342666e008650beaa67a79c4acdb73a6c790bd8f2cbb467c1afe53d311cb0 SHA512 daf8a83963fbc8b6857036a3f67a25031fc9e5f032ffedb1e041246354ede2363f5324b6f52ffe69fb41caa177eeca0a1c120f235e460043da1db5fb78fa5e41
 EBUILD stubgen-2.08.ebuild 531 BLAKE2B a2cd9223a2be09989697630269bbde75eafbec809a131e774585c47622ba9560046079d1c93f4c085011e05742b9c51ee4fb8bdd01c3f68ed834549f31c17185 SHA512 3e64445ddb9037bdac22cbb4dc93bd7c2d1166de01e4dca09c51cd107a77ad810d28b960a0e97c875401d347065d24914fea8da49294850ab5f4099409b83482
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/dev-util/stubgen/metadata.xml
+++ b/dev-util/stubgen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 83a36e6d7366..c629fe09bc9a 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -2,4 +2,4 @@ DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeac
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
 EBUILD vint-0.3.18.ebuild 1315 BLAKE2B c6ed0e9a0f7f57887fca3ca9bddbf70b4096e36bbdeb2e6e3d4fb73f1a9749d862e92e03cbd0fbe78c46323bd55da152903d0bfc8f8f01cbb6b1f57d3df9e888 SHA512 e40aa6fc1619b0505722cb64272d0b13f73b537650fb6a999aac0e958cc34d9a65397c16ac56a47cb32e76a2f3b2033496426cdcd69fdc2271c21ca9f90909c1
 EBUILD vint-0.3.19.ebuild 981 BLAKE2B 86ff247aebea513fa4a173c5a24e257aeb1468484d595ca779bfd28c480308af4d1a5d3cde9093596ad8f4b2f90271d7cc9bb46d5ca6fdb2d3094e4fa8327be4 SHA512 8ac0b0bf411975913a5c91b09307d15bf6898373f53bcebf77066cfb34c467a76723ab252063053b8eda32f25cbc7e5006b3878a1dbd6088e1a72467f0c52756
-MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
+MISC metadata.xml 356 BLAKE2B 2e20ccc80c3828e2dd47f3b073ed3925fd37c010197284dd2b917b01ad365fa7556562a19f5aab16f4e8bb0e43850354075c1802703ecc1e9f43739451247c42 SHA512 3deb46a147db24fd9858b4f4cdc6f864d303ffe2b2989bac8fd6039bbdc7e9e4d06db96a4cdb2441753d103c86523cac48743ecf803d5b0c2f85d0b211052dd3
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
index b2d24cbd66c5..6909b8c486aa 100644
--- a/dev-util/vint/metadata.xml
+++ b/dev-util/vint/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://github.com/Kuniwak/vint/releases</changelog>
 		<remote-id type="github">Kuniwak/vint</remote-id>
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index b391eecce123..b56dd1273c0c 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.1.106.tar.gz 576943 BLAKE2B 6985b5635e0e9201dd931035470638f85a0accfa679c71aa98bb6174853eb324cd926941bc8f259a879e4a269c27686ca30e9b83946cab6e42036631a2753c40 SHA512 4b0bd6cdc3b29cff0960c592c9a40fddfe64c828e77f3ff52dcb8d5848e71ad6454b13f95b64e39227bd442b1ba2692abf7a824cdc9476b339fc31e4c8b728f0
 DIST vulkan-headers-1.1.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
-EBUILD vulkan-headers-1.1.106.ebuild 627 BLAKE2B 83919de68da20e7e0b92a594f8251e032a39ed7965b80d06b9020a7229b662131e152d547cd25d32c05b2707a7b6ed5de3bedc7fce388cf84e86b05e8432a9ac SHA512 a78ac1319f094b265b402a7dc415728c90ac8dce60517e65dc85f28651842c2ac89cb569eb98e95ba1ec1f4d22a6fbe748db73dae2c8369bfc09799884acc98d
-EBUILD vulkan-headers-1.1.114.ebuild 629 BLAKE2B 0c0d0708b5e5ff8750d0d6e442b90982de5bf5933ca46e4f74f353d3523384f68b300dfc41e356484fa1b9869b264584798bbce6a9a47d7b494cae3bc1e57cb3 SHA512 165d8cf84f656fe3194d2b0ebcbafa344f326313357965ff4513a2fe10c08e3787d524ad76af635159d2ecf37e7583bdb8677f45bd21a9b700844c1fa781acf9
+EBUILD vulkan-headers-1.1.114.ebuild 627 BLAKE2B f3f2eb31d94953b415ae94c4ca5ba2b45eb65d348645c66f55c8e00473f861a30e85779d27f3413fc9fa4ab59048f7ca0f9aec958c8551b3980f30099e72fd7a SHA512 bcb14b626aae1c5264ac3eb708ed4baf62a591b55ba97a24308dee64b19517b7fb197b978b84f9cc7eaeaf48078b37c6b30b3800298895f999c27b3a676194c4
 EBUILD vulkan-headers-9999.ebuild 728 BLAKE2B 880211ab2cde0320426f6048c2b6743fd57c1e1169b809d8512fffe09a0e99aa5d991d93a6c2656a62db0af83252213223ef7cdab0aaa8c33a4a26e3382f19e4 SHA512 4c103ce4a085d44b77c411aea833bce8962d24a9c50b611d3fc0bed545021d7e9342f86db333671e21fe58bf22087cda88f6d69a3196be34eec921959cbd1225
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
deleted file mode 100644
index 645ee5d02cbe..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="08cbb5458f692d4778806775f65eb3dc642ddbbf"
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild
index 28ee9aef3f38..2207a814a523 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.114.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="e3f96a9ccab9397481eb81c4d9bce4ea7590dc33"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
commit	a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree	4aa7483cd0ad7de54338afc8e7971417abe1dd81 /dev-util
parent	e8f81810baa21f490d6910e8e2d424546b72a333 (diff)