gentoo resync : 29.05.2018

49 files changed, 209 insertions, 637 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c299ced2c327..6e1856301037 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 0b21b011ab41..173346e8dad8 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,7 +1,3 @@
-DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
-DIST android-studio-ide-173.4697961-linux.zip 894046861 BLAKE2B 233fefaed2a0b9c70e6cabc61663dd15d9a2486d1df17a45fc71d9c542ffd9212fc36ef54e22032ffa709a76aae796b2f14b189e31a79e96dfb0736017cacae9 SHA512 787a1cf1ab74f84cd39f663496b7b0e1cfc77130d4a7b8b732d010cf2dd553865f368463e07220144c7e9f7d5c12e20ec149ea05f5ee2f8e291537a99d678ff0
 DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
-EBUILD android-studio-3.0.1.0.171.4443003.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
-EBUILD android-studio-3.1.1.0.173.4697961.ebuild 3074 BLAKE2B e8eaa428420dddd0e0fcd5ace1dcd0eaf64b6ee8011d2ca961e8ee166d0e1f7ace254c3b28208b1b19558910842d9c9876e8a56fc2781aacb5c15e61a4fb6356 SHA512 1c6ffdf4f63b5701ba2633ba3c58dace43f5921695c9bd3165fb0a6343ca024dad2655ec328237e22e988d45488d57256c47bcac73fa02e1604329d9bbdc50aa
-EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3074 BLAKE2B e8eaa428420dddd0e0fcd5ace1dcd0eaf64b6ee8011d2ca961e8ee166d0e1f7ace254c3b28208b1b19558910842d9c9876e8a56fc2781aacb5c15e61a4fb6356 SHA512 1c6ffdf4f63b5701ba2633ba3c58dace43f5921695c9bd3165fb0a6343ca024dad2655ec328237e22e988d45488d57256c47bcac73fa02e1604329d9bbdc50aa
+EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
deleted file mode 100644
index cc5bd95dc8b5..000000000000
--- a/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
-
-if [[ $(get_version_component_count) -eq 6 ]]; then
-	STUDIO_V=$(get_version_component_range 1-4)
-	BUILD_V=$(get_version_component_range 5-6)
-else
-	STUDIO_V=$(get_version_component_range 1-3)
-	BUILD_V=$(get_version_component_range 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/zip
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	eapply_user
-	# This is really a bundled jdk not a jre
-	rm -R "${S}/jre" || die "Could not remove bundled jdk"
-
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	# Replaced bundled jre with system vm/jdk
-	# This is really a bundled jdk not a jre
-	doins -r *
-
-	rm -rf "${D}${dir}/jre" || die
-	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
-
-	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
-	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.1.1.0.173.4697961.ebuild b/dev-util/android-studio/android-studio-3.1.1.0.173.4697961.ebuild
deleted file mode 100644
index 10d45b8040b7..000000000000
--- a/dev-util/android-studio/android-studio-3.1.1.0.173.4697961.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 versionator
-
-RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
-	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
-
-if [[ $(get_version_component_count) -eq 6 ]]; then
-	STUDIO_V=$(get_version_component_range 1-4)
-	BUILD_V=$(get_version_component_range 5-6)
-else
-	STUDIO_V=$(get_version_component_range 1-3)
-	BUILD_V=$(get_version_component_range 4-5)
-fi
-
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	eapply_user
-	# This is really a bundled jdk not a jre
-	rm -R "${S}/jre" || die "Could not remove bundled jdk"
-
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	# Replaced bundled jre with system vm/jdk
-	# This is really a bundled jdk not a jre
-	doins -r *
-
-	rm -rf "${D}${dir}/jre" || die
-	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
-
-	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
-	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
index 10d45b8040b7..cc5bd95dc8b5 100644
--- a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
+++ b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/zip
 	dev-java/commons-logging:0
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 1c9c5a04343d..a78fe5316106 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,5 @@
 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-EBUILD astyle-3.0.1.ebuild 2203 BLAKE2B 970472e208b473cd2b20a1a59a15feb656467f141baeb48f686b1be35f3053077aa4d91caa1f2760ed20b6f6b7e41ccf93ca6996c201e6448ba21c3907681a5b SHA512 0b28bdc51d5a313ea9c297c14b680e31e2ea5c84a3a8d5dca92669c7e93f692c034a1492f5e2dbbad2c8cd881108b4f33c73f28b29bb04c1d6d5b5951253cd6d
-EBUILD astyle-3.1-r1.ebuild 2417 BLAKE2B fd9add4c25203e2d4c9c93bf286122f65a92f804c4080021a9dd22e0df935f05d805f3326b95893958ede31432bda3a150ca464fe4a0465aeed1ee812b15ccb9 SHA512 787156f06c4a928eabd894a3fa7224b82913588a5e1c8affcac4b40321a68fb4818a56e301fb83ec90b2f4687df694541bbf17cc6f4f637020123fc74e61687e
+EBUILD astyle-3.0.1-r1.ebuild 2401 BLAKE2B c27dd1d6b4e886cf68a795563d15d3fc942b62480aeae96116f108ea70dc0c6383a2d4efa5622c2aab03dda4d8ecb8d202eb7fa95c4ada8e2f8229be0f5a98dd SHA512 868aa688a44823004342598fe128af286aa78a071612cecdf335410cf7ccd88ebe91774d3385afd68c29f00fb5d26e95c235f0a2c4afb0650c75b2d802aef67a
+EBUILD astyle-3.1-r2.ebuild 2409 BLAKE2B e3e29396801ed158bf96660d80617ed202b4482e989491ecd31c73605e95f65239a7179498ee73e29f5ed08f371d258bd3a0195ddaa5c2ec4be171af68580bbf SHA512 1682a25a8327cc5bb7fdb0ef23c4341946926b27a119d413f33b0c4c8808520ae5dbb7d24704549c0acf3442d991ea6b4b2d9e17ef56dd1b118efe943db3f52e
 MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.0.1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
index 369eb7a23007..2d3fd9cf88ce 100644
--- a/dev-util/astyle/astyle-3.0.1.ebuild
+++ b/dev-util/astyle/astyle-3.0.1-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
 HOMEPAGE="http://astyle.sourceforge.net/"
 SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/3.0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
@@ -52,16 +52,20 @@ src_install() {
 	pushd src/bin >/dev/null || die
 	dobin ${PN}
 
-	# ex: libastyle.so.3.0.1
-	dolib.so lib${PN}.so.${PV}
-	# ex: libastyle.so.3
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.$(get_major_version)
+	local libastylename="lib${PN}.so.${PV}"
+	local libastylejname="lib${PN}j.so.${PV}"
+	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
-		dolib.so lib${PN}j.so.${PV}
-		dosym lib${PN}j.so.${PV} /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version)
+		dolib.so "${libastylejname}"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
 	fi
 	if use static-libs ; then
-		dolib lib${PN}.a
+		dolib.a lib${PN}.a
 	fi
 	popd >/dev/null || die
 	if use examples ; then
@@ -80,6 +84,6 @@ pkg_postinst() {
 		elog "deprecated. For more information, consult astyle's release notes at"
 		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
 		elog
-		elog "${ROOT}usr/share/doc/${P}/html"
+		elog "${EROOT%/}/usr/share/doc/${P}/html"
 	fi
 }
diff --git a/dev-util/astyle/astyle-3.1-r1.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 75d605a3c894..4394e1defb22 100644
--- a/dev-util/astyle/astyle-3.1-r1.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://astyle.sourceforge.net/"
 SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/3.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
@@ -52,18 +52,17 @@ src_install() {
 	pushd src/bin >/dev/null || die
 	dobin ${PN}
 
-	# ex: libastyle.so.3.0.1
-	local libastylename=lib${PN}.so.${PV}.0
-	dolib.so ${libastylename}
-	# ex: libastyle.so.3
-	local libdestdir=/usr/$(get_libdir)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
-	dosym ${libastylename} ${libdestdir}/lib${PN}.so
+	local libastylename="lib${PN}.so.${PV}.0"
+	local libastylejname="lib${PN}j.so.${PV}.0"
+	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
-		local libastylejname=lib${PN}j.so.${PV}.0
-		dolib.so ${libastylejname}
-		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so.$(get_major_version)
-		dosym ${libastylejname} ${libdestdir}/lib${PN}j.so
+		dolib.so "${libastylejname}"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
 	fi
 	if use static-libs ; then
 		dolib.a lib${PN}.a
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index d9dbd00eb749..630d47c472bf 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,5 +1,3 @@
-DIST bcc-0.5.0.tar.gz 1764775 BLAKE2B e1e059b83846115347f225e968edd2823408c26f4f25a89e26c663147ca9c379222c4f1d97578f7cf981fbbb23307deab408bcb278cb26fde5399afbbceb1e39 SHA512 12de5ef04185dccd0847fc97ae855b386e0c81b545ae497af797667925ebedf97164c17fb99468abae3f87fb3ddfdba5200070f80b3bbcad63c2355497012f0e
 DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
-EBUILD bcc-0.5.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
-EBUILD bcc-0.5.0_p20171230.ebuild 1128 BLAKE2B 2b43727b4b2008ef6e3480f5cc2b94a3ec8947ab23bd14c0ae67a9c6a9877300b451950aec402f0a5dc593610b909f7c831bc1994947c5d0ac5313cfb7671c2a SHA512 c50cd6a6bd11d05636c47621ce154af4ec2ef146b509fd772e717eac506744ecf7c93a3a827825eff92100647affe3320af48b77828462a21e062da3afd37090
+EBUILD bcc-0.5.0_p20171230.ebuild 1171 BLAKE2B 5d895b41e7608473e636fae524091fad9da737394216b71077cd364c5cf5f044b1409fcf6e90afb56de0a4fa852ad479491ec1d84be3c65dcd3727cab6e45be5 SHA512 d1b25d2299af9430a5814109c9be17b9047b18e84d57feb92f3d3efbc82e665afc849624384ff21812cf342c8cf3b9378ba164943e54d6702b365cccc4a71f83
 MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.5.0.ebuild b/dev-util/bcc/bcc-0.5.0.ebuild
deleted file mode 100644
index 0e8e32826953..000000000000
--- a/dev-util/bcc/bcc-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
index 5062f45dfd85..a37a5992ad07 100644
--- a/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
+++ b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
@@ -28,7 +28,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL"
 
 	check_extra_config
 }
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index fe835d0c0be2..187f5c15dce4 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,10 +1,7 @@
-AUX codeblocks-16.01-gcc7.patch 1135 BLAKE2B ac57db38c781ecb7d8df0e05cad107c8a92ab205a52ff463959667b7dae18d2610ea222d80b68367d9772ded867e478325323e65c6b06cd748c5a7998511d265 SHA512 b9780f966ede4336bc49117a90a98c7131a4f49b48ce2c925d4b88d2c7d840ccf1aa00f5df022f6222d3da5e3aaf5ed1af391f2717f124a34c107a8c96dee4fb
 AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
-DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-EBUILD codeblocks-16.01.ebuild 1003 BLAKE2B 1a5d584b2ad287cd02b6ad23260562c7f037fbd18ed8bc5fb3b733553bb79ac824f79fe344c85a1d4d4f26b6b5193c4daf7992cabd746064337b291ce9478d80 SHA512 5c5cce9c1d88989cf5ead2a51caa02e916fc08ba4085b8511ef310abb7eea8525aa13baa3feaad88f95caf279323ee0b4690f18b7b333cfc41cb3bd95844d78a
 EBUILD codeblocks-17.12-r300.ebuild 2014 BLAKE2B 6b99be334575d995d4537c192b90785c3628a6ee0c377957519d200ae7a931bea5e0ebd2cabed7d0fde9808bea95795d0fbd85c3417999197800db57c70be329 SHA512 a6bcd96a13095c3e31357d94cdd76fba0f7161120261750edbffd81b243b9323f089bb91a4929f317e79fde85c7579ef72fe5dcbd241a0cc7eef6dd385599b83
 EBUILD codeblocks-17.12.ebuild 2009 BLAKE2B a2266b73e5b75e95173240f01929146cb81d9313c570589899142c4631660bf214384fdbb73522bca1bf33d7a40cc0217eb5beb78d1b1998bf2e483ace970bdb SHA512 43d790abbd465566cf5aa18ca86133e7835c51643a570d23b43ac8df74e74a764079077e1e40c1a7b5d30c19d28cf4f9377f6b689f5618bac4e9e8539b57d132
-EBUILD codeblocks-9999.ebuild 1249 BLAKE2B e96be4c155ca8dd71b1b768d106076c36728ab5521418cb8ba722081485efbc4ebcffa95e535ee98e138ede0968ab59584a98bceb79c990b590a3f6f9efdc8d4 SHA512 a0a9d87c06df9f1dccd43fb009c4ac4261dcfcc99138193b3836d9a0e6ebeb4ef38180a3388774ffd84c17abacde95589c35e0febc425b07cbc75dbac9f9b3e6
+EBUILD codeblocks-9999.ebuild 1249 BLAKE2B 143412cd2c6b0652612cbb89e0385803ccadfd34fda6df4a0bbf8a4628f5dfedc5480f890b57e814778768cfe7b728fddd0e8119086c61b0a1b5b6433cd5d053 SHA512 f2d31b7ef1d77d92d388c9a2c89114d14cc0c5bd7e1e29f120cf9ad12bd43d14d04adacd0f63e0bdc340c2b229477a41f43cd36f0e489a8e85a1f0601338808d
 MISC metadata.xml 673 BLAKE2B 2868f0b98e33bfa54b217038a440d01d7f289093a6d31873b33f9eb3570c9f83c57476d2aaeabfbbdc180ec00fbdb300ec68cbb45ee95ddf99b3ddf7e92681f6 SHA512 54996828105be8435499880af88e1bb48eb746787f4838e691ddf740c86c3ca84a09973a9925ff160308ba1a28a5e746f58d2d1b646f922a2949368dc3a016fc
diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild
deleted file mode 100644
index 07a042e6263e..000000000000
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="2.8"
-
-inherit eutils flag-o-matic wxwidgets
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}.tar.gz"
-
-IUSE="contrib debug pch static-libs"
-
-S="${WORKDIR}/${P}.release"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
-
-src_configure() {
-	touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	econf \
-		--with-wx-config="${WX_CONFIG}" \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		$(use_with contrib contrib-plugins all)
-}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 4592ffeead9c..9296cc13443b 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-WX_GTK_VER="2.8"
+WX_GTK_VER="3.0"
 
 inherit autotools eutils subversion wxwidgets
 
diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
deleted file mode 100644
index 84cbc88696c7..000000000000
--- a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/649248
-SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
-GIT Commit: https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
-
-From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
-From: jenslody <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
-Date: Fri, 10 Feb 2017 20:56:25 +0000
-Subject: [PATCH] gcc7 build-fix: avoid template-related error
-
----
- src/include/scripting/sqplus/sqplus.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
-index 73f37b24f..ae7d3c75f 100644
---- a/src/include/scripting/sqplus/sqplus.h
-+++ b/src/include/scripting/sqplus/sqplus.h
-@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
-     return safeStringCopy(s,_s.s,MaxLength);
-   }
-   bool operator == (const ScriptStringVar & _s) {
--    return _strcmp(s,_s.s) == 0;
-+    return strcmp(s,_s.s) == 0;
-   }
-   bool compareCaseInsensitive(const ScriptStringVar & _s) {
--    return _stricmp(s,_s.s) == 0;
-+    return strcasecmp(s,_s.s) == 0;
-   }
- };
- 
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 326bb6c9b44a..67ae58945c4b 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,3 @@
-DIST gource-0.47.tar.gz 876624 BLAKE2B bb54650d4d642c15c4c83028b077b8b76fb15e7d1da1f523ef323ff7d58fcc97fa936cfceaaa18628fe6881c7a4f0f84e48e4d0ad66ae5f7bb188581fca346c1 SHA512 8b2c4c20f5266823846ee2ff18e4b793b35af4c65ab466b962aa2861d2fc8b3b9f7614db14ad8b3745548d3921ecd8163d58bb7ef67e7e4ca07f381565c85d14
 DIST gource-0.48.tar.gz 873333 BLAKE2B 95b876b486f0215f7516cb2bb940dd00771f67659cb2d10ad23e9da0732a51e3f2030d8f7599a8be901f0211bf1c484964f1fb66696be01c990a7b99d1123084 SHA512 5b638cac9b464c0d8f0df87ae0115c36d314cce9cd0ce269b05e0a635ff6f23e62d06d0def484b796267299041e4de675cb13a0381b19d9144bbdc1d3b7f1b16
-EBUILD gource-0.47.ebuild 1060 BLAKE2B 5a811cb587234bc7baa70c84883bc42bc1b5cb128104d4cdb42a7d46ae370c2cbf4694afb0a7cd9ada2c80eb5e81a119c6400953d784dd0f5948897479556f94 SHA512 3cc91c93ae21cb3e89ee95d6094fa49416439ac394ca1f72585c204afcd2e7f91045e63184c12539df6daed4b83dfa284f01cd779dc8f02895f509cd8cc2b213
-EBUILD gource-0.48.ebuild 1062 BLAKE2B cc5904ad53ef11df22c22b5547a6fa3b07234c640aca6c96de1e7fe9c7ac44ac053c8955c62bf91bb92345952cbf7c5aaa4dc46ca6f0ff0ec65720718830d8de SHA512 6709d71956fcbb491e279f7180c166e871ef7fca7bfe96fa84b54b83df2480ed69fa14881dd779d6f8515b2c9f4cd78b401584116356968811a17c7dc7e6c985
+EBUILD gource-0.48.ebuild 1060 BLAKE2B 5b3e6c4c560bdbef5c052b275b31c28f05bf2fb37bcfba7000efc24fc88b0987d03c22fbbb59e063a4314fc61f0758936a42cea0fe651bdef27ecc0f7d37bed5 SHA512 a2b87b1e273fe48737aefebbbef8f0c01616dc1b74eb430149c21bf0f51f94290944f8b2c7c325e27a0b00100ab06e4e8c71a1ac8ba49ff6bf0bf7d66356d660
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.47.ebuild b/dev-util/gource/gource-0.47.ebuild
deleted file mode 100644
index 026d269388f6..000000000000
--- a/dev-util/gource/gource-0.47.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.46:=[threads(+)]
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gource/gource-0.48.ebuild b/dev-util/gource/gource-0.48.ebuild
index cd54b4eb2266..34639205e93e 100644
--- a/dev-util/gource/gource-0.48.ebuild
+++ b/dev-util/gource/gource-0.48.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index df7f24918f74..ab0a4210ca1f 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0ce572db9bb6856141eedf8e3ba1b1d6f50e5ef9166047d610bbef49e72e44618d3761dc5cb828537a14dc7b66256968943238808a620a8533ef SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
 EBUILD intel-ocl-sdk-2.0.31360.ebuild 1444 BLAKE2B 840ce46bd4e9cf54e91a58e2f4385ec7940fa62991342969970431f0d7cb015bb8f08eaebf2e8f96ab996fa544113f4cf2e9b60952a3732870221cbf8dd5362f SHA512 a5c5875f45bc572131cf9b6b4fa0b5f819fac2795a60a8ebcf459c0735337752f7ed367efabbe7a95b7744b97a8766c03bbdcd7a813c6a8d9b6d491bbf3ea36d
-EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2344 BLAKE2B 5a38038f261888b08c6db27bcd27f03613eadcb49a9d5c0a715df1185e7d28a8e7f38d80644d8919b8885add9dd8efa32317eff246c6ec0074103d898f333596 SHA512 01131983224e4bb673e4dc65ea9eecb18fc7e0023279feb3b9890c5435586cd228e73fb9694b3554b6a8ca9e762a29698ee38adf6d942d20bc9f94723488a4a8
-MISC metadata.xml 774 BLAKE2B b5d5e2933e1a03ed39a1f5857fe96f8c0b51a19210dd1a59acfe93f56e6cc39bd0c5c646f4f1b76740dd50a02fd0c463f9a2dfc2b762d1511b39833122173323 SHA512 f52b91fead4961711f04cee7ef9b35467396db3010b46512e25aaf67efe7cbe8742ed09364735ec7931afc20f033b14ebe127b9472a1cfc876ebb9c30d8400f8
+EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2189 BLAKE2B 5be44e0d2491f98cb8cf4aae5b07a9976ad5c2d1b4d650f3a76184e51480ee5c18a7bba2b919f9f6d812e358245c73aa95b3ec377ac831b871f594679486c432 SHA512 695252305d781e6b61250096a8e84fc04a82d154472b90571d3a3609a64219825bd0a7723afbe6929342825f397099a82a571f68758ec0d0d6432312ea9d648d
+MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index 062e89a96985..9310497d34a5 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_appl
 
 LICENSE="Intel-SDP"
 SLOT="0"
-IUSE="android +system-tbb system-clang +system-boost +system-qt"
+IUSE="android +system-tbb system-clang +system-boost"
 KEYWORDS="-* ~amd64"
 RESTRICT="mirror"
 
@@ -20,11 +20,7 @@ RDEPEND="app-eselect/eselect-opencl
 	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
 	system-clang? ( =sys-devel/clang-3.4* )
 	system-boost? ( >=dev-libs/boost-1.52.0:= )
-	system-qt? (
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtcore-4.8.5:4
-		)
-	"
+"
 DEPEND=""
 
 S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
@@ -56,9 +52,6 @@ src_prepare() {
 	if use system-clang; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
 	fi
-	if use system-qt; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libQt*
-	fi
 	if use system-tbb; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
 	fi
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 1c21e7de1dc7..2b3e89f60bca 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="tools">Install Intel Offline Compiler</flag>
 		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
 		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
-		<flag name="system-qt">Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
-		<flag name="system-tbb">Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
+		<flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/lockrun/Manifest b/dev-util/lockrun/Manifest
index 696887221a37..17bdaccb5d13 100644
--- a/dev-util/lockrun/Manifest
+++ b/dev-util/lockrun/Manifest
@@ -1,4 +1,3 @@
 AUX lockrun.c-20120508 7025 BLAKE2B fe577a1e360c0595a2448ed03f7af1a049327e21b6f4caba6d69659e557a527c16f07e80b2591d4dfa1633e1a77a78bb1cd9f231ca4fec3ef261cbadf284c4ca SHA512 f800e96d41d11c9b6f7e28c5bd1f2b59b824ccba5f093574d8f4df8e737f2df47c3f8e89a08eee81b9c3fb46377e62be9c5ddf83df253fd0ab3a25a85a8bee0b
 EBUILD lockrun-20120508-r1.ebuild 599 BLAKE2B 8c25e4eeb05110a23a76132c681a48e2003a4623343050d8f2b681e42f3b2b656ad332115ea2d25c0c72fb5909007a0993cc9b3260e6cb2496d3d19f5890242b SHA512 45706c14e51631261c1c9ea22eb626c847eea47686f66ddc9b5d463607f5bfe073eca56e2ab5d6668367cc7c91c2e5730d2308515a62f109bdc6ec5db5118d0c
-EBUILD lockrun-20120508.ebuild 599 BLAKE2B d260021280b9c22b133190ff6a753d3202f20bdb352bd8b0407c1e6ab086d9463120b5ad353e927013d66d1e0bf989dab35ed1430508fa067e3129e8f2325835 SHA512 a39be47b2381380580eb9edc1387591ac7b36372cb6b27f41a4d1f83b177682ab5f0352a234a1c55db3575cbd31dc0994f44f4f9dbbb9618ea88c7550986ec73
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/lockrun/lockrun-20120508.ebuild b/dev-util/lockrun/lockrun-20120508.ebuild
deleted file mode 100644
index 70d5bafe59d6..000000000000
--- a/dev-util/lockrun/lockrun-20120508.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Lockrun - runs cronjobs with overrun protection"
-HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${FILESDIR}"/${PN}.c-${PV} "${S}"/${PN}.c || die
-	cp "${FILESDIR}"/${PN}.c-${PV} "${S}"/README || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) ${PN}
-	sed -i README -e '60q;s|^ \*||g' || die
-}
-
-src_install () {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 56a380f69f9b..148c918b0ff4 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,7 +1,7 @@
 AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD ninja-1.7.2.ebuild 2654 BLAKE2B 6d06ebc1142aa72cc51f6ef11c42b9798adf36c98c778ea660ec88595c6b558458f3b2d4b988cea5c27b9daa717c78334da132eb40fd18ef50b6a70d0050e123 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3
-EBUILD ninja-1.8.2.ebuild 2623 BLAKE2B 3cbcc388e4dc71f6d4b2674f8dc360a78e649afb4fff00317214b7511d5ee973602e165a39284b59cebc52f4e974f0755dbd5b6c5825b0fd7d52fe74aaf7e518 SHA512 74c00f7e068a3c5c1ab7936ea2095983de574f206d4e066dd20380cc23b00bbd43e76ddbe4fd39634e0fdd83c4b6e885edf62c31fc6ee3ca6472db9837c28e39
-EBUILD ninja-9999.ebuild 2617 BLAKE2B b39d201c06de2faed1e66931a03a5e3aa7a09e12a12cd2d618b7cb3537054205cc9e137fdc811f6fae3f0cbae1ec75a4a0c69dd880ba1cd9dcf15d27bec790f2 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8
+EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
+EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
+EBUILD ninja-9999.ebuild 2630 BLAKE2B fc04da58337a300929fe2394beef0b18d2e2633f5c94e508e4f0b8cbaf3999713bbd59ecf2cc65a5ad0860f379b68744ddba5a5c26338c1d1fbd3d87c96247ab SHA512 bacf92b4d5d5c569866b6af4284094e1ac92144c426c029cf3b4959b1a5b8dac73f8f584e5f1313c05716df0d830f90dd6cc64edff9f75e0ee623f6c822ab6a1
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
index 00220b01643e..a314bc0103f1 100644
--- a/dev-util/ninja/ninja-1.7.2.ebuild
+++ b/dev-util/ninja/ninja-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,8 +95,9 @@ src_test() {
 src_install() {
 	dodoc README HACKING.md
 	if use doc; then
-		dohtml -r doc/doxygen/html/*
-		dohtml doc/manual.html
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
 	fi
 	dobin ninja
 
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index c143bfab4212..f25829f0ec1b 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -91,8 +91,9 @@ src_test() {
 src_install() {
 	dodoc README HACKING.md
 	if use doc; then
-		dohtml -r doc/doxygen/html/*
-		dohtml doc/manual.html
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
 	fi
 	dobin ninja
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 4dc6e68bbf61..73fb8e30509b 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,8 +91,9 @@ src_test() {
 src_install() {
 	dodoc README HACKING.md
 	if use doc; then
-		dohtml -r doc/doxygen/html/*
-		dohtml doc/manual.html
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
 	fi
 	dobin ninja
 
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index c95e236d8e04..5fc1f1ee4678 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -1,6 +1,4 @@
-DIST qstlink2-1.0.3.tar.gz 661197 BLAKE2B 222b1c4b467ce0b745752ce76cc7978ce6af42074940552d9611b30f6a3cb80fcc1c343fcfea12a6c224c277e50446a22faf37938cfcbe56a1a6c681f9cfc760 SHA512 bd6d083623296cfcbc407e8c9c920de24efc91f508fb8bfe64d538ff776ed927cb89efba5c265c393b877cee995ed022b6ac51e081423b787cbcbb176215231b
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
-EBUILD qstlink2-1.0.3.ebuild 496 BLAKE2B 6281611b2b87e4cbe52d2fc875cfd35e5219d78e5efea63125839dc43a5688fad48dc8c3d020ad2165df3453b53cbd5b67228c1ca49a6de91876e0475be0e9fc SHA512 b23d8241e1c78908a02b98b63cfcc5b8c032ddae3bf18f0fd7150d66db4f1cd6d24d52685aa136b7cb7c69e45b4666e70539ca947a7416dc6a1a5e86b4b860b4
-EBUILD qstlink2-1.2.3.ebuild 900 BLAKE2B 9438e350bb4ae517daf21fc08d1d0aacedc6e31464828187c45fa1781bce384af09b4a18f148ee2a304b53b5ffde1f4c21ea9dd5ac5c0c8b3abca5d9df062c14 SHA512 63cff17e0575979e30a418a96a01460875e9b263cacd07cda730e05ce3cc50924b42452da93ff9c887e20dcb33c4832ee4c0102c5d36e81ff44b3f660936862a
+EBUILD qstlink2-1.2.3.ebuild 899 BLAKE2B b1d806b3e66a3903bb89fe8b7ea327bef879f08a4d073cafe64dae432ca2abb261e73f6775e213615002cd967220436ccdb1a13ed950c0ea42317620adfeb9f6 SHA512 76821723e8d535eacf61cc7519922ef064f98a04a8f2a22263a3d2e7c01c6bdf99e1afe3088e20ef4b6de75e1c6b5648cc953cd76184eef6944a2b3159aba63f
 MISC metadata.xml 626 BLAKE2B ba349e967f446ed21c1df37f7433be4e009f28a161745fbc3b886544820f17b4e0c3fce00f411b2e0308106d0c19f821ef3ce83e0c44b8e522640b13081131a4 SHA512 5b086323c16218c71c03a9dff91e7c95a3be54c82a871ce3e653a5208876c08d18e4292e9126e49224e65b93315ec2e3ae82a09eede155c5f705e432ac8603a1
diff --git a/dev-util/qstlink2/qstlink2-1.0.3.ebuild b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
deleted file mode 100644
index addd107df2ff..000000000000
--- a/dev-util/qstlink2/qstlink2-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="GUI and CLI ST-Link V2(Debugger/Programmer) client"
-HOMEPAGE="https://github.com/fpoussin/qstlink2"
-SRC_URI="https://github.com/mobyfab/QStlink2/archive/v1.0.3.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/libusb:0
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/QStlink2-${PV}"
diff --git a/dev-util/qstlink2/qstlink2-1.2.3.ebuild b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
index 7899e17f8d8c..680f49ef0ce4 100644
--- a/dev-util/qstlink2/qstlink2-1.2.3.ebuild
+++ b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fpoussin/QStlink2/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 7ae27f204e7a..e2472e988e74 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -5,5 +5,5 @@ DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b
 EBUILD rebar-2.6.1.ebuild 626 BLAKE2B 7f5e7e6d83b186bdfd103e238a1b057e1b025dce6e414a3f3b368221d18267653a654c496e36da0c1c4c7687e6f3071688c26eca03e5e7d503cfd97f842c2cf7 SHA512 5ad031fdec579dd3bd352f03ed32ee561a277fea02a945f58dd74a0bce101852a5f54e345f069b7755a4b593426203ebe142f77fa030c3688d7413a612d5f2bb
 EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
 EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
-EBUILD rebar-2.6.4.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
+EBUILD rebar-2.6.4.ebuild 628 BLAKE2B 2c2b910d62cb1723fadb51995f5dd65fbd1949b2e4cf4e021a414875ee4e03dd8060e772dbfecccdc476d6289cb1954db8fd97ba243fa1a6e04780b802409077 SHA512 c7e7e67bb27f2668207ecede86ca78162a54021397e96ab3649d4778dd56d0a861958977be90e2ca09a37da0648920eaa4da425d4e8db77c32201983f6757849
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index 6e91c65845b5..90ce6d8dc3cd 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 460e6f64059e..f95b70e2a856 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -13,7 +13,7 @@ DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e9497
 DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
 DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1604 BLAKE2B 13dfacaa0117905ed25e1caf7b22e97211999c92a538c380fc3785780c077f2511ca89ba50ae0c462edfb5027b99c3fa8290d10535eab5503034eca2d27496e2 SHA512 8c77ac2c7a6204cb7be8c654b1e8d4cce351dc83eed71c9d1714dd697fc6d17aaa4caf55e361f31994e0f201b6ac4bbce87bb01e1717806c3a4dcf367720d9ca
+EBUILD scons-2.5.1.ebuild 1603 BLAKE2B 2469be4adae61636d044e2beec6bba28cb62bc81c6381d8eb1228a8907ae05c248ca042490cb4af0ef94bd1e081b950dfff064d07e194cba347e01c5ad647624 SHA512 1609e0aa9c7ac60e38aa92cae29d15bebec7583656d9f18cd545745f8fd29677fbd00643e617408866df88b42949c47de3405e2c57ddfde1e608a88a8ea83611
 EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
 EBUILD scons-3.0.1-r2.ebuild 2063 BLAKE2B e2112913d1726903f0852585e3d93c029104fd83c5a598ebef1562e344e9c804d495669e74a2b9fe2f2e05362308fae60f29d3315ab028b72ee25a16830191e2 SHA512 a359c4f0dc2daea7dc12200d8dfeb91bd3e7d4768de2b807f82e863dd468251264e250061ec1088550d096a18005947a5f0f622aedf1eb721ce7cd920758d67c
 EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 2f57aa2a0114..22476258b7e4 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 4754cbc5c596..1e2c41f58429 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
 EBUILD spirv-tools-2018.2-r1.ebuild 983 BLAKE2B 4dbc7ec6a58ff9a219ef28333e63521232f654ef3069c2936889058341de3f52bae573d436a16c593a4dca2635a3fe8764cd3f86565fc3a026386999d764aed6 SHA512 082cdf79b0a477d6f25f572aaeb5aff6b6ee925b64b587819b36a4e484f2293afe3a2d5d5fa96485ce07b074953da7fd7b62d08371278864121d802ac5b18066
-EBUILD spirv-tools-9999.ebuild 986 BLAKE2B c2f3fd69fe7945679cfe5039a13097833e428dee219c03810c489827515383e2b247c8f54f46c27466d1325e85e4b4cb4f1ca392a7312d77a68c0f8dd9b5688e SHA512 33e4374d04014378f5b8e123159d40d42372760a991f097ccb01070674c338cdf39350c4fdf2e9150952035a66fe2feca15ca8839ed08c4792b112a0d5deee51
+EBUILD spirv-tools-9999.ebuild 933 BLAKE2B 9bf70a1d6c12a693da702de94bd564823a4714c2bb21b83fd7479020a800f53ec247139eebff4698eae761e2358d25d09c6b16e27e3663f54afb14fd0eb32ca5 SHA512 0c0773cfebc77f3d44d24ed7d053e658ee1bebf0327dba76c88964a74f620c5cd995e37fabd5fec8d7136ebecff54aa16ef6aebbdbdb0bb329c025586958ff37
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 9cd364683405..31b356a6c96c 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -32,6 +32,5 @@ multilib_src_install() {
 
 	# create a header file with the commit hash of the current revision
 	# vulkan-tools needs this to build
-	local revision="$(git-r3_peek_remote_ref)" &> /dev/null
-	echo "${revision}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
+	echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
 }
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index bc1094b91a82..02c5c0edfb24 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,3 @@
-DIST sysdig-0.20.0.tar.gz 750798 BLAKE2B 9e5c57abf81531f6643c661e539b06b33bda352eb3072e1ed686da3dc68550d90c94a4273554c2dd4752c73357f0bfe52bcbd10ad8551d8a2876552acf31292a SHA512 2549c8e2d0db0abd95e31272837fe5072c4c26926b2d17348bd8d73177bc024bab0a8503aa427f9134d8ca0a0bbc05fe97495933c3b8236db5fcb74df7c1efb2
 DIST sysdig-0.21.0.tar.gz 756010 BLAKE2B 0dfcc3e7f5c830e8b250e4edd9d470764ea6be25804fefbc59b020f208edc313a51b3fb783e538d2acb520c56ad7c8555f224fb90999c87b89125394a90d54a1 SHA512 73c516c9fccb504d4ccd37384aee37ece542d29f82d696acf7c90df18b3a1538faf8d2b29065eae1f3dca7c04c6c2dbe93ed9369bc1340216482c4af2f61d23a
-EBUILD sysdig-0.20.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 EBUILD sysdig-0.21.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.20.0.ebuild b/dev-util/sysdig/sysdig-0.20.0.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.20.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/usb-robot/Manifest b/dev-util/usb-robot/Manifest
index 05a7208ac326..ed25e9d26712 100644
--- a/dev-util/usb-robot/Manifest
+++ b/dev-util/usb-robot/Manifest
@@ -1,3 +1,3 @@
 DIST usb-robot-0.2.0.tar.gz 43682 BLAKE2B 10deb05b78781dd9d004b357af359de6713c0394dae741b544c501e32675b01719792b4e7ee787f7efe4dfdb255c0660f848a59ec9f35d88a59b3d1b6da5b518 SHA512 45d7332a10ba881ade03e1f927a6f36e13d31661ac85950c2f31534b313db4bb354e75404b98bdbe522ab22a08a18592a8ab3b4c73bd6cd902e97285b505e37b
-EBUILD usb-robot-0.2.0.ebuild 565 BLAKE2B 4af189e9f10a599ecf9be84f9037c33ada6c0ba99487cd7aa2d319557561bd13f89e1713d6f1353e26a0d4c463de83751d23a14ee7a6fe3aac8b45d089fafe9e SHA512 a630c903c673819198ed16d3e52d743159ac2ddaece12211611a334984655b3a8d0d7c2aafbe5646ab1c2223499e263fa56e70ca7694e8960c1189060f7cded0
+EBUILD usb-robot-0.2.0.ebuild 447 BLAKE2B 99089cae1653ef19562cf98b957eff199956aaec66ad141bdb6dca55f5e98459ba40f447077b1177293dadd28e453ae9887f1e35cd4b08623b4f10ebb6b7cf00 SHA512 2eed631028ec07463e279d52560d5751e0c8d466fbb015c9d6831b7d27b4108f6e7c85764634c21c0ee8f31a642b5c09bbb3313911ef9a772c7a3c007130b305
 MISC metadata.xml 329 BLAKE2B 1079bf19c0f237b84e3073fadf5d929ba2e37af27e224a843fbca34d103d76395ed49dfd27c49706c60dc4cfd01cc184a9af4e5db3478515e98739f7eef35c02 SHA512 0e3f571fe0ff42f145e6d2454ee9dcab22b58ad84c4fe058e90b52a2ec84d9eaf07a34aa4cb1a60efc76714d230c5481fc096b1b2edbcf64c4e7c638ab22db9a
diff --git a/dev-util/usb-robot/usb-robot-0.2.0.ebuild b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
index 81f343715d57..fb7162d691be 100644
--- a/dev-util/usb-robot/usb-robot-0.2.0.ebuild
+++ b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -19,10 +19,5 @@ DEPEND="virtual/libusb:0
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README ChangeLog
+	emake CC="$(tc-getCC)"
 }
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
new file mode 100644
index 000000000000..26da4632dc52
--- /dev/null
+++ b/dev-util/vulkan-headers/Manifest
@@ -0,0 +1,4 @@
+DIST vulkan-headers-0_p20180526.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
+EBUILD vulkan-headers-0_p20180526.ebuild 858 BLAKE2B 8eadcfe957a20687759e68935626abb8e5652da92cd627ab932641c82c0c28387c3ff4d3a35cf941179cfdb85f8e6619413cc8f896bf0aa445f32603a8c31ee1 SHA512 bbd52551f0bd14cac8f57e5861efe8da1e8857a9c0e010e31556fc5f6fb42e21c79fcf595d4d9eaa14d24037e69b7000c9016b0db8b01134e280a76c588c2d7c
+EBUILD vulkan-headers-9999.ebuild 858 BLAKE2B 8eadcfe957a20687759e68935626abb8e5652da92cd627ab932641c82c0c28387c3ff4d3a35cf941179cfdb85f8e6619413cc8f896bf0aa445f32603a8c31ee1 SHA512 bbd52551f0bd14cac8f57e5861efe8da1e8857a9c0e010e31556fc5f6fb42e21c79fcf595d4d9eaa14d24037e69b7000c9016b0db8b01134e280a76c588c2d7c
+MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/metadata.xml b/dev-util/vulkan-headers/metadata.xml
new file mode 100644
index 000000000000..830c78812893
--- /dev/null
+++ b/dev-util/vulkan-headers/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/Vulkan-Headers</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
new file mode 100644
index 000000000000..531392083dfb
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+
+src_install() {
+	mkdir "include/vulkan/registry" || die
+	mv "registry/" "include/vulkan/" || die
+	insinto /usr/include/vulkan
+	doins -r include/vulkan/*
+}
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
new file mode 100644
index 000000000000..531392083dfb
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+
+src_install() {
+	mkdir "include/vulkan/registry" || die
+	mv "registry/" "include/vulkan/" || die
+	insinto /usr/include/vulkan
+	doins -r include/vulkan/*
+}
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index e85951000662..16e0105d30da 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,6 +1,6 @@
 AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5
 DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
-EBUILD wiggle-0.9-r1.ebuild 1687 BLAKE2B de3bed817cc0e3afaf0bfbc960984270c8606e1811202f441cdd3551e27e7a8c56dcc7149bbd0e18520c006bd098871a5dcba3097e0e7c33bc98a3e012661f2f SHA512 bc1ca47e4546101e6634a45dd1177ae92d14022b088f9bec18fb52c88c33e15fb799fdb1f49b977f11450aa12f4be5d8e9363205bb8add125f2ff7bf6f200316
-EBUILD wiggle-1.0.ebuild 1465 BLAKE2B e98ca4365f3165ed13fdf4600fad10e26db3d3386664562fce42104122a92f78cf47fff88a0d2e14d7f1caef7b784a05f1f859255d7d02a424da0f83c8e50d47 SHA512 c0f51a7caf75b2534ead9e5c9da254434874ea4be217cf4f8517943cb195a9762132e5afe19dc5641d6a9e52ad1c48fd9659e0c95b58d560cda471467c63e30b
+EBUILD wiggle-0.9-r1.ebuild 1690 BLAKE2B f0e67336f89a41e05db5bf0d39d58a7bf57a83e80463fae544f19ea85673a1c9300a8f4fc2ed213b194fb12a198a68f7c00f0e565331a6328fbce68d7c0a258d SHA512 37d5bc901fbfa267d77f6a2eb5cdf32fc24b311c85166de17156f08d4b699e79e69d88ae49031a05efe32cf7b6235c25b0454904400f0390693614c2e27fb1cc
+EBUILD wiggle-1.0.ebuild 1468 BLAKE2B bc428b50db001c2323daec804a317536c9fc63755a4da06135940fb69050e7fe65103f7ae3204d7f860550172ad4480a0ca284ebfe34467243edeb082f33b631 SHA512 9e7a0ebf4d70ce014b2c87dfb87e2d3f7c1766aa7bc67144115fb30c259f4537ffe324a990d6967bd951e28aea224d171ba4cf88af6724e491e248b5f8d21bd9
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 27cef589a4d0..4c583165574c 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
 DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
-HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
-SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle"
+SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2a949ba271dd..22f8dc34ed81 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit fixheadtails toolchain-funcs
 
 DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
-HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
-SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle"
+SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index be7253f7913f..3b0e0037d952 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,4 +1,6 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
 DIST wxGlade-0.6.3.tar.gz 595243 BLAKE2B 748369ab08cb114c9fabf046a981dd955532b7752b176c616e9660fc74eade1db3b6bf08669f5373586880fe7798ff96a7ce588878ea129a7c9d7c76a8bc2e3e SHA512 7cb8cb99f2a3d97c2aa43a6ad5cbb8c1b6aafff0e5d120fca1760acbb44d2c8fb3bf8a4d5b42055e1b4bef061bfdbe8eee884f4e087b9d6572874b5b818a61f9
+DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
 EBUILD wxglade-0.6.3-r3.ebuild 1127 BLAKE2B abd1d19ce4d1668354f3e1c4607efa6b446d5af0703ab60cdb583d0807596327a2bf68fcf15726a424b620148aa8032c2b8025f7a6abd42be6da1d9e32ffc743 SHA512 60d54c5d1d36570b65a0319f99bb0921ef1f35c5e742d0cf060871ed36a58a178e37858d087c4be14540a48564bbc1dd6f774cd6a5a0523928a8711057171c6c
+EBUILD wxglade-0.8.2.ebuild 1079 BLAKE2B 5868b07efb9b33d2b179f7f93e910a16a494798d0bf1c56953844891b61f1cf4df8b22bf7e1ef5c4b4d73a5b5ac7bfd4a68f04e9314ecb1a6e2a3135d6cf3e67 SHA512 414e702ccd014be4a96523db15ad553004cca055f6ad8a8e3cf244f168d412d050c9781261d6a3f8e9d15c4fe68a85a723013f7d3b2f4948680b3c39dc903a8c
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
new file mode 100644
index 000000000000..399a943d73c1
--- /dev/null
+++ b/dev-util/wxglade/wxglade-0.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+MY_P="wxGlade-${PV}"
+
+DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
+HOMEPAGE="http://wxglade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	python_fix_shebang wxglade.py
+}
+
+src_install() {
+	einstalldocs
+
+	# Install a bigger icon
+	newicon docs_old/html/mondrian_200x200.png ${PN}.png
+
+	dodoc -r docs
+	rm -r docs docs_old || die
+
+	python_moduleinto /usr/lib/wxglade
+	python_domodule .
+	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
+	fperms 775 /usr/lib/wxglade/wxglade.py
+	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
+
+	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
+}