gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-util
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
178 files changed, 1542 insertions, 2650 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3e55e21aeeff..676e50f4a15f 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 165458f097ea..143f999fd9d5 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
 DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
+DIST android-studio-ide-191.5900203-linux.tar.gz 774544330 BLAKE2B f1bf4e808a731336c35d2a264fb7608e2129aab31eb9afe0f6e898603dbc5aac13e3c30335ed7c4567b5d3860299ed5ed4d25ba919eebf3f847955fdd49fced4 SHA512 5b736002e3a5dc0c6ff8897f05d20132444304bbd96ec4f14acf93dee8389e67f2bd037ae6d3df9770254a744f364d04f6324dcc17d49bf07006049c80572afa
 EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 9021769173d13b280d186ae0508f100b219f5203b6e384bb9499ae6c64303945626ac84c6666ffec73c98173b47bdf89fab376684d6001176a92776bfeac3499 SHA512 39484240e0708a5ea4a1c5f9e0309a0dd42916ad4c7f41a53095131342d17bb7d4de97595aadbea37fcd80ef26b1578bb61de254d2a90e2f031003c6915489d3
-EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3658 BLAKE2B 6aae0b97fefc7fb4ab69e2f2630c6dbf27f054f7a986c001b934e657768f51be4b29664a108b4ff2101ff001eeec7ea65be9df7bfafa8a8d36ca4c93f5ec7b02 SHA512 5a427c9d5cebf3ea2e3b2a767265d8ccb3e22717648243ab3805c884ca79709c6644b9633bbe056169f1c1802be5fa67713af188d6984962de82d7db59fc2477
+EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3656 BLAKE2B d4ebdfb3462e9d86fc72041cecb82e9e78e181886e0c15b8b75fcfe28c3f0d47002a181812e00db3ce8a2af16fe4d989a043c58c9ed0f2399446927f72424ccc SHA512 f5be1e707d7c51734457c61dfa111f92310e24dd810032d890c7ae1735b67d41ae0b95f546b28d957931b0c0adc2b72e1808e0912ab7f393fa3119d9ae93afc6
+EBUILD android-studio-3.5.1.0.191.5900203.ebuild 3658 BLAKE2B 6aae0b97fefc7fb4ab69e2f2630c6dbf27f054f7a986c001b934e657768f51be4b29664a108b4ff2101ff001eeec7ea65be9df7bfafa8a8d36ca4c93f5ec7b02 SHA512 5a427c9d5cebf3ea2e3b2a767265d8ccb3e22717648243ab3805c884ca79709c6644b9633bbe056169f1c1802be5fa67713af188d6984962de82d7db59fc2477
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
index 98fc3046cf05..2f6f8b6fb826 100644
--- a/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
+++ b/dev-util/android-studio/android-studio-3.5.0.21.191.5791312.ebuild
@@ -34,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
diff --git a/dev-util/android-studio/android-studio-3.5.1.0.191.5900203.ebuild b/dev-util/android-studio/android-studio-3.5.1.0.191.5900203.ebuild
new file mode 100644
index 000000000000..98fc3046cf05
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.5.1.0.191.5900203.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/libdbm64.so
+	opt/${PN}/bin/lldb/*
+	opt/${PN}/custom-jdk/*
+	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.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- ' ') )
+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="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.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+	>=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-compat: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"
+BDEPEND="dev-util/patchelf"
+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
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
+	else
+		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+	fi
+	# 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() {
+	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+
+	# This is really a bundled jdk not a jre
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		dosym "custom-jdk" "${dir}/jre"
+	else
+		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+	fi
+
+	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+	if use custom-jdk; then
+		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+		fperms 755 ${dir}/jre/jre/lib/jexec
+	fi
+
+	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/aruba/Manifest b/dev-util/aruba/Manifest
index 201463917993..0b5e15b2ab09 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,5 +1,7 @@
+DIST aruba-0.14.12.gem 172032 BLAKE2B be19078caef5e0d1c50d0f0da0efdbfb6cc128d40605eccd8ec7e89ba655523f4c8a0ac11e59d347439be3ac8da64f7c3ce5ff761c07c716efbc2e51c3bf420e SHA512 f75adf0b4ed04a4516111d7cc5834807f940c517baf652dc8062450d7c284f11c9dc68216757e431a4e1fd084c50c2b0eb274c2d2c3e25795785a44b0a61e06d
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
+EBUILD aruba-0.14.12.ebuild 1520 BLAKE2B 947a401829e02bc0b9aac249ebac01b06f8a80a2d1412a4b1886e89232b5ddc11b5c6899b77c7d95321a6ea71ddb54e02d7a8da7ef180d398649b0abaf35dd9e SHA512 2b105bb544644d01e88e6c6ce539b1bc91267ec1104be455585ddf47e3e775905883b29a0ea540dec9a436f8f77e2db754551b6b9ab8db8931d988635d667c80
 EBUILD aruba-0.6.2-r2.ebuild 999 BLAKE2B a8b57253f1a10650a3ae566abf5a844611d9b331b9482616dbfec4cd89fd402c4b243f2d3516b058cf98e722ace1d2794f7261d7a0e535da15818862175ff03c SHA512 d780d17941f81a10bc5986549b4ec867bb54a264cfa93a621122ec0abc8ec3b299e060b6649f89e62af04fcc13aa5ad2714bce64faac62d4bed11c2b8ce68df1
 EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.14.12.ebuild b/dev-util/aruba/aruba-0.14.12.ebuild
new file mode 100644
index 000000000000..4397253389bd
--- /dev/null
+++ b/dev-util/aruba/aruba-0.14.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.6.3 <dev-ruby/childprocess-4
+	>=dev-ruby/contracts-0.9:0
+	>=dev-ruby/ffi-1.9
+	>=dev-ruby/rspec-expectations-2.99:2
+	>=dev-ruby/thor-0.19:0
+	>=dev-util/cucumber-1.3.19"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+	sed -i -e '1i require "time"' spec/spec_helper.rb || die
+
+	sed -i -e '/Scenario: Default value/i@wip' features/02_configure_aruba/home_directory.feature || die
+	sed -i -e '/Use ~ in path/i@wip' features/04_aruba_api/core/expand_path.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/atomic-install/Manifest b/dev-util/atomic-install/Manifest
deleted file mode 100644
index 112c75683fc4..000000000000
--- a/dev-util/atomic-install/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST atomic-install-0.1.1.tar.bz2 279555 BLAKE2B 7665cf291243f208f809a5a22508df122ddeb2e2206431c6fe601f0db19e5c1991a3e1277259666fdef2ed08ccb2384c0af93efe71a4c6b9ae3b7395e3520d69 SHA512 6614b47ab24f3ce480dd977983c2117836418915a13689e301922dce3091cfbb4dfec412402fa4c68f77d15c7dc297f14d70c12aeccab98d77af0a3534f29c8a
-EBUILD atomic-install-0.1.1.ebuild 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
deleted file mode 100644
index 7328e3d55b9f..000000000000
--- a/dev-util/atomic-install/atomic-install-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A library and tool to atomically install sets of files"
-HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable doc gtk-doc)
-		$(use_enable xattr libattr)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
deleted file mode 100644
index c8ad8483d1af..000000000000
--- a/dev-util/atomic-install/atomic-install-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-inherit git-2
-#endif
-
-inherit autotools-utils
-
-DESCRIPTION="A library and tool to atomically install sets of files"
-HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.18 )"
-
-#if LIVE
-KEYWORDS=
-SRC_URI=
-DEPEND="${DEPEND}
-	>=dev-util/gtk-doc-1.18"
-#endif
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable doc gtk-doc)
-		$(use_enable xattr libattr)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/atomic-install/metadata.xml b/dev-util/atomic-install/metadata.xml
deleted file mode 100644
index 92f08657ac2d..000000000000
--- a/dev-util/atomic-install/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/atomic-install/issues/</bugs-to>
-		<remote-id type="github">mgorny/atomic-install</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
index ec3b3e38fe71..2291b67124e9 100644
--- a/dev-util/autodia/Manifest
+++ b/dev-util/autodia/Manifest
@@ -1,4 +1,4 @@
 DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
 DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r1.ebuild 744 BLAKE2B 5307f034033d6dc37b2b563809192ede57df84ba51dd95ef9987b812a45dc51e2e7f70fdd83a786a966bb7963994fefcee535586977ce887d883f11512890163 SHA512 9b3b1bf623f64456284971cb72bc249c7fb663f33b0974d6af4c56757518ef79bad54c2634340a5bc1fc68f7d4f1cca2c638d93f540baa598ee0cd993ef62fd4
+EBUILD autodia-2.140.0-r2.ebuild 702 BLAKE2B aee73fea78c7814ae1aa8c6d26db39012546e1e7f708c7abc02856ef1f43c3d227d29d62e60cb66ee784a448fc331bd1be035411511255b7d13cc51f605c0caf SHA512 68a2d01e4dee1661840d99f931320f974426a37c2c7e634a14909d2a23db7f00ae92b92eb8da9b15fca158423a25a5aeeb55d64d88cc2d303618222f8cebff67
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r2.ebuild
index 656e77b1bd87..0798ccd75ec4 100644
--- a/dev-util/autodia/autodia-2.140.0-r1.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r2.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MY_PN=Autodia
-MODULE_VERSION=2.14
-MODULE_AUTHOR=TEEJAY
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app multilib
+DIST_NAME=Autodia
+DIST_VERSION=2.14
+DIST_AUTHOR=TEEJAY
+inherit perl-module
 
 DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
 HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
-SRC_URI+=" mirror://gentoo/${MY_PN}-2.14-dbi.patch.gz"
+SRC_URI+=" mirror://gentoo/${DIST_NAME}-2.14-dbi.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,12 +24,12 @@ RDEPEND="
 		dev-perl/GraphViz
 	)
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-Pod
 	)
 "
 
-SRC_TEST=do
-PATCHES=( "${WORKDIR}"/${MY_PN}-2.14-dbi.patch )
+PATCHES=( "${WORKDIR}"/${DIST_NAME}-2.14-dbi.patch )
+
 mydoc="DEVELOP"
diff --git a/dev-util/autoproject/Manifest b/dev-util/autoproject/Manifest
index 96f212858731..ab33c5ee552b 100644
--- a/dev-util/autoproject/Manifest
+++ b/dev-util/autoproject/Manifest
@@ -1,6 +1,4 @@
-DIST autoproject_0.20-3.diff.gz 4704 BLAKE2B f94227d5792477f7bab8d9535fcc4a927a8d779121974ca1ea0b342859ca9946693d107514c874e216bbb202c1e9c7a02ee3fedf7d0dc0508965cfe0471d4c3f SHA512 8058fb2430010ddc8613c9e310c262b28379eb3d38b7e9badca7e3adb3560e5965bbe6612a0211d38920094a4851502471f9e1670e694ea3ef7d29bbfde340e9
 DIST autoproject_0.20-5.diff.gz 5287 BLAKE2B 3bc26c42876606c8a8a879a888ec1c51fac8de2b380ef10c1c346a35dcd4747b21264cf4d2161e55ea31d49393569a897aa98ff1b0a8576465fd5e06b77fd27a SHA512 156f8feff53936c3113bda9d8a3f2e19679f249656ace69aacb1f0a13ae93066eef49de3e5a268c47ed3e440144de629f6b84a477ecfc6a3f793c41412cc9b5a
 DIST autoproject_0.20.orig.tar.gz 151101 BLAKE2B 657a4a4baae35b038392c2cc78a1ab0e657229587e64105f0a6150ce83c29cd2305b716b12e706ea31fc31f091f21fc8b00f89dbcd753453944ee26f7fbc01f1 SHA512 eb6ba12af96e03f4da51b6b9fc0db618180d92b8a363f30182013a003bb13f5b66ee12b28531a234f6035b64bda29bb0f838466ccbeaddbce06a437a18c05288
-EBUILD autoproject-0.20.ebuild 774 BLAKE2B 5e7845e2f0fd3b0172e1c291e081d8ecd1e58c47658c3866bdbe54c86b69d11e1a0071d9f8ca703f98321452fafad513cf65b43bf37270a89cb64bcb65308ad4 SHA512 b6a2c8064d7774c09bded4ff170f557a273a5339ee21f34fc5a7104952ade04df5948f5f4c675e8c6e8e03a10866f175760058369581289394cce4db4c1f0fdb
-EBUILD autoproject-0.20_p5.ebuild 873 BLAKE2B b95bdb9de4bb8e0f4569c11d7cd888ebe088d7148000df140de2515124c70eeb811d14f08f625bd5f773217b92a7cb519dba05a8d95e38014e029ba4ca218641 SHA512 d248f8249106279717206a419cc50ee617b4bf92fde07a1808c6d5c9033b8666fcf881074ee6502f86938494320d8ccbb47c3eea4aaa9d46159a6e4ae051a487
+EBUILD autoproject-0.20_p5.ebuild 780 BLAKE2B e66ccd3049d18c020dd27a85c67475755d48280f7136b853dd62da3e41b655481c6e16f10be532b97e8121fb027bb4b9dbaa6e82d5bc2f2287f2eac304565ebd SHA512 6dd5cc4a451e832ceba81339d5e8768953e2c1bea096917208fb585ab78ca5841369d0303e95bb5f0fe16e88e2c0d90669f6910c0b45e7f81a492377aded7144
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
deleted file mode 100644
index cce818573a50..000000000000
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DEB_VER=3
-DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/texinfo )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index 239a51de78ec..9fd405115687 100644
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -1,35 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 MY_PV=${PV%_p*}
 DEB_VER=${PV#*_p}
+
 DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
+HOMEPAGE="https://packages.debian.org/unstable/devel/autoproject"
+SRC_URI="
+	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
+RDEPEND="
+	sys-devel/autoconf:*
+	sys-devel/automake:*"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/texinfo )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${MY_PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
+PATCHES=( "${WORKDIR}"/${PN}_${MY_PV}-${DEB_VER}.diff )
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 016a04df8033..06b6e7f5c493 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,4 +1,3 @@
-AUX bcc-0.10.0-system-libbpf.patch 7201 BLAKE2B c2018dfc9709c6bbf3ea041eec9f731ab3055131558f9fcf07423c06e22a881eac8b6cff757ac3637cd0c12af878a8aaf2f1a13bc0cf859ae23eee75c3e635da SHA512 330d4c69b551fb0e066adc9676358dad4fc75a75cf6e7898a364fa379172829ba6a494aafe82e094218d3cef249e791c89d6a48ebea250597b3b61d0ac7a5f47
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
 AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7
 DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235
diff --git a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch b/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch
deleted file mode 100644
index fabb3f3f2e63..000000000000
--- a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 94aac856..bd454226 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,12 +9,6 @@ endif()
- 
- enable_testing()
- 
--# populate submodules (libbpf)
--if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
--  execute_process(COMMAND git submodule update --init --recursive
--                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--endif()
--
- include(cmake/GetGitRevisionDescription.cmake)
- include(cmake/version.cmake)
- include(CMakeDependentOption)
-@@ -61,6 +55,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS})
-   include_directories("${DIR}/../tools/clang/include")
- ENDFOREACH()
- 
-+find_package(PkgConfig)
-+pkg_check_modules(LIBBPF REQUIRED libbpf)
-+
- # Set to a string path if system places kernel lib directory in
- # non-default location.
- if(NOT DEFINED BCC_KERNEL_MODULES_DIR)
-diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
-index 906c9aaf..210f0f75 100644
---- a/examples/cpp/CMakeLists.txt
-+++ b/examples/cpp/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- option(INSTALL_CPP_EXAMPLES "Install C++ examples. Those binaries are statically linked and can take plenty of disk space" OFF)
- 
-diff --git a/examples/cpp/pyperf/CMakeLists.txt b/examples/cpp/pyperf/CMakeLists.txt
-index 6f963c66..e8dd66f6 100644
---- a/examples/cpp/pyperf/CMakeLists.txt
-+++ b/examples/cpp/pyperf/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- add_executable(PyPerf PyPerf.cc PyPerfUtil.cc PyPerfBPFProgram.cc PyPerfLoggingHelper.cc PyPerfDefaultPrinter.cc Py36Offsets.cc)
- target_link_libraries(PyPerf bcc-static)
-diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
-index 88df6e84..de8a6464 100644
---- a/introspection/CMakeLists.txt
-+++ b/introspection/CMakeLists.txt
-@@ -3,11 +3,11 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON)
- 
- add_executable(bps bps.c)
--target_link_libraries(bps bpf-static)
-+target_link_libraries(bps ${LIBBPF_LIBRARIES})
- 
- install (TARGETS bps DESTINATION share/bcc/introspection)
-diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
-index bd34fd48..dfbeb596 100644
---- a/src/cc/CMakeLists.txt
-+++ b/src/cc/CMakeLists.txt
-@@ -10,8 +10,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang)
- include_directories(${LLVM_INCLUDE_DIRS})
- include_directories(${LIBELF_INCLUDE_DIRS})
- # todo: if check for kernel version
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- add_definitions(${LLVM_DEFINITIONS})
- configure_file(libbcc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc @ONLY)
- 
-@@ -28,13 +27,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}")
- 
- include(static_libstdc++)
- 
--file(GLOB libbpf_sources "libbpf/src/*.c")
--add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
--set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
--add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
--set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
--set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
--
- set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc)
- if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)
-   set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc)
-@@ -79,12 +71,12 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f
- 
- # bcc_common_libs_for_a for archive libraries
- # bcc_common_libs_for_s for shared libraries
--set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static
-+set(bcc_common_libs_for_a b_frontend clang_frontend
-   -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive
--  ${LIBELF_LIBRARIES})
-+  ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES})
- set(bcc_common_libs_for_s ${bcc_common_libs_for_a})
--set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static
--  ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES})
-+set(bcc_common_libs_for_lua b_frontend clang_frontend
-+	${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES})
- 
- if(ENABLE_CPP_API)
-   add_subdirectory(api)
-@@ -111,8 +103,7 @@ set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
- install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(FILES ${bcc_table_headers} DESTINATION include/bcc)
- install(FILES ${bcc_api_headers} DESTINATION include/bcc)
--install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")
-+#install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif(ENABLE_CLANG_JIT)
- install(FILES ${bcc_common_headers} DESTINATION include/bcc)
--install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc
-index 12816757..29e4c707 100644
---- a/src/cc/bcc_btf.cc
-+++ b/src/cc/bcc_btf.cc
-@@ -19,8 +19,8 @@
- #include <string.h>
- #include "linux/btf.h"
- #include "libbpf.h"
--#include "libbpf/src/libbpf.h"
--#include "libbpf/src/btf.h"
-+#include <bpf/libbpf.h>
-+#include <bpf/btf.h>
- #include <vector>
- 
- #define BCC_MAX_ERRNO       4095
-diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
-index 836c458f..eb03ce59 100644
---- a/src/cc/bpf_module.cc
-+++ b/src/cc/bpf_module.cc
-@@ -43,7 +43,7 @@
- #include "exported_files.h"
- #include "libbpf.h"
- #include "bcc_btf.h"
--#include "libbpf/src/bpf.h"
-+#include <bpf/bpf.h>
- 
- namespace ebpf {
- 
-diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
-index 63f4894e..83147dbe 100644
---- a/src/cc/libbpf.c
-+++ b/src/cc/libbpf.c
-@@ -52,8 +52,8 @@
- // TODO: Remove this when CentOS 6 support is not needed anymore
- #include "setns.h"
- 
--#include "libbpf/src/bpf.h"
--#include "libbpf/src/libbpf.h"
-+#include <bpf/bpf.h>
-+#include <bpf/libbpf.h>
- 
- // TODO: remove these defines when linux-libc-dev exports them properly
- 
-diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt
-index a47abe14..ae710eb4 100644
---- a/tests/cc/CMakeLists.txt
-+++ b/tests/cc/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- add_executable(test_static test_static.c)
- target_link_libraries(test_static bcc-static)
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 6f9e5c597acb..e68b57cfc5ac 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -14,5 +14,5 @@ DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c2
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 EBUILD boost-build-1.65.0.ebuild 3891 BLAKE2B c47be692e2688b4fc97ccd937e68779859b8f0fc32aabe080ffda307b3fdb04fd67309c204348165b277e19504562d7fe1046ca2295a9f6971e7170d45edd570 SHA512 440452088de9c406150f18dfae2a586c3039d16dac623a065d524b6b3587d6f83346906e3e0e1697bc735c53c55ae19414750c8ab3c61090e49cc1a344b6ae88
 EBUILD boost-build-1.70.0.ebuild 3865 BLAKE2B e815fe470d6bc8e7c4e1a08e4ed6425c41c720615077478385710084582f5fba5048626b925a8e89c274b429e81f5b2ba2e820bd4cea3624539ccd3a337fa351 SHA512 d121308dcfb95e2f2b696ba00ef4cbc1279b84cdd2925005ea9f6557ef9763d35874c4e718a8f51da80fb492b3ac24a2799d5f285098a76b7c039ce7d7508dd7
-EBUILD boost-build-1.71.0.ebuild 3116 BLAKE2B 8069482955916f23fbab461a21353682f7dc7cce179709e6b2bf29b67c20f38c0c27a2011acf8a3e86cf05191fffa2e69e3b130f8fe74f54812478a26f7c6444 SHA512 dcaa943b218bc683c849a0d1fcadc82edca578b2c102f701e8881509d5e5ce8760b301eec50f3af918104bb3a2ee2a7a1e739e95d5b9bc05efb8b8dc31056d15
+EBUILD boost-build-1.71.0.ebuild 3113 BLAKE2B d8a4511fd35f13cd5f5a18373e8fb4f3bdbd5046ab6da5c1669b859c7d0d7079424f198e24257d1f3b1495060fcf3c9af9e44dadeeaf42f37fd73507326a097a SHA512 776066802dadf9e744479e4e2e74c44d3e0bc75fd88070e95cb3b598926db22b00fe8fa75b9cbb917c7deccefc5ba413ec890cf191460539339f7d111b4ffe12
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
index 16494056062d..0e814d227891 100644
--- a/dev-util/boost-build/boost-build-1.71.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.71.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 RESTRICT="test"
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 1c8a13e25199..a6806f3479c7 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,8 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
 DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
+DIST catalyst-3.0.7.tar.bz2 873526 BLAKE2B e056c2ac7589e2423a984c8a089faef87af24d401d4b2c2c4c3752b0af290e42df1fd1f5fd3dad5586fd96b23ecdfa90482f913b2be4181727048cf8fdef8d43 SHA512 403d33c10324e4bfd7c7c2f9a63bc41823230b0450e3e153fb051e8efb18263f1d7f260a11d8acdfa052efa8d41cb2ba4570e65d68c41e342d83477c755e68ab
 EBUILD catalyst-3.0.5.ebuild 1885 BLAKE2B 293ea4371c2eb33f45bd40bb5984dea50e29f18c085f0e14411745f3bf2b8792e6f0bcee8889fb1f159d8d122adb8a417ae2891332bdce014750e04730f5efd5 SHA512 7308a22ba955fdadfebd6db46a3dba8e6980b1592969189bf03d3a01d4812a150c74589c190af27ede0102c5f65939b34fecea2b71badc5350a9693971b14fec
 EBUILD catalyst-3.0.6.ebuild 1896 BLAKE2B 560f65b5e87a7833741c3abcb624434dbd4e064983459e68a798dd49e6df83daf86615932759c2bf6bb35f023b3740a1c835bea99f165f5c3c797c69e0800494 SHA512 ff4952be8a36d496708da49e7dcbf9bf8bd2ed054203ec890be82aae23131fdb05dd69975e6fe97cc414c788321f412d4c392da3c8fded1e21c9b2cfd7ec9c06
+EBUILD catalyst-3.0.7.ebuild 1897 BLAKE2B 141dfa371702236ee38e03e6ded540789c5634145212e94136c262c669310c623de6561da7e149289de380b7a955a6622a10a973c77fe35227aa6e23796cc6e3 SHA512 d0f293dc7eb1a408f29f492128fd182277d6204ab0b17ebe2643093c912f039487df2c1846ff330c0d0228255c9eac40121122e278b1c8bfc79820854b5aea92
 EBUILD catalyst-9999.ebuild 1897 BLAKE2B 141dfa371702236ee38e03e6ded540789c5634145212e94136c262c669310c623de6561da7e149289de380b7a955a6622a10a973c77fe35227aa6e23796cc6e3 SHA512 d0f293dc7eb1a408f29f492128fd182277d6204ab0b17ebe2643093c912f039487df2c1846ff330c0d0228255c9eac40121122e278b1c8bfc79820854b5aea92
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.7.ebuild b/dev-util/catalyst/catalyst-3.0.7.ebuild
new file mode 100644
index 000000000000..9b191cbaf519
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 414884bce207..0a3b8499c5fb 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,10 +1,3 @@
 DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea331b2d7c78945ebc1051d1b49d28069e47bd8aa3f12d57b646fc6764ccd4f365cda9fdfea15f5a3a4334b6e9b17e SHA512 baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29
-DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
-DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
-DIST catfish-1.4.9.tar.bz2 182247 BLAKE2B 343a9a83bed73a5f0416fa2ec61869dd3fdb13b8bc45a46dba7d4901c36d97b17e9f32f616baae8cceece566f4e529d34e55f81cb071504b750f4edda048185b SHA512 c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d
-EBUILD catfish-1.4.10.ebuild 1087 BLAKE2B 0d73240222f11debf0fb9547a1c3e3fea38d1f586e85c2ee8087b256946c68d4f1bf2e1fd2daff18d0fa041636e310f7938cd112fd744dddd297062289478fa1 SHA512 409b5b2dd6c76c58fcb11cffbdc475026fb30cd78fdb615454d9cc6ea6deee354dbf0afa13c4d586613b0922c9edce18f134c5a7b311c39ce6457cadfd49b421
-EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
-EBUILD catfish-1.4.8-r1.ebuild 1071 BLAKE2B 99e71a14716847ec22defeca8824dde5abd2cded8a423f29b7a55e35c3bebd5e0592cad3a912036382fbf27d17b84ac07e407b09de7dae60f32483b7a8ea767f SHA512 5e3ee490a3dcd677c983b7f90c9a3d35f15d022d7125adf644ddc0e4989a5fc91d076e560649bd9ff56480d7ec8d61bedb3ed5541219e2bdcd31a1c459a49977
-EBUILD catfish-1.4.8.ebuild 949 BLAKE2B f07556d8a90c1f5fb0510ddfd10ed5721871be076199e51fb5caa2bcac541e85b1202c336fbc0febf1ea34792c259647b0216c6a74554f027a6e755947fd55de SHA512 dc32d008d3620f787b21013a454021290e7e5ed45f5fc299a75361ceb2b48f4870824aaeacd10c238eeba06a1630560e2655f0bd456aa2b8208e220541fab890
-EBUILD catfish-1.4.9.ebuild 1089 BLAKE2B eecfd11133132625e85709f77c28e3d9ebad74b2061773369542f0e470532be320a1d25df825c5863ac89c1ca68023dd32b890f47c317f67d6b96416b9393f79 SHA512 9733034aac8ab0e60a4dd74684754a7f8e924fed1ff21c2559ff239848060760dfc54b368bb20aebddd021f2a1e479cb097aed8e1b7268800bcaa6f200e23edc
+EBUILD catfish-1.4.10.ebuild 1085 BLAKE2B ac6da8b5f96a6f3e569c1478e53eb12dc661168bd111ab54fe466bc55ffdee9493abfc8d095b3946adbc748b1f23d28b4733f46b28f887006fbd1b8913400fe4 SHA512 d0a900d178dfdefc74105ff71dbfd4902f2450dab6e73c9cdcbb5a78fcfa2feb2c03372c04bcc73b486b585dc92f91cd6daba24f4dfb7eed4aa913dba4886985
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
index a1d0b1e691ed..8c7b7b27e812 100644
--- a/dev-util/catfish/catfish-1.4.10.ebuild
+++ b/dev-util/catfish/catfish-1.4.10.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 
 python_install() {
 	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
+	rm -r "${ED}"/usr/share/doc/catfish || die
 }
 
 pkg_postinst() {
diff --git a/dev-util/catfish/catfish-1.4.7.ebuild b/dev-util/catfish/catfish-1.4.7.ebuild
deleted file mode 100644
index 4f37b98187f3..000000000000
--- a/dev-util/catfish/catfish-1.4.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.8-r1.ebuild b/dev-util/catfish/catfish-1.4.8-r1.ebuild
deleted file mode 100644
index 31a5b419e965..000000000000
--- a/dev-util/catfish/catfish-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.8.ebuild b/dev-util/catfish/catfish-1.4.8.ebuild
deleted file mode 100644
index a6d1ef38c048..000000000000
--- a/dev-util/catfish/catfish-1.4.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.9.ebuild b/dev-util/catfish/catfish-1.4.9.ebuild
deleted file mode 100644
index 8833b3e29740..000000000000
--- a/dev-util/catfish/catfish-1.4.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 370497c0c8ce..eaecfe70b19b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,12 +3,10 @@ AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9a
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
-DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
 DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
-EBUILD ccache-3.7.1.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
+DIST ccache-3.7.5.tar.xz 352440 BLAKE2B 6761d7a1a8c8086081fa46d50db1dce719856910da6324c9863a3f3731fdb0f5153e0d93a5c575074d1993650623e4e4b02d83dd3b656a31cb9be04ad6b58efa SHA512 d66eb9d923c3e4663242a034860bd198175e08274a295b6d5d94e6cd69fe32afa3fb8c228d64d5c5dda025e6f97d0aef0586ce4dbd66e8ce3a23093331f1841f
 EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
-EBUILD ccache-3.7.3.ebuild 2024 BLAKE2B 3445c5ee59412701d5b02ccab41f475caa70d157b02c76ea02465a662317cfba3bbd3e0563011d1fdd56cc29893b87f236380f5fc88bced67ce0d60363852c95 SHA512 f5a4e763254bcec13b6a715c57484153526a119476723f2c9d1cecf9e2d6e4eee5449983b48b0473558eebabaf033f40ed76827f6245619f916e8bad93236e60
-EBUILD ccache-3.7.4.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
+EBUILD ccache-3.7.4.ebuild 2199 BLAKE2B ae97d794736f0aa50b788b1c8a70a3310b221305085e1a1b25656935d802993d42f1954be52884dccdb1c7e1a9b88611ecf96b856b1647c3763b2da2242770d9 SHA512 74cba4f0c8e1af74738e5e34c535a8a87f94b646ebef3cdde38aea8e2af85363946b97ac0b412ad4e49d2a900dd9f76d012ec7d358a44c40d9b3db751dbd5ad4
+EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.1.ebuild b/dev-util/ccache/ccache-3.7.1.ebuild
deleted file mode 100644
index b8fa403d10c2..000000000000
--- a/dev-util/ccache/ccache-3.7.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
-)
-
-src_prepare() {
-	default
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	emake check V=1
-}
-
-src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT:-/} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.4.ebuild
index 998d395a3b2d..ee3ac9fb5d17 100644
--- a/dev-util/ccache/ccache-3.7.4.ebuild
+++ b/dev-util/ccache/ccache-3.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.3.ebuild b/dev-util/ccache/ccache-3.7.5.ebuild
index f50e43657b3a..998d395a3b2d 100644
--- a/dev-util/ccache/ccache-3.7.3.ebuild
+++ b/dev-util/ccache/ccache-3.7.5.ebuild
@@ -12,13 +12,19 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
 DEPEND="app-arch/xz-utils
 	sys-libs/zlib"
 RDEPEND="${DEPEND}
 	dev-util/shadowman
 	sys-apps/gentoo-functions"
+# clang-specific tests use it to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index d45471131487..db4e771d5f57 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,4 +1,6 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
 DIST devscripts_2.19.6.tar.xz 844316 BLAKE2B 93eddc1d5ff78c579a28f8f54ce317cc251864917aa579094bd392f0811f07dc38447b3bd36a608431cb3d576b05c5e1f6cdc51a453b1c07389a5e1794f1acb5 SHA512 9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422
+DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d1434afffd35eda33b6c7f442796c2165cdb316290d41313876cd5ef8108e0bba03d173dd52c139908672a6f3d6902588 SHA512 6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7
 EBUILD checkbashisms-2.19.6.ebuild 890 BLAKE2B b766261b04b2be48b2c9ed540c48e9f8e6a5de05498dd55f3a5740a89b27f2c9b713fe65c275ba21d791f985d9800d9dbd5c034b646f36bd9822e1d992e55c7e SHA512 3bce9e58d293dd4772b23674342bcc96af079aeace7512b04fcdcd51f20d07a739c8461669270d08d7da57c049b895f03ddc33d7f8d2f8d73d264253b79dd56d
+EBUILD checkbashisms-2.19.7.ebuild 892 BLAKE2B 07b1578c67cdf6a8e53005e9ecec39c1d2d854d50ae595b81079cfda2141023bd699f62dfa45824026e16496a9ff879c7397991b8038afa82bf394f7d39c8961 SHA512 186da6cbc20eba27c969e2b84a4896908c268675d6db9a53201ba31a1e5757e16ae5637182ec77e8ac8d2f320540a96927c7190f7492596b95262eaeafaca404
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
new file mode 100644
index 000000000000..e48d94ca95a3
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index f06902dc61dc..84a8fcf8a54c 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.2.3.tar.gz 495323742 BLAKE2B b4747a4805ec7d8776e3c52c4f94a2d12c1156eff9c0a65e5e275bed269f472d3e8d410e2ef41b2e1504408cf7dfe3f2b8ccee06c5cdba4c8664ad5e7a1873fd SHA512 34599a92b9522cbc6bee6505a26d24b9d4ac727100b2b30414199ac3ec03f73d81c5811f66b35ad51e846eb6fcf66651c522207bb5f471adbf5c5e25d5e7d7d5
-EBUILD clion-2019.2.3.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de
+DIST clion-2019.2.4.tar.gz 495317026 BLAKE2B 24e2dfbd9253b1b2bf70f8259ee09c6439d5623c12c78a7af60a9bdf00cdb48c7d2967150b5dca98c588b91573f2928288dbb57416b6fe397e3f7ea4b4d7bc23 SHA512 fbac7c3f6ea8b7f38031ad9a46dfd918683d66c317cca954d5f0f3b729040e23ac2ac1ea611bd6eff4c41ea3f03816ec95c4786475ab6f49dcf9b3d612d6c067
+EBUILD clion-2019.2.4.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.2.3.ebuild b/dev-util/clion/clion-2019.2.4.ebuild
index fbe93d313de5..fbe93d313de5 100644
--- a/dev-util/clion/clion-2019.2.3.ebuild
+++ b/dev-util/clion/clion-2019.2.4.ebuild
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5a5c2347cdcd..b4d8f199fdc6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,13 +16,13 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
-DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
-DIST cmake-3.16.0-rc1.tar.gz 9097643 BLAKE2B 979bd9a659a84348d261600536b876c7bfc255b37e3dc1a87b03759d47cfa1871c2c0e22e1fd75bca8e614906f8e029b4cdd590e48c4b5c98bb34a1ebc99000c SHA512 82dd74ca1f3ceacc1ea0e078a95effbae2f680903c7a730ea8491499f788b7e3b6fb3b899a471dfb251ac70df8c2a0d486a445b13ae95cb41e5411b6afc250b4
+DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
+DIST cmake-3.16.0-rc3.tar.gz 9102878 BLAKE2B af0a74ec617804c0a8680f0325274927dbcea5aa375223dccd3ce43f6b6c77ef0c456b89bb4f5e4e22e856f7dd9f3e1dead62d2b029749e2252e2a9898647283 SHA512 137faa9c4b90ec23b95660b12310f5a11374c461b9149fb93e5ce8ed319d453f10e12ff5a3c9df2cfc3408998bdeddf4ffb3d3b62702575a740ddd5b650905a4
 EBUILD cmake-3.13.5.ebuild 6193 BLAKE2B a1e0034672cce72bf6d7cd3c777143c70f22fc6ab7952a47107b58a45124c05ccafb4285a7a7626789327b46c0947db22cce3b7ad58ba97b56bd70acb706ea09 SHA512 55014b5288ba9a8265dfebe63e46b8dcae7c1c49c298990b04577e5c0b0f81a91f471f3c4da800ce30210edeabead5dfe80e72f88961a5f70e013335a7c8cbf5
 EBUILD cmake-3.14.6.ebuild 6220 BLAKE2B 85ad1940ec047b3d370cc2e9cf05bbf8c0aab108cec4e767872038ec562fbd1b18e1ae96f42ba74a43e8b11999c6eb870ce08ebdfc47a2a9b566d4d6b9363ef0 SHA512 63e0932812432530823e50292a71d19fa7c4483cb032a14578cbf5795977d09ed276c44192d3965b881f0f4b7f91a8edb1b31d65159c08a62c2aa94b6cc9461d
 EBUILD cmake-3.14.7.ebuild 6231 BLAKE2B 8259dea7e638d21f3c33a0427830ccb21ccac271585f90b14039c5a41164cbe8e9364c29daa3f8a3abd94cc0837157543bdc08c38b74b4833a7844de3eeeb9b0 SHA512 c18e2cbaeecd74a28241b475cc1ccf6a943e59be9b7dcbe990a8fd0c0200a2e67eb9fb3ee912cbd0cb91e2895dfdd8d3e04cc4231c3942ff9553c13331da8f66
-EBUILD cmake-3.15.3.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
 EBUILD cmake-3.15.4.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
-EBUILD cmake-3.16.0_rc1.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
+EBUILD cmake-3.15.5.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
+EBUILD cmake-3.16.0_rc3.ebuild 6258 BLAKE2B 2cca51250f50ab699ed8dc17c463e3c9dcda042d6d047eeb5c81c98e3129050e88dae1c8f8ad4fe86e11e8ac42d916b00841e7546f4f2403e2aa298da762619a SHA512 f806c749c63e7bbba4832b536f7be5b56303d4627bdac8d8a31ae0c6af28d2f879524ee166aea40d13c3972806e354be3e4bfeab791f2b9ec7291986c83040b3
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.15.3.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild
index 8379ddfb9330..8379ddfb9330 100644
--- a/dev-util/cmake/cmake-3.15.3.ebuild
+++ b/dev-util/cmake/cmake-3.15.5.ebuild
diff --git a/dev-util/cmake/cmake-3.16.0_rc1.ebuild b/dev-util/cmake/cmake-3.16.0_rc3.ebuild
index 8379ddfb9330..d9456163e0ef 100644
--- a/dev-util/cmake/cmake-3.16.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.16.0_rc3.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 0bba44d83b31..eaf39cdf97db 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -3,5 +3,6 @@ DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10
 DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
 EBUILD colm-0.13.0.4.ebuild 372 BLAKE2B 789e470189b8c31dce2145bd696f762569d5a8021090d3d09a0c300f63488e2de8412d1e250a16a9e37bafae61530d5ccc61a56e1998a5d485345f292d5bb3a5 SHA512 d1240148c5b89cdcff5750859b8bd920782f907f53d736f775def15c259e443d044900cd19d65445ff55ba6ab62a15b3a084a9a0734ddb1151a0f887a24a68b0
 EBUILD colm-0.13.0.5.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
+EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
 EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.6-r1.ebuild b/dev-util/colm/colm-0.13.0.6-r1.ebuild
new file mode 100644
index 000000000000..24c79169a62c
--- /dev/null
+++ b/dev-util/colm/colm-0.13.0.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-text/asciidoc"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/confix-wrapper/Manifest b/dev-util/confix-wrapper/Manifest
index 722f07de2498..fd50882b4506 100644
--- a/dev-util/confix-wrapper/Manifest
+++ b/dev-util/confix-wrapper/Manifest
@@ -1,2 +1,2 @@
-EBUILD confix-wrapper-0.ebuild 802 BLAKE2B cf911988108d5950257959be2aa8d787d139cdc655c62a331e150717d304a692291255fdeb0d156e2194180dccabf7778e12ba03f36d117693d60f3be8fccbdb SHA512 91329de488250579866b2e928ae0dbf145b539e3f17d7da1df1cee1e5604d1e3033b95d21bc3573ab47614b9544265c68a1e0b30867f127050258d4bb554adac
+EBUILD confix-wrapper-1.ebuild 681 BLAKE2B 80a47a9b0a83c64a4e63cd6284efc8a073545df1b0dd9ca1d5147189e7fdc49931881b9d151890de74504020344cb3824b40560390a8c75cf9b2f884c3107935 SHA512 c46355ac91b3908a20544f0310f9af2675a91080d0f3d153c5642198f36c69f22d85450a240c8e65f7f38277255677558b722bee94cd63cd33fd4969bffd3bb7
 MISC metadata.xml 329 BLAKE2B ce9d264f3d40c4c4a7078cfed1f27f93c06420904a98051031a91bc600c33708c10291128b48be7065eb493866d4a15d9140b5933954eba9716a7dde376e001a SHA512 a2e7c1b3ef9b2228e2820c0aa46354d771b518e7a5f854f1f06850840929846b12125b4f526a7f0282b3e9545c5cf7ed670ef2f2047c7deb0c6de40b9667b321
diff --git a/dev-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
index e8f8dcb4d2cb..685b1b97161d 100644
--- a/dev-util/confix-wrapper/confix-wrapper-0.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
 HOMEPAGE="http://confix.sourceforge.net"
@@ -10,10 +10,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
+S=${WORKDIR}
 
-src_install() {
-	dodir /usr/bin
-	cat >> "${ED:-${D}}"usr/bin/confix <<EOF
+src_unpack() {
+	cat >> confix <<EOF || die
 #! ${EPREFIX:-}/bin/sh
 confixpy=
 if [ -f ./Confix2.dir ]; then
@@ -28,6 +28,8 @@ case \$# in
 *) exec \${confixpy} "\$@" ;;
 esac
 EOF
-	fperms a+x /usr/bin/confix || die "cannot set permissions"
-	dosym confix /usr/bin/confix.py || die "cannot create 'confix' symlink"
+}
+
+src_install() {
+	dobin confix
 }
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index b5839931ea24..8d6887a69d80 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,4 +1,6 @@
 AUX crash-5.1.1-install-fix.patch 469 BLAKE2B 110aada551499ba765499de40880b8658bac253adf066de0f33fb43ac99c7738aac90e8254eab46626024392903d3d859fc2304e21fc427bab830ac77721f14f SHA512 c9f08e57a3cfd6b1ca4d8a7f5d497658430e0f2c16f1ce73c8fdac4d6566d48e56ab8acf53f4c4db1e88943f188967cbce23b64ecb117aae598f92128f4d78ef
 DIST crash-7.2.5.tar.gz 32214678 BLAKE2B 1d19bdb0ead372b4df6f4715f9fc26218d7060ad2a3f774cdf6069d6fe7a85a24968766e6eab19042c1208716e871318bbc44be04012b7ef8527a7f536edd5d9 SHA512 6d07c4aa2bccafafe66567e2022250208ffdd5f0e64aad1aefb4c8d7c10df49464ad772e2ffe0d1067f324dd351e9186841d501680a181c79d7b9b58464d6987
+DIST crash-7.2.7.tar.gz 32249495 BLAKE2B 410f851afc8b4f5a4685985b58236efb6f88ae82465dbe553c8f2133cc5ca14013dc8e0efd242b3fb1b8fdd6cf0de85fabb5308252306e8c9831f9f9eb6ad56e SHA512 14e0c5842b752faa7f2c5667517c9cb214a172cea5b779df5cd38feec6472eb6fd6508346c1c4eec02d4565fd6dade270e851ebf571e778023f32ac7f82836b7
 EBUILD crash-7.2.5.ebuild 584 BLAKE2B 23361a8f51416c016d84ca434bf09750004b51f6da06d32cff7ada13c1cae930799c90da216e68090722f575028e6f9ef395a4d4647cd575db2bb41d862b7eaf SHA512 f36e973e2ec92795c85dd1ccc77b2afaa795fc58112d6336e8cb5861212b502ef119c26db6fee4d7abca706fd0dbcd1062aaf139a7082b24da6c7b3a1fa4838b
-MISC metadata.xml 567 BLAKE2B 146285d4713a120dd476acb4b032e7d68179aade464b4657642af03c4bb92cfc1a41a4c73757f0cdb32dfbe119de4fd0f3daae5b3ac4452e1f7644de4f1900f4 SHA512 e726e4cda51e9a904662a9c1c0946a421bf5a350d9057a3cb0df080441892ca6399998f78b37dab883d34250380b5bc8d8ef5565a1adeccd1a8085d67f877f1f
+EBUILD crash-7.2.7.ebuild 510 BLAKE2B 9889ba6e360fe4dcef061d967d777268aef964086b3a0d381043c45b822eb7b093a7d778c444c8b7fd4a53867ba47c899fae586f175afcc7a54fb508be285dd8 SHA512 f9cdb3f60fcec48accd88a54e5880355a6862722ea1b6c16fd036abc48493e171397036cbf63abe3d387addf59281a736eff08105d36e63dc47be0eac9815218
+MISC metadata.xml 640 BLAKE2B 65450e02ac8c60f56fa7e82bc8b20f3d6b36bae290ad891265f9cd19ac405bf8452a5712e2c83c85c6635e4bc75f396c1b7976a7b7341efee3a8475f720d6c15 SHA512 c131b6f87a36deff7f2bc599000a692315f016774d0e87aa186c1ebe660ef85da04f2c3e5b89afa90473a65acf40f493d9434d677a621c9e77a0ae8ae81ed0da
diff --git a/dev-util/crash/crash-7.2.7.ebuild b/dev-util/crash/crash-7.2.7.ebuild
new file mode 100644
index 000000000000..d9bbae491a70
--- /dev/null
+++ b/dev-util/crash/crash-7.2.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
+HOMEPAGE="https://people.redhat.com/anderson/"
+SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+IUSE=""
+# there is no "make test" target, but there is a test.c so the automatic
+# make rules catch it and tests fail
+RESTRICT="test"
diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
index c81bcd9e0c3a..5306956b816b 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Red Hat crash analysis utility is loosely based on the SVR4 UNIX
 		crash command, but has been significantly enhanced by completely merging
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index fdf0f6c4d20e..2192cd383623 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-messages-2.1.1.gem 9728 BLAKE2B 07ad0635f92d7aa25c9ede7915abd73a27db9894dd62d6a5b0f0e7b4bfd649f7a88b46bcab5cd42b18895933002e7650073becff16ab624b80abef97a23ea4e9 SHA512 0858de8b7211307c18f6c41c5316b5b29edd1f829ca27ada8c2bb13ef84099a5745b54894bf8ec72304d147a1cead693c109c5ffdf9fc105cf1795bd522e27fa
 DIST cucumber-messages-2.1.2.gem 9728 BLAKE2B 31753c5082814df61aeaf4f471112b79b27bec2b7be5fbe72c1320f1da44ec85890bbb91866b640905d73bd5a8f8723c2aa122c192040949c1725a0dc050b87a SHA512 f8973e4159aabae17b21dc76f314c6784eefc03ddc04a4ee6e3dc56844202034635343b51728cc3c028c4dc1881d19690eda4c3286ad0ad6da390a0b70ae6ae2
-EBUILD cucumber-messages-2.1.1.ebuild 514 BLAKE2B 41410ace239a27dd7d0a4415fc314cda20eccf1f4cb53931a127d30ebd36be5ad6089e615fa53a8444caf9c83a75f1e4f292dac30241084cb4ce607ade2bfccf SHA512 0837c4c23f440c93bb4d6948a76c82deb2edc9e618a71dad4a6a8df62d4eac1a289a3cc9b7d915189675fed5684b222454726dd5679a251247eac80eff6c945f
 EBUILD cucumber-messages-2.1.2.ebuild 514 BLAKE2B 2be66af0bb17c166e44c78d4492838de363785d252572633551acb23d63dd49577417e3205e761b3b3eae375694ac3b1545cdc477848d7a7b3339cced4796dcf SHA512 7c2e2db8b2317c9b77c68e058b4e9d96860834357d97122102e90a581d801b13d48df080b65d659e0764b0cab6ee4d491ccde80cad9f1544ed67bb0e1223166d
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-2.1.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-2.1.1.ebuild
deleted file mode 100644
index 30ad1ab56116..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-2.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2.0"
-
-ruby_add_rdepend "~dev-ruby/google-protobuf-3.6.1"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index f0853b8152ea..09af8af9a65b 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,7 +1,5 @@
-DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
 DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
-EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
 EBUILD cucumber-rails-1.7.0.ebuild 1212 BLAKE2B 3395490b1f7a8956b8a72a9a2c18978089bb4d1c9ad423e5c10e669c4e21046db58e9ee8e769dde5e875e04ebcb03ea772c1fc6754cb4eebeb6176f13eb79ed7 SHA512 40ef5370f37e771af3c681f9df15a657bb8158d96ec9f98b06893abfb19c38784a373104e7609ba9b53c6a4cb8ec48a0eb0b356668dda18618016f757a5d3785
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
deleted file mode 100644
index 4bb922cd0f1e..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-4:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
-	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 2e5e6e58534b..1eee50ba27f7 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,5 @@
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
+DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
 EBUILD dbus-test-runner-15.04.0_p100.ebuild 1072 BLAKE2B 73a7549bf47036e537d090918c501bf7da7884ed23f6a662b05407a70da22a7f98a6571cb680c6598d2ed6be28b0a4a15056b913256ec4009c12e2fdd96aa017 SHA512 77c5a806bf089f9659b1ec316fbbd90a08d70609dc427343923ab43d10e7d018164fda02adcd7a1ecda9f0baadf34e5fa4f9a71c2e1dc615b9feb866444d224d
+EBUILD dbus-test-runner-19.04.0.ebuild 1149 BLAKE2B 4e274fd843b698c2b30b836c170155e811d45aee4f6d9147cfa31a68a5eb006020d8a0e13cedc3a66b337199e73c84695d162af4896d861335a656693ed01eef SHA512 eed078ca42b583f09f9a22863acfc5c60406b7e041be7191529c95dc08998b3fccf618d0a2941a6a44e68d0a1891f3eeaf60c1459e4f3e27d45422bdd142006a
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
new file mode 100644
index 000000000000..ee88ee066e74
--- /dev/null
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit flag-o-matic python-single-r1
+
+DESCRIPTION="Run executables under a new DBus session for testing"
+HOMEPAGE="https://launchpad.net/dbus-test-runner"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# now optional:
+#	test? ( dev-util/bustle )
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/dbusmock[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbusmock[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	# bind to specific Python version (with dbusmock installed)
+	sed -i -e "s:python3:${EPYTHON}:" \
+		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 8ae3662d6b08..466180c1b179 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-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_12.7.1.tar.xz 503768 BLAKE2B c61932be0c36df9cfa486eb61d1a4ac64af59c696fbe4e2ab21d85fe5031d659d25531a8650f235cc1a35d32a8b9bc2d67d7fbcd10401da09b2c7513849fa857 SHA512 4d15e45e47e1f6671f0b3b916b63197d394533e35d05c60719f85e945c47e71036a30fd952a33937d4151603a7b6100f41a0c6251b185c1ec3c78532f394c251
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.5.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-12.6.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.7.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.4.ebuild b/dev-util/debhelper/debhelper-12.7.1.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.5.4.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.1.ebuild
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index c01fcffdd835..95a30ed84ab6 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,3 +1,6 @@
+DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
+DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
+EBUILD diffball-1.0.1-r1.ebuild 1013 BLAKE2B ea7a6f97ae95ce9568c172b865a1fd259a0b4f8014e20754c2f0512084791660f1a4fadba9c2f491dcdc332de90c903e2338551939dfbe62f9e3400d42bc2f81 SHA512 b206297573957da74b7d50cbcf9b410fd6005ae26f77852a44c75262b732e247e1fde141be9dabded566bfdecf0d36e04390461a6ed4d673909e87478d7b50c8
 EBUILD diffball-1.0.1.ebuild 850 BLAKE2B 02535a55320b2cb6831801d8bc4d12675659d10db9909984b88ab5cf605c9d4735ce3198e5579a17cb6cddc444f331a9e230d4ec59d9468b72999c983296295f SHA512 0df7a66f7f67f5d7115c272787f73322767434a4ccbd47cef8e8519acc92c476c23fa98f5c74a11d10142435754cf12daa35ab2ac41a9136f09c1d49e12a5a6f
-MISC metadata.xml 397 BLAKE2B 08a0d58404fdad1f2d187d5f6f51a061c5b1b24e83ffc3b59b54b223305c8da2f9082d8c961d6bb4ad13f2bb659cf265677d6d1fb7b70fd560add8e64d011f34 SHA512 4375382936f9f3f05349b4d648134251ed463ec7f74d3af2c48b1045999e1c69f9131853efb613d171b17e3ac8d7b17ec56a8088518bd6ef1aa442bd7f287bb8
+MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1-r1.ebuild b/dev-util/diffball/diffball-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..9bff04668006
--- /dev/null
+++ b/dev-util/diffball/diffball-1.0.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="https://github.com/zmedico/diffball"
+SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zmedico/diffball/pull/1.patch -> ${P}-bug_543310_stack_buffer_overflows.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=app-arch/bzip2-1.0.2
+	app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# Invalid RESTRICT for source package. Investigate.
+RESTRICT="strip"
+
+PATCHES=("${DISTDIR}/${P}-bug_543310_stack_buffer_overflows.patch")
+
+src_prepare() {
+	# fix bug 548316 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug asserts)
+}
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
index eac20fbfab6a..3f9423fb713a 100644
--- a/dev-util/diffball/metadata.xml
+++ b/dev-util/diffball/metadata.xml
@@ -2,11 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rafaelmartins/diffball</remote-id>
-		<remote-id type="google-code">diffball</remote-id>
+		<remote-id type="github">zmedico/diffball</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index edb6106cf908..62ef12d9e360 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
+DIST diffoscope-129.tar.gz 1766281 BLAKE2B 7e5dfc66a20daa62783811ec6f57b32b0733c65d66d9a17379985d5a18cf0e8b2901cf49a28d72f9305b2721e10c6ac455d747dbf5b5f3b9773c63b7fee0cd5b SHA512 2c472485b594cf2fb424bed52233a422e643bf8d5d8c919b5b5ce20c83ec7345325d337bb188c1a860f85f777012bd3e0137721a418903e0d421d4fe2d5a1b08
 DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac41e4c193c68fc037ab8089745e9b10dddc04b396f2011d22468e00a07392723631021d062f59935a953effd04fa SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
 DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
+EBUILD diffoscope-129.ebuild 1881 BLAKE2B eee2bcfe510e10fc647c807de67e8075df0854e288d1b4de8f3072442f34520446e6d0fc81c74ee1c9feb9122ceb33ed1511249c92f064ea9e3efa8e91cdbec4 SHA512 d052c86d59da7d9bd161cca0c4c571c9d093edda02809a2a5639c0e84aaf64a8ca4737bcb5744f7f7155f4437b20c266e90a110e5a00191654d68aaee0ca24dc
 EBUILD diffoscope-87.ebuild 1835 BLAKE2B 7e11544ca6290e664e2f243640e70a483ae5aa86ed12b1904c56e46ecb3bfccdf6351e8460df5287006f6ca0c76ed6892bbe8b7804e863f3cc6f592319e4562d SHA512 58ab6f85b61caf31261ede9f807c6bc55a663a3d6582c1f73458b52d8c81bc1009ca8d4966222e2539fce78c0379fe05b938f6f362548b8e5e5f0b785343a1ca
 EBUILD diffoscope-88.ebuild 1884 BLAKE2B dbd6e3783941065ecd855b677b58ae2235cc90f631d9b0d7d415603b730513d32b46da275c3d442990d0b660c5f55761b028170db82737067fec6e4ce6c2a7e4 SHA512 382393caf25441d14a073376273c18691207e4dc3913c736998bac413d5ad1b86bd7843a9030b7bf9d4d78752f538050f95a25887acffc809a07657f116524e4
 MISC metadata.xml 2078 BLAKE2B 06fb9631030fb0f6d9a482c998238884bb2094751d7f99fb424e5c4f78f97c731eed98b783b14d0215224f786186e5a536e3775a5b7f7b6d980cd468ec243cdb SHA512 69afd9a3ba85d3a6ad92a64811b76708700f0790bff588762a92ad178da94690a940c939de09ca1719fa47ef5c85f10988debda26abef283b9ab01941b3232fc
diff --git a/dev-util/diffoscope/diffoscope-129.ebuild b/dev-util/diffoscope/diffoscope-129.ebuild
new file mode 100644
index 000000000000..34ccce9cfac0
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-129.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( virtual/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )"
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index 3ac87aeeb0d6..12df59c314c2 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -1,8 +1,4 @@
 AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
-AUX gengetopt-2.22.6-makefile.patch 264 BLAKE2B 73c1bef7d171a3acb7dad8930fa1d7ce87cf83b7c395756a6658be276d3c22c2c71f9687d1666870d696fefb2940bb0ffde7d0c1de27c5b574afb6cec59cf747 SHA512 062de57db53d79261132fa62e7ecdbb6a3430231489beadc028e39258407a367033a3490b30a25acc5c1b95f8dec9557889436bd9b645f15ceb6b6b1f6655ebf
-AUX gengetopt-2.22.6-no-docs.patch 247 BLAKE2B 7d703bd0224aa6ea25095eb36902a09695bbd262f0aba524f966b97ae620abf82f230fdaeaaf29f3ad4eecf2c42699c715bd12864e26e646a41cb83d8c51b55c SHA512 05b910473674359173d380a4fc681d824fd2ca4348ff098b5d8a9110fad487ff3827e8e20b8981de4d1db1a692cdf624a5cb4c8230b2fd0182e9bfdd99ea35b7
-DIST gengetopt-2.22.6.tar.gz 1056293 BLAKE2B a99fa2ee362fc7b01ebc4c81f9daa17592a30b63f63883b73ca67885fa39f2ece48bda3f04ed5b98e74785c4030f94cc139df93a847e8789962e51d0950de0c7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
-EBUILD gengetopt-2.22.6.ebuild 801 BLAKE2B 53d523dc4b84feb8d86bad53e7b2eb0654e0ec252732bd893b8f10ebe29d6179fbebe00faa4729ef2f9ce33f59ec29eaad2f2117165b941d3b7a0a341d24dea7 SHA512 20b5852e27a6075403100c80d678c0c4066c6b0f7db7741321e5b099c7980f1b93d01226a08599bfbc2f965f3744de4e67461fc45dd71a8d5335d6c186079dfd
-EBUILD gengetopt-2.23.ebuild 720 BLAKE2B 1ccdab18dc10e9a6c3bc54da0ddf8520dcad90cde4eab6cd4c0debba3978ad69fd6e6ec8654bc277662d4506f40e0a08a51d500d7351df645e0d459c5d071a81 SHA512 6915453a64f4f6031822fa3bd0edf3347febe78b2fac47136aa698fb6e3909de900561670982dc3970615520ecee0ea689f8404e1be29a17013a08dc272cd2be
+EBUILD gengetopt-2.23.ebuild 728 BLAKE2B ee115feb7eaf766393b065831fcf8d51b4c4742f118857f9785508444e0977da50c0c6f51d5fe3905cbfc57c35a2c5af71b2d84aed8150270a75827f96713fa6 SHA512 d81fda324c6d9d4392717804fc0b809ac4ee5d68592c9ffc77ba67a83eda6e6f7c79d2810711f3eb453c4ed89e6b266ca233160ec64a1a277991dfafb024177a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
deleted file mode 100644
index f5ecefff9993..000000000000
--- a/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -51,7 +51,7 @@
- 	@LTLIBOBJS@ \
- 	skels/libgen.la
- 
--LDADD = $(top_builddir)/src/libgengetopt.la
-+LDADD = libgengetopt.la
- 
- EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
- cmdline.c cmdline.h \
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
deleted file mode 100644
index 84f0324ea07b..000000000000
--- a/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,5 +19,3 @@
- 
- EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
- SUBDIRS = gl src doc tests
--
--gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
-\ No newline at end of file
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
deleted file mode 100644
index cd8b5f7a020c..000000000000
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="A tool to write command line option parsing code for C programs"
-HOMEPAGE="https://www.gnu.org/software/gengetopt/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-no-docs.patch
-	epatch "${FILESDIR}"/${P}-docdirs.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index d2f7836b3a84..a11ba32f0ad2 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 85a26a83a39d..7e14291820d8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,9 @@
+AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
+DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
+EBUILD glslang-7.12.3353_pre20191027-r1.ebuild 688 BLAKE2B 9fd85aec4efeba74a64284f1e8b9f5643bc84b1a0fe483a55d5df0c674cdffbc16f1d9e3f684310299c202ae5c8206045ea0ff7e28ac2e9cba50e0e4e0c9b5a2 SHA512 08cfbc174d6e29fe4642a7356e044986cc27a9c7a0221a7a34a185baa35053f5884f75b2377c3e970884954e2eb7fced1dda31e455e56713f4a95d825257c0ff
 EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
-EBUILD glslang-9999.ebuild 415 BLAKE2B 7c9fbc60b1bcdab2c19f01abc3dd83000cab76cf25509bb3efc24a1fd51b26b9f78fba4b03d8d5012b2f63217b10da174e14cdc452579dcd9fbc2775fb2685ce SHA512 e3ddff0a117d4f75b493bf4a0fc0c5c8dfdf43a9b89f53dc292199629ac871a6b234f6f6b52d0812bf2fa05f596fc01f6d89ea828c626333159ea90a0fb924db
+EBUILD glslang-9999.ebuild 475 BLAKE2B 0b777f21e7e0102c9aa5ddc96b0eb0db879bf71c863581ae3bfc6c29a28bde53fe160e6fd3b8fd14e7b9a105e705ae8cea09317df06522fe9643a909b0e9648f SHA512 de572163317dbd22012cc89023dc006a279a4391ae6f317538097130633991e83ba9730d84dde2fc41bd8d96a711cd6c6c8a89716dacd8d7414aec54638bd126
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
new file mode 100644
index 000000000000..4c44cfbbbedd
--- /dev/null
+++ b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
@@ -0,0 +1,26 @@
+diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
+index 86e1c23b..3907be43 100755
+--- a/SPIRV/GlslangToSpv.h
++++ b/SPIRV/GlslangToSpv.h
+@@ -40,7 +40,7 @@
+ #endif
+ 
+ #include "SpvTools.h"
+-#include "../glslang/Include/intermediate.h"
++#include "glslang/Include/intermediate.h"
+ 
+ #include <string>
+ #include <vector>
+diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
+index 7422d012..59c914da 100644
+--- a/SPIRV/SpvTools.h
++++ b/SPIRV/SpvTools.h
+@@ -46,7 +46,7 @@
+ #include <ostream>
+ #endif
+ 
+-#include "../glslang/MachineIndependent/localintermediate.h"
++#include "glslang/MachineIndependent/localintermediate.h"
+ #include "Logger.h"
+ 
+ namespace glslang {
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
new file mode 100644
index 000000000000..c1e6eeb104d2
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib cmake-utils
+
+SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 63a6238d03f8..4283dcd2371b 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -13,3 +13,5 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
 
 LICENSE="BSD"
 SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index fc6d86ed6609..31858b49346b 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2697 BLAKE2B de4b84e3344e5fd3c791b21e143f46c3435cc6c324320da9f19c4257b400be6b0aebe3e051d26978d41668d248bb51e569a9214fec39f67d4ac51524b8528b89 SHA512 c7d9c6edb342078144342430bc34052f104ecfd87e69896f7fddb533559add1a0a13904905dfb5c7b65844049280fbd370ef81fa23637643618137d4453fa14b
+EBUILD gtk-doc-1.25-r1.ebuild 2753 BLAKE2B 2a546eab9116007cb8371c4af44d7941815d6cd59bbfe3afdfd6e8fa823dc202d763f5b0b02c488a141cdc79a3ec9f39ec76d55ca7b4a59f29c1c9d2c701a64c SHA512 be4c6e93306c97b65099e668543d9a4fa2f5361a0970f6f06cb50abe181f7e614536a24538876970c17ce5fa4bd701f6d9b3dfd7ade3e3fd71fe9e83f34c126b
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index adafa6c78730..f09aca3b44cf 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
@@ -13,7 +13,8 @@ LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
-IUSE="debug doc emacs highlight vim"
+IUSE="debug doc emacs highlight test vim"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -31,6 +32,7 @@ RDEPEND="
 		vim? ( || ( app-editors/vim app-editors/gvim ) )
 		!vim? ( dev-util/source-highlight )
 	)
+	test? ( sys-devel/bc )
 "
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index a0c3a56b7b37..b47afec885fe 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,7 +1,9 @@
 DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
+DIST include-what-you-use-9.0.src.tar.gz 589377 BLAKE2B b695354787070948d81e3e80b07bbe47a84b5609262df2220b6a62e6d648865b17e060951819f45956c6ca858977614d6e0401640509599b391a1165521b20de SHA512 f2d6ba05121a9968da9e42e8ac66f83ca0f35bfbe7cb1d616e2c6479cf2833c4668cb86e46a04ffcd5e77f10a575da9eeee5272c7609b5afad555d79cb640fb4
 EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
 EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
 EBUILD include-what-you-use-8.0.ebuild 1216 BLAKE2B 09b50d9d452f36bb3d044e42af3952f2612813251209875404847cf4f0d065991b7eef3a31577a876a769263680c9559beba838a2cce97f00876dc17e03d2d48 SHA512 173540c5ca5c145bb3764a9c13fc601e7121be7039a1ec45f0bd9dd6aa91b70a998939b10628024f679b69e267242bd989baba97d9fffd547d800f73a1a78300
+EBUILD include-what-you-use-9.0.ebuild 1216 BLAKE2B 6e2dd4fd83e5264cfecb4506cde27765c4be796f5011f577d35a0a28d5ce146eb11424772cd7d93dd3057e5e1f337b453f30918faf27e470948072fd218ba38b SHA512 e01fd3c8b42d9b20d6fa6cdd70e7aa576d504d6230c9be0237180706a95d42efa8f400e9109f7ddf93892f794f7c0cc406e2f7a8285710f2f6c0914adea60421
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
new file mode 100644
index 000000000000..2b95d9035551
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=9
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 191d6d064016..4be4e61f9f35 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,14 +3,10 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.176.3.war 77364728 BLAKE2B c80f54999faac0a740a4030498785f5caaaf9dbbd077258a767f2b23fefdcb32892865d256a46ca9afa015a5c035ae05605ecaf031017d350684e3b199f11517 SHA512 dc01c28abe624165c8fa63534a6beb8489ed73152dcdbb1cdb0bbb2e66492583eefe3b62f7e804089febc017de61535c336aa26835501759090f9cfcbd6f2e91
-DIST jenkins-bin-2.176.4.war 77368917 BLAKE2B d997e8fe0faa693830447046f23aa528e3265caaa813283aef474ed667c06d4cbaa009e6171c34fac05e91f811ad998ca28dd32bc7b7811e3c618a06b0c9eeed SHA512 43eebdd25571a2fb100f98e52e4fc77009bf6e8254aea724c9917ad6a775bf40ca07339b5379d3932fcdcd8700b94f45a8428d54da7b8154bb7351cd14dbfca1
 DIST jenkins-bin-2.190.1.war 78245883 BLAKE2B 6c80eaebc6fe34e2c889c78a34dfc3e105a9bd9b92d79d8a9cfe76bfdf66a851afca2a5a2b7373b437deed663fde3cfeac1646f317a9c052d2d09d01d82aeccb SHA512 db27957452b5e57666a1bbce43547e8cfd8f95cc557b43e5162a033779f0cd68d8fd1fc880b563000927f3a71e79385f583d18c21ad06575b192e4d8e47a8c8d
-DIST jenkins-bin-2.192.war 78257602 BLAKE2B 09f9df5f0394fc5a8d45b4b11a53b7b110d99275ce8e2ba7a984592bb2f883fbf8f1da45903a28fa20c18ab285a6a3200077784436716cab7a5f47ef7f3cba09 SHA512 f60fd5a74cd05a755dd85ee2be13f9f473a9fcbf3d3400df17b840fe88025b8311cee2d5e9e6c6dafcc8d268fac245a519078911e600d9af5580d228bba773d9
+DIST jenkins-bin-2.190.2.war 78243424 BLAKE2B 7a6bd4cf1c070ce3a09fb84b3dbe7e87f474f4254dd4b4fcffdd7dedf7d4c2ba91d8783e7273214aaaa39bfeb02da721e4d539cba76312c21b523a9bf336a964 SHA512 b1f59ef10dfdfda06bedbf9a40a9e83e159b44b2b5574cba4d62547294386224f64d856490fd4477fb3300a4119d17fc284819719218dfcf32d3dc20ce468847
 DIST jenkins-bin-2.197.war 78309466 BLAKE2B c3d34c6fc40a82148eafa978c8787375ece6522d0d936b42f0296ee13cd084669bfa31975c0ad27816bdd4c1266cb066c0909774199a1373661a7ec524c06e91 SHA512 3b6a00dee5aeb8a94c8f75323c2469b54fe96d90bf8371898e41dc5bdecaa472f112bff1466481c66c9c7a07b22cbe799a08e45ac486d68fd5bdc7c20d43d722
-EBUILD jenkins-bin-2.176.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.176.4.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.190.1.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.192.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.190.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.197.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.176.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.176.4.ebuild
deleted file mode 100644
index 323b88955105..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.176.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.190.2.ebuild
index 323b88955105..323b88955105 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.190.2.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
deleted file mode 100644
index 7d232cbccacd..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 767def69dcb7..1c59250cc703 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,4 @@
+AUX kdevelop-pg-qt-2.2.0-qt-5.14.patch 1988 BLAKE2B cffef4d7f61981b3f8e236e225e54b9ccb1964b1648c78b506678a76c0082f4e9ad8b6f1b68ff5d7e7a6f2413c7589513bf0db288d57cbc176d37a3b5959d7c9 SHA512 6b4429de2c8770c869e821a1a196cafdb52c6aa350c8d0dffd9d232fb1cb1ca3ef1da01fee70195b7344685ee82b735f9baea6e1365e58a98b52dbb4d29fdf2d
 DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
-EBUILD kdevelop-pg-qt-2.2.0.ebuild 468 BLAKE2B d2056997ba2031f120abda1331d467e6f5832a02b844b5f7679c2ae4501af4f1ca6c8e32b088fb1b2d053bfbf65e827906eb8dd68cb5281a43c69de997f2c9a3 SHA512 658346b75ccf7ab3321ef752ec7343235124cf0894b9a5c7c4b456aa8d8ecad22b18daec1902b35c8f83a31bccdfadd2ba019e0f7b49a6fedbd26188d80afd61
+EBUILD kdevelop-pg-qt-2.2.0.ebuild 514 BLAKE2B d0b103446fe315ec4fcc07a0883a8fd565a03b8c9f0947b686682a0598dc6eca1791844094b77fd6a71ef8cdaf9cfc32ea9a95b2848a21b724543a5da9142470 SHA512 f519e5a1f26592d5a64a240b4d520498773cefeb8c48324f01ae9dba28a1984587696ddb5d2861e1190c753e30521e15172d435997858bc2cfed721e177a06d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
new file mode 100644
index 000000000000..5a4dec36d887
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
@@ -0,0 +1,60 @@
+From d05d0b19e9d6f47fee3e11d837c2c21125589763 Mon Sep 17 00:00:00 2001
+From: Alexey Min <alexey.min@gmail.com>
+Date: Thu, 24 Oct 2019 14:34:45 +0300
+Subject: Fix build with Qt 5.14
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+Trying to build kdevelop-pg-qt with Qt 5.14 results in an error:
+```
+.../kdev-pg/kdev-pg-regexp.cpp:44:23: error: redefinition of ‘struct std::hash<QBitArray>’
+     template<> struct hash< type >                          \
+                       ^~~~~~~~~~~~
+.../kdev-pg/kdev-pg-regexp.cpp:53:1: note: in expansion of macro ‘q_Hash_to_tr1_hash’
+ q_Hash_to_tr1_hash(QBitArray)
+ ^~~~~~~~~~~~~~~~~~
+In file included from .../prefix514/include/QtCore/qvector.h:47:0,
+                 from .../prefix514/include/QtCore/QVector:1,
+                 from .../kdevelop-pg-qt/include/kdev-pg-char-sets.h:36,
+                 from .../kdevelop-pg-qt/kdev-pg/kdev-pg-regexp.cpp:20:
+.../prefix514/include/QtCore/qhashfunctions.h:209:1: note: previous definition of ‘struct std::hash<QBitArray>’
+ QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
+ ^
+```
+
+std::hash<QBitArray> is already specialized in Qt 5.14, so avoid redefinition with conditional compilation
+
+Test Plan: try to build with Qt 5.14
+
+Reviewers: apol
+
+Reviewed By: apol
+
+Subscribers: kdevelop-devel
+
+Tags: #kdevelop
+
+Differential Revision: https://phabricator.kde.org/D24914
+---
+ kdev-pg/kdev-pg-regexp.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
+index 8cc0b95..9fee81c 100644
+--- a/kdev-pg/kdev-pg-regexp.cpp
++++ b/kdev-pg/kdev-pg-regexp.cpp
+@@ -50,7 +50,10 @@ namespace std                                               \
+     };                                                      \
+ }
+ 
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
++// Qt >= 5.14 already has std::hash for QBitArray
+ q_Hash_to_tr1_hash(QBitArray)
++#endif
+ 
+ namespace KDevPG
+ {
+-- 
+cgit v1.1
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
index 05aa96fc8afd..4fac1ce848d0 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
@@ -16,6 +16,8 @@ HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="LGPL-2+ LGPL-2.1+"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
+
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c1d6c9e9436f..a5db6793b4cc 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
 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.2.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
+DIST kdev-php-5.4.3.tar.xz 1042108 BLAKE2B 65191e7fda03f00e3cfe0332325bd804ba357ea569ac223237d2cae4737e50a1d79b8eb422f464f2d2b0cdb48eed7d38b77b45f3cdb75e0fdd1db9ecc73e6470 SHA512 38f6e7fec5b08ac8cdeabb111545dc6fca522f560b953ee51f9f37e9905780adddabc7d2e30333dfaf735a1869f33c6bd2fe2dfbd054f7b874e1454e701e3a25
+EBUILD kdevelop-php-5.4.2.ebuild 1112 BLAKE2B 496b496d12beee31995121918ad861a9d3320ac220ed9f008c130a5e21efa2ee6b5c2d6a18a3ef0c2a282648a38e87cbe5f5acbd81393c58272bee8099d3b3e4 SHA512 3471c55d779081a6090ee90758c37f3e21c2b522947f7fa682892063789a27056e04ac5aa664b08705daddb5b54bba4bc3132d02bab31baa18e089c18b69f25a
+EBUILD kdevelop-php-5.4.3.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.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
index 736a5e6971ab..9ab3c8b228dc 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.3.ebuild
index 23b9ad37caad..736a5e6971ab 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.3.ebuild
@@ -11,8 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
@@ -37,7 +36,7 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
+	dev-util/kdevelop:5=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 3d35fa57c5d2..361d9064ea24 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
-DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
 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.2.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
+DIST kdev-python-5.4.3.tar.xz 1072228 BLAKE2B 4b1a6bbed56d30aaed290951b4aeca99512a0def3ecbe60126bac058c908f12821ecef1989688a6133f4954bd6ceb8fc4c2e05677898639294d441ad6a15bcbb SHA512 0e528515dfc333ce56eff00ed3c0ab0130d2cea6518e70fe4756179e447881ce3488f09900bed628ba92f9a423c396ff6ca71a3cf73471cc71f2ac9226a27bb0
+EBUILD kdevelop-python-5.4.2.ebuild 1050 BLAKE2B 6381123492acb52a6ac14bd257c31e04d08d355a7c60aee2fa19ec8c2b8a01a75b9d77febc2e4c3b38d14fe5f3cde78d6350d6ff9b939e6edcd7340473528af6 SHA512 cc75784fde96ff5dac748f7f81aa4d6c0514b9112af7a89496e11999757d3e2aa05b9daa5844454a26e356d31021c5f4af2c511d161f6e6e99f75564a1c30f38
+EBUILD kdevelop-python-5.4.3.ebuild 1050 BLAKE2B b85f44090547c99ac5edc8116bb531399b23a1c6e792a8df0a84d86fa3f8e5e6850d610543b4eff67bc531d29534aaf9d5f3cb76e65c5037cbdd039e5f6d0bbd SHA512 a5aafc26a1853b02d4e5023dadaad621939184266bd56d5c5b304fa89ab858508998ecbc085baa17167a687cbb6de37266c280654a2db42155d8628bfc384740
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
index 4329abd3e932..e5342a7fcbd4 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{5,6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.3.ebuild
index f9a306678f5b..f85c7d2da5c4 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.3.ebuild
@@ -5,12 +5,11 @@ EAPI=7
 
 KDE_TEST="forceoptional"
 KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
@@ -34,7 +33,7 @@ DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
+	dev-util/kdevelop:5=
 "
 RDEPEND="${DEPEND}
 	dev-python/pycodestyle[${PYTHON_USEDEP}]
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f5b53fca1759..921d6ad224e2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,5 @@
-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.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
-EBUILD kdevelop-5.3.3.ebuild 3796 BLAKE2B f0dd1488afb9408bcf6f44f1dcb0c948ad69e2f6c89e2328a9fc00c43295acef256d1d9527a0e576d8141ad32d99502e26944dd1d2d4942b1753e404b2a38455 SHA512 98fbd77a30b1e1623116c36f0098527126119cf27e982ea02c3bc9d4cd1e9a344eeb8e01853ce4cb9fb468dcf087ffa92b6c15afec38eecadb6385aefe9a24dc
-EBUILD kdevelop-5.4.2.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
+DIST kdevelop-5.4.3.tar.xz 7010496 BLAKE2B 2f6aa0073321ad1e6c6eb905879c628717927957e60c26b353b691560438afdbd42c7803c227e8de8ada0fca6da38ef02664afa0fc3e9d372d53b2d879b64665 SHA512 f21f282ca772fea6a4bf8f000ddd71386c98c17956c151d71b824a5a9b30223530015e3a73979856580dc318caa9da7bae6b3cf914ffa8aa7ea56cacded1c524
+EBUILD kdevelop-5.4.2.ebuild 3864 BLAKE2B fbba8860992a4f9835e3265f87158b596c900a46439b4e548dfca78d32f81efb27911e7b917ea91acc9d46d457af3808dfde351ef21694e4eb05cab59a930096 SHA512 825ef6759a5b84447102204e3882762d2cb0d3a3bd0e189b0eff56c65f416c628ae739d07919e08cc0bcc3c78c304a69c2fb422e5d8df339bf9aff65b35b151b
+EBUILD kdevelop-5.4.3.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
deleted file mode 100644
index 39b1122f7189..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
-From: Tomaz Canabrava <tcanabrava@kde.org>
-Date: Thu, 18 Jul 2019 18:07:39 +0200
-Subject: Add missing include
-
-(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
----
- kdevplatform/shell/mainwindow_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
-index 3020957..1e915a0 100644
---- a/kdevplatform/shell/mainwindow_p.h
-+++ b/kdevplatform/shell/mainwindow_p.h
-@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
- #include <QObject>
- #include <QPointer>
- #include <QWidget>
--
-+#include <QMap>
- #include <KXMLGUIClient>
- 
- #include <language/util/navigationtooltip.h>
--- 
-cgit v1.1
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
index 5ed1e8f93f5d..4fe926d9971e 100644
--- a/dev-util/kdevelop/kdevelop-5.4.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.4.3.ebuild
index 0e818dc362fa..5ed1e8f93f5d 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.3.ebuild
@@ -10,13 +10,14 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	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="
@@ -59,6 +60,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
 	>=sys-devel/clang-3.8.0:=
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	hex? ( app-editors/okteta:5 )
@@ -84,17 +86,18 @@ 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
 
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kubebuilder/Manifest b/dev-util/kubebuilder/Manifest
new file mode 100644
index 000000000000..6224cdd3dcb6
--- /dev/null
+++ b/dev-util/kubebuilder/Manifest
@@ -0,0 +1,17 @@
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-gobuffalo-flect-v0.1.5.tar.gz 17787 BLAKE2B 0a389b0deacc7dcda74fac4dda8c99d586849f9824e4e0518fe4a42c52c8cc9388862b98cdae9700515c299e6e927edd013fcfdeba84e48aa14702f664edc964 SHA512 f13dc8c7511c2943b2a85994fcd50c1df44e622f23c2402a2d616edb52ed3916ab433f7985951ba6988647eef1816932144ffad89bc35195360a3a552bf6b276
+DIST github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
+DIST github.com-golang-protobuf-v1.3.1.tar.gz 310884 BLAKE2B 704efef653d39b4954798537e7451d15dd1d913c67d1332ffc016b396b028a0dd03487765a89b0bc5f920b75cf4f51be79a8da9d3291e0f02873c47601360080 SHA512 7dfc6d7851c7181e1a73effe9e8a97752bb428bf207a44b065412a8e87e0e3e200b5eef3d8c68af33a0721d12a8b98bfa88b22add074b19b6e1759e9268abf25
+DIST github.com-golang-sys-d432491b91382bba9c2a91776aa47c9430183a6f.tar.gz 1448871 BLAKE2B 08763852d5fe0af14a48f00044398dae153392750a1fdfeb6238143e76debc15de6e54ab14984677f199a6875320d037a3124aaea0d0a7f2e4f19963daf50c19 SHA512 f337b115e8975a3ba0ca12c68d203a5223734bc204d617d90ea124e348a26f97a81ae493f537cf3f87b3a732fa5cfba6fcfad2225ee8b4129667eedf86dc1507
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-golang-tools-58d531046acdc757f177387bc1725bfa79895d69.tar.gz 2271817 BLAKE2B b78f38a435a84e40b9b33e677f72cec39b57e1d85b7cfb90c52ec3c5d4ec8ed8051c3c6ff088ac5561643934cb3a93e21d6f0ad24dd4c01013b9b21ddb608ae0 SHA512 5bca07ccf8cb996c9051e43a9f54327f955a81da3add116bcdc55c82d1addf0d2dd9ced3c2f4d8af1921ea14ef8f41ba4f08220809ad1cacf4a617c9a115f252
+DIST github.com-onsi-ginkgo-v1.8.0.tar.gz 133392 BLAKE2B 42105f337a583d1d07554e07a13ac141edbe6bfa7c04a2a83c9ee49eff3f7b5b9b9acb35d824d33045cd991876f03457f8271a6eb3d493fd9288b23a1f07e704 SHA512 ed8a21d07c63dff1291a3ea0413dd5168f54738630bc0ebe1938765f3e0cd5d41e01f3836e401d3c2c96770281506440bbaf83d745a6c5b3be4cb5cde84f3d9f
+DIST github.com-onsi-gomega-v1.5.0.tar.gz 88642 BLAKE2B de8a842d9cd48d11f5f0df905bdeabf37d6467ffb3d8e4f30f160061e00452d5e5fb63384fcd64b83de69106859a89cb9de3667624a5db2853b9bd95f31bbd0f SHA512 96420cc6fca24ad8144bdf207a702c67f9787be6fee041875e22fc8762b257649b54be5f4e926a2b0b2e52bc0ffa1f3297d0db39c8668dea5ccb1c0d9240df41
+DIST github.com-spf13-afero-v1.2.2.tar.gz 46157 BLAKE2B c9cfe5ce721a9992b775f82521f769fb79c67743db499540bfc5ca371f2f927c715d3ca11a1231180f56c3dd6a844a69ceb3b84b33a37ee348f3e39fafd29df4 SHA512 6b4b39ed3f8c537069cdf26840f21ad15807621ad494c78ba6c376de3994842730282a7517a3c5f7919402a3ee06a5cc6988a34207a531b16933b403c1635ee7
+DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
+DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
+DIST kubebuilder-2.0.1.tar.gz 1371557 BLAKE2B fcefc068a9aa3e84d9fc394bb0cb1e99bc535c3a0b627de52f3cfe482f4ea209ca2a5e318520560ef297b95e4b4cccb1b8cb2eba008f1febfc97516f0e12313a SHA512 9a031971edb8df2c498e55e5282cdb4feef130f1be767222ee643e8beb601314255e93b312403846b1bbb84a841b6f027e633371f5ce5615aeda75564d1404f7
+DIST kubebuilder-2.1.0.tar.gz 1394454 BLAKE2B 0a1a1cb3531eb1346b629813a1d44cbe7346c9d8b2945b2c7d9e4a3381b843591c3db54407ef64590affa88d9427718c85983dbc9fead44fd724b2ba78af8ca9 SHA512 1fff1adf91e9b660937b3c2ba69c3bff534af50a363730a3ae9ddfb50325f343d239398db9f7ad15976c2a1f8d5abaed01136332ba21c0766966f1fb12551442
+EBUILD kubebuilder-2.0.1.ebuild 1196 BLAKE2B 28f8afccd4f6965f8b202e6ce562a89b307b914c01a825e48b07ccdc73796236c186e247fef6b116b43123f74b8cb3ea0d05fdf1ccd232e59f6d1c256655f958 SHA512 1a25098a79d530d05828af5f62e7d47f08edeb929a54cfc45fa836c60a6f4805a4352125f3b419a1b52f1f877f4906a3eff022d73c13deae3ab5bb88a03eb507
+EBUILD kubebuilder-2.1.0.ebuild 1196 BLAKE2B 28f8afccd4f6965f8b202e6ce562a89b307b914c01a825e48b07ccdc73796236c186e247fef6b116b43123f74b8cb3ea0d05fdf1ccd232e59f6d1c256655f958 SHA512 1a25098a79d530d05828af5f62e7d47f08edeb929a54cfc45fa836c60a6f4805a4352125f3b419a1b52f1f877f4906a3eff022d73c13deae3ab5bb88a03eb507
+MISC metadata.xml 1407 BLAKE2B 80fc7e22a57a376599b6ebef5a2c95cf3b34bdcf0dd92590c325ad04474ee517c093d44afa1e38ad5c1c537a9c85f764343d5d0c6939c16f69d390ef39952e24 SHA512 825ad0becd710a0833b593dc4346511a9f54e06f0c22420a122f289bc18b9e0cca7481a5e968ceb4975e2441754be86d1f0a60a0ee6ca6e305d6b53ad4380db4
diff --git a/dev-util/kubebuilder/kubebuilder-2.0.1.ebuild b/dev-util/kubebuilder/kubebuilder-2.0.1.ebuild
new file mode 100644
index 000000000000..14af483330be
--- /dev/null
+++ b/dev-util/kubebuilder/kubebuilder-2.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="SDK for building Kubernetes APIs using CRDs"
+HOMEPAGE="https://book.kubebuilder.io"
+
+EGO_VENDOR=(
+	"github.com/gobuffalo/flect v0.1.5"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/onsi/ginkgo v1.8.0"
+	"github.com/onsi/gomega v1.5.0"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/pflag v1.0.3"
+	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
+	"golang.org/x/sys d432491b91382bba9c2a91776aa47c9430183a6f github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/tools 58d531046acdc757f177387bc1725bfa79895d69 github.com/golang/tools"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0 BSD-4 ECL-2.0 JSON MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {DESIGN,README}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-o "bin/${PN}" ./cmd || die
+}
+
+src_install() {
+	dobin bin/kubebuilder
+	einstalldocs
+}
diff --git a/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild b/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild
new file mode 100644
index 000000000000..14af483330be
--- /dev/null
+++ b/dev-util/kubebuilder/kubebuilder-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="SDK for building Kubernetes APIs using CRDs"
+HOMEPAGE="https://book.kubebuilder.io"
+
+EGO_VENDOR=(
+	"github.com/gobuffalo/flect v0.1.5"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/onsi/ginkgo v1.8.0"
+	"github.com/onsi/gomega v1.5.0"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/pflag v1.0.3"
+	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
+	"golang.org/x/sys d432491b91382bba9c2a91776aa47c9430183a6f github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/tools 58d531046acdc757f177387bc1725bfa79895d69 github.com/golang/tools"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0 BSD-4 ECL-2.0 JSON MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {DESIGN,README}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-o "bin/${PN}" ./cmd || die
+}
+
+src_install() {
+	dobin bin/kubebuilder
+	einstalldocs
+}
diff --git a/dev-util/kubebuilder/metadata.xml b/dev-util/kubebuilder/metadata.xml
new file mode 100644
index 000000000000..f9f79039d30d
--- /dev/null
+++ b/dev-util/kubebuilder/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Building Kubernetes tools and APIs involves making a lot of decisions
+		and writing a lot of boilerplate.
+
+		In order to facilitate easily building Kubernetes APIs and tools using
+		the canonical approach, this framework provides a collection of
+		Kubernetes development tools to minimize toil.
+
+		Kubebuilder attempts to facilitate the following developer workflow for
+		building APIs
+
+		- Create a new project directory
+		- Create one or more resource APIs as CRDs and then add fields to the
+		resources
+		- Implement reconcile loops in controllers and watch additional resources
+		- Test by running against a cluster (self-installs CRDs and starts
+		controllers automatically)
+		- Update bootstrapped integration tests to test new fields and business
+		logic
+		- Build and publish a container from the provided Dockerfile
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/kubernetes-sigs/kubebuilder/releases</changelog>
+		<remote-id type="github">kubernetes-sigs/kubebuilder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index b3fb4de80776..cc94d05627e7 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,9 @@ DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bf
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD lldb-10.0.0.9999.ebuild 2762 BLAKE2B bebf58557637dabe036f1142f61823508cdaa4000b2bb5c0869c87f3f8d75ec9a845c68569f2db257aa0074ae723bfe8a0d90db475d3fbb6d6134c403b02b4f6 SHA512 446c4c6f1f82a03210f0773d115f86509e357a76cebc76dea85f995042cdccd426d98472dab8abcf4f2bd4c6cf0b5b14f3571042d34e03b52a578138c2aba676
+EBUILD lldb-10.0.0.9999.ebuild 2440 BLAKE2B bf6f144d0ce7f858a346fcc2506bb79ba48ae2cccde7f7f62157ecee96deecc36ae97ba725056a16d44198da82ce8e7aeaa22d9cb396878820c60125bcc8d4b4 SHA512 3e53ce44234f772270b998e882413f7d3b5cba94f40141f921fc14b0ce7192decfa18f8ee138e961d11cc5bf093e9323d483747a31778ad2b70829e642e6b2a6
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
-EBUILD lldb-9.0.0.ebuild 2791 BLAKE2B 96d09991c69e8835a557d0e49c0eb005b1c4202646031fd601fd5b1fcba5d48c02b4997cad7ed5fd201d5b216afb5dffb68393061f7304b19cec6975cb14b831 SHA512 3cc0b03a73fdd16c2a3f575e0b5b046c36b564fd7964431d27c16d09aff3a5b86fa40e5beb9bc2551eb07b34507741bf420f9953d4fbc9c2d7328d010cd0bada
-EBUILD lldb-9.0.1.9999.ebuild 2747 BLAKE2B c6c14740393f0808556912230587d4299ef22bac4e9e632b364e8e01413059cd5bf2e2ea715362ed676217661cbcf4553bde7ca4c34608169ffe55e75b6d457c SHA512 a8d059545a68ca487c6e3cab6e9cfc64444f504527db1d8f9921102e5b4ff03d6970fd745ff888af8770db98eb2fbce291a540c77ea6f751725e4ca0b7674075
+EBUILD lldb-9.0.0.ebuild 2321 BLAKE2B 67da72dc7eb0c3e108b355b0f322d90a94f33266172053007f9f483db5ffa204262339617b8a93013fe22e7e3622ee895968bbcff81055d881edf77d09f4583a SHA512 473303590bbd86598fb5f78628edb0cb8c5d3a77992804373094f23c625ab5ca437c0196931a951ed14ad736e6273040246e3b4a4cf594e87735ecfacab0842e
+EBUILD lldb-9.0.1.9999.ebuild 2300 BLAKE2B 47b8092e629bcd192cbdbb114fbc3ab159cc2fba589c761b955162300c4c4950671830d96618be0a0e5c4bab728a87c0b9ff3da1f94ae196cafb23409051c721 SHA512 c060abd2b8ae5e3cb47dbbf91d821b990e7e13451fbb549d1a5c97f380cefabc4103ed9489394ec284ea1627b72ccaf02cec72c98bd89714509527ccc60f34c0
 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 a76bd5aa712d..384878929777 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -3,29 +3,26 @@
 
 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,7}} )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="libedit ncurses +python test"
+IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
 	python? ( dev-python/six[${PYTHON_USEDEP}]
 		${PYTHON_DEPS} )
@@ -48,31 +45,18 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
-	fi
-	git-r3_checkout
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
 		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
 		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
 
+		-DCLANG_LINK_CLANG_DYLIB=ON
 		# TODO: fix upstream to detect this properly
 		-DHAVE_LIBDL=ON
 		-DHAVE_LIBPTHREAD=ON
diff --git a/dev-util/lldb/lldb-9.0.0.ebuild b/dev-util/lldb/lldb-9.0.0.ebuild
index 84fc69b2d438..bc79687eb310 100644
--- a/dev-util/lldb/lldb-9.0.0.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.ebuild
@@ -3,22 +3,15 @@
 
 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 \
+inherit cmake-utils llvm llvm.org 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}
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -51,18 +44,6 @@ 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)
diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild
index 9389776f49b5..2e9e420b07e7 100644
--- a/dev-util/lldb/lldb-9.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild
@@ -3,20 +3,15 @@
 
 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,7}} )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
-EGIT_BRANCH="release_90"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
@@ -49,21 +44,6 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
-	fi
-	git-r3_checkout
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 966568aedffb..733bd9abd3ce 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -3,11 +3,7 @@ AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edb
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
-DIST ltrace-0.7.2.tar.bz2 483806 BLAKE2B 4d635385c1a2ab24ee52c205fd1dfcdab8addc1121cb0d1adb5c4091d87bfdf3687e930246481fb4ff6de0fd787527b1b9dd66054f18619c4878eed6048da8a4 SHA512 ec86f08d0c18579ff05f8be23ef3c7309c76c647a0d952fbc627e8095b6ce52b2552e152dc0ec9c6098039c2d50d549a1d218f56a13f75f28bc7b03eb39e94e0
-DIST ltrace-0.7.3.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.2.ebuild 870 BLAKE2B d54ab07bc77f0123e1c45045cfdac7211871299520eaa945083febb3e4efddab68450257beb0882467ff3b488c588d03f371bc775575d9270edc20d529765d3d SHA512 4ee1d65ecfd2b2d69a06c4f09e32715b6c4ffd242834bcc683053de28932d6fc94a8a6b176890bac2c5013478c3db29405680b05e51bda9b919f71083e1337a1
-EBUILD ltrace-0.7.3.ebuild 878 BLAKE2B 63d0fc0e772670082d1ee5b36922db061d3bcd13c1d94093c1a520992a13d28fe19d06f88d3774f36075a9a39d6a7d907d7366ed7a0d3bd54847a8b921756fbd SHA512 675739c0dd96d879fe87d66b7711217e7d4070a0d6b5fc2bb3f0b4667e1e27ad521a373bb0030b6bf62344da4db3af0f674a3a5fdd3f1542cc34c5e486d16ad3
-EBUILD ltrace-0.7.3_p4.ebuild 1345 BLAKE2B fb979d8531e45c2e18dd5fc7da79b2bbab2d3ceba3743a42599ce26624da926463f78abe5b93bf16a6edc50bcb8d1fa439b931736259095e9917f679ad1ff323 SHA512 2b4ef00bd037f8b72f2b6566acee782dae675764a68f9e63eb9c604146ae24270f2db31761d0b3cb7da5d169e7ff7e0b6f086df36ce130381a95e603a8c9ce43
+EBUILD ltrace-0.7.3_p4.ebuild 1356 BLAKE2B 21ff4a5e4b94063ea58710e38f93609dbbaee69452524573ebeee187c84be2a4ac43d9f700011acc68e9b1a98c5f3119f41147e410e07cf355d4dad99f2c2cbc SHA512 d9a179a1e1220b1b24d9736e59392b54a2417fb6ff5dea0919f45671b4688ff59f820b72fdc36aec4ab65a15d7e5fdd0e373817d172b18dabd0a34860a062c89
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/ltrace-0.7.2.ebuild b/dev-util/ltrace/ltrace-0.7.2.ebuild
deleted file mode 100644
index 0b9d0854b682..000000000000
--- a/dev-util/ltrace/ltrace-0.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-NUM="3848"
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/${NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/ltrace/ltrace-0.7.3.ebuild b/dev-util/ltrace/ltrace-0.7.3.ebuild
deleted file mode 100644
index 7b48efa94cdc..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-NUM="3947"
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index c17e3402f379..abe4ea0c259e 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -8,7 +8,7 @@ LTRACE_V=${PV/_p*/}
 DB_V=${PV/*_p/}
 
 DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://www.ltrace.org/"
+HOMEPAGE="https://gitlab.com/cespedes/ltrace"
 SRC_URI="
 	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
 	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 790140bd7bf5..77426bcbbd67 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,11 +1,7 @@
-DIST lttng-modules-2.10.6.tar.bz2 302285 BLAKE2B 3a6ca46ce87d5d846f65f250a10951b1c72d305a817bd147d4e0c1896aafd2c81745253f2cd19069e0e59a46724009c4f0591926daaff43c9885019bbbc4bc8d SHA512 1bc5246f1d93201f2bce62e64d3773de70ad3aad9eb5b9bbe141dfba19e7a03f65ef738c1985f1de557c81383e1be2ce8af474c1f7593f63f4256b3fde5dd9b6
-DIST lttng-modules-2.6.4.tar.bz2 295609 BLAKE2B dcc0d46c57b53abaf65f499a889d6fa32d062f47b589450d5d8d65f7a50b9870340ea8670fa69c8eaf86239c86a1f299db8378a562e3afc2b00d3a582dde9eae SHA512 ec93456829b04964d0c9befd1071e220bc047e3bf57978bf9e6a666d0be418c5825873746604e0758cd8fcd47f70f4471e0b190ad87f53b79d7efa94febeef03
+DIST lttng-modules-2.10.12.tar.bz2 306825 BLAKE2B 9f71f3102094e905bdbfc7d17888452d940f035e7c1dcaf70c004c927c976a029f9272809bf89e37cba2b62375a51cbbdcf9664b364cc14339ed58e0c5c9681f SHA512 f0f39af2308eb557ba344dc38285dd2199b54a53f92c06fad756ed853ce76c1b75e41d04b9259fc97962d9473e93132871c0e5168ca45f80cfb474d73aff2963
+DIST lttng-modules-2.11.0.tar.bz2 315192 BLAKE2B a56d2847ab48760a1fa41545a69b5c855723c71dda488b3af9555cab6b3744db98fdb7650bca74c88a36549dfefbf40c8e75390557cce5e43ace5615bfe7430a SHA512 549f78bc192bdf4e39a912d45a6918519c5c29bdda3bee0b4f7172c6c2d83c887b669dd8e17a8a5d0c17b5dde57aa6eb5087dfac3a103ccf1e5017be2d038379
 DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
-DIST lttng-modules-2.7.4.tar.bz2 302329 BLAKE2B 32526361d3814ff834b3dc152833f610f64189a573e171102b45ef730b5ade57e382f70bbce1a5b5462c7e18e04ac1157f404f2cae260e29a69aceff0a8ed956 SHA512 bdec56c59f282be9a7d191f7799db5b66577f231f92e8fffbc1dad059706fe07c4dd288e74b516e8f6c13cc0da8a54f5e5dd913ae39639489b8eb1507ede08a8
-DIST lttng-modules-2.8.0.tar.bz2 315529 BLAKE2B 17ebcbb9b01b90e276e61e1af5a97719ab26dbf4a20f3bc18891279450e09af393ac3f82761ae67c85ded46e8a61fbdf813f67807d113412f0a9456f979d372d SHA512 760a4417ca6113501f99177eded3dfdf39477a8978894d414c3e2f49c1e86716dc7a076d43f67b3fffb52e1f05ef1bc2671c0e30cfe0cead41c97a8ac1488d8c
-EBUILD lttng-modules-2.10.6-r1.ebuild 1012 BLAKE2B 3d530eb0606499589a5231e411008f536d6970a5bffd5ea5c6fedefbaf63569e1dc62973ead677b8608029c1e46a05ad760cd09a99416d796d9cbdc4b4f80348 SHA512 a68634eb574869fdd8fb0c6a54b8630563dade7fbb09b5d83c8beaa768e162f262bc22061e540d189dd5f6bc2fdfdd954a62187f788d4608edb83ba06ffede1a
-EBUILD lttng-modules-2.6.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
+EBUILD lttng-modules-2.10.12.ebuild 1009 BLAKE2B 1911586193c92eb0cc65d6e9c8b12db49412d44fa6ef3b2a4ee258f3eed6296d4dd42e7702dec800cd5b3f42b0b056760cb23522486ca0b1a6c17a8ff707a9ea SHA512 f24b93b030771e52134638dabfc4298f05bb44c8d457311bb8dbfb8bfa9237c93bae911e449565521c2dfdd481a742d45ecaa3bdfc40b3e2e4698d50d401e10b
+EBUILD lttng-modules-2.11.0.ebuild 1009 BLAKE2B 1911586193c92eb0cc65d6e9c8b12db49412d44fa6ef3b2a4ee258f3eed6296d4dd42e7702dec800cd5b3f42b0b056760cb23522486ca0b1a6c17a8ff707a9ea SHA512 f24b93b030771e52134638dabfc4298f05bb44c8d457311bb8dbfb8bfa9237c93bae911e449565521c2dfdd481a742d45ecaa3bdfc40b3e2e4698d50d401e10b
 EBUILD lttng-modules-2.7.1.ebuild 964 BLAKE2B e17b9f21fdcf4044f9644573d65e05397c80605b1dc12bae60c5a6cee1e7d16278fc91e0e4562314354795a5109e0b08b9ceacfd0cb2a232f13af3c5e4da0192 SHA512 ae8b58e4d351c9d85b7371a571f4e700e3c9c6ed74ea977ca388cd24e559ea135be96a518eb42bf02bcdffdca1089b2caedebc8b35ba4d7e7135bfc245023d5d
-EBUILD lttng-modules-2.7.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
-EBUILD lttng-modules-2.8.0.ebuild 1044 BLAKE2B bd5da95bc6d60a481bdc7fb26577e4f9efaf98c03605b167fe227019c72e79cc6ccf55e54ba7f3d8c7236b8722053c031ff2bd4c7d8e3ffdcf04daf99ea4f699 SHA512 d0217861e451b5972a55c48426d977eaae8b87fde0b5bf03c2e7c5e949ccf5293505b60eab4d13a200ba729893e59725cc6b4d86b97b3bad72bf4c69fd9549f1
 MISC metadata.xml 695 BLAKE2B 958048b1eb1c07437cc982fd344eda9eb0928ebb4f136517838caa934383480d7ade6f6f000c10b36ebdca33c4ca0879644806a522ef3a991cf2fe0d3635a6bb SHA512 04c53b397e1a57634fca43761c76031f4c19299c15a0e639964de526691ad90c81326f7bfcf42afe1073830c66600b653165a752381c983a021478e112f8b6f8
diff --git a/dev-util/lttng-modules/lttng-modules-2.10.6-r1.ebuild b/dev-util/lttng-modules/lttng-modules-2.10.12.ebuild
index 159621ef8ebe..a3fb417feffc 100644
--- a/dev-util/lttng-modules/lttng-modules-2.10.6-r1.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.10.12.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=7
diff --git a/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.11.0.ebuild
index 33312ef7bf42..a3fb417feffc 100644
--- a/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.11.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit linux-mod versionator
+inherit linux-mod
 
 MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
+MY_SLOT="$(ver_cut 1-2)"
 
 DESCRIPTION="LTTng Kernel Tracer Modules"
 HOMEPAGE="http://lttng.org"
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
deleted file mode 100644
index d7f32b7b99d1..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
deleted file mode 100644
index d7f32b7b99d1..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 27; then
-		eerror "${PN} require Linux kernel >= 2.6.27"
-		die "Please update your kernel!"
-	fi
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 688b5b1742c3..d470b1498432 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,11 +1,7 @@
-DIST lttng-tools-2.10.5.tar.bz2 1243054 BLAKE2B e8f912f8051e75d7338b360574e32f0a98dcfcbaf7ba99aab5a157bfa3f28b4b163cf1ede5a4a5a6b59a8f9e6544f9fc81d6e36ed63057816a83e3122a55ed43 SHA512 30689be92331fb3421ecb67150dab29c182c2febd5db77113dc0439c2289cdadb645043bbbbb4a95c6da40dbf8bbc258dd775e22b908e9514fbeffc450312a5b
-DIST lttng-tools-2.6.1.tar.bz2 956120 BLAKE2B 2d0b641ae11989a90f54fc9955c18c26faeda621ce44c304ca88262329c2e048a839fb24c6cf59bfb0021cb0d43d5f7fb38f5aba8c9769ac7d1f0ac0c6196671 SHA512 7b2de0a42975e3c8ced67ed877417684892322c477a35a310c13ddbf84fcf125ee87156bae56b802eacec7757a927388d764e917ce8da8e57bfd33fdae3da469
+DIST lttng-tools-2.10.9.tar.bz2 1254174 BLAKE2B 1666aab83bbdeb48a0c5764b359760346cfd9b55ee1677eac87a5d16f00c6c9e0f0952bf84486e0cbf9052ac1b485b276e230b36097b5366040db4e3112a3086 SHA512 2e390eb53bfbc874afd1c0c8273f9546fbe08da79fd2c9430eee8e348c05afba34bb6fe365165bf7468b284f7d88dcc16c37803d807109042c51cac1d8c2df1a
+DIST lttng-tools-2.11.0.tar.bz2 1479411 BLAKE2B 5abe2613c8a35b18587c75d75be8af85a37b52daa9ff36bf0126385e5f736f7084cac7815e858e48c26c1e3fe4bc9b00b8ebaf0ce339689bd9a0e177a518d51e SHA512 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
-DIST lttng-tools-2.7.3.tar.bz2 986692 BLAKE2B 4632781abe699a4cec6c311ade314d8c1dd5264fe46b6ee14a4e982a52a6bfc738bcceb42c2d58f93052088b1c9a5cd3b024cbfa85418782e75ca25f9c7a6d0c SHA512 17568232b24028757b623c63bf40fc2929e700ecafe3e759d891373fc7342458c3d26c2199fcbbde6deeb1746b6bc8e7e95b7c19bb33c40f4c97339c4c04c459
-DIST lttng-tools-2.8.0.tar.bz2 1118863 BLAKE2B 96eb5f8fd43851ad39f0e51bd66fd7c5b7a53e52c4a50e2e22d44abd2a4407912a4b71b0eeae707502e7f0590f08038eb0fc1344e5b5119b8b5df994f0eb8cb5 SHA512 2a49b9f83b2a53dda653d8bf7cf35cbc67173912a38d9d52e2eb9313deb8a64ec9b5f7751055dc56cd972aaf412694088a7cc63297338448418872da5791d7a2
-EBUILD lttng-tools-2.10.5.ebuild 873 BLAKE2B 3a9d5f554658f41aab146abef5f48711dbd69f98e89847ce942ac3c9dd25d3450e58bf485528b11357df6e7a8a85ebc3bb570c81450e812a51600a66dcdc8436 SHA512 daabf517bc5ac4dba30647ef98a4c0f8749fbc6dcefaadaec5fb08b309fd0a840a1bdb8098c4841782ce5d75c9db6929098bb3e4ed75a03a1c26916cf3ac109d
-EBUILD lttng-tools-2.6.1.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
+EBUILD lttng-tools-2.10.9.ebuild 873 BLAKE2B 629bbac1d576785a8bacb525fe680d67c473eceba7e1f78fc83637afc9c3502beea3c5224d592217b34664a84cc36eca99495d8047a76c52b79768003df52547 SHA512 4b6fc7c3dc962e879adc02e7433d8f2b5723719d07d8381d03a0902ad3a38eb8ad042867da65603ab3588ad85634b6c9e2d52587527214be41a5c8679d171210
+EBUILD lttng-tools-2.11.0.ebuild 873 BLAKE2B 629bbac1d576785a8bacb525fe680d67c473eceba7e1f78fc83637afc9c3502beea3c5224d592217b34664a84cc36eca99495d8047a76c52b79768003df52547 SHA512 4b6fc7c3dc962e879adc02e7433d8f2b5723719d07d8381d03a0902ad3a38eb8ad042867da65603ab3588ad85634b6c9e2d52587527214be41a5c8679d171210
 EBUILD lttng-tools-2.7.1.ebuild 858 BLAKE2B 31a692fd7f821c17c55334006c76a46b6a9379d288cea505175a9de97fe3b54755e45e407b1fdba4c18f06f166bb900c1fa6f1da056ccb5124c2f2679a64e343 SHA512 b349080d5b4f2bc8b8a82e1f1b2ebb99674ad7d2aabfe503aec90c6eabeac2c4d6069b1da49f6d112aaf7da2457bd703d53e266f2fa4b05140d04d6cd8e014d0
-EBUILD lttng-tools-2.7.3.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
-EBUILD lttng-tools-2.8.0.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
 MISC metadata.xml 493 BLAKE2B 3b627bbc8927620ca6fd13d49c5cdf57999a84ad849d32c0303bd1d4409b9bbb511330b814e29fb626f85754c07ce0d08e9a8343d724650f2ff21f5d7462c81c SHA512 39a5a7c28b3471efe353af48d001726df67d061cf89a11c1a7f8f80309c9d591f594787968570af1af86d2f5ac2ddfcb9d81bd84604d2836d28b184c414af252
diff --git a/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild b/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
index 0f0562f2e525..671fae563392 100644
--- a/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
index a538527aec43..671fae563392 100644
--- a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit linux-info versionator
+inherit linux-info
 
 MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
+MY_SLOT="$(ver_cut 1-2)"
 
 DESCRIPTION="Linux Trace Toolkit - next generation"
 HOMEPAGE="http://lttng.org"
@@ -35,5 +35,7 @@ pkg_pretend() {
 }
 
 src_configure() {
-	econf $(use_enable ust lttng-ust)
+	econf \
+		$(usex ust "" --without-lttng-ust) \
+		--docdir=/usr/share/doc/${PF}
 }
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
deleted file mode 100644
index a538527aec43..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu:=
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
deleted file mode 100644
index a538527aec43..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu:=
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(use_enable ust lttng-ust)
-}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index d540298d6ece..4b176d2f5eb5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,11 +1,9 @@
-DIST lttng-ust-2.10.1.tar.bz2 797819 BLAKE2B dbeb0ae30d81dc90b0cd8c7d9baabf60f2cb27de3089477a2915e33b1975e3ca781ae85c7112adf8275a1c7e755b7156c533cb39213a30673204520ad6a97711 SHA512 bd9b75ff359a8698ba4f7b6a27d9958c8bd9539fd43d8f1bc4bb40003271c9074f1bb4176d074bac290fad1636d5a3226063275006b781f3533567dea71fac96
-DIST lttng-ust-2.6.5.tar.bz2 619053 BLAKE2B babe2d0b8df6ca1d1942415d613a05d774714a9cffdfd7c5ff7d7c88540d78e4c6eb8b9c00a253dc2718255c9b3061f5b4a72d08393f7e515e128aa6be9047f8 SHA512 bf144c987b7ff62f70551db51a5605bc006b1d8a0e7f4197e1a2c7a7d79a1e4e786a658d0ec885f7d56c4d4f405da23717137c8b0d2be6289fc16ca84f06a230
+DIST lttng-ust-2.10.6.tar.bz2 804912 BLAKE2B e320cad821f143392a95e98cf99f5a23597c25f7d570ac5ce3206cb5b4b7bd931e5eb765a133e421e78307fbd882e33ba291cc2c19e37250a87844308d1af2f3 SHA512 a689838a621e99408bea0e5b6ccd4a930dc2103ecb05c8b472974eda9387b813b1b9e59d3aeb4d04434754cfab170723baf961cd5063116916da471c04165c50
+DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
-DIST lttng-ust-2.7.4.tar.bz2 648002 BLAKE2B aaacf4da1c1ff7c4909d9a8ba17b3d108175e8669dfcba151e2e73d094fa68096a0ec2c0bbaf89bec8370566e9b25147a0bbe7bfb0965b0e9fd70704e7a226df SHA512 f3164fd72724065d23b2b21aaa037b6e90f4eeb9dad75f16af4766374cd8a0a7a6eb2c815d93c17950a1048c5a32e6b334fa31b3d4b0f8314e352a9ddc8d4395
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.1.ebuild 687 BLAKE2B e92c5051c63af6f75479fc703ea6167e96b034ab7e1557f637629496231f954e6fe3fbe0683fe6d46d63ff4d693b26a774dcaf6bc9aba2b47c604015882ccffe SHA512 852e72fc196dff6fa72b38a187c5de2c4c7d864e03cdef26d74aa44838cb165c6774150a713b26c0604f4541a15da38f03ca5d27ff2db572c86d916bc70f22d0
-EBUILD lttng-ust-2.6.5.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
+EBUILD lttng-ust-2.10.6.ebuild 687 BLAKE2B 9899e92ed7e601b134085ab745911b9c1db244c2cf1e9edfa01a74e49922e2bac175087a929f4affd077bece0f94f1b0dcfed422663d05fbc2ab2c710dc1615b SHA512 5e8ebc60c5a1602307dbbb3a881add54e2162f19f0c19b26c7bfff990d7de225fb2c96f37ed299c313a6a6d4316c79bb962b5731da296bfee8359f989af4100f
+EBUILD lttng-ust-2.11.0.ebuild 754 BLAKE2B fa1835f493f5c1b7536990eb325ab6f8066572961379eb0e92cd24ff7a50c9b0375de045b40ade9c23355f238c6f3f15eb2d41a48d171701a8f754fe47876841 SHA512 c3eac2ac01ef5886eea98ba5965980472940552c7144e82f29c80384965b1be5337581216ecf855a2ceccc1c8822ddfb0c1bebc8309ac011a472351432d9647c
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
-EBUILD lttng-ust-2.7.4.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
 EBUILD lttng-ust-2.8.1.ebuild 659 BLAKE2B 1f7343faa9b7af2cb9971ec243c062d739ce07433d4c2b1761dda31d2b0af3f3a683bb5ca58f26aa5d31fe1ae586c5ba50f4d9ea05ab928d64a70198e72c39f2 SHA512 d9198a93561e7494c7685b76f974e537d1e08718149d58a77a3b160206fbee206d57db7159de99fc282f29748adf4cccf982845683037e68d8c5a692f2f9d3b0
-MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
+MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
index 07d839929318..ead5c2518d16 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
index c20c8f8b88d4..ecc26c91c8ac 100644
--- a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools versionator
+inherit autotools
 
 MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
+MY_SLOT="$(ver_cut 1-2)"
 
 DESCRIPTION="Linux Trace Toolkit - UST library"
 HOMEPAGE="http://lttng.org"
@@ -14,17 +14,27 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples numa"
 
-DEPEND="dev-libs/userspace-rcu:="
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )
+	"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
+	default
 	if ! use examples; then
 		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
 	fi
 	eautoreconf
 }
+
+src_configure() {
+	econf \
+		$(use_enable numa) \
+		--docdir=/usr/share/doc/${PF}
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
deleted file mode 100644
index c20c8f8b88d4..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="http://lttng.org"
-SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 6c50e4708494..2b073ed00322 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/metadata.xml
@@ -5,7 +5,9 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-
+	<use>
+		<flag name="numa">Enable numa support</flag>
+	</use>
 	<longdescription>
 		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
 	</longdescription>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d7ce41501a32..2f638351baaf 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,8 @@
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
+DIST meson-0.52.0.tar.gz 1507218 BLAKE2B d3d869cf4a992ba89f150960ed742ac5da2b63b60a3583f2c4c7cce1e2a86f5101a90a05f59000af70c7ada00c119268df87aaadc55ccee50b85c24e308c1d5c SHA512 b32206c5499580a74bb5442d21263b5328cc3302c3226452fb3a2434fdcf55d5fc16fc841102b09a85abc19dbd00e836a571f917833ef3d726d84524f89b2e1c
 EBUILD meson-0.51.1.ebuild 1940 BLAKE2B 6dc6c1a49dffa23edcab9da8e60cf20d9e57d2ce612a6adf7e5cc92f21b0eaef6b241f5dccbfbdfa05de8542b473ff175f639eb5abbcc0fa23e8033ac6988628 SHA512 e3afe681ac5b465bac3d80ed6f083750430971aec0dc82ecd98910cf27f0ffd0aab40e80ae9713fd471e62bb0f7298f993564d9fc150ceba66ca02214b6701f2
 EBUILD meson-0.51.2.ebuild 1941 BLAKE2B a2037c7b214b9349c956c7275c7ad187bcdec091b316a401e312e959242fcf4ce913291c1eaf63169fcf647794e1276dacee26eff3207128f778c9447b9ad605 SHA512 dbba78b53f1ba5f52ddc8c9bc4fc6abfb276c713253bcce475d39214bf1dbdb6934ec79614946b63d30efc3f440609c000007f9fa0307f90641a8aef234fdfea
+EBUILD meson-0.52.0.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223
 EBUILD meson-9999.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.52.0.ebuild b/dev-util/meson/meson-0.52.0.ebuild
new file mode 100644
index 000000000000..6a59a76c31ba
--- /dev/null
+++ b/dev-util/meson/meson-0.52.0.ebuild
@@ -0,0 +1,79 @@
+# 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-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
+		sys-libs/zlib[static-libs(+)]
+		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
+
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_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
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		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/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
deleted file mode 100644
index b3a5f791c8cc..000000000000
--- a/dev-util/mingw-runtime/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX mingw-runtime-3.18-gcc-4.6.patch 861 BLAKE2B cdcfbfd48163f8a6df52508d9f1ec2410e1957bea5fb1f4521b61ccaae4f2d38572870776bc9674e64272744718bf377ee2c90d5ff1dd8e9315d5d5c8a4b32f5 SHA512 696469f42f03f79219d946ea046aa2cf419f3abd6664db60b477a3ea474a652f42521ab039f4e4ccbd2d0c15d6816d54b4ac3551fbea3d5539dfcda71e17139d
-AUX mingw-runtime-3.20-LDBL_MIN_EXP.patch 5806 BLAKE2B 2076564daebcead92b58f5845c2dfdea60c970add2b4cc3dd4ddf24d1caa620733439de4eb1ce4dcbeb82201e02f7e2e8a85881585c7f237e95f4da923e86979 SHA512 2013860ca92e5eeeaf94b5b78882a453d2f3312a51b6d8b37665e9d1f70aa80364355b5d3cb60a561adc6f2fb0001de41069548d715ffeb65793cdcc6c4b97ea
-DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1a80719fb91baf2898670dcaed868c95b224d7b6d947d0a1b0cd70b5a0360f7d26a10d0956ee778e7c8d489d621ae531b788b SHA512 87778f08469a806dda606b0945d00511fccd0f7e0d545a33e2b4685db2490ec6a3e5e4267090b79a88eb963f97035fe8149097892f1f4a6e85f3a4661eb5e977
-DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
-DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
-DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
-EBUILD mingw-runtime-3.18.ebuild 1691 BLAKE2B 29724a85561d0f9ee6117c42f74c9652366bea6da5db50bc9e49accf7cd5c6b393f932e11d6675c637f4c85a42b430986867de905f6d17124a453dbc27a37840 SHA512 8c7a41a197b6e28f4eb320f43b1ca2243741e155993bb04746acbb0511856afe6a451b44a69a6bc1f13349dcaac12426838fe9fe553fe44bd89511695b4f26fc
-EBUILD mingw-runtime-3.20.2.ebuild 1835 BLAKE2B 23e24d14e5b0532b7d85d124c16f0d11b3876d018e3eada513feee4fe2eeb4986159d18d762ec4cf87a7068721b84da00f9ec787200725226985094eb3be2a1f SHA512 c09ab84d1745d72dc65d31cb5d2fa0a8b479f567713b985a6e56edf5440bf84604f65a3bd864108da7e488b91f44e88b8c757a05fbba27fa53547d77262c5b3d
-EBUILD mingw-runtime-3.20.ebuild 1763 BLAKE2B 99ef27e8a2cd3b3c149e782ae81fa508e1e5562d787bedb0a1b8adabd441e840af1ef32d05831d547f14ce28e2e9a4821a90c7baa6c77b9c501ec27a9a3de3c0 SHA512 fd994d7bd5b1512802f09481462fd4f704ec3f794d2c32a1338fa2d6cac75e5c8669f0113b2df3df8ac04716222e27f23af86a2004fbfa2257bb312664c0168b
-EBUILD mingw-runtime-4.0.3.1.ebuild 1836 BLAKE2B ae3e693f7d8adc9bd3dac5cdaf3b14a6afc115753aea57ff6c8c415a23d7762dbd1b2543d5fec04df4c91246d5d37886293a97b1a6c5b2735b2f0a16365bb2bd SHA512 f2e6629afd51251e6e5d8b63e15810e4d09a34e64129d52ea244a75cea2be5e7abcbc13d74c4711ff1445637bc2d6927e68f73cd62c498fa4dbad1cddc8834f5
-MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
deleted file mode 100644
index eff81002e624..000000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3446009&group_id=2435&atid=302435
-https://bugs.gentoo.org/419627
-
---- a/tlssup.c
-+++ b/tlssup.c
-@@ -84,6 +84,7 @@ BOOL WINAPI
- __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
- {
-   _PVFV *pfunc;
-+  int nfuncs, ifunc;
- 
-   /* We don't let us trick here.  */
-   if (_CRT_MT != 2)
-@@ -96,8 +97,12 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
-       return TRUE;
-     }
- 
--  for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc)
-+  /* Use the nfuncs variable to iterate the TLS functions instead of pfunc to
-+     avoid nasty compiler optimizations when comparing two global pointers. */
-+  nfuncs = &__xd_z - (&__xd_a + 1);
-+  for (ifunc=0; ifunc < nfuncs; ++ifunc)
-     {
-+      pfunc = (&__xd_a + 1) + ifunc;
-       if (*pfunc != NULL)
-         (*pfunc)();
-     }
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
deleted file mode 100644
index 49377fe2b099..000000000000
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&atid=102435&aid=3441135&group_id=2435
-https://bugs.gentoo.org/395893
-
-????-??-??  Keith Marshall  <keithmarshall@...>
-
-	Support pragmatic identification for w32api source directory.
-
-	* aclocal.m4 (MINGW_AC_W32API_SRCDIR): New macro; implement it.
-	* configure.in (W32API_INCLUDE): Assign using MINGW_AC_W32API_SRCDIR.
-	* Makefile.in (W32API_INCLUDE): Prefix -I flag to AC_SUBST value.
-	* mingwex/Makefile.in (W32API_INCLUDE): Likewise.
-	* profile/Makefile.in (W32API_INCLUDE): Likewise.
-
-diff -r 62c176864807 Makefile.in
---- a/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -166,9 +166,9 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_
- # Various libraries.
- LIBM_A=@LIBM_A@
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I$(srcdir)/include \
--  -I$(srcdir)/../include \
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I $(srcdir)/include \
-+  -I $(srcdir)/../include \
-   -nostdinc \
-   -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-diff -r 62c176864807 aclocal.m4
---- a/aclocal.m4	Mon Nov 28 11:32:25 2011 +0000
-+++ b/aclocal.m4	Mon Nov 28 21:18:55 2011 +0000
-@@ -15,7 +15,65 @@ AC_DEFUN([MINGW_AC_CONFIG_SRCDIR],
-  AC_MSG_CHECKING([package version])
-  PACKAGE_VERSION=`awk '$[2] == "'"$1"'" { print $[3] }' ${srcdir}/$2`
-  AC_MSG_RESULT([$PACKAGE_VERSION])dnl
--]) #MINGW_AC_CONFIG_SRCDIR
-+])# MINGW_AC_CONFIG_SRCDIR
-+
-+# MINGW_AC_W32API_SRCDIR
-+# ----------------------
-+# Attempt to identify the location of the w32api sources.
-+# Accept an explicit location specified by to user, as argument
-+# to --with-w32api-srcdir; if unspecified, fall back to standard
-+# location relative to ${srcdir}.  Identification requires that
-+# include/windows.h is present within the nominated directory.
-+# This is naive, but AC_CHECK_HEADER cannot be used because
-+# the system's w32api headers will interfere.
-+#
-+AC_DEFUN([MINGW_AC_W32API_SRCDIR],
-+[AC_ARG_WITH([w32api-srcdir],
-+ [AS_HELP_STRING([--with-w32api-srcdir=DIR],
-+  [locate w32api sources in DIR [SRCDIR/../w32api]])
-+ ],[],[with_w32api_srcdir=NONE])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_CHECKING([include path for w32api headers])
-+  for with_w32api_srcdir in ${srcdir}/../w32api*; do
-+    test -f "${with_w32api_srcdir}/include/windows.h" && break
-+    with_w32api_srcdir=NONE
-+  done
-+  AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+  [AC_MSG_RESULT([none found])
-+   AC_MSG_RESULT
-+   AC_MSG_WARN([source directory containing include/windows.h not found])
-+   AC_MSG_WARN([ensure w32api sources are installed at \${top_srcdir}/../w32api*])
-+   AC_MSG_WARN([or use --with-w32api-srcdir=DIR to specify an alternative])
-+  ],
-+  [case "${with_w32api_srcdir}" in
-+     "${srcdir}/"*) with_w32api_srcdir="`echo "${with_w32api_srcdir}"dnl
-+       | sed s,"^${srcdir}/",'${top_srcdir}/',`" ;;
-+   esac
-+   AC_MSG_RESULT([${with_w32api_srcdir}/include])
-+  ])
-+ ],
-+ [AC_MSG_CHECKING([for windows.h in ${with_w32api_srcdir}/include])
-+  AS_IF([test -f "${with_w32api_srcdir}/include/windows.h"],
-+  [AC_MSG_RESULT([yes])
-+   case "${with_w32api_srcdir}" in /*) ;;
-+     *) with_w32api_srcdir='${top_builddir}/'"${with_w32api_srcdir}" ;;
-+   esac
-+  ],
-+  [AC_MSG_RESULT([no])
-+   AC_MSG_RESULT
-+   AC_MSG_WARN([the nominated directory, ${with_w32api_srcdir}])
-+   AC_MSG_WARN([does not appear to contain valid w32api source code])
-+   AC_MSG_WARN([(file '${with_w32api_srcdir}/include/windows.h' is not present)])
-+   with_w32api_srcdir=NONE
-+  ])
-+ ])
-+ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
-+ [AC_MSG_WARN([please correct this omission and run configure again])
-+  AC_MSG_RESULT
-+  AC_MSG_ERROR([unable to continue until this issue is resolved])
-+ ])
-+ W32API_INCLUDE="${with_w32api_srcdir}/include"
-+])# MINGW_AC_W32API_SRCDIR
- 
- # The following is copied from `no-executables.m4', in the top
- # `src/config' directory.
-diff -r 62c176864807 configure.in
---- a/configure.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/configure.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -44,7 +44,7 @@ AC_CHECK_TOOL([WINDRES], [windres], [win
- 
- AC_SUBST([NO_CYGWIN])
- AC_SUBST([HEADER_SUBDIR])
--AC_SUBST([W32API_INCLUDE], ['-I ${top_srcdir}/../w32api/include'])
-+AC_SUBST([W32API_INCLUDE], [MINGW_AC_W32API_SRCDIR])
- 
- # The following are used by the GCC profiling hooks...
- #
-diff -r 62c176864807 mingwex/Makefile.in
---- a/mingwex/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/mingwex/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -126,10 +126,9 @@ ifdef NO_CYGWIN
- override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
- endif
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir} -I${top_srcdir}/include \
--  -nostdinc \
--  -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir} -I ${top_srcdir}/include \
-+  -nostdinc -isystem @W32API_INCLUDE@ -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
- 
-diff -r 62c176864807 profile/Makefile.in
---- a/profile/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
-+++ b/profile/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
-@@ -65,10 +65,9 @@ THREAD_DLL = @THREAD_DLL@
- THREAD_DLL_VERSION = 10
- THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
- 
--W32API_INCLUDE = @W32API_INCLUDE@
--INCLUDES = -I${srcdir} -I${top_srcdir}/include \
--  -nostdinc \
--  -iwithprefixbefore include
-+W32API_INCLUDE = -I @W32API_INCLUDE@
-+INCLUDES = -I ${srcdir} -I ${top_srcdir}/include \
-+  -nostdinc -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
- ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
- 
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
deleted file mode 100644
index 6c377f90be9b..000000000000
--- a/dev-util/mingw-runtime/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mingw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
deleted file mode 100644
index 74ba9950cae3..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #419627
-	sed -i \
-		-e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
-		$(find -name configure) || die
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_compile() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf --host=${CTARGET} || die
-	emake || die
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		rm -rf "${insdir}"/usr/doc
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
deleted file mode 100644
index f1842bc41165..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic autotools versionator eutils
-
-MY_P="mingwrt-$(version_format_string '$1.$2-$3')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
-	eautoconf
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
deleted file mode 100644
index ed32fcb768c7..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic autotools eutils
-
-MY_P="mingwrt-${PV}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
-	eautoconf
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--with-w32api-srcdir="/usr/${CTARGET}/usr"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake install DESTDIR="${insdir}" || die
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
deleted file mode 100644
index 82167469e438..000000000000
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic toolchain-funcs versionator
-
-MY_P="mingwrt-$(version_format_string '$1.$2.$3-$4')-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with w32api-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}-src
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^install_dlls_host:/s:$: install-dirs:' \
-		Makefile.in || die # fix parallel install
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	filter-flags -frecord-gcc-switches
-	tc-export AR
-	econf \
-		--host=${CTARGET} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/*
-	else
-		local insdir
-		is_crosscompile \
-			&& insdir="${D}/usr/${CTARGET}" \
-			|| insdir="${D}"
-		emake -j1 install DESTDIR="${insdir}"
-		rm -rf "${insdir}"/usr/doc
-		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
-	fi
-	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
-}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index abd0a7820389..969e0707312d 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,7 +1,9 @@
 DIST packer-1.3.5.tar.gz 9198704 BLAKE2B 210c824aa61fed8ab58ea6eed2a1804d8b144e7e20f0794721b2c282d066969d1193fc36b004bb7d31d8a2b19fa609e673d05457653bf8ad694a142563e839cc SHA512 becd747b43c8a9c0aa93d1d723f2e2383e9f2adc19e82653142ea13080aa393750cd3fdf86fa259af21af6b6417bf023e7e482402dfa56d347720fb740ebe906
 DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
 DIST packer-1.4.1.tar.gz 11279518 BLAKE2B 7b1b966af8cac73826fc8f5a1cb39183fd2ae1d3b7da6d7408cbb7c3342a0fd2ba84cf1df89ea9edc41353c0bbb6c874347745a91c3eaa1a742521c79500f21a SHA512 4038990655eecf412be9dae9edd09a300543a3b0b841c982631cb48f4905388f9dbf26a9b0ac3cb77628d1e650600b7d3b89a1694f746dfdef086a621078cde1
+DIST packer-1.4.4.tar.gz 12811202 BLAKE2B 7a59f0252ac3d8158d64806e54fe459fe154bdc11b67539e4a39e7c79273bba6c5814cec0128c177a51e48bcf9172692d3eb3c7e789b768019c329c111fd5a0c SHA512 c4d2ca049b442fbbc65214ae75f5c85dc87b09eac8711891c4678ff3b2a676d00a051c08448a7a99b7a0977d4a04ad8bc559fd09885b520e6a8eb2dfc33ba50a
 EBUILD packer-1.3.5.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
 EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
 EBUILD packer-1.4.1.ebuild 777 BLAKE2B 6123da351bda25d983b0032e68d842954ac3468b06b85f71070c8021b83644a39a3ae9ab13b7dd9a3849637170613c3ad8a0c9693dbb487905ddf5e9311ec081 SHA512 70a934dc3fda8efffe92a17a67e024c2831859fdb4e5e0f2732017866b296afee87280fabf3ab8c26ab5be86418b4de15366d07b9d6252f0eb53ed93e2a6d96c
+EBUILD packer-1.4.4.ebuild 751 BLAKE2B d67b3a56a978907284edd5306f2284a3c1145eeda73d11d5100cb78c11ea003caaa559d4a53e7a3942576ce9cb4fa9d8de7b1db0ea266d8fd2912716fdb00f19 SHA512 56d14027df5fec480812b730626fc31e7ceba8efca492432d4aeeab5c8501bd8dbad41d59d09d097be76193d30deaacd18b98716a2b7cdab0948adb1e6abe906
 MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/packer-1.4.4.ebuild b/dev-util/packer/packer-1.4.4.ebuild
new file mode 100644
index 000000000000..a361a43a1fa3
--- /dev/null
+++ b/dev-util/packer/packer-1.4.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+
+EGO_PN="github.com/hashicorp/packer"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=""
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e86f0bdb7949..66f0b88d7489 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,12 +1,11 @@
 AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefbd40d8f6d3cac00a8a5ef33d0f94f99dfb06ea70a7df5b81e1917c8d5f82e63d76c118b6c386f0c228ae5bc20a7b2f SHA512 66bae97bcd73cf9fe5bc68e843cb46921511bafc8671e0cd058b1493e83fccd41b786ab5b45f8fe3f3cfccefe3b6bd209e66533fc9331853484e212b0207bf98
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
+DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
-DIST patch-5.1.15.xz 426292 BLAKE2B 45a90fd8faafce8bb52273494adfb3b16f6e6c31fa8fba3fa89c71622db6a9db4868ca1a805cd32344cb72cf4cf0049af9215fceec5274c6796a91081db51b6f SHA512 0b2e4436644da2699cf6fdfb38d80dd7156fac74c1d99bec718f74171fb91815e3de1d08b892effc0ae39080c90b569a2bd30c1c4665c6b3a156cbb8e4c2ba61
+DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
 EBUILD perf-4.14.33-r1.ebuild 5050 BLAKE2B d46e8022e1a30987056ec44cb1c572b114041b91672428fb73a234b2258e6f1a71e4dd062e70ebe07487bdd767b53d19297baf18c599674f1bc59642e188ced6 SHA512 917893afd097be5e8b7d6c4eeb71750d67dddcf368df2b7a28d1f82a6f96e6c0bb92d0aab810dcdf4224d44c1a8fabb1ddb29f839f1ef5abcfc6f369afd8dd91
-EBUILD perf-4.14.33.ebuild 5001 BLAKE2B c5a5919bf33d1d1f9ae73c73715b8464ea53bdf81df6fa2fa73640a2ce519b2801122529ca5d6d05b48822d6f0985c0b3838a9ee414a38e7f64e281d4dc4b584 SHA512 744be026660a585479c3bd3ea278cd630d49d99777a50e3f76a296ec3f21ee6aa6253b9ba0c31405ac9aa9f68734e8101dec34a50e8c6cb52d7ab6fc5e377f89
 EBUILD perf-4.20.3.ebuild 6040 BLAKE2B 6b2afc45b7644e598d1c194616ad0aadc1e0f08f2bd227e8bb98fbc3742ffc7ebb5e043d1c8a0fb863933aecc365895cebbbd9aff29c85c4b30815e260809fde SHA512 95fe444b3eb8b558012e6050963524299b56b4869c78a4f15f6afbaf4fe70f50b858c8ce6b21b37c6321f8ab118b436e6daa3053f45ad4c58fa7137394b44a56
-EBUILD perf-5.1.15.ebuild 6358 BLAKE2B 7750e26c220654eeb9a2f0332032fa75c028151f2cd3859ff85e8adce404cc531ab505e1814bb2de39da811c69599f0f4f2ad51efce0da9c5fea7f7c6a0f4bd5 SHA512 6e3640e6591f0b3ecfe9b96625d3e3bfb102bdb6363346847530aac5e304c7e651588112cbca57a3fa0928887884ce36b6b83e1a09f8ce00a89f98f0db0bb73a
+EBUILD perf-5.3.7.ebuild 6358 BLAKE2B 7750e26c220654eeb9a2f0332032fa75c028151f2cd3859ff85e8adce404cc531ab505e1814bb2de39da811c69599f0f4f2ad51efce0da9c5fea7f7c6a0f4bd5 SHA512 6e3640e6591f0b3ecfe9b96625d3e3bfb102bdb6363346847530aac5e304c7e651588112cbca57a3fa0928887884ce36b6b83e1a09f8ce00a89f98f0db0bb73a
 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
deleted file mode 100644
index 799478faa0bb..000000000000
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 versionator eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-else
-	VER_COUNT=$(get_version_component_count)
-	if [[ ${VER_COUNT} -gt 2 ]] ; then
-		# stable-release series
-		LINUX_VER=$(get_version_component_range 1-2)
-		LINUX_PATCH=patch-${PV}.xz
-		SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-	else
-		LINUX_VER=${PV}
-		SRC_URI=""
-	fi
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.9
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		eapply "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.3.7.ebuild
index 22d9957a2549..22d9957a2549 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.3.7.ebuild
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index e3efb8c5c8df..cb55cb9f43b3 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,4 @@
-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 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.5.4.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
deleted file mode 100644
index 32d82df1413d..000000000000
--- a/dev-util/pkgconf/pkgconf-1.5.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 24b61d4db7f7..07d084c71130 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2019.1.3.tar.gz 334018235 BLAKE2B 8e4c400685e69aaa53426dee848d5f14a0c40b88232ee8cb8c0c0f2f727c68b9212600dab7717ec77c1cd4b42666bad965fcbc217e3158d357b5a5edd6a94e26 SHA512 42627af39a8530931442c8419ebee4d999faad40a203519fc8564e4b8b14d2476e8426e9976e487c92e4398db8efb15c5e2d28536b1c7b374898f9dc0021acbe
-DIST pycharm-community-2019.2.2.tar.gz 359797110 BLAKE2B 64e7c811f04ccea8178632a9eb25f25641fbda9bf38f2cad55b7b15e9cfe568cecfa6ceafbdb4b8c670d32923e871efbeea20c4d670bcf851621bee61502c240 SHA512 7d136d98b695d04e16662d7ecf8d7a67dd37667952870dddde1d881aa899e2896a95e83de2a88cb42bd8f92e8872a9ada30941e85bcc251a00d73e87950c7f22
 DIST pycharm-community-2019.2.3.tar.gz 360509772 BLAKE2B 8924e6b5e2823c26a96531d14bc60f01f0849a5cca3c87bdff7c23c304081e668aecb1b2c681622c472cacf4b2e1f58c5fa4e42624f204491d27e37785146fd3 SHA512 65f834ba20cddb93533d596430f8b537167f32e99d224758d9fd4407f95304609912dec7f11cf61f9edf2e30722f1624250f44765c0f83dcbf6815bb8c35d9d9
-DIST pycharm-community-2019.2.tar.gz 359295798 BLAKE2B 9a1b19e93d0d2cba6c7dd2c059d511e4d193b6bd9e5f1900c3aadd6ff322891c834947360715c8f41e5112f7a71d3b5b09ed7e23dcf3dd8c6c4de9c4eaf16b5b SHA512 490925de309bcb0ef052593e517f3d701ae1d82b05d4ea38bb7bb5eef86e9df21472e395fadbb21906fa1024358ae599285fba8fdb72b0ddb7f1e8f7f26ac046
-EBUILD pycharm-community-2019.1.3.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
-EBUILD pycharm-community-2019.2.2.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.2.3.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.2.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+DIST pycharm-community-2019.2.4.tar.gz 363680469 BLAKE2B d550dc8144746c0b4bcff408531eba289896dc325eea99a2d2a4363cfaca00de55045cff54a3163acd15105b0705dc48ac28374831bd6f0f6842823cdf4b5ceb SHA512 f7d12ccd8309bf547d1f37853977772d7ab023ebebcc71c6f09f71a21ae9bfceb8718d9ebf77a7717e1b145f56ea902d8d02d573d658b7db540696fb9630b0d3
+EBUILD pycharm-community-2019.2.3.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
+EBUILD pycharm-community-2019.2.4.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
deleted file mode 100644
index 92e344b69eaa..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild
index 3bd1b2cb4101..92e344b69eaa 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.4.ebuild
index 3bd1b2cb4101..3bd1b2cb4101 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.2.2.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.2.4.ebuild
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
deleted file mode 100644
index 3bd1b2cb4101..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 6e1fcf05318c..fb617fa28aa1 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2019.1.3.tar.gz 436604810 BLAKE2B 1fcf742b119dd8d9e9eeaa08f803f2742f388c711da446ae00e5718e09c231d926a04146fdcfb9ed18e2a44d43049598ef63c527e8994077987a127fedd630cd SHA512 2a26279944408cf5e6436d28ec15e2e6fcca234535fb69f4e7391a230d4bf39a523e6d2262d8cd5036d4f40b0629cd33866c5b839f82a82ae1d4271c89901cad
-DIST pycharm-professional-2019.2.2.tar.gz 481767269 BLAKE2B f06b0ad5d75e3c5c280cb6d70f07bbf01f18fadced8bc60607a964a6d98e190b3034f0bb725dcf88d895a1a3f2def8451159df0a358001d4702d5d43f2f14ce0 SHA512 ab34ef109d0abfadca2525cc9b00d8a0da1be151f09e379ac2bc21bc1dfb25dd312d4638b7c56cc59cd8ae6e25c8fff2a8d63e65cea8da552280aaa4b6acd239
 DIST pycharm-professional-2019.2.3.tar.gz 482051405 BLAKE2B e299c2d545b808ed15b4775acb003137467694f528a088cd84d7055a9c15ead96a9e0ac6599374faf60fab3c2ca72a390157130411f4b15bc2b7e3f4b41f0c8e SHA512 4474a74d2762b202100ddbcdfa3807a8136bd392200c79b795cee34a843716218ac21d1d7ed3ac7df9b3c6241f77658a535274759473871cd23a4cc4cfafcfdf
-DIST pycharm-professional-2019.2.tar.gz 478100459 BLAKE2B a4bf01fcca96866e40fc43b1d429a5dfccd8572d97bb68a0e2f40367563b17c7e26c8801d637325b3352caefaf19eab8d2269b23b0849b6649624ac1bd155bcf SHA512 7e42bf72ab5ed318475506c2a07e12ebe6ee1f33c47e329da0bdf807e288a57681607be4353f5d1510352689537d2cfc67a3f43f0b752c8c8a76d66e83688b8a
-EBUILD pycharm-professional-2019.1.3.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
-EBUILD pycharm-professional-2019.2.2.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.2.3.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.2.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+DIST pycharm-professional-2019.2.4.tar.gz 485589877 BLAKE2B c2af015129eec902927ac1b33860ff696e7e3f994a1c827b6e31c84a87a6163262c95a579ec2d4d3c801612af8f8f23b23b432db470f30b199ddca7c6874a37a SHA512 c4fa438ee4ef1de66839a225f61e2b8ecb6e49f41da4099fe0ed8da4840c72c34886a76e090e47fc5ad9f7112b339fec01f5617935e490314d7e73a4585f4ce9
+EBUILD pycharm-professional-2019.2.3.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
+EBUILD pycharm-professional-2019.2.4.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
deleted file mode 100644
index 0f418726afde..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild
index 9196130c9fd9..0f418726afde 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.4.ebuild
index 9196130c9fd9..9196130c9fd9 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.2.4.ebuild
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
deleted file mode 100644
index 9196130c9fd9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index ff2d1518b7a7..d8896cadbf91 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,8 +1,5 @@
-AUX quilt-0.50-no-graphviz.patch 1477 BLAKE2B f070303e072b26bb70de578277ee9fcfa56975d6c4a3927835f0d3a17d3c40bea5e57ce5863c5f91939e6b0f8ff9b63ebbd039458b474591fc3e545efb4e1515 SHA512 281c3f080e6ce6d4fd38e881b5cf111bc8313a9171a1c93edf9393b4f33eb0bd4fdb4c1b1df2cc888391acc6016c0eae9183948f5a76b8dc492e2ebb99f84f98
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
-DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
-EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.66.ebuild 1647 BLAKE2B 621b6ae0d8e140cdc01cbb91c0dfb0bb8f2881aa22f7da8b7794e9ca996da7d0077a0313a8411dcbda3db53326f976dd7aaf6ad2fbb60770ed1664fd2440fbe6 SHA512 0da0428658e047279803a197a71dd1099f00ecb7eb6d571e3b4e0cb7d336f460fdc17cbb5c4e5c2eab1d87d471c520e9c52486a047b03ee13ff3e172b18710ab
+EBUILD quilt-0.66.ebuild 1646 BLAKE2B e1484c788cf95f4f517f1b9f17e0b93b0edf6746f5b8389aaa7342e638f5a850e2a5790fc0c183536463276e86fc8d02d2ffeb20e35a3152332bb54ea0b7f668 SHA512 b186b163a1c12399f334a50272e205e9e22135539735052ca6a4b35be497ea93848edd35a5b1470211b2fa755d7d1ec2dc054db88c172a1e2b57dfb38fe1278a
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
deleted file mode 100644
index 04e0d7d3a9a1..000000000000
--- a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
--		remove-trailing-ws
-+SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
-Index: b/bash_completion
-===================================================================
---- a/bash_completion
-+++ b/bash_completion
-@@ -95,7 +95,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands 
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
-           grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -189,19 +189,6 @@ _quilt_completion()
- 	        ;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
deleted file mode 100644
index d5d270c6d424..000000000000
--- a/dev-util/quilt/quilt-0.50.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="emacs graphviz"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
-
-	rm -rf "${D}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${D}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${D}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index f82d56b85a6f..13481d763f2f 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
 
 RDEPEND="sys-apps/ed
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3d6124b5616d..289ae6e01186 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,8 +1,10 @@
 DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
 DIST radare2-3.8.0.tar.gz 7510078 BLAKE2B c3dcc28c0cda8c7c5f8dbc6d35c3d15fa73fec8402acfd5de0b3ea85ef0295608d2332efbb29a41e75239acafb66b1c3b946f58523d9e5bb605b70ddce3ce38d SHA512 c9a1a4e7743b54026990d7473f05fb8eb25d7a7f0fd985172587ce82b8f6fefb53dd181b0bdb8463d2460c71e4a9eb377ead4ef7379615c90aa858d8fcadeadb
 DIST radare2-3.9.0.tar.gz 7519146 BLAKE2B cc64567c3ce4c0c764f288fcd8110a7ce25cc15fb6a977fc489ce7ad9b697d628d87ff9280601fd00a53a79fb8de3b7fdc83dff56463addfa80f3528ccb733ab SHA512 7198c6fb35778d93fdbba5dd3dceddb7af21d555fb42f22752c8898ccba44fdcba92a6c502ddc8bdda71b883df392168ece807325b53cf75537b4ec59d86e42a
+DIST radare2-4.0.0.tar.gz 7558070 BLAKE2B 9c7cb4492832c97c4f71c9583ecd78af843551fa0d02a07b29cf76c04062ce9e71e8d8fd72e87260311896f61ec709e577b328215c69d52598218d566f98d543 SHA512 3877088f61d8fac6a8fa12a35ef895904473e1db7e7428961eb06822ff1218338cd5b9ab16f78773413b31fec7463963b0cc3f801c661ce17cd40c8ddd423d76
 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
+EBUILD radare2-4.0.0.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
+EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-4.0.0.ebuild b/dev-util/radare2/radare2-4.0.0.ebuild
new file mode 100644
index 000000000000..36cda6bb0ae0
--- /dev/null
+++ b/dev-util/radare2/radare2-4.0.0.ebuild
@@ -0,0 +1,56 @@
+# 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/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/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"
+
+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-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 0b3f4cfb432b..36cda6bb0ae0 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="http://www.radare.org"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
 else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index bb3209eabaff..01f0a4662195 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -12,7 +12,8 @@ EBUILD ragel-6.10.ebuild 930 BLAKE2B ad400ece265f290ebb1fad3a6a5ecc83a88780a5ae0
 EBUILD ragel-6.7-r1.ebuild 1130 BLAKE2B 6f6480f6191cda811cabf2fd45875c376f617faad742f49aa51cc0c4b5e8c83752b93c08aba17ec05cd58981d952b5f02df0e78872655962808fb4f08b1fe3b4 SHA512 25461f40bae5fdbe10ad5a57f57bc4a6c60c9d37739c5dd23e003d0bacb5c596360926529f7b5d249fb343ba1729785c639a64a3f4c0970efd55b609f62d8b06
 EBUILD ragel-6.8.ebuild 1072 BLAKE2B 879c499b08c93ae6c01d42b1801b2f6b1d7f2bb608ddc099a8731a702c47216605a783b9bd95f108e155c1b341e8e60907ca11c88735be4e51f95ffd94392c28 SHA512 8ee237bb58d6eaeafd7b71c3f807d2399deb739e95b90e5cddca6ad33c76deb3fd7f0f276abf03ec51058e4fae4a0b77e2150e70642ea5538d83eab458eb7382
 EBUILD ragel-6.9.ebuild 986 BLAKE2B 40271635fabfc45f7fb1020b8636f6461ce4d09954090ca388bf8d70b7b7d2fc7b7897874bf0f18cd323ce1ba451ad63e937f019f65ab57022a198ae46878ebb SHA512 8855488a58b252768ff9eb61fbd757ba33f8dc6b02ba4631d7affeac45880a3d0382ba196246fba592f811363230c6c899859f2c9c77191edb36912e87c3443a
-EBUILD ragel-7.0.0.10-r1.ebuild 760 BLAKE2B 9a5dfbf4ae0ee048196413a77f48f089992f1bab6420d92b0c2aed3a3a584151547d2bb844e45caa7cd30cf009a6aeaab66d004013286d25bdca12a63847d896 SHA512 e4048d4baad5174d9a37c316c36bf062a9451d6c4dbf8a8bf9793b3e0b9876833aeb1440ca6929bf5a39d85165ee957f378d426d71301f107bf0e8ac58e998a5
-EBUILD ragel-7.0.0.10.ebuild 627 BLAKE2B 929253ed83851fb333bc6c31b565b83dc30d8b02e6377824945d642a807b5ff5d8e5ea890a33f0601e0f5732c46e213c6aae93f51d19e33b5d209d3b98a9a59a SHA512 023290b91413f0a249aa409de73a22ab622290c81281f699187ea64ceb6393819a9e0e4b9b2eecaf5c25d519d09ba080f7bfbe085dc86c228ab3f7400980d9d5
+EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
+EBUILD ragel-7.0.0.10-r2.ebuild 844 BLAKE2B 57993ee41782c71062ffc31df4af845fc54f8aaef22d8e6dd0619882cba894bacd554a1bf685158ca1d63d078cc5c1f1ffabb23660f7f5c43c904ac648223d36 SHA512 086c18195cfa190eed43c66e4ca3074d6596ff7cd465484eab7966bfae26ab2a1d733ea731d9201c18f89ae904f4dffc4800533910d49f27a50ed7e51146bf2d
+EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
index 26f9f2d52054..3b71791dae1c 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Compiles finite state machines from regular languages into executab
 HOMEPAGE="https://www.colm.net/open-source/ragel/"
 SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="vim-syntax"
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
new file mode 100644
index 000000000000..c26cbce821da
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="vim-syntax"
+
+DEPEND="~dev-util/colm-0.13.0.5"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_test() {
+	cd "${S}"/test || die
+	./runtests.in || die
+}
+
+src_install() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/ragel/ragel-7.0.0.10.ebuild b/dev-util/ragel/ragel-7.0.0.10.ebuild
index e9215b2485be..89ac14258778 100644
--- a/dev-util/ragel/ragel-7.0.0.10.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Compiles finite state machines from regular languages into executab
 HOMEPAGE="https://www.colm.net/open-source/ragel/"
 SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 IUSE="vim-syntax"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 8632f2230c28..50ab00fe972a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
+DIST spirv-headers-1.5.1.tar.gz 369998 BLAKE2B 7ad91a93d2704baeff9d8dd32c67f4a7d428bc174122a37e1a405865ca8f1d9dfbf6b1d096092f8b2e83610679ddb8d311fb7823411548976c9fef3929449df4 SHA512 6ed09d1b825ad921bb988f260a236c82e9755ca3904a2ac130cf82d876a0de087d8d5f6eba01e923fe565c93a8e3eb46346bba21c64a664598a43063e5e5108c
 EBUILD spirv-headers-1.3.4_pre20190302.ebuild 493 BLAKE2B 855f966aa9be178e9c388a89d6cb7dddd27e398736013a3614c8b2737c3f6261afcf679c1288e92b67b3aef06d35ebb8ca08e455168056dc6b31f41d04e5c693 SHA512 d5a29abfd52149e6e07527055aaad89b879eb91b82c2333ee0b0f05da31c229893487d0de07a012dd487f370de45c34a410db328408e67b039ba4e5071e37fda
-EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
+EBUILD spirv-headers-1.5.1.ebuild 495 BLAKE2B 636d80e626f12f3af790fdeebadd530c64ad6f905902619e8f4c3c02c909e7a85f0ae0dd717c70de514cdc53c2ea3519118edab93788a9a0e49dace9c6ec6cc8 SHA512 ab131971a7dfb3da0b8ff950ddae77f3017e75561403f988e00abcc0c0f4cac3fef293b9f961dee2923f176f6ce739a983e100789272e5bd88937296d327a499
+EBUILD spirv-headers-9999.ebuild 355 BLAKE2B 087edb2619bceba7e57db82dac834c8d04c2718e81c2fdb56a501f64b21329e66b4e73928b56f21cf705c1abe8627db4b757bee5e6da9faf7998935acf3c84d1 SHA512 b92a326f90e77d1da661f0107c9b5acec51bc14553dc8a8512c6b44345231db97765a40c0b41002952788e1691a8280b5fc898f3d0fe718375522fc182b8abb6
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
new file mode 100644
index 000000000000..360226753f52
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="af64a9e826bf5bb5fcd2434dd71be1e41e922563"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-9999.ebuild b/dev-util/spirv-headers/spirv-headers-9999.ebuild
index f5feb0b4bbd9..7a7e30be5d45 100644
--- a/dev-util/spirv-headers/spirv-headers-9999.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils git-r3
 
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index aff107f746bc..9b1c6e7dac2c 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,8 +1,10 @@
 AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee84d3b129803e1ac2c2befa59392bd9cde51070155798f12e3d72bb5de0bfb93117599f315e6f106c6f9852dbad4d1ce0d9b4f3831a5af3844ef0c6 SHA512 9f1fe685e9205e848cc931802c003529b885c1f409a12e6bf118269a3073be8535ab3431cfcea9d89e8d78b55205795861d47e94f9728153541efe9354564003
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
 DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
+DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
 EBUILD spirv-tools-2018.5.ebuild 1033 BLAKE2B 43041e0dcf349d1626cf0e247d9078870291527663cf5a689e2a77cf0b5d1b02007534a1a56f7d13fcb39c11c81ad10b92aac7e69db0105f85fae9675c316219 SHA512 06c008fcaf213eddabcd0a507a97219a711c2cc9d0c0b6994a2b8f096894266229732c18625b8d14e5b3f885b5078a1348f496321d08faccfc7ee1cfb3929344
 EBUILD spirv-tools-2019.1-r1.ebuild 1105 BLAKE2B 295eb615075c5e39aee4e1f79f31c0b2fadadcfae8457631f4898bdb05d3ba7d262043f61e4af45d6c928d5a20347b8f7b21a33a2cac2ea34cf2b3e3b7266ea7 SHA512 ef2ba43840d3d171075621724565e90e6883e29cd0f98ffb40eccb97426b806694d95260bdd6d082ada3aa69c4c44f90217cbaea268ec7b0d1b31bb4d9eedacb
 EBUILD spirv-tools-2019.1-r2.ebuild 1229 BLAKE2B 737149830215bf07fbdea4f1be11fb7a86ea904bf5975a3431e3ae42d6729a2d017f99bdfc8930cd68fcd077abb32c48f6c96431da21b2356fa22c794defb2af SHA512 d5a70e0c1c35cad10c5e26b4f584f9f51bb0405f236755083bcd3ccbacedb8f167876dceb0f8d0e54675ef46d573725fde15aebb7f715937059db822d9c7c58e
-EBUILD spirv-tools-9999.ebuild 1112 BLAKE2B bf643168106b1edc414cf82e947322025da786b51599c06be58a1cbba958225f406d9da9a5a10cd770ad735ef2e751293e24a5cf0e12a0e3ce44731ad7d0e6b3 SHA512 6219dce97fca8bc0529aa6d45133d7b1bb0400ffce6fee2b7cb5ff727c49a07966275f512af99c92357bfeea0983dc91bf020244074272a8e29cc5c6c1484460
+EBUILD spirv-tools-2019.10_pre20191027.ebuild 1164 BLAKE2B 4882d29b08c98a9b09c9f8d65e51e32b598ce63fc1b372bf43b609ebc53bef320b25d19db6c884680482f3497ab2678d56b4a06480b7293f8c08b5819aea18e4 SHA512 39cf6e7d07f34c7105652397b7a63912651de5bad5020a0f29788c6a347246bdb0ab5f37f7b365f3446f264f789c5317e58788c3f571be5b4cce2d4fdfb1a14a
+EBUILD spirv-tools-9999.ebuild 1100 BLAKE2B 9383f01a660bd649a6e004bd0050ff5799dbf72c8c4b7ec5568e9795c624d85d17da5fcecc86eec2b87b59b6b1b3e1622baf7f7eaa654f571d414c8d0eefde52 SHA512 eafd19456cfd873fa2ddd2d699e0a3992e9dfa31cc9f8c8b795e13d92c03bce2e0b68f978575ce394b2495b07e5616ade54d5c1fafcc1e733697fa5e03437253
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
new file mode 100644
index 000000000000..9a8715e9143d
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-multilib cmake-utils python-any-r1
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
+	insinto /usr/include/"${PN}"
+	doins  "${PN}-commit.h"
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index a30f91104a17..1b5e6e1f0090 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 02a797195f2e..2268abd6a313 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -3,6 +3,6 @@ DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
 EBUILD umockdev-0.11.3.ebuild 1038 BLAKE2B a3a3320532272437cfc288c19dc2d699a23f4680849b9909eba5d870b94cd0f3ac6044b8a7bfcf702837ad2be5a25f9fc99601d87f1aec11436da40f1a2a87bd SHA512 e0ea324957343aafa2dc70c321cdcf842903543900c6458d56ae15d668017b11635fffc65193978034dc3896eca3f03e415f96d11314365f7cef25ce539f2d8c
-EBUILD umockdev-0.12.1.ebuild 1145 BLAKE2B 675257b3395bd6215f59c576561089d72066c91265cab4eddbcd61e60198a4bc00885bf9b70e1831b2037b0cc0fdd7b05ac4c0eeaf2e134dcdead264c28b3be8 SHA512 2ed4e998afe917348d2416e1d4405af6b48db901d8a3cca49f504f2b34a349cdffba10147389f38f0cd3c4b7c8a7a444933604879b188d44879ab6bf110cc374
-EBUILD umockdev-0.9.4.ebuild 729 BLAKE2B fe316c30b4ac67d524b2e25516056170e79cc1d97db52a3b8a564339ef10e5583f8ce37a1929aaf005cf7388a53814fe5cf33b33c7adedbd154957bc6d9b6ff9 SHA512 bb692554b01a023cc9542059128232afc1ee994e18913b02f162eaab462cec7f2e43a5cdc8473cc1325d50193f875ae98f3e2e2d4847a51b81a9fa84779790ee
+EBUILD umockdev-0.12.1.ebuild 1146 BLAKE2B da49baa997a987e48a4544270a1400839b09ea4f685f67ccb5eb1ab3f0d190850aabb246b101633b53552d27bff7f1126d2cee2257cac453af56fcd8771bd828 SHA512 b799ec04e9a30b47ba5e5c158ec71ca888bba8dca5023eb00b42d8e83703cbcab928b36211537d29bd54c392100e5e4946c41052a5db1c59e22c18a2bafab2d2
+EBUILD umockdev-0.9.4.ebuild 727 BLAKE2B d7ab0652bde1b589e13ccdfb884f1bf97cd5536873638b9292b0f2a2409727f59a98ed79e01460a0f9252cedec348eebbeef9999e52ecf296007498290773263 SHA512 4fde96e58a65b16dea1a0502b0347a78693773c44e185c3f87b1c68b863ae358d70105431116f882ca38818a19ce9febaa7e5c47ae2ccdd5e88560906328cb64
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index b9ada4a868ff..036d7163ded6 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		${PYTHON_DEPS}
-		virtual/libgudev:=[${MULTILIB_USEDEP}] )
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}] )
 	app-arch/xz-utils
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
index 8f6c4d3ad17f..07743116fe0c 100644
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs test"
 
-RDEPEND="virtual/libgudev:=
+RDEPEND="dev-libs/libgudev:=
 	virtual/libudev:=
 	>=dev-libs/glib-2.32:2"
 DEPEND="${RDEPEND}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index b56dd1273c0c..92f1c096aa7f 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.1.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
+DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
 EBUILD vulkan-headers-1.1.114.ebuild 627 BLAKE2B f3f2eb31d94953b415ae94c4ca5ba2b45eb65d348645c66f55c8e00473f861a30e85779d27f3413fc9fa4ab59048f7ca0f9aec958c8551b3980f30099e72fd7a SHA512 bcb14b626aae1c5264ac3eb708ed4baf62a591b55ba97a24308dee64b19517b7fb197b978b84f9cc7eaeaf48078b37c6b30b3800298895f999c27b3a676194c4
-EBUILD vulkan-headers-9999.ebuild 728 BLAKE2B 880211ab2cde0320426f6048c2b6743fd57c1e1169b809d8512fffe09a0e99aa5d991d93a6c2656a62db0af83252213223ef7cdab0aaa8c33a4a26e3382f19e4 SHA512 4c103ce4a085d44b77c411aea833bce8962d24a9c50b611d3fc0bed545021d7e9342f86db333671e21fe58bf22087cda88f6d69a3196be34eec921959cbd1225
+EBUILD vulkan-headers-1.1.125.ebuild 784 BLAKE2B c47201396af371bc6882a6159441906242ea78af661f237c6267fb830d48c4a6ff63f129e94d979dc727778a0517c9b648fc2b79a7bacd6aeaeeb746762520c9 SHA512 e9a29f6b59b818b9fc2645a7cdce3703622aaf1e7791b9c9b83946bf7d9f95d262f94b56e095528c5a101f854e190677e0c0f2a1cb595e926a5de24be34da5c9
+EBUILD vulkan-headers-9999.ebuild 784 BLAKE2B c47201396af371bc6882a6159441906242ea78af661f237c6267fb830d48c4a6ff63f129e94d979dc727778a0517c9b648fc2b79a7bacd6aeaeeb746762520c9 SHA512 e9a29f6b59b818b9fc2645a7cdce3703622aaf1e7791b9c9b83946bf7d9f95d262f94b56e095528c5a101f854e190677e0c0f2a1cb595e926a5de24be34da5c9
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
new file mode 100644
index 000000000000..4dfe2c54e31d
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Headers-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
+	fi
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+RDEPEND="!<dev-util/vulkan-tools-1.1.124
+	 !<media-libs/vulkan-layers-1.1.125"
+
+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-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 06f98f73c88e..4dfe2c54e31d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -9,17 +9,23 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
+	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+		MY_PV=v${PV}
+		MY_P=Vulkan-Headers-${PV}
+	else
+		MY_PV=${SNAPSHOT_COMMIT}
+		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
+	fi
 	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}"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
 fi
 
+RDEPEND="!<dev-util/vulkan-tools-1.1.124
+	 !<media-libs/vulkan-layers-1.1.125"
+
 DESCRIPTION="Vulkan Header files and API registry"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 1388d2847cee..f32eafbe21b3 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,7 @@
 DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
+DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
 EBUILD vulkan-tools-1.1.106-r1.ebuild 2237 BLAKE2B 7fb55b694f9fe0fa8c6b2ba8978e06b05866a7f977382141b5ae13519050e816741f77825ed9100649d84581a22bf700b21c583758aeeffea8555576a3416b8f SHA512 cd1931161a4fa56c6e8ebbdab0fa4ccb04f22ed42a54e753c25a9e3daa3d8f898a897174604882d812a8ba69f9f916ea79a0c83472e8925af54c1f8e39e0276a
-EBUILD vulkan-tools-9999.ebuild 2240 BLAKE2B e092fb1d0a2553e1d45ce151df9b0d72e7430f8340f063c77a5e455cc9938cd25e51b48b18ccef56057790903eeef8dde7d33d2e3b64864ab00407638d789bb4 SHA512 11928348b83856cac67c825a76142cb107c95a42d1cd23cf4805d4b152c01cd47922174ef77de40d8de641b01b9457e1604ccd63e8ef7c9d17ae60f8b52c3208
+EBUILD vulkan-tools-1.1.106-r2.ebuild 2272 BLAKE2B a04e6131440f0f6c246636c14f1107433e3718380dfb9d4e6ed79a7c3d5df89f80921edc8bb565dfa1529fc63eef105ba0dfdad217b6e1126db40f0da8317193 SHA512 8f4ee978eca947e4838344a46b20911207a52a65b902bd5ee693c55a271287bb04177b27ce58e5a6986999afc86eb5613678ba11300779014e532fb629e8682c
+EBUILD vulkan-tools-1.1.124.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70
+EBUILD vulkan-tools-9999.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
new file mode 100644
index 000000000000..924b70dd8d81
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cube +vulkaninfo +X wayland"
+COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
+DEPEND="<dev-util/vulkan-headers-1.1.125
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Vulkaninfo does not support wayland
+REQUIRED_USE="|| ( X wayland )
+			vulkaninfo? ( X )"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=()
+
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
+
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vkcube
+			/usr/bin/vkcubepp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_VULKANINFO=$(usex vulkaninfo)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+
+	# Upstream only supports one window system at a time
+	# If X is set at all, even if wayland is set, use X
+	#
+	# If -cube and/or -vulkaninfo is set, the flags we set
+	# are ignored, so we don't need to consider that
+	if use X; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="XCB"
+		)
+	fi
+
+	if ! use X && use wayland; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="WAYLAND"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
new file mode 100644
index 000000000000..3c0376f76251
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-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/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cube +vulkaninfo +X wayland"
+COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
+DEPEND=">=dev-util/vulkan-headers-1.1.125
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Vulkaninfo does not support wayland
+REQUIRED_USE="|| ( X wayland )
+			vulkaninfo? ( X )"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=()
+
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
+
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vkcube
+			/usr/bin/vkcubepp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_VULKANINFO=$(usex vulkaninfo)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+
+	# Upstream only supports one window system at a time
+	# If X is set at all, even if wayland is set, use X
+	#
+	# If -cube and/or -vulkaninfo is set, the flags we set
+	# are ignored, so we don't need to consider that
+	if use X; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="XCB"
+		)
+	fi
+
+	if ! use X && use wayland; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="WAYLAND"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 574fee54f75e..3c0376f76251 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
+	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+cube +vulkaninfo +X wayland"
-COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -32,7 +32,8 @@ COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 
 BDEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}"
+DEPEND=">=dev-util/vulkan-headers-1.1.125
+	${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
 # Vulkaninfo does not support wayland
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
deleted file mode 100644
index feaa1d83a0af..000000000000
--- a/dev-util/w32api/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
-DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
-EBUILD w32api-3.17.2.ebuild 1448 BLAKE2B c931c7ece14bc00cba7880d4544e79e7d57070b898e10b304c73ad2145feba72c9b10030e57d1e857db296f2ad64625341e5bc7013acd6b929b17599f87b52d8 SHA512 414133b6cbabb6765abd2b561af85cf2f8113a90679555a9f1ff31fa83b1fcff43763337e071914106f4400470f119b191a0ed09ca439b26e4c298fe4a740676
-EBUILD w32api-4.0.3.1.ebuild 1548 BLAKE2B 1a10faa217b01c79c95674cf99ce2cde5c73e5e3f72483c2c68a0f69e415df993d1d2392d44d8026b30f2fe151e22dd4a3f77f3d6ec013cc1256ee7df8590b74 SHA512 c2766ac499194dd2c1c1ece9f8c8a238b6425a340bad289ff8c12cf7d4c032960f14a62c742d9c0293857c6d4ea09f4575dbf028037af16fc1564b2593bd2c83
-MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
deleted file mode 100644
index 6c377f90be9b..000000000000
--- a/dev-util/w32api/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>toolchain@gentoo.org</email>
-		<name>Gentoo Toolchain Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mingw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
deleted file mode 100644
index 61232887fb74..000000000000
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit eutils flag-o-matic
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration; do not emerge this directly"
-	fi
-}
-
-src_compile() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET}/usr
-	emake || die
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/* || die
-	else
-		emake install DESTDIR="${D}" || die
-		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
-
-		# Make sure diff cross-compilers don't collide #414075
-		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-	fi
-}
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
deleted file mode 100644
index b3d1c3c93af2..000000000000
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
-DESCRIPTION="Free Win32 runtime and import library definitions"
-HOMEPAGE="http://www.mingw.org/"
-# https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
-SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-# Collides with mingw-runtime-4.x
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-m/.m}-src
-
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration; do not emerge this directly"
-	fi
-}
-
-src_configure() {
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	filter-flags -frecord-gcc-switches
-	tc-export AR
-	econf \
-		--host=${CTARGET} \
-		--prefix=/usr/${CTARGET}/usr \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_install() {
-	if just_headers ; then
-		insinto /usr/${CTARGET}/usr/include
-		doins -r include/*
-	else
-		emake -j1 install DESTDIR="${D}"
-
-		# Make sure diff cross-compilers don't collide #414075
-		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-	fi
-}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index a2c0f983dd41..fa83ede14912 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -5,7 +5,7 @@ DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
 EBUILD xdelta-1.1.4-r1.ebuild 896 BLAKE2B b6b0f32c7c4b2571258628b756dda26f5128ca366ddb1914bb3bed3982dca080a8db05fef23bd42456ef1ca27ab5cef8c1659902754905f883dcf31c1fa251d0 SHA512 b4952b33ee40c5cbc73e1e959b7a8b595c6e0a43497f7e178e28901a0e3b417f06df03c123fcbfc3b42c8419cff0b135d59702af7f321f85feac623dc9550ece
-EBUILD xdelta-1.1.4-r2.ebuild 723 BLAKE2B 871cd094f8e866f37e16e2b217d0a449518ccf0f2594c509ef3f43c5861298585f3f0569526793f850648941a6b1a8fb9fd7660bbfe496ee7b87d14554d34efa SHA512 3418d26ebf60ed63daf82b8567048134e0593d345f146d4471e920e2c2d7677dfd2648c155b8d16aaf22c7d153f9a4741d17f76de051e3b286ed8a36fbefb122
+EBUILD xdelta-1.1.4-r2.ebuild 717 BLAKE2B a4f200cca4a53232d0d2338fc9744fb8bca82b963b043f7cad2785060b6c0988d115d7654e250bd65f6e00ff4defb92a7d9af750744121a63e7e5067ead90866 SHA512 43b42aba0aaf12f231aa9a150319c6f750d7c9477e2ee28de02ceb3ea54541bd2dcf526ae0ea6f49bec98302f2f86c2d4c5b77ac615192aab7eee71619e2ef86
 EBUILD xdelta-3.0.11.ebuild 837 BLAKE2B f6d575a2bbc1091c0565225bfee15f2ace5c1b308e6970acd8d6755df3b92633ea9b4685a0d51b20ec5ea2cff25f9dc76011e8966ac4ef57435ebc86a5ae229c SHA512 864c62d7307064f7ff8b7c827ec98759a375684e596efdc729b332dafbe22943584c09c2d4cc5391f7e4f4adff358f1d98d1252980222c048602bea83182c819
 EBUILD xdelta-3.1.0.ebuild 1122 BLAKE2B f78880912c1b4436d8ac9d70787a8b3643acb86fd2151c4a2da8f4f4c7d6a929c8490d04fed71ae57a9ccc5f64b5f123e526273ac055a9c3e61b1cd16bc4cf64 SHA512 441fb38fc8a40dbc261fe9efb21a9d026c52f59f2c7f70fc9fcf86f290c9471a0cc380ec919ee18777e13cfacf1a829ec58575f4e5300ccd97c2865a5cae360a
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
index 008f5b44ef68..8fcb8aed4244 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 0f4529cbeb25..8a6fa241cb9c 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
-DIST xfce4-dev-tools-4.13.0.tar.bz2 292066 BLAKE2B 3200bb73f135d4c82ef785269d26a34f3874e69188831c94574766080a26d7837ab3a05b88457397044b66c58cc78d1b136d3ee303ae3b78e7894fc91aac3c7c SHA512 ee1289044cda9d908b15b7c88c5911f785efec1fed4c4ff20d66d535078a652f827489ec8ce58467f44b185ccba887fd9b4cd55ea62dfc181ddc87ce74ed5618
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 626 BLAKE2B b9aabb496bcb32c9983079da11c70e09cc2bbbb650d15e37e3ede940cf65919e7f404b2ce371c8414f9ef8790be4bb632b088fd7eeea0846ba10e9707ea6b37a SHA512 51eaf1a4e44f215a91b32f4c83f27e6dc373b1dfd0a07cfc4c1f282b4e432ba5bded6d3b81ff859fe9eb2f1832ada9500a33210ec61784808b5124de73360f37
-EBUILD xfce4-dev-tools-4.13.0.ebuild 584 BLAKE2B d17bba46a6787fd07cfec37678abc83597691beffd08c2c0019594711d65ed69fcc370f62a527a0af09551f02a84340778c7324a409d6fa1b43e2ba9cd8f1034 SHA512 d5d7186d3933c30119e321015c9170d9a2e98bf838a9f2af2ca823e4043b588dd4ca3170b0b0d9c13a7b9c1d5387cf4f2262fdbb696b3f7553aa1c0a4968d879
 EBUILD xfce4-dev-tools-4.14.0.ebuild 577 BLAKE2B 0ed29c8e1ed9b465bce7038ee5a44431e7b922a0f893e760a854eb73a430d3ebd46cedcd499b852dcf9023a00c7004ac78d5b3251d373b05a759c188b543d6f5 SHA512 774f086181479a4663fc2894d023a00d8d277765f97b74f472c1d374deadc4a63b9698e370e3ee800ba6c9867daf3ec32c82f546c0ff0294e00b1140c3d023ec
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
deleted file mode 100644
index cc4c1faf4705..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild
deleted file mode 100644
index b09d36436101..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-util
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)