gentoo resync : 15.10.2017

23 files changed, 23 insertions, 911 deletions

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 618c2714a6b4..fe0a2caf8ed5 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,27 +1,9 @@
-AUX apitrace-4.0-disable-multiarch.patch 1239 SHA256 65eb0796a9ed1e1c996de5852a99281154e35d691a6b6b5bbaef9d81444ead88 SHA512 30d67873bdc6da9085a0680765473873d1a8020c468e951be740a81bc3e4404bba7b636ee01ee1d20af868861dd6d7f5b82104b914bfaf994cd3be029271a43d WHIRLPOOL ba52fd3c59f838da622cf282af9214b270e7cf92b2cca44c4767e1279b9d8bb07a1e716b3544b7629c75fe9ff8297602e3ac96f412e30575537ee95e0f37931c
-AUX apitrace-4.0-glext-texture-storage.patch 3765 SHA256 3f6928448d9b82323a0731a6b66ecd02866d9e5b637582e844c9291b61d77406 SHA512 9bf5523af9aa18d141a6676577364c8c29560ee231f4a7913006d6fd8a796b66270fcb06974eb3c62562d087a79d9453a5f3dd3b38be7f627879361919d15901 WHIRLPOOL 4e2caedd4b964c33595a79eb7a95fe47771acc9a19c6b63b6fa6110fdaa12954d05de99936064a0bce1cd1943465119ac1260e6307aa5b740d4cb7228ea6aaa1
-AUX apitrace-4.0-glxcopysubbuffermesa.patch 2715 SHA256 6c5ad45f5015a95bcae9fe39691d520d15a6382d2c29b7d220b1ba57b2bcc40d SHA512 817e13d7668a2d95c321bf2c9506829b9a0e3e96139873220783c7d80fc9cdd5ce2408765fcce5ce3dcb37393d3921257a9d9c0f48b820cc325dde61f6e4a82a WHIRLPOOL 67483b27b8dadfaf57cab9870e561d059c337b3ed7fac6f8fe8e02decbe8474f62f5947ae781daaac07f1a7e2e037c75b117f88685ed7225dd70aa40e4902ba8
-AUX apitrace-4.0-glxtrace-only.patch 1641 SHA256 e4b0318763b2cd7ad79e684052674991515b612534dc7a9033e4e1ff5d86d3d9 SHA512 103d646d35e5b0b198b224088c97b4b6639bde8ce05e4b1889b124bb835c29aca38116354a674ba9802056e60a31f649afc05876458ab0995fde56893ed910ac WHIRLPOOL 7a3e96b0d678c5e11762b1ddec756d60ac68d99a5bd85f996e3b998e27b7fdff65050d0e15c9cbfc6b89d8adb586d764eece02b17ff1788506f345e9e8d456e6
-AUX apitrace-4.0-memcpy.patch 256 SHA256 233102422b76746a6b6d71bd22980b4f71fd7b39597b500e9beb89fec2fb365d SHA512 d0392c2e4dbdb3ea3a7ad3ecfb51e383d59c4a1d0ee2fdffbf0d0d5ea939fc03238ca8b9ae0fc8eb7799806de783292bbeed19ca94154fd09ffc62f24369d5e3 WHIRLPOOL ebccdee8fa7d703bd3843129e6a75c53bfdf2d2f51d889288e6ffa96addc2cdc2aa99f479e3808ecf364ab173f5b310497591b800a8325aa05bf7016932ad4ed
-AUX apitrace-4.0-multilib.patch 1457 SHA256 d6ab2a72fe9c696788a1cbb996006ff9a0a0909aeb33cb51adc43fb1f7e6f45f SHA512 a351cbdca7d02ec7a7570b32bff2d138779a8543a2b04b72d23fe8847b188b2143f826bfaf93c35a53831ba6ea93d4032eea0514d238573fbca6225d61ab7bed WHIRLPOOL ea525b48d838db7f1c42bc211f45807ef3b783c95c936d4a47cae649cfdae427b932b4eac0f10b0e89ed114f0e6d0ac5bcd9b2c27fde6bd197f8351f0aa2246f
-AUX apitrace-4.0-system-libs.patch 2049 SHA256 ebeb2c56565f696836863f2bc5882ded3bd6132d85837ecf91a1c9ccec8ecae8 SHA512 6831349d462a8abb5a660d5478c0a2ddd523d8af6347a0ed8da4eed2ae85d1fdd74b9b5f5d507a09b7b703b9b6e099743879a093cbd8b04fe2d99b034f011cc1 WHIRLPOOL c5a1f8e55b667f2b98fe95e71e8ceb6594063df076f5ad8c5168a71d3db35fcc619f624dd00292ba250b0f6c5990f0e50776c586541d1a440603c7380b75a9ee
-AUX apitrace-5.0-disable-multiarch.patch 1340 SHA256 c372309ea37a4f45d98a1f27cb6ec15d5711e99a908da4bea5b32a2292d773b2 SHA512 bea98c8060893d6fb69a59b0287503311f7fb8f3015a91c9a6121e578b71195ca04d88fc1f2da7c88502a8034c594f3f325a4ea7f513f91d8149bbc36999db4f WHIRLPOOL 645b288fbf4af16aef70e6f4e85704c530f111996bff06a1ab09c2ca90a9dd8041849b8b4c30d4d584ffd53d4e9c1f748961038b08a89fb62969db0fd4d64997
-AUX apitrace-5.0-glxtrace-only.patch 1798 SHA256 1c748e9cfa96ca26c73524a94c8311efffb642bd62ab12d4b3fac23e09eb9caa SHA512 f725b4ce98cf07ae3d2619cb49aa5f3634bd987a8523d95e8e6aae449efb490efe6be488236191a763440173e81c83be37d577b803df960f28f2bb36e1ae03c4 WHIRLPOOL c50cb7e633b7904599ac1cd989696789a38223237692d7c60d1020c94a28ba778045444657c72dc787c57e24ec2a315ddce7697d5d3cf1dedceefa465d7b35f1
-AUX apitrace-6.0-disable-multiarch.patch 1252 SHA256 424a0f54dfffd0f57d9598cbd21e79a9b165d4062020ed29c16c2528a7c98fe2 SHA512 fb88abd703bc48464d04aced4f8509e741f9cfd62d44d54b40771c8f45b42ab9512e4aab90949be751ab236e5e1a05d18df659c9d8d636d1137744387513a97e WHIRLPOOL be5f8ba58b013c06a9387c96f1fc47d733aace4e2e0b95a8db0e02d9d4deaf579074dcb91dca85328298aa8219dd6867f6c3cab9452a8f3c6e1650e50e280a36
 AUX apitrace-7.1-disable-multiarch.patch 1250 SHA256 6b0b4429b689ae5d09142582df1541b7c5776e97e7c133fd5e687d6a0a8d2263 SHA512 f9ec915c3221697ae81f9d49fcd56d846a5cc8d2f5e44d3da5df0ee3674c790370dbb4d58350d631d735f725a63fc323b1386f5399b89ae311ec783e29b0d396 WHIRLPOOL 1f00e670a3f2da9a95f0b5c1843e1d1da8c0d69aea13a8229d06824ebad1fdbcf8fcd44eb45849b8c656153e691c3bdcf0238c659f1712eb4a17cd17c5321739
 AUX apitrace-7.1-docs-install.patch 526 SHA256 51d8307920093800bef0a398e31ad4ff037faedd84e58d85bd9d5c196056e470 SHA512 530d232c41a447ce0e95f5b9d25bd0f48cfcad2867c7efd69e69b7179d85fd35d60a27adce1295e9499a6449f968ef3989c9e5f874224fb11086b92a714e5831 WHIRLPOOL 01a432317fa3f183415ce11182c1e28560110e63e5190360576c9d12c4f15d341f78f965a515db71fac8fec16b501cda3e6bb0e70ae1426fd97f4fe773c18d57
 AUX apitrace-7.1-glxtrace-only.patch 1022 SHA256 2fb863d843681fc5684006658d40fd78ba21b323d250403f1bfe009fc8cd9dc6 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1 WHIRLPOOL 7ce2a7fad03f6d10e5d47af5bffc3d906aaf4a480db9828243083eab634199e06313a062e00f8faf608fb3bbd6f64e76feba135e755ed28295760728916391e8
 AUX apitrace-7.1-snappy-license.patch 240 SHA256 b0529be8c0bb93fabf7256e6a2b50caa4cc78635afb3ba489c4ee9dd35ae6f3f SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c WHIRLPOOL 9ee7d959b89c26df67ba83cae52f60a2a9e059c9d481883b683e06627c550f2924f7ead134b2e1868bba4927b7b0f1d461455a87dc7f76306dc02e4903a30073
-DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
-DIST apitrace-5.0.tar.gz 1868044 SHA256 c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424 WHIRLPOOL ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
-DIST apitrace-6.0.tar.gz 1738830 SHA256 4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c WHIRLPOOL 1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
-DIST apitrace-6.1.tar.gz 1741041 SHA256 0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd WHIRLPOOL 6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
 DIST apitrace-7.1.tar.gz 2343156 SHA256 2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 WHIRLPOOL d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3
-EBUILD apitrace-4.0.ebuild 2428 SHA256 ef77e073af848c5216ca32905dd469cd403eb85918b88e60f47234e6f19e1032 SHA512 1d3466a7c4e79a0da9c4478aea70fa093776024b18ce8d70156722e85a72d63ec1d1251b6588d261ed03a2f1540891df1a52a668e59c8d0a321c8430e499e5c5 WHIRLPOOL 0d65452436143569e2e735f5505050fae073312a1fa1a7359b423ca66739c8e477cf99489fd59bba71492700ace91fa6313b3ff39c63971886f485e1540d2cf4
-EBUILD apitrace-5.0.ebuild 2270 SHA256 8b1a4906ac9cc4afdb6710dcadc6044ef0efa2f1015befe8599746338aec1ab0 SHA512 4a7eba7f4efad955d12395491685ace6cd47ce0c09b0e8188948103a72bf7261a7877a97df83d718168809e0440fd5ed679a05157d448293434b8fb1c844b4f5 WHIRLPOOL 24676d62472fc4eafcbf8941521f659f96cde66c01a9e781c21c907bc5c7d6b4eb5387947c8437b4bdcbc802d49f9f89bebbfb642e26f0b38a1a4190c5bfecbb
-EBUILD apitrace-6.0.ebuild 2279 SHA256 0f089236b0900bcddc3cb74a7814faab26de1eba647d864fa521fc02e0c141b9 SHA512 517bfd6b5e186ec63137ddac0ef4c7c7b9f89f32dbb3b838971bf608bced347ff3b571a999a18a8529045b05d1fffd8f7850dea727ace09519f881e7d83aec56 WHIRLPOOL 8d9c9b03b735125285f7cfdddf0d76608516c676d48deadeac2a607d34c82ab8d037927c138a2ce5ecb399593d81b66c0a3921217f6831fb24e84f05455249e0
-EBUILD apitrace-6.1.ebuild 2284 SHA256 b8cb074f50fbf20ea1c617108a5c538dea71d7c4e7c9f739ae349721e6cb9663 SHA512 094bb21aa5b37ffd39adb32173289155bd5f3671192998e31ec28c790d7c1f4554b79d8866fd39f2eeff0e00da4f5bca5bbe976e79b3d174724f8969b5545f39 WHIRLPOOL 4f03efcdaa4c835dbf9bdd0a909c198c3aad79710308768edcf61775f726c6ab0d1f0d8fd6006bf848d3440ef0a0bb6eee7c19102de6ac304dc3f6fe8b8acecc
-EBUILD apitrace-7.1.ebuild 2552 SHA256 56b602993061f401d349f1ac88ec780d88029bcac35d5c06b6c8b00dac8c97fe SHA512 433370c49d61f3b3537b9240dd5fc15e3490bebdf4bac160a658b219bc6fc11617d14bbc6067bb2f6abb12322b3de3bad3fd8d188d69a86a8b9b85103579e5fd WHIRLPOOL 9bb1e09b4d4aa55370d854d5c557b894b80deea0a0bcfbe49faf5369c6134dec036851acd3d62c283803d305b7d9f36704d771363548735a707def48fbaf41b0
+EBUILD apitrace-7.1.ebuild 2514 SHA256 8843617b43ec7d7391e77ecf1b7609fa6f12b4a371db5c0da43caba5edcb7b94 SHA512 c65aeb52b0ec152d4413d569172b2235434bdf2b17326e84cd85205880b028f0f390f2262a7a2d4aa1ca11dad48f208ab16daf0d0511a856eefd5fb583492595 WHIRLPOOL 1a1f8fd267b21a197084a17969aa963e52e92f18c84c99b1a51266951d20f8b3981767e27f47928a073f82c2b33e762c53bd2ff666525c21d84d7de029eeaf73
 MISC ChangeLog 3342 SHA256 c48eaebfab3bf2fb218038d7b7f7822d31c466210757f7b54bd1e2b1fa830f56 SHA512 39f341b50bbf91045e80c1fccd27ec2c28155a53ce26e26cefbcea30b50d9ba1697e2b3251c8bf0c1a9626877dab40754928fa175e4252236052b05c1cf4f7fa WHIRLPOOL d48376a9afb9f3d26af9abaa1ad7405f9ab16d8fa566495473f6e4b46b81689de7981d396b3a01c95f7d825a6d55d6c8a8736157a37ae82f48df2e2f947a2007
 MISC ChangeLog-2015 5308 SHA256 bcbf64895b2d12c90e903793c83fc086db336c48986b08562c7cc8c67847fa44 SHA512 472955bdccbf250f2e75c5be1b7fbf3cb6b121c5ede7234dd0f35841f0adfe3d6a7b61e1642d0c0b88caf0240910f4f33aecdb6d716a9a7bc50d233355410967 WHIRLPOOL ef5f27e3925d40672d7bb62e72f02a8fcd8eab10061261023ff233aceb77e605ecb89bdd11f2dbf2497b9d0b018897e016b5a3c4ae3b9f85134616740824b94d
-MISC metadata.xml 873 SHA256 73102a36c78e45ce4df0dd20d3d71a78a79702b43bd80e6405089b600c690267 SHA512 70888ddc502b5de4c1de887e0d383f7745a82ae58ac4f733789c919b014a78018ad89da7c7665011fc94ea91be0e32245b859ebadbb88661ab9949a1215d509a WHIRLPOOL 5d4bb986419dc9580871fe1d256816ff4c4d9a6a0759e8d672eac726d98f98d177f5aa4b67912cc3a949927efc2d7408bf9166c21aee75e1b60d9e383b19ca86
+MISC metadata.xml 845 SHA256 38c27002890300bca25a0d192a6c71c3d4f03926b8d52a50456eef38f4eb7ba8 SHA512 042a487ff68ee61aa55af21c50dce3e2e5aa04a60453500164f65f21e368c1ef005b823eb8538b0ad3a0f3cc3ba8cc86f2068c6db2398380cc922067d4691d30 WHIRLPOOL 9c204afc24998005f2ea3cefb55b915de2a015f7cac275e94da6ccf51dc982506fee9a56ae1d7995a8a73a5d4b1531f6b4fc86d7f4ba9f4a9b8d905279b7ff15
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
deleted file mode 100644
index 9b529af04909..000000000000
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${P}-glext-texture-storage.patch
-	"${FILESDIR}"/${P}-glxcopysubbuffermesa.patch
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-	"${FILESDIR}"/${P}-memcpy.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild
deleted file mode 100644
index 712b310b5588..000000000000
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
deleted file mode 100644
index 9e36010d4e43..000000000000
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
deleted file mode 100644
index 3439c4a28306..000000000000
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
-	"${FILESDIR}"/${PN}-6.0-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1.ebuild
index 7ebcd73810e0..7eeab3135213 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -22,15 +22,13 @@ RDEPEND="${PYTHON_DEPS}
 	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-		)
-		media-libs/waffle[egl]
-	)
 	media-libs/libpng:0=
 	sys-process/procps
 	x11-libs/libX11
+	egl? (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		media-libs/waffle[egl]
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
deleted file mode 100644
index 0ced4d84cbf6..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -184,12 +184,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
-     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
-     if (READPROC_H_FOUND)
-         add_definitions (-DHAVE_READPROC_H)
-@@ -205,11 +205,11 @@ if (WIN32 OR APPLE)
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-     if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-     else ()
--        set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
-     endif ()
- endif ()
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
deleted file mode 100644
index 2d04db408693..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream commit to support GL_EXT_texture_storage.
-
-commit 0436cc01329b6be60801dd7bfe641be7d8be5bc7
-Author: José Fonseca <jfonseca@vmware.com>
-Date:   Wed Nov 13 13:57:43 2013 +0000
-
-    egltrace: Add GL_EXT_texture_storage entrypoints
-    
-    Prototypes obtained through:
-    
-      specs/scripts/gltxt.py http://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_storage.txt
-    
-    Issue #184.
-
-commit 0bacf23eacd15c8f15413b85bdcb6ccc4d288f37
-Author: José Fonseca <jfonseca@vmware.com>
-Date:   Wed Nov 13 13:59:51 2013 +0000
-
-    glxtrace: Add GLES prototypes too.
-    
-    Some applications seem to fail to distinguish GLES and GL entrypoints
-    apart.  To have complete traces in that situation, generate wrappers
-    for both GLES and GL prototypes.
-    
-    Issue #184.
-
---- apitrace/specs/glesapi.py
-+++ apitrace/specs/glesapi.py
-@@ -255,4 +255,16 @@ glesapi.addFunctions([
-     #GlFunction(Void, "glProgramUniformMatrix4fvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Array(Const(GLfloat), "count*4*4"), "value")]),
-     GlFunction(Void, "glValidateProgramPipelineEXT", [(GLpipeline, "pipeline")]),
-     GlFunction(Void, "glGetProgramPipelineInfoLogEXT", [(GLpipeline, "pipeline"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
-+
-+    # GL_EXT_multisampled_render_to_texture
-+    #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]),
-+
-+    # GL_EXT_texture_storage
-+    GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+    GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
-+    #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+    #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
- ])
---- apitrace/wrappers/CMakeLists.txt
-+++ apitrace/wrappers/CMakeLists.txt
-@@ -393,6 +393,7 @@ elseif (X11_FOUND)
-             gltrace.py
-             trace.py
-             ${CMAKE_SOURCE_DIR}/specs/glxapi.py
-+            ${CMAKE_SOURCE_DIR}/specs/glesapi.py
-             ${CMAKE_SOURCE_DIR}/specs/glapi.py
-             ${CMAKE_SOURCE_DIR}/specs/glparams.py
-             ${CMAKE_SOURCE_DIR}/specs/gltypes.py
---- apitrace/wrappers/glxtrace.py
-+++ apitrace/wrappers/glxtrace.py
-@@ -32,6 +32,7 @@ from gltrace import GlTracer
- from specs.stdapi import Module, API
- from specs.glapi import glapi
- from specs.glxapi import glxapi
-+from specs.glesapi import glesapi
- 
- 
- class GlxTracer(GlTracer):
-@@ -104,6 +105,7 @@ if __name__ == '__main__':
-     module = Module()
-     module.mergeModule(glxapi)
-     module.mergeModule(glapi)
-+    module.mergeModule(glesapi)
-     api = API()
-     api.addModule(module)
-     tracer = GlxTracer()
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
deleted file mode 100644
index 4dd3cdc6be3a..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream commit to support glxCopySubBufferMESA.  Modified to fix compile error with egl.
-
-commit 4dc3f3bdc3611ca1b3dec402f9242a036db8c8e4
-Author: Carl Worth <cworth@cworth.org>
-Date:   Thu Oct 17 14:52:21 2013 -0700
-
-    retrace: Implement glxCopySubBufferMESA
-    
-    This enables replay of a trace captured on ChromeOS.
-    
-    Note: Replaying on EGL is not supported, (will trigger a warning),
-    since, as far as I know, EGL does not provide an equivalent function.
-
---- apitrace/retrace/glretrace_glx.cpp
-+++ apitrace/retrace/glretrace_glx.cpp
-@@ -111,6 +111,16 @@ static void retrace_glXDestroyContext(trace::Call &call) {
-     delete context;
- }
- 
-+static void retrace_glXCopySubBufferMESA(trace::Call &call) {
-+    glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
-+    int x = call.arg(2).toSInt();
-+    int y = call.arg(3).toSInt();
-+    int width = call.arg(4).toSInt();
-+    int height = call.arg(5).toSInt();
-+
-+    drawable->copySubBuffer(x, y, width, height);
-+}
-+
- static void retrace_glXSwapBuffers(trace::Call &call) {
-     glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
- 
-@@ -173,7 +183,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
-     {"glXChooseVisual", &retrace::ignore},
-     //{"glXCopyContext", &retrace_glXCopyContext},
-     //{"glXCopyImageSubDataNV", &retrace_glXCopyImageSubDataNV},
--    //{"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
-+    {"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
-     {"glXCreateContextAttribsARB", &retrace_glXCreateContextAttribsARB},
-     {"glXCreateContext", &retrace_glXCreateContext},
-     //{"glXCreateContextWithConfigSGIX", &retrace_glXCreateContextWithConfigSGIX},
---- apitrace/retrace/glws.hpp
-+++ apitrace/retrace/glws.hpp
-@@ -127,6 +127,8 @@ public:
-         visible = true;
-     }
- 
-+    virtual void copySubBuffer(int x, int y, int width, int height) = 0;
-+
-     virtual void swapBuffers(void) = 0;
- };
- 
---- apitrace/retrace/glws_egl_xlib.cpp
-+++ apitrace/retrace/glws_egl_xlib.cpp
-@@ -244,6 +244,10 @@ public:
-         Drawable::show();
-     }
- 
-+    void copySubBuffer(int x, int y, int width, int height) {
-+        std::cerr << "glws_egl_xlib: Warning: copySubBuffer Not yet implemented\n";
-+    }
-+
-     void swapBuffers(void) {
-         eglBindAPI(api);
-         eglSwapBuffers(eglDisplay, surface);
---- apitrace/retrace/glws_glx.cpp
-+++ apitrace/retrace/glws_glx.cpp
-@@ -213,6 +213,12 @@ public:
-         Drawable::show();
-     }
- 
-+    void copySubBuffer(int x, int y, int width, int height) {
-+        glXCopySubBufferMESA(display, window, x, y, width, height);
-+
-+        processKeys();
-+    }
-+
-     void swapBuffers(void) {
-         glXSwapBuffers(display, window);
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
deleted file mode 100644
index 08ce65e2fc0a..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -30,6 +30,7 @@ set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.")
- 
- set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
- 
- ##############################################################################
- # Find dependencies
-@@ -248,6 +255,8 @@ endif ()
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
-     add_definitions (-DQJSON_EXPORT=)
-     add_subdirectory (thirdparty/qjson)
-@@ -257,6 +266,8 @@ if (QT4_FOUND)
-     set (QJSON_FOUND TRUE)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
---- apitrace/retrace/CMakeLists.txt
-+++ apitrace/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -259,3 +261,5 @@ if (WIN32)
- 
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
deleted file mode 100644
index 5b49808ada9b..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/465504
-http://github.com/apitrace/apitrace/issues/118
-
---- a/image/image_png.cpp
-+++ b/image/image_png.cpp
-@@ -31,6 +31,7 @@
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include <fstream>
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-multilib.patch b/dev-util/apitrace/files/apitrace-4.0-multilib.patch
deleted file mode 100644
index 6ad78c7cde08..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-multilib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream commit to find wrappers in lib64 directory.
-
-commit 3f9c2ecf18d8fa37fad5a7062f80952692eaa8e7
-Author: Alexander Monakov <amonakov@ispras.ru>
-Date:   Wed Oct 16 20:51:47 2013 +0400
-
-    cli: use $LIB to handle multilib automagically on glibc
-
---- apitrace/cli/CMakeLists.txt
-+++ apitrace/cli/CMakeLists.txt
-@@ -31,6 +31,7 @@ target_link_libraries (apitrace
-     ${ZLIB_LIBRARIES}
-     ${SNAPPY_LIBRARIES}
-     ${GETOPT_LIBRARIES}
-+    dl
- )
- 
- if (NOT CMAKE_CROSSCOMPILING)
---- apitrace/cli/cli_resources.cpp
-+++ apitrace/cli/cli_resources.cpp
-@@ -32,6 +32,20 @@
- 
- #include "cli_resources.hpp"
- 
-+#ifdef __GLIBC__
-+
-+#include <dlfcn.h>
-+
-+static bool
-+tryLib(const os::String &path)
-+{
-+    void *handle = dlopen(path.str(), RTLD_LAZY);
-+    bool exists = (handle != NULL);
-+    if (exists)
-+        dlclose(handle);
-+    return exists;
-+}
-+#endif
- 
- os::String
- findProgram(const char*programFilename)
-@@ -76,6 +90,17 @@ findWrapper(const char *wrapperFilename)
-         return wrapperPath;
-     }
- 
-+#ifdef __GLIBC__
-+    // We want to take advantage of $LIB dynamic string token expansion in
-+    // glibc dynamic linker to handle multilib layout for us
-+    wrapperPath = processDir;
-+    wrapperPath.join("../$LIB/apitrace/wrappers");
-+    wrapperPath.join(wrapperFilename);
-+    if (tryLib(wrapperPath)) {
-+        return wrapperPath;
-+    }
-+#endif
-+
-     // Try relative install directory
-     wrapperPath = processDir;
- #if defined(_WIN32)
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
deleted file mode 100644
index 68468a30bde1..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Find external system libraries for ebuild.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -224,23 +224,14 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
- # - on unices to prevent symbol collisions when tracing applications that link
- # against other versions of these libraries
- 
--set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
--set (ZLIB_LIBRARIES z_bundled)
--add_subdirectory (thirdparty/zlib)
--
--include_directories (${ZLIB_INCLUDE_DIRS})
--
--set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
--set (SNAPPY_LIBRARIES snappy_bundled)
--add_subdirectory (thirdparty/snappy)
-+find_package (ZLIB REQUIRED)
-+include_directories (${ZLIB_INCLUDE_DIRS})
- 
-+find_package (SNAPPY REQUIRED)
- include_directories (${SNAPPY_INCLUDE_DIRS})
- 
--set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
--set (PNG_DEFINITIONS "")
--set (PNG_LIBRARIES png_bundled)
--
--add_subdirectory (thirdparty/libpng)
-+find_package (PNG REQUIRED)
-+include_directories (${PNG_INCLUDE_DIRS})
- 
- if (MSVC)
-     add_subdirectory (thirdparty/getopt)
-diff --git a/cmake/FindSNAPPY.cmake b/cmake/FindSNAPPY.cmake
-new file mode 100644
-index 0000000..5cd64c3
---- /dev/null
-+++ apitrace/cmake/FindSNAPPY.cmake
-@@ -0,0 +1,31 @@
-+# Find SNAPPY - A fast compressor/decompressor
-+#
-+# This module defines
-+#  SNAPPY_FOUND - whether the qsjon library was found
-+#  SNAPPY_LIBRARIES - the snappy library
-+#  SNAPPY_INCLUDE_DIR - the include path of the snappy library
-+#
-+
-+if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+  # Already in cache
-+  set (SNAPPY_FOUND TRUE)
-+
-+else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+  find_library (SNAPPY_LIBRARIES
-+    NAMES
-+    snappy
-+    PATHS
-+  )
-+
-+  find_path (SNAPPY_INCLUDE_DIR
-+    NAMES
-+    snappy.h
-+    PATHS
-+  )
-+
-+  include(FindPackageHandleStandardArgs)
-+  find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
-+
-+endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
diff --git a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
deleted file mode 100644
index aac018e65817..000000000000
--- a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..c3fe52e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,12 +216,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
-     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
-     if (READPROC_H_FOUND)
-         add_definitions (-DHAVE_READPROC_H)
-@@ -237,11 +231,11 @@ if (WIN32 OR APPLE)
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-     if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-     else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
-     endif ()
- endif ()
- 
diff --git a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
deleted file mode 100644
index 03e6143afff0..000000000000
--- a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 4.0 version of patch to apply against 5.0.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..3bba2a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,7 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
- 
- set (ENABLE_WAFFLE false CACHE BOOL "Enable WAFFLE support.")
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
- 
- ##############################################################################
- # Find dependencies
-@@ -301,6 +302,8 @@ set (MD5_LIBRARIES md5_bundled)
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
-     add_definitions (-DQJSON_EXPORT=)
-     add_subdirectory (thirdparty/qjson)
-@@ -310,6 +313,8 @@ if (QT4_FOUND)
-     set (QJSON_FOUND TRUE)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
-index 4e37979..2607ddf 100644
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -282,3 +284,5 @@ if (WIN32)
- 
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
deleted file mode 100644
index bc6ba03060a4..000000000000
--- a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
-
---- apitrace-6.0/CMakeLists.txt
-+++ apitrace-6.0/CMakeLists.txt
-@@ -280,15 +280,6 @@
- ##############################################################################
- # Installation directories
- 
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--endif()
--
- if (WIN32 OR APPLE)
-     # On Windows/MacOSX, applications are usually installed on a directory of
-     # their own
-@@ -297,12 +288,8 @@
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
--    else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    endif ()
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- 
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 7e0a3f3a4d5e..932ad0c7edf7 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-    	<email>EoD@xmw.de</email>
-	    <name>EoD</name>
-	    <description>Maintainer. Assign bugs to him.</description>
-  	</maintainer>
-  	<maintainer type="person">
-    	<email>xmw@gentoo.org</email>
-	    <name>Michael Weber</name>
-	    <description>Proxy maintainer. CC him on bugs.</description>
+		<email>EoD@xmw.de</email>
+		<name>EoD</name>
+		<description>Maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Proxy maintainer. CC him on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
-    	<email>proxy-maint@gentoo.org</email>
-	    <name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="cli">Enable command line interface</flag>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d1c4eda93630..04f5c32287f6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,7 +20,7 @@ DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
 EBUILD cmake-3.10.0_rc2.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
-EBUILD cmake-3.8.2.ebuild 5722 SHA256 55fcb6fcb1610d608e66c608dc0b17319db4d89b44c8c3bbebaf3d1d64a698e3 SHA512 c6415dff3a55b7b86088f1b5a5ca89eb33be13981253170c49f5c65c3a88d519b83478bd7159d23ce1e0eded95657771dcedf2257de20412f7138d5e49dd2353 WHIRLPOOL 9a2b275dd8bb1123be67c3512534a6ffb16114cee97c648fa1c31fd918f000b0d80c9875c41923ab979dad5e65008b0146816eee0963511229254dea8fc8b75a
+EBUILD cmake-3.8.2.ebuild 5718 SHA256 40346555e866d5fe562d5dfa13332473d7ea752ecd69d90c35db8735577a495e SHA512 906412ef4eec46e4b993ed8d9ec1da36f0c7b0b29881cd0e47c22d07b04024ae532fcc269502b2810a14ca75a6d3f5addf250dfc1a39307bdda35d1c5747dd9b WHIRLPOOL fa6c94c4a9d1c24edd9cff255a5007addfc4f49a3a6cf90ad3a8ba1b70087a6581a774ad9414f4e5df7e8e8e007170f875e4477b0d00b5459f2b4973d3716029
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 MISC ChangeLog 19332 SHA256 2a3d0d8e5bfffb597c1906abb1eca3af3f997ac21673c469afbf6158a6b81b61 SHA512 83435d8060bf76931f512560a3ac4e9ae1f76073e9b8d05f75a5a4fb5d809a949bd55c4891b72475c7f8e19a4d31eb9e23799131fdc66ead7877790d43d3337e WHIRLPOOL 5e3bb823b8460257e98e0431bf55d44e5279f993724293f421e8348640ccf59980ca804bb247dc1f0f19d45aec45245dbf2f6c5d6bd075ed6350167782412c52
 MISC ChangeLog-2015 51428 SHA256 7e79c94e1bc0bc7071915d8e7bdba4812c823812de795931aec29749c410bb8e SHA512 cf217bebf0e7cfcb5771dce5a6df4fb9a4ecf77d296928de0dd2f3f34852a509a403b5b6351b49ab0ce6de755631d7e01b395a5bb9d6be5d6aa49f00185acc8a WHIRLPOOL 8f8585bf220e0a89a7f404108fdd4bc290ca37daf5d24ec3244b0bea8616b066725d7800d94697696a98fd49d6cb7cf834014ff4a0a2b77641119af3a186d451
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
index 15c2fb44f896..0faa524dfd2a 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index e5e8cb20ef2f..3521eb10fc16 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,7 +2,7 @@ AUX ninja-uclibc.patch 526 SHA256 5864494d956310fbc8abf6d7dd7cd8968eb483a1da0468
 DIST ninja-1.7.2.tar.gz 180611 SHA256 2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 WHIRLPOOL 43623778d3f96a87efb4bfd272075b257ebba3760d315c5650fa74493e2193699401c9b6d35d679e7c5235456d48674ac7e913fe1d45b5b98c2542c3b0a72e44
 DIST ninja-1.8.2.tar.gz 185226 SHA256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 WHIRLPOOL 7afc5a6ba34f5c5b464ed47af8e0b5e50bc02a81beb4e5719e19348d60057e6cd3f156ef20f77646fe883b8becc1298d7998d85f1d8bc07ee6b0bd415a58aa2f
 EBUILD ninja-1.7.2.ebuild 2654 SHA256 f1e1da387aacfe5e7e20a410fccbe936b6b35ddfd81f6cc20d6e994184be5d04 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3 WHIRLPOOL 998aaf6b6ed4493b74b01dd74a80dcb85a6b4f656b2ef2835db58c0cf5fee418c61422ec41f9aa0462e3e1253be3c15c13f0bf1fa52c6334313f850a5d8f6666
-EBUILD ninja-1.8.2.ebuild 2616 SHA256 fb50fea53ffb0a670091cdd8ac8b7b88ffd236319d9485bc2f74840ab14ae01c SHA512 a1cf6b878c41ac8274c03abfa6c8c7b90b0fb80ec1c17664846fe5d995555036ba409e30e62a466046d326a56a0e292f18ff5b2c4b8e71c0d7f6e2a825f3b39d WHIRLPOOL c77957563226419e4246ef3b279db28379f0d606c53ac61ba593429ed7969dfc710e08cbe6322ef35f0ad03673f2bb6a4ac71cb9ebe751176b33d60d08c039a5
+EBUILD ninja-1.8.2.ebuild 2614 SHA256 a8052df0c7f255f373d0df51391e2023704e85188982bd67efcfc15be68e7084 SHA512 356613554f491e50d95afc5659360f735d3aa4e1ed45ea30f2ceb3235f864b59688107614244d029e3cdc3917399e1d9f8c06d5718911b0dde735ec932745274 WHIRLPOOL 66abe63d2eac7c85b8af0bba0a367cefdf054e9ef1e11e8ce6be0173b25553889128892d318a8d7ad4a933734a8d790fde20e7bab6914251868463d3b0a4b4cb
 EBUILD ninja-9999.ebuild 2617 SHA256 b92033b3a4b37c5f5770e3c1c1fb3b379b8c2dc72d78cba37f7640f80dd60096 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8 WHIRLPOOL 2e0a8b4949f31056d4262d6937dfec1a7c5693d3e42bf1acc8f6c6ebed53ddb0c796bdc5ae27aac69a787022d5c82728d51abcfcca08eb45376bcf901a1e12cc
 MISC ChangeLog 5535 SHA256 06426d51846a9e0a803d92040f79bfde06554f00ff4999f8311e482d5305b62b SHA512 f2fffa79fb37ee24f392afe8a55e9cdcccf3b91a0191ff0573ca05b6b5e737ae16c367ed33e830ba70590829809f89ff45eff90f9d50bcd1a14b59f73bcabdcf WHIRLPOOL f11e09e4eff52d5b0e76e759005b5d2eed7153d679664bea5cd919dc3ad9515d711dde733da6c8ddeaf57476f341844ad1cafe45971bb32d029ed71e99a6bcea
 MISC ChangeLog-2015 6583 SHA256 bddeb0e9007198ddea2c83fa3d9fedfeaac320a7bcb78d75c7e272d3705f2d44 SHA512 62420fba29520829755b371c15d3e5abda58e62bbfbfef9c5ef81843fbb4053ad50f68c2919ec54ea9d32a1a7ecfd444ddab92a219ef19b8b95b8ef03e016e1f WHIRLPOOL 7819fc4209a88659bc3c1a202453a8d153a81ff78373924c0baff929689c3f1815fd7b9acfea04692fb747e116b4b77fa50aeb88fd0548057022defd6f04e373
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 20034f8194a0..cf9df1fec31b 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index d594dfa67fd4..a8d4c82cbc47 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,7 @@
 DIST source-highlight-3.1.7.tar.gz 1600692 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8 WHIRLPOOL 3d99a135abef73e865d2729bcbdf47fc7c143aeef91015b73a87d4a129323ca95aac153c3fa7d5207afb2a03ecba2f05db3e3ed8627b1e0477dcd9dfa830bbb7
 DIST source-highlight-3.1.8.tar.gz 1648351 SHA256 01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c WHIRLPOOL a05c3028816d0e0f0236ed18b806ce7f9f8f82be61b142774fe2156543c577bfcd5fb49bb259f03b4e97d5c01b5292e3b82720e29ccafa3a6bd7661f353ade5d
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 SHA256 9f000c1eaa884515fbd7ef9cac72de9eb5ecd38eaec5984d97c763d50e43d49f SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075 WHIRLPOOL bc3e156e85e3d6c3b0c0461da5419877a6a962a05da6749143250a2036b02fae1e46a9280efbc7e5107a99a5de55a38382cb401dc3a22364a34bbaebd036ac47
-EBUILD source-highlight-3.1.8.ebuild 1275 SHA256 edba0d9846ce853aac2ffc5dc24a6ac6dd20165262f02334b1aec53e82683624 SHA512 b8a514aca099b6378287334e7df0e5849ee80f54e4824f6ff076ab2206f74275cfa07acf2590f5dadedfb8e64b168eb29e74a0243f188ca05ccdc3f20cfbc029 WHIRLPOOL f27c059c8ca43c4a71bfc97cf57dc0a1a4efad2f006e63400cf80217f52de1be9f838849190333c009bf598f976cf93213d49990c0392a3524cbfb321dcda96a
+EBUILD source-highlight-3.1.8.ebuild 1274 SHA256 7e91fcb2582ed64062d1d4db3ee4244586d96c1ffa1eec8ebf6444bd1fc88472 SHA512 ce6143846ad8d4338c9a3b5c897f44a0f34d3fde0180fd3f84beb8c45f4e2e415eac8dbd01769fef179ce79c2fa453a079a88a5662be52d09dcd8679812013ab WHIRLPOOL d1bbcb846d0e13f4387297e6c4d2277a87f52b86f588e32fd1af6d4b654f0fde596957323b52f0a4d2ccf2f65e6c0a1fa0db8bb7e89fea2f84901e63c517079c
 MISC ChangeLog 2658 SHA256 3ce8341779514bdbd2b350655d0806e56a921b10790c3c1096da9dedcbd05f21 SHA512 fe132fdbb7b7f1dcd3cf6077a0ac1cd03736acd0d5c1beb52861d1aa12de34fbc60fb2e8c3c55d72887b3d86c42170576a8bf0bf0cbaf6e9ca9570f3d99bb559 WHIRLPOOL 110a8acc4f7f162d557464d9288411178b5a67b4960ea41906121aa72bd105447ad40795929adea99ceac6695c497a1a5f7f49d5d61327aabb6c2a1555f45ee7
 MISC ChangeLog-2015 11116 SHA256 a0c4f9c8ad1fd05e3457f5625bd43b3adf5ddd2b35ef60d79c0ae5c9fc334bc1 SHA512 3ee6493d2a3d58a8e59bcc0760c1b8489e66cee03471d03b626bf322a4f9e184f6a725cac64a43c7e49dfb3ad3acfe9fe8f8bb6c207465e9290411e9923cba8b WHIRLPOOL 69b51e97b6eb22a9453649ba283dadbfb0ab585bda0b91076dc7b51a5ca54cde3a05e1a687f38951edd1193a8c726b43134323f6f29a0511611d56cf4f1f6361
 MISC metadata.xml 250 SHA256 e950c68e7a4e72f8096556d6bb21fea300438999061af252e040672516b06351 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 WHIRLPOOL 7804a583de98e5ebb9478b76dd2a78071f8fe6973d88692ae4ec9107dd1dd7c54fd11baf66339a9ad4267da708ffaae3d8b1d0bf332db2d5db9feac46b6856f1
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 26e96bfbcc65..71d1d5c44a95 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"