gentoo resync : 24.03.2018

21 files changed, 218 insertions, 245 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f184298c7fe8..8df4feba8126 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5283ba214780..2443a6e10afe 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,7 +1,3 @@
-DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
-DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
-EBUILD qbs-1.10.0.ebuild 2975 BLAKE2B 53d92b0f1a40adf3d8bbebf98353589fee3c8dbbd16b62d01a4fe9f76efb1e81a8dcc17c6ad42e467233fed37144809ed5682af722604af6f5987efece017f0f SHA512 f587fbc48e2ea72b76ec0c3a2b2ba3239f51d066c8d21d7540078ca3e589e297b8b63f7d1c8ecff69722db8e17639de0626887cef72708c1e0299d593f5620ae
-EBUILD qbs-1.10.1.ebuild 3012 BLAKE2B 349e583003f8f8e54fe97b311965487413e7520f9384b098227425c772be2317e07ab9bb09eb5c7931b7dda4a0ff0abc005a1b60c42bd2e7b948a0eceb3f39c0 SHA512 3cfbead7109404dddee730e6bec48c22d95ed3862c0245a9647a7f9389f78cef8f8ac156f1db79ce951fe12f7872231dcb8ee3a57cd20940baac5dd690271b9b
-EBUILD qbs-1.9.1.ebuild 2865 BLAKE2B a090c3f484cce5bc105d5e7078975f3f79af9264cf68abe8c3ff79d73741f7c8e9156b21770a87d3ffe9372834598e3444d9bbff1b592dc1ff5b5093cdd1a6ad SHA512 28df0a53335da532fcdc0585587d642abdf66207d74815421f60e1d04381ef2b6e2d64af6f425590ee928ff47c80ddfbb8039193c5895493b090d62baa0b3d9e
+EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.10.0.ebuild b/dev-util/qbs/qbs-1.10.0.ebuild
deleted file mode 100644
index 5b93b79331cc..000000000000
--- a/dev-util/qbs/qbs-1.10.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
-
-	# TestApi seems broken in 1.10.0
-	sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die
-
-	# skip several tests that fail and/or have additional deps
-	sed -i \
-		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
-		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
-		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
-		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	# requires jdk, fails, bug 585398
-	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
-	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${WORKDIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	dodoc -r changelogs
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/qbs/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
index 6f49fe08ac2e..55632d81072a 100644
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ b/dev-util/qbs/qbs-1.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND
diff --git a/dev-util/qbs/qbs-1.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild
deleted file mode 100644
index cba25cda6a75..000000000000
--- a/dev-util/qbs/qbs-1.9.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="doc examples test"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-qt/qdoc:5
-		dev-qt/qthelp:5
-	)
-	test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
-	if ! use examples; then
-		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-	fi
-
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
-
-	# skip several tests that fail and/or have additional deps
-	sed -i \
-		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
-		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
-		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
-		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
-		tests/auto/blackbox/tst_blackbox.cpp || die
-
-	# requires jdk, fails, bug 585398
-	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		qbs.pro # bug 523218
-		-recursive
-		CONFIG+=qbs_disable_rpath
-		CONFIG+=qbs_enable_project_file_updates
-		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-		QBS_LIBRARY_DIRNAME="$(get_libdir)"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	einfo "Setting up test environment in ${T}"
-
-	export HOME=${T}
-	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-
-	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
-
-	einfo "Running autotests"
-
-	# simply exporting LD_LIBRARY_PATH doesn't work
-	# we have to use a custom testrunner script
-	local testrunner=${WORKDIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
-	exec "\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	# install documentation
-	if use doc; then
-		emake docs
-		dodoc -r doc/qbs/html
-		dodoc doc/qbs.qch
-		docompress -x /usr/share/doc/${PF}/qbs.qch
-	fi
-}
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
index d6771327ab4f..f8906fa5d0ce 100644
--- a/dev-util/sel/Manifest
+++ b/dev-util/sel/Manifest
@@ -1,5 +1,5 @@
 DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
 EBUILD sel-0.08.4-r1.ebuild 724 BLAKE2B 50930e9e18dfaede634eac8266a93d018f8fcc367ed90dd1ec29a8169ab2123fdbcf0ce4bc2c3e2544ef13f514ce815c60c987c09ce78761acbba028a98b0c0a SHA512 9978eed79f8494738b544c1fa2e122e532a62151db28cf30b6de726db970a88f86897d04bd1f68ea51062042835e28277a42551d1662f85955bb54148465c285
-EBUILD sel-0.08.4-r2.ebuild 719 BLAKE2B 25850351ea7e39444a33551d80c9ba6c28d3ca835d2c23b8c5e239c4bbb1aa57f01875eb13c1ca5a8ea72f612da9b529798f8125ee4a7c5612f2a23e2dca0987 SHA512 7926381d0807c29a928a321ea8b90e9e54925eb587e96ece6efaa8ccb1373451314eb947e8079504bc2ba559d4fa7fc2ddb6741b6ae6af31fba54df0760fcbc1
+EBUILD sel-0.08.4-r2.ebuild 718 BLAKE2B 63ab917f26ede270a2e1cca7a39ba2926fe4af8eae0883b34b360fac191d63a8c04cb50f59cd21631de24d155739cf43a4cafdd6ed956396c6beed82186ea289 SHA512 94350bdcc3bdf0cd9c183883f1da6041efead6a1e2e97984d0a0d8295af4d3f2dce190a6a571a6ececb0c08ecb9c90b378086c92e45e8ab7b469e0711367e541
 EBUILD sel-0.08.4.ebuild 840 BLAKE2B 38f87fc0dcb7c571f8be279827720433b4e155dd5b1dba117d849891a0e1137e3c28c7c19e5529ae6a0d69b8a61686b02c8542dfac634b47988aee0899316d59 SHA512 ad031883bc3001c85d233ed580a614f4a9abb82715c2e6f5cf169a1326a59453fc785e91be9cb6d149af6707c72da532840ac29c01f9396177380b88bb44cf1a
 MISC metadata.xml 357 BLAKE2B 350bd3f9b854f7cceb8d9281c73891ef21077ae5e15a51c4a93bc96ac438bde4d687bdbdfaa15b4e8e227c023ac6dc2b560c31033501b9d4b6f7690853fe54dc SHA512 3d3239c312742d66faf8633c15e799b93c48e42c23dc555e7de2df2d773f5b5383a37208f6f11eb37db18d0c9a51cfa3504c5ffb5122a9e62e14192a6e051bfe
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index 46c4f928b547..b6b33bea31cf 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~s390 sparc ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
 
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
new file mode 100644
index 000000000000..89726f2908c7
--- /dev/null
+++ b/dev-util/spirv-headers/Manifest
@@ -0,0 +1,5 @@
+AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
+DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
+EBUILD spirv-headers-1.3.ebuild 557 BLAKE2B 5f7e5a8f2e85333b0e8fbefc01fddc6540e985175a6a6725b1ccdb5257c69170cf843e866e8b61b56f939e7d2e436115f895fda089cda0c75fc08e708af13fe7 SHA512 019b68821189bf705e3dd6c98d177b5c4cd01c0a1d5d42781d483a01119256e765c1f0efa263be1f96a4e35e53849e1c0ede77b06d83fc755ec140a7d3225d26
+EBUILD spirv-headers-9999.ebuild 422 BLAKE2B 8b354506bc2d8ee3ebce13ca9e83cecf7f175494aa49e3b42255f5bf1423fe3f69ffcae361645d09d9f4869a0f639fd6ecf95dcd50bf73ed2ded05ed2f1289bd SHA512 d76c5ef2f2474771b3402c70837a86c1886308fa60bb2e00ac7ea850017a8414707fab08aa775134809125e98b3d97ada47ce8c5ace6a8d5f110be1c76e37f1b
+MISC metadata.xml 437 BLAKE2B 232e49e7463b89ba5e532bd57428bef91615dad147f05e0c4ee1a11e214a10cd1c3025bf76061a84f0ef333ff7dba994c09ccffb8505de90a268daee3a93e411 SHA512 649acd19470edfd6d693827bb09cc5e704ff343452172225571f5dc56373b63c36d499b3bc180bcba8f464b3081461abdebc87ed7015d7ec588ed3ccddaed0a5
diff --git a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch b/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
new file mode 100644
index 000000000000..b1581f5417b6
--- /dev/null
+++ b/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
@@ -0,0 +1,25 @@
+From c44560949ec78dd13fe1394bf2957e4fd5adec79 Mon Sep 17 00:00:00 2001
+From: Brian Evans <grknight@gentoo.org>
+Date: Wed, 14 Mar 2018 20:00:22 -0400
+Subject: [PATCH] Get rid of custom target
+
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5bff17..bbc3ddc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,5 @@ project(SPIRV-Headers)
+ #   3. cmake --build . install-headers
+ 
+ file(GLOB_RECURSE FILES include/spirv/*)
+-add_custom_target(install-headers
+-  COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv ${CMAKE_INSTALL_PREFIX}/include/spirv)
+-
++INSTALL(DIRECTORY include/spirv/ DESTINATION include/spirv)
+ add_subdirectory(example)
+-- 
+2.16.2
+
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
new file mode 100644
index 000000000000..dd3d561acca5
--- /dev/null
+++ b/dev-util/spirv-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>commendsarnex@gmail.com</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/SPIRV-Headers</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
new file mode 100644
index 000000000000..f9c2a16b0e0b
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-9999.ebuild b/dev-util/spirv-headers/spirv-headers-9999.ebuild
new file mode 100644
index 000000000000..a2e33d00bd82
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Headers.git"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
new file mode 100644
index 000000000000..393e74406ce4
--- /dev/null
+++ b/dev-util/spirv-tools/Manifest
@@ -0,0 +1,4 @@
+DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
+EBUILD spirv-tools-2018.2.ebuild 617 BLAKE2B 7a3a6c6d7dc3a90386dd6c893a0ebf65bb1a43c7d309ae0fcc771f921769b3d35f2751f8fd60ac9b5ce859acfef5548c0b871fdb6fc46e6ab82da9f27c97eb96 SHA512 851d87e6c52a534aa17101c67746b0d827e5ca065184e09f353a506140dab8b0cf813373d7257e4954fdd49e34e65fe992d9c149fe5a75fe8beef32a4774f89f
+EBUILD spirv-tools-9999.ebuild 556 BLAKE2B d2efcc80959ac8455dd01526585b0fe62750b094bb26390b0a414e3daa1620c2248681417e8a73616299552fbabf0ede768b3c9fc4f7924977e2d71c4720b7f2 SHA512 f4ad82e40a68b811abcdb5bc9e3ca5799edede222356d5aec680f6e3f58f60b1851cc9520331c5e155def002dfde1c5861622af55f2794a9d8c0499499f9fa2a
+MISC metadata.xml 435 BLAKE2B 907f35e3f59db2ebdf69dde5e9c01e6b4dc3efeea3defcbb81dfe7b84a94518008925b3b24849c150cfe5ea80b166cf3bb93f4851db0a5c647ee27742b68df65 SHA512 7a436d1fb3280e11ab02fdfb76051788f492e03649ae6f88c8cb0b15e4432d10b40c8ee27d5a732cead38b137faf1a9af5713e28c26ea179c4d8c8b18eb59b72
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
new file mode 100644
index 000000000000..72d8623dc68e
--- /dev/null
+++ b/dev-util/spirv-tools/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>commendsarnex@gmail.com</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/SPIRV-Tools</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2.ebuild
new file mode 100644
index 000000000000..ccda02331582
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2018.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="dev-util/spirv-headers"
+
+S="${WORKDIR}/SPIRV-Tools-${PV}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
new file mode 100644
index 000000000000..e6ecb91d83e6
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils git-r3
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-util/spirv-headers"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
new file mode 100644
index 000000000000..da553fcaf404
--- /dev/null
+++ b/dev-util/statifier/Manifest
@@ -0,0 +1,3 @@
+DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
+EBUILD statifier-1.7.4.ebuild 917 BLAKE2B be4f41d9863a281f8743df62e5f5472fe6414dbee1e12a880b72dbe67ac1a41ffbab86fe7c5ccff3a7aea8032d14ad2677154a0867f77a09e5226c6b726f7229 SHA512 c5ce6da61b64a14d3a443ec46b21cd650c25c51c86860750c60723455c9b5e0553f8c702c21674df9b6b98e3ed16ebf67211002ecc81576520b2620bc88a0fef
+MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/metadata.xml b/dev-util/statifier/metadata.xml
new file mode 100644
index 000000000000..54d5423c4060
--- /dev/null
+++ b/dev-util/statifier/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
new file mode 100644
index 000000000000..2e2867cd1b96
--- /dev/null
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
+HOMEPAGE="http://statifier.sourceforge.net"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/coreutils
+	virtual/awk"
+
+src_prepare() {
+	# Respect users CFLAGS and LDFLAGS
+	sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die
+
+	# Apply user patches
+	eapply_user
+}
+
+src_configure() {
+	# Fix permissions, as configure is not marked executable
+	chmod +x configure || die
+	econf
+}
+
+src_compile() {
+	# Package complains with MAKEOPTS > -j1
+	emake -j1
+}
+
+src_install() {
+	# Package complains with MAKEOPTS > -j1
+	emake -j1 DESTDIR="${D}" install
+
+	# Install docs
+	einstalldocs
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 37f805c05c5a..da55a86b08b9 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
-EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 626 BLAKE2B e3589a886d089a250c142ca2a00c3ce4492d44fe28169cf8cc9ea15056268ca9901c975d69760bbc6ab3851e8f33752f9a1f04b9719f06d20e4b8e41798bb9c2 SHA512 c4cb19e47af35700caa6c9807cc072f5d5fbd142ca51a6cb548e0e85ee5bffa0e0d18ab2d84d58b1c9dbda3a244d72fc2a1d8d963e535a3ec741157e2d235e27
+EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 625 BLAKE2B 4f1d21d96f00d66c831dcdd3da7227245c728b209a850af016d60b6464ea09ca705b14e51419d4104a19737cb4bbfed3bbbf491b2eb38f9cbd215042fc35bdb2 SHA512 8095e118fcfbfeffd6482cef19762cae62406bda526a5488ade91157592881519ca99adb4b3f3f832941ac021ce6e3d47bea02180d42c5ee8269870685bf1241
 EBUILD xfce4-dev-tools-4.12.0.ebuild 656 BLAKE2B 8ac6d5792b533095405de797a2965b03a3cea149f780e65e9db7b6238854f1c2bb36fad06b74bfa0c2a0994ce93ed1cc0f17e6f3ba0c6eaee1264879b43fe85b SHA512 7eedf87afd0397dc9632458762b3471ebbbfd2453d5d2903584f79f05912999631629ea1d221aed8883705e05eeb6beff4dfe99aa38e0c515a9f0944b1b93382
 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
index 0cf5db7423e0..c8e5b400bd50 100644
--- 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
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30"