16 files changed, 661 insertions, 10 deletions
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index 8e17f531e378..db0eac8c8d46 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,5 +1,6 @@
 DIST adplug-2.2.1.tar.bz2 810257 SHA256 f95a015268a0dfe9ff5782f3ea7b2a69e09b8d36ccd19ebf4d979d767b6e53ef SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f WHIRLPOOL 3f337b914f1779f9702014108d4cb4dc816830d1cadc0623751d979bd81213286d431225aa7d28a7aeb35fb32bc614cf581915b6e27357f3f6dc51f30ae58d19
 EBUILD adplug-2.2.1.ebuild 624 SHA256 e8c71ae6bbb876fdb3b3d724d79b21adbc2fe2c80faeab508e320213c1026516 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090 WHIRLPOOL 1e3526fdaf1c13764e7d6c2032708df69ea18b4a75c32ffaa1a0cece183d355f84a3a69793a5f368b50faa936444d1e033f47b6cb63dc5db0532b7dd6c1f5eb3
+EBUILD adplug-9999.ebuild 817 SHA256 3a0a89742bedb8bf689db37c0e9c52e29aec293a5d2f051634dae99af64850c3 SHA512 9c8223f4f75b1e70ebcb8e2529213d19d68ba09931b964fdceeb6dede9c243793e2bd189104bb129890b5a9a1edd88a576eb06da3b36db80369db02cc9591511 WHIRLPOOL 2c7bd17f2e912252af9e665de06be82820597218a3810ff028503d28605b791acefb53d8a9d72cfd86346b365174204d9c965c35bcc89b535470b903866abde4
 MISC ChangeLog 2426 SHA256 bc4b267841a455800078486259259cf8ff55759ee0d8899f927e2aa02021ba20 SHA512 5c698142b2e96457317392f03098e5d8c14145d8c7245058c1e0bd86ab8f92111b950d85755ec5b511fdd6419385dd237ba8635130c61803f19090c99a6d1121 WHIRLPOOL a0f483589b2a74e737996470649327dc6f48c506f111063941ac522cda99db85eecb2b9d24d8bf7b09492777bf5a9c2b622ee23635d90f2f89f68ad872ecd5c7
 MISC ChangeLog-2015 5709 SHA256 663a7f595318274c9a23508136ed07bf272505a292f44a0e4f9ad21965b19baa SHA512 b38559363e72c0a914dee2e877bf5d7d2219b9db7de6ab1f521b8869f892cd39fc8b14d0f365f20d624ed9228e80a1a1e2922f55dcbde057606fac3d37c92229 WHIRLPOOL 2044dc603d2e1f5540a8fe1bdeae6c5b6d0d326dc6a04aea400122a3612eccf7f8600c2012d78b8327d7c4d8803fb1f16236d2f0add862b73c5a9d4b7a03cb15
 MISC metadata.xml 329 SHA256 cfc5475682e64822374960c3dcd2ca07acc5ff73a68026c58a417b24d3da9d28 SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073 WHIRLPOOL 0ed02ed1a2ac6ee25d834fa08b00e48ed6630c43c2a01ec1e06f3d507a697812c4f4cacb4363c40b40270c1bc0ae1dcc78be32e93e929792763bf8516e04050f
diff --git a/media-libs/adplug/adplug-9999.ebuild b/media-libs/adplug/adplug-9999.ebuild
new file mode 100644
index 000000000000..b44d43a3eae6
--- /dev/null
+++ b/media-libs/adplug/adplug-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
+HOMEPAGE="http://adplug.sourceforge.net"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug static-libs"
+
+RDEPEND=">=dev-cpp/libbinio-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index d9e5af38f1d6..f8dc82da9ff8 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,9 +1,11 @@
 DIST Image-ExifTool-10.63.tar.gz 4277554 SHA256 84d63972e9172cd18fce54fef862f0d818c91c29a79c95689557be31747b9fde SHA512 84b62b73c3df22e69fddb6c5513461a2fa6086dd3bb8c3747fb495803771d307c664393e655b7892666ba74e51332558e353e64a620c55ecba86011b1a3b5675 WHIRLPOOL 300fe1984d3d5ecc014b4676c18a82c08bfc1d3b90ececf41b50911d3cc7073a5b53484abf2ff29993b3e3db7ef7820e3a2afd2e1789e8d363e69096346fe93c
 DIST Image-ExifTool-10.64.tar.gz 4278747 SHA256 1632a684fa93bc1051f3ffab9cf9453c2b5e29173afd8b91b1044e4def8c42c9 SHA512 e0823c51521e5e300a2ad23734d8174da1d5f963fe9fe44c72dc1b2d9835bba8a5c940c748f17ce576be495e919685342f2c6932afa94019efd3fd2d47b852eb WHIRLPOOL 0acb37fa6e93e2a22df2e67ccdb9abef3b3a1f03fcc26945cf742f5d71b83c92fce48673962ae900da5434b8f1320f9b14ac39fe3d787dd2368100afe4acc731
 DIST Image-ExifTool-10.65.tar.gz 4290148 SHA256 206a03c3ca8f25ad3b8f25290d934c19da350c8cbafae9de2a6db074bc5c42ad SHA512 857081033563540fc991e7e1a910ecee6c530d1c200a250ca7ec2644c2b57c57b6f1d660c2f33109ed6c385f04a81aff57985a38d783235159b5c8c530740413 WHIRLPOOL d8f7532ecfb018416cdfb1f02187f39cac8f842216f997b0d7ff5d3629529a9d87cb4f0a72e5308995404483c968a71a8df05fff5dce038f34f8b8a6ee273caf
+DIST Image-ExifTool-10.66.tar.gz 4293398 SHA256 9da1e99199d3249d42fa7fc55576d6d389f8e9226826bdadaac441c6d2ee8cf6 SHA512 32824dfcaf84055143141cbdac05c56d322ecc970cf98813251b2eb1cda32340e08fd4fd6e9323994416e9dc4f9affcba7e35b991abfd6f30cabbb57d02b5eb2 WHIRLPOOL c0ef671f9276ec83a5402b9048c02ed21853ebf8a94ab049bbd872b58a082bcce47f8b3a6bc7322aa0dd02ab72dddb1848d9f5dfa3f689dcd857b944825b7d64
 EBUILD exiftool-10.63.ebuild 532 SHA256 78959a4d602d821b8496778393f6d5e3333d854875f23528b0c08cd90a5e79a2 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255 WHIRLPOOL e645a129f87b5be4f13a7fe4423406a0ee071fe751222be5af88bd586ca396033b6af6a10372013f796f7012c7fb31d6ba88328b3eb12efd8d44bb789dc6288c
 EBUILD exiftool-10.64.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
 EBUILD exiftool-10.65.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
+EBUILD exiftool-10.66.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
 MISC ChangeLog 8276 SHA256 a9a90786aae602763bbd782a5a959eb98953f6f6f4ab42c4e54cde5ce995a261 SHA512 2e19dfe347911a4f160d9b9bd1ebf2731396ffc8546d302a78b2c9041ceb92e9994ce09e58187b1b042fac596498c8d65747161e60e591abe1f6045876a47154 WHIRLPOOL 90c5ca53472453b72f303f4bf45f990321bd4923daa1d0d91c4ec287f7312789699416b4f768dd5e9f5ecabb06fe39d2b86d3c65fcd472e404828a5360761135
 MISC ChangeLog-2015 21462 SHA256 6e383b131d092c798a8705c06687fb1d4ab6b8343d775366814f5709e3a3b42d SHA512 c48d7c80bc283e061b10ec73ecbd0a2218ef034b9cc7095376dafe12df8cf634e44c2391f15b093ca852e2071fec7acd0187c2d2e809c90ab99f08321e32eeba WHIRLPOOL 5469c93d15acd8ae441354ef227da7708d88c4a65c0677bb9ace69c9eeff410b5c5e271cc1267b6f5f1a776a83ad1c72e8bc4b3afdca2a6bed8b29ff5c5a8454
 MISC metadata.xml 10159 SHA256 c01f25e3812847ed36085150466c33f271d064680a5085afec6bc7926f1a918d SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484 WHIRLPOOL 7afd890fccf7845f4b3168c41c672d6fe72d7687b44c1618bf52dbc224438e784589970d292588b34cefacb1e07641a8a137817373256875abe5fd3e08707171
diff --git a/media-libs/exiftool/exiftool-10.66.ebuild b/media-libs/exiftool/exiftool-10.66.ebuild
new file mode 100644
index 000000000000..22e52f948459
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.66.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index d4184dfe0707..f973e996c6d4 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,7 +1,7 @@
 DIST libcdr-0.1.3.tar.xz 596772 SHA256 66e28e502abef7f6f494ce03de037d532f5e7888cfdee62c01203c8325b33f22 SHA512 9811efb13f7dd72c69a98e81b44a261e913ffe87200486c8e07200d75790004d4fdf30e29f779b0ddd2ad09e3d1e8813ef501e9448c1789f89256f71bdb5fadd WHIRLPOOL 6772ac928a66f21c689f39a3abc762d043baf89d009d86ce79d68aa8b1354a4965a2f489bf8bd754c4a76bee3ac3695658ee4ec14ed7cf19986e48c22b0e4f97
 DIST libcdr-0.1.4.tar.xz 609592 SHA256 e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6 WHIRLPOOL 30dd5538e2b1d5e4749c838902e04b5f59cd5a5376468209307850ab5bb2807822d8b6aeab44e3559227bdc5011b7ecba5a150c255f57c63e3cacfe577a04f7f
 EBUILD libcdr-0.1.3.ebuild 1094 SHA256 28f137f0dd04b98db1414d16b227d174b158d7de9dc3c23ba4408b9b83bd0920 SHA512 9e152c4f6869ca846ee3ccb775aacea88e50a894880c884f7a9596e17ed3ea91b27753e15e438ffdea26e27e44f72218939433fc24d29fd333a72e579b65a91d WHIRLPOOL bbf00b37a73799a406c8be181f5f2f6a1c1cf73f06e31f4f2d85e414972753d8f493b7fa5f08ac5b85dd61db756d1cbfdab8186685c9faa2a07f7888e36e17d5
-EBUILD libcdr-0.1.4.ebuild 1095 SHA256 b26ea587f351641edca07c0cb779576297bb8b86bcef63d6a66861765084eace SHA512 482ea1135ba78e285505ae85202cc81f3f00303e915a47bf664a28eb734669411cee95d4ee4fff3764b9251156b45d574e566780267bbd38a4ed3f9cdee47e34 WHIRLPOOL 4e67a187ca72ffe87146fdc2278c47dc334d300e36aeb96a10d5c67065cd341d3e40c8ea8042d3c71a0ca985dd5eb7a52979aec1204c6e24c2f2c7d3dab4e5e1
+EBUILD libcdr-0.1.4.ebuild 1094 SHA256 28f137f0dd04b98db1414d16b227d174b158d7de9dc3c23ba4408b9b83bd0920 SHA512 9e152c4f6869ca846ee3ccb775aacea88e50a894880c884f7a9596e17ed3ea91b27753e15e438ffdea26e27e44f72218939433fc24d29fd333a72e579b65a91d WHIRLPOOL bbf00b37a73799a406c8be181f5f2f6a1c1cf73f06e31f4f2d85e414972753d8f493b7fa5f08ac5b85dd61db756d1cbfdab8186685c9faa2a07f7888e36e17d5
 EBUILD libcdr-9999.ebuild 1097 SHA256 349723996c2175a26eed0d7f9b8ca1adb03013f91cccc1abaa9796684330ba71 SHA512 d7a2f06ad221999261b61c58516103fae638628f4b9b1466fc592c6ce37d3761ede332e4ec434d8004e13b320a55849306a8d1c0425e58902175395286d4f6bc WHIRLPOOL 2ee6608a57686a228b70d21049d6b40cf05f65da863f5fdf0f3e6446ca271489172ac6a9db65536cad46ae690c2c3208dca953aaec263d7ca35edc82cf454818
 MISC ChangeLog 5059 SHA256 cc3681764e3dc27c8dd0a5b1e9e4bff7edb26ebfcb47ce3ddd4c0eaff2075469 SHA512 e68c2ae4076096b99af2bbf6da7697d0797e8cbdc7f2e173909b790e5a277f8e6ac8cc27c56942a4e2d50a2e832e779f243caded999371aa05e737396f7a9c2c WHIRLPOOL cb5d2463023ab5aeb4bb0f840793fab12cdc387c57f55eb49cee54d4c59a99f772c5fd3eb6b82f1563a71cfe93fda950afbc26a36f89a0f9d4bd2d3d5db2d4ec
 MISC ChangeLog-2015 6014 SHA256 d69af7c4bc79a873b3e920b28569f751bc963344bad436079d335e7f507cd78c SHA512 c93ecdcfd6f0937b15d353203e94f8f4f273189849fdc0e42ced737a14b9cb42fa049df753100ba19f28d277600b8c23d278dc92088caf5c0cf9c502e7c2c842 WHIRLPOOL 840831bbdac2c5d499815686e4104b7946d39a650244fbf9f139d3b624baf6ba97e271d4fcc3996b457dd94b3ff6048fcef6760f73ebf1f5d9e7e9dbaba4f06d
diff --git a/media-libs/libcdr/libcdr-0.1.4.ebuild b/media-libs/libcdr/libcdr-0.1.4.ebuild
index 6c347d58177e..b114fa2e952e 100644
--- a/media-libs/libcdr/libcdr-0.1.4.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 3588150e60b5..902097c1be7a 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,7 +1,7 @@
 DIST libfreehand-0.1.1.tar.xz 492916 SHA256 ec6676d0c63f7feac7801a1fe18dd7abe9044b39c3882fc99b9afef39bdf1d30 SHA512 552b6b8c00aabe0d557fdacf4bfe8b0b4c2d34ec6f15820f3a54da76b4f24ca5842ba38ea756d05b947a0e8cf48d351429abef64b25508ea032a92965e9c91e2 WHIRLPOOL 2b82b4a3790df93fb52ec872ed38c1c991ce63b35fd25c87c60c2816f3275b6fa8f7d607fc6f9bd41c6bcbc0fca44efc11e5486b4d0bd47077543ce5e69d9fd8
 DIST libfreehand-0.1.2.tar.xz 516132 SHA256 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 WHIRLPOOL 54ae55cc80304f15244d0eac671264afdf2d30c589ddc917eb9db4ce7409b95f7bbbfe17b9d97b3b0954f0ab1e1a3342f09df435d93c3945dedd4767e81d1038
 EBUILD libfreehand-0.1.1.ebuild 1028 SHA256 738ffb0416571cea421424f668edb12dd372fcfdf854df05b40f968b36831093 SHA512 69b48456b5cb05fa10b67a3aafd5a284fbb8bc7899649893685e8b895a091d5470add499f5a99a0691632d2c1bb05b5ab305c7ee3dbf94d8e46d745b8029ee86 WHIRLPOOL cfeb9f2b364c906a0317a0806382e901898e07c4613ba0d10886ca047a4f90e29d34c450fa59c573153c2e066fede660fe379944983914ac19750c2e84aef4a3
-EBUILD libfreehand-0.1.2.ebuild 1103 SHA256 b4c5244b9d12fd4eb49953651acd4f1a6fdc51d143372a716d6bc2d27008fcdd SHA512 e57196f0a12a2821e2fccf2d2f5e342d14cc1fd80de5a22f8cc926162db8f91f31d7f225623887611addcc00c7a6bbef0e0b857769ac4d94583039fa36a86f45 WHIRLPOOL 2b2c8bbc7e1eb9bc14e97443331d2c4d2cc0b84a65500f220540a410da5965742f562903bdd215ee0a82952e9b1747d1ea70b92a52ca00b54d860eb8e256d28d
+EBUILD libfreehand-0.1.2.ebuild 1102 SHA256 36a784b8d7a61beb9bfd3f325b5540cfb386aeb2870308ab291a3f220ef5ff4d SHA512 404b63f3579f642619a1574cb71698355bfc2c01ebd6dc1252d8204f09c0a8e74e2c49e31a5806950774ee06e2b07798e35e0d47db7060fdac6b98c42d3c766e WHIRLPOOL 0e27c74320c557ec757e1f2d552607d5ca98569bba3b7deb6a596998038f929acee207e8e822d116531a753820b0712261caa7637ab75252ea7ddfd0ad9b6a01
 EBUILD libfreehand-9999.ebuild 1092 SHA256 2fa3c7305b45feba0cc588afa5db782d54479e595240e1b43b96db1d968092dc SHA512 d21d085e44c862de43052f1431bd8e730e9d1044f392bd3dec48b69b917867c74b80d681dc0e3d8a51c4d6c04bfa2be501e735de8b04993a3122f7e749e452d0 WHIRLPOOL d89a72a26809a4c3475c8f7229984ee3b3c6206c58c56ebfed1986d3d2102fe543391c58a10554a2463a4f5a65b369ac44d7b486ec1de62f9feda1e47a9fc109
 MISC ChangeLog 4089 SHA256 f2a64e7b0145e4905fdab650a2e9821341d33484a8953674d2384e7e75be2250 SHA512 e1aa850c9b53fc34bbcaf8454290dd3898311bd0f70293406215d6e69c81722aeaf2dbcdbaaaa07931e9d042772a8d6acf60691434608b1c5e3165793d7e75b4 WHIRLPOOL d903724cda3072e7cdd245279d67144eb2c8196ae6663baca78a1c80df510fabad58877ed8b014ef33a7cecbf19a254a3f8d52210cfa081f278f775e21731dbd
 MISC ChangeLog-2015 1713 SHA256 26f1dbc4a94b3b288cfbe88d06c1557a6035ed50cd26aee849eae0ba1a48b6dc SHA512 2c22b313821cd44763ef555b203ca1fae7dc969b27bcb892e9da92291341706fe6f55aba1c377825d6ce7ba0faa35a126f56324b9507c5bd0bf4af0b9f13db3d WHIRLPOOL 8fd8b2bb579b778980302ff619e41da430621830baf98db7591a237a4d5fa2d280a5f4908d453920fd126e2c11d256407b595ad08bd4639eb4fa47d0fc7a80f4
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index 9447e4c0bdb2..14e49ab8f824 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libgltf/Manifest b/media-libs/libgltf/Manifest
index 89c8a6ac548a..5f72dd3648ba 100644
--- a/media-libs/libgltf/Manifest
+++ b/media-libs/libgltf/Manifest
@@ -1,7 +1,7 @@
 DIST libgltf-0.0.2.tar.bz2 538040 SHA256 d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b SHA512 74ca5e5e0f38ee5a67e870b49f4adf6c9710dc696afb776149618c05d15e3527d605143230f7ceacd199b609bcbb683cfc72d8e4ef22ba5b9ca777c8a2b53dcf WHIRLPOOL fbac1dc41cab63d4f322893d1b55d513fe8eefad5d625db703134dc429b3b87b5b6d36c481810d6e819c8f8213846b700d318421ac7858347c5ddf1cd875a246
 DIST libgltf-0.1.0.tar.gz 736163 SHA256 119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da SHA512 c4ef222d638a3f691bcce493776ef451830168ef0569c417f0acdd305e5f261500767943f92a3e65d6b00aecf6c02bdae56f52e0943b8d36490ef66474d9252a WHIRLPOOL 3994d7200b351dbc73c1041aad1ff802344226a61c5d46e366f5f42ecf3d5fbd5410c40d2eb9cd6b0b92d25f496ebf06cdc9c942470d6b6a99c9e69ff31d9106
 EBUILD libgltf-0.0.2.ebuild 1003 SHA256 f5c83c1b42e278d7a952fa1baa5cf9c6eb5469824a3b20b42c65898199668bad SHA512 d428a7ea7c9e40e6fc9823ce887c2c46831a713d91120a15a735ff0b10f3a3a04c30e54fb7812c082efd96a3cb04a92af4b277d41a1ff24b972402bb46ecca3f WHIRLPOOL c465d093652942f417c6e189699645e5207d283c1d46799b2fbebfda70e0720bcecca32a0448168e65b8a6908781ad76a6f6c35de4d38cb262a3b56c4dd4347a
-EBUILD libgltf-0.1.0.ebuild 1045 SHA256 629732d3c39f325977c85bd5e5cf01eb06807e2726d9881b086f6d7f652a232f SHA512 0b6ad4de2a8a8bf219c6cbd27c575d7064a161cb5a591974ca52f357f182f288c580b9fa73bd3a4a8fd496e4930ef9affc16df0d405a5fd04b2e00e564116db1 WHIRLPOOL affd0d5db1c17ffed730ca839bfd542d51491283feebad49d75dafa3bfe0027de660d8b258e1c430198d2896782de8a62b9d1b656d6050cb556d76eb5e653449
+EBUILD libgltf-0.1.0.ebuild 1044 SHA256 b03427783bcdc7e3a1849cf60993094c375ed952f4d37a6cb695c80cc3e6943e SHA512 891c541d62183ed99ac06dcb318076cda23bf77b95b8166cf0691b9a0f69e17252d84ee936fe08414df487870fabe84233a191dedc0a7ad24eb6510af4fc63cb WHIRLPOOL 5c126ce7043848b60a2a498294f5e8553c157639d3538d6f21b31b6644aa2f8d7386d8b8aeec932ae3c9c4d9ef64db67ede5e7e5a16f0dec46433dd9603670f3
 EBUILD libgltf-9999.ebuild 1045 SHA256 629732d3c39f325977c85bd5e5cf01eb06807e2726d9881b086f6d7f652a232f SHA512 0b6ad4de2a8a8bf219c6cbd27c575d7064a161cb5a591974ca52f357f182f288c580b9fa73bd3a4a8fd496e4930ef9affc16df0d405a5fd04b2e00e564116db1 WHIRLPOOL affd0d5db1c17ffed730ca839bfd542d51491283feebad49d75dafa3bfe0027de660d8b258e1c430198d2896782de8a62b9d1b656d6050cb556d76eb5e653449
 MISC ChangeLog 3437 SHA256 c3ef933c49c42e618cccebc62c9872b99450714032f65694cdd6c38cf06dfe76 SHA512 31236dae8d80d34ec7922f6cd23948c35cb5449e3786cb109c0ac9002d2ed889a020739f8a4d1b63f2f16140b611cb576cf33225528f77bcd99d9d9ed42fe745 WHIRLPOOL 6937663a150f5f64a6171379aa796dc1d33066e3937b7ab5d5ebfdbe4fcb5c03666bee7c41a2c86d6b0b7d4468eac1d42aa73acb1eea1cfcd905c9c256f201ca
 MISC ChangeLog-2015 801 SHA256 bc5a7aee739fb354ebc68b58b39b59b2f02d49e1dae1c4a85210f0e105f175b1 SHA512 680eda7489492cf49c2e7b59a3a01c29fb7e5a83cb22225c38929dba4fe00dda7c434af16197ed98159616c8a97a3a1799b950561abd4ef991dcb5e538d27fd2 WHIRLPOOL 78aafcd566bf45d7bf7a5fb50bdd34672ca03eb5495a6375b0deb108f7d4cbdcfb74318a0b39cee69ab5cea8f276dd1ce73ca02b9588e9b736799b4233bb4b73
diff --git a/media-libs/libgltf/libgltf-0.1.0.ebuild b/media-libs/libgltf/libgltf-0.1.0.ebuild
index 320dc63b2873..e3b07f6fb1de 100644
--- a/media-libs/libgltf/libgltf-0.1.0.ebuild
+++ b/media-libs/libgltf/libgltf-0.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.libreoffice.org https://gerrit.libreoffice.org/gitweb?p=lib
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug test"
 
 RDEPEND="
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index c8a9e2a4379b..09fb6a0bf2d8 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,7 @@
 DIST libgphoto2-2.5.12.tar.bz2 6974928 SHA256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 WHIRLPOOL b690d5b55a7dc11cdd04e694e4ec4a44c0b3801c3e778610c32b414fd7e6e89f1ef49ac1c9b5f36a57d35afbb94c08e4e4f8cb9663c4106658eaaeaea1ddf5bd
 DIST libgphoto2-2.5.14.tar.bz2 6992238 SHA256 d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 WHIRLPOOL 45a8cb9380f96da0fb680be95db3c028c07d7cc5f66126609f7a6539a5b5fd7e4edb45d00c43cb9c491e026311cd6161666280eb93ea784538c90297fbc1cc9c
 EBUILD libgphoto2-2.5.12.ebuild 6180 SHA256 ae6be57b1a0f742de8fcb796c22c8c021e56e659d07f87efd13b6e6b48edbd18 SHA512 f93d213bfbc4e4a61fe7aea4a63e5c3d3d5e59a0c5c262463bf6b4f36687f47ec3082ab7554a2e56f286ff7b4393a52dafeb29feecf8d6e6a9c12430e4c2f583 WHIRLPOOL 75a5a5fe19a7972287398ea7cce92e4c0c1a538cb5000f8f44151c1c7d2274506d8b2d23e43435f58502a8da5dc0377041c9f75e6bd49b89af5f0658b7b325e7
-EBUILD libgphoto2-2.5.14.ebuild 6278 SHA256 d9a3f695c89bbc9173fabac194d452a0d51861e4ea208cfd27cd95099ae61573 SHA512 73e27273cf52cf9851fae730216739c6662d29ffa81a15859a1339f524ac9681868f0b361d1011d9e2a938531292e4e841d04bb8ee2973e89d4fcee72d4cdb4d WHIRLPOOL dbd6010d4e90aa6031e7e3cd92d1210da89b93647050c5668efc8b7677f3f571255c3c8c787323ed029c31ee309b95e77970cffb63945405abf1d778ec60967d
+EBUILD libgphoto2-2.5.14.ebuild 6276 SHA256 5c8c0dd77984d6237689e97e0c2ad1703c043dec1bea47955c5b5c12735f8649 SHA512 75e6c31254b5e667f450d5ba61d86f5c91c94b83554fd7f22641178e3a391e17ab6a0e584ee1b4885e7defbc9e0f5734d8207bf18a7363e0675233d65cafcd47 WHIRLPOOL c53b1f05812feeba70b074a466e1331fd6611137c34873d1b4fc3e8b4f2b9dbc83fa8def8c7aab7359c18955a4f8ebbbdf50dfc4193d3e8482ab8039daff8aca
 MISC ChangeLog 6886 SHA256 45a3751db9b40a23e36945565ece8e9cd60be8f0b581681cb9fda43f1304a376 SHA512 027cef9bab94be877fbb38d11a2ce700232d8e7bf22ec0c958cbd91b339db6f1745bcc2987b92604562b9dc19cba4d694e1e5c7e250902ce78433d44f79c6c64 WHIRLPOOL 10649a261dd4b65393f5b032adc9a6140335550876c717cf12ee5b482030a93388e71edce4c0cefb1332a62b1cc854860651342e9976bf91c1ec179883c49d6d
 MISC ChangeLog-2015 45252 SHA256 d6ac5af90c263c4380722889f201ef21c12dd7e4ee18d6f7429fa623afd37421 SHA512 ff4d88756d8113d2e251810a2c8630116ba5b474837a8c2bb23c1f9a9424982b660508b6c74b3a9034e5916b3ebe54fd7b94ba38eb3ddcc0e777e0f8bb5e5ad1 WHIRLPOOL 5d5bacd539ceebf412e1db13d85d56ce38e2f2307b8211baa54db4745c685b2b904087d3d9ebf8c7b3f8fbb5a619fe919990686e3545d2289c8c7df73908788e
 MISC metadata.xml 520 SHA256 604907467a908596bcbffd2eb1daff70570b1ba6667d8c4c9b6d4d5e262dd07a SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 WHIRLPOOL 68d8ac8eb045b9f4e384dc3fb6629de2b9e651395038a500e71062cc0aceb31377df92bb78ba29a1fa425884d3ded0ce4c6cc7c0ea59825e98663a81f1f390c6
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
index 9da299419ccf..546aa0f76345 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index 78019451154c..bfe98b625093 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,5 +1,5 @@
 DIST libzmf-0.0.2.tar.xz 320952 SHA256 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2 WHIRLPOOL cb919a9d0861b7c75c4bf66cd3c6ae69ddf31cdb30619b8f201306360293cf72dde31037030ed063e62fe2a6d960a3691261470ec84e310c69e016a2466bbc8a
-EBUILD libzmf-0.0.2.ebuild 1014 SHA256 48fd5fdb769ae69b3fdb2d8282c12c2d37a578436b3dba4a136334a13ff79279 SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b WHIRLPOOL 616438c0710fd39bd6c5458124a1c7ba295af97f47dc0fff08f5cb1fe94b464ca24025ebad34fde304a9ebf617d5b6055602af85d3b9f645396ecfb9319fd9ce
+EBUILD libzmf-0.0.2.ebuild 1013 SHA256 43831aa6bb49905cef8617ba58c5a8426e305d599dfbcc1fddf55ba79851fedb SHA512 3490d31cb9bd20e374db38da3288efe3f283b95c2644c1d2449c4f901e5c370858dd3ee6114b1ce87ac7fb27ac23fd142b77d6e90b87f50c368a9c80e3ad7c7d WHIRLPOOL 75b92542a699ed47943dd4a30a1b6b221a95a401dd64f563297fc5e6be43a730ed659a58122ad71048b152e20e6147522aa3dd998890274fc0146e3a89b89a4e
 EBUILD libzmf-9999.ebuild 1014 SHA256 48fd5fdb769ae69b3fdb2d8282c12c2d37a578436b3dba4a136334a13ff79279 SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b WHIRLPOOL 616438c0710fd39bd6c5458124a1c7ba295af97f47dc0fff08f5cb1fe94b464ca24025ebad34fde304a9ebf617d5b6055602af85d3b9f645396ecfb9319fd9ce
 MISC ChangeLog 560 SHA256 23738d0cf3a192d167a1ebe2285996e9f7f6487957a1d2bedba0d8d415263ab0 SHA512 a645613dc99362d0d9d2726ffb1c3e8e8b5eebe8d22b6c4633f004c057d885467d8a6333a5b925f61e7cfdf2efc4255462e6239bb62788987e4898a460b816de WHIRLPOOL 7b32b52644695cf6ada9d6cdf1763aba8a4000a5355a8c640d09e1e150e9eabf29ad2791a29ee8d84bdc90503b004b59eac3f155928443267bca646a20972728
 MISC metadata.xml 321 SHA256 15734f8ebec32e2105559ce4eab317bff358a151a1227d66d24684108c4b123b SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12 WHIRLPOOL 418aeb03aa8269b934dad63dd1624fd825389b6064e9d2e0803ca10081644d36da39479afa1c7ce2e099ba05119b0bcaacfe8d53615b13d4f4f5b70ac692fcd6
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index 029727cdcae1..dae96597639a 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 IUSE="debug doc test tools"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 214f954d77c8..8ce0f62a94ac 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -14,6 +14,7 @@ DIST mesa-17.2.4.tar.xz 10381984 SHA256 5ba408fecd6e1132e5490eec1a2f04466214e4c6
 DIST mesa-17.2.5.tar.xz 10386312 SHA256 7f7f914b7b9ea0b15f2d9d01a4375e311b0e90e55683b8e8a67ce8691eb1070f SHA512 c4b0f7f48b0b57fdf610de3d61e127774f8223e755acfde6cf2649818eec985e8f925abf8a15d530ecdb882cb8d7268fd01e5d94c8ac6934551b8a74272353c7 WHIRLPOOL 51d066640824964acebc69e78ec368753c18833b0c0cdb940e6afb8326edc2a75c657d81c043d728ca66968608e59a128295e3f4863980c2dcaf6716f55d14d3
 DIST mesa-17.3.0-rc2.tar.xz 10658696 SHA256 13b2c085a54836465a3b6814ad4bc2dae0a502f43405e75ced67789d5afc18cd SHA512 749cca3e0875dbff7b6fab4d646974ecbcc7659ec82ad025bc386372d6e0e050d84d5e05fb68c5099e685557d85daf55c6a5db7bd89a7323778ae7e87e01215e WHIRLPOOL 4007e6641de55145b9bf8bf7aa567c284d3a4b29ea6b83fb5ba3324abf757cf72cf1f1bc0cd3011e58b3d0c6cc6fa7f7c03b1affb7f0ba7c4a5e7ade398bf2f3
 DIST mesa-17.3.0-rc3.tar.xz 10664384 SHA256 1f3677429018f6ef4167b31db9eef558827a649239aa685f54c1a400ff5462d9 SHA512 403da79ac87325f2f0962e9be406edf4d009b6f5d479c2943be5bc1a26ad201d96072461a0d041b5a59abe327829eeba0dfb44abce217074079c47811729b058 WHIRLPOOL 91a5f65bc1dc9dc27bcd8492d82c80d2827d2408030890fdcaa653993d9a1deec983b00cb48c0675f3234d36512396c03cc7659bd30cadd6e536f5bef90d65d9
+DIST mesa-17.3.0-rc4.tar.xz 10662396 SHA256 90c9283caa21c047aef013395776ca44037662450bbed188b4eea679084239be SHA512 410a43852944899fbc9d7ab887510dffda3cb98330d7acd5d529cb01abafe1886b353d050c918cd63ecb1b7afb9350e5ceddf8eabf6e8fd6bd4e6f87343f68cb WHIRLPOOL 43fa0b83683526abec04744a418f932d08ee2a566950ae0473c4795ec7905ff5edf6e7f75a64e1fb52ba7865a7b0b46de0c00eefd84715424b68a01eecb8e577
 EBUILD mesa-13.0.5.ebuild 13605 SHA256 94df75dbe63d76d35074eda2826bce65641f4919b94e4c59164474b95e045ede SHA512 95793611d72d699e14747c52b73d98510518d05055ff893c171f79413a00c9ae9a055dd9e240b134771c01070d48691e2e7e9942e19b77474af56ae93bd89d9a WHIRLPOOL 8739463b0dfde12c8b9f069b2373f7c53ee3160b5fb9b28453ebf0eda037365f16b0d91dd22bd4647afdecf979e002721ec6bf6165ce66afc9f1a06f276717df
 EBUILD mesa-13.0.6.ebuild 13553 SHA256 dd0b9f71b641c3405038f640fc8a2a1f04d60447682598e744f52b2c1d51c1eb SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c WHIRLPOOL e2d2086ea547c2bcf34ea4ad19925e6b30bac63809cd311edc6b2a6df3b310d3aa20c706367418b5e142425461b0877d3e2602839beda2f44c8fa7db92c927ec
 EBUILD mesa-17.0.6.ebuild 13560 SHA256 796db0fd56888084e6d8daec8179c65df2eed1dcfe6b0bab80e0c13f81658d22 SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334 WHIRLPOOL 4f2ba8010bf86e048849a9e7e61c1984bbde4ec23afd9da7d60807b03c58e63dc723b50c0f7118e995a0ad778eb30e00cf3c0b9a596f0d41fff5e2ef24f3efc8
@@ -28,6 +29,7 @@ EBUILD mesa-17.2.4.ebuild 15003 SHA256 776ed79613f55242943c6aa2554e7845401524d7b
 EBUILD mesa-17.2.5.ebuild 15003 SHA256 776ed79613f55242943c6aa2554e7845401524d7b8f3132372f476355e966af8 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe WHIRLPOOL ba82e86a2fd48c3c2a9a71b348b8af390f2e0f2f70803ce9dca9ec4b4ef3a758b7a4a31d971d594e32648cc7f6e2a9fe7cc550f7031db3766c32cf8daa6b3670
 EBUILD mesa-17.3.0_rc2.ebuild 15160 SHA256 0ecca5fc364dd0945f46f89212ece8e22af4c93d87ecf4b22b3fa830c448765c SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40 WHIRLPOOL 73f18e8c6fb5a15cfcd2ea6c8af5915e2a6047025c9af4f591ab07fc2490925d7d290a8669db71ed4a11c170bc2a4fcb7a2259fa62dfdb8d256108f595880d9e
 EBUILD mesa-17.3.0_rc3.ebuild 15160 SHA256 0ecca5fc364dd0945f46f89212ece8e22af4c93d87ecf4b22b3fa830c448765c SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40 WHIRLPOOL 73f18e8c6fb5a15cfcd2ea6c8af5915e2a6047025c9af4f591ab07fc2490925d7d290a8669db71ed4a11c170bc2a4fcb7a2259fa62dfdb8d256108f595880d9e
+EBUILD mesa-17.3.0_rc4.ebuild 15160 SHA256 0ecca5fc364dd0945f46f89212ece8e22af4c93d87ecf4b22b3fa830c448765c SHA512 6f21d271e8e2e7938cc4c61406e93f032ca63c1ba4fe71ee9dec9998b020dddbdd776bc6de0f01d55020671c2708f33c3116c66b8401009961cfabffa0e43a40 WHIRLPOOL 73f18e8c6fb5a15cfcd2ea6c8af5915e2a6047025c9af4f591ab07fc2490925d7d290a8669db71ed4a11c170bc2a4fcb7a2259fa62dfdb8d256108f595880d9e
 EBUILD mesa-9999.ebuild 15160 SHA256 75fe901f83804d0eead4452891e74f312a0d6231df217f36a6a6161dafd9ac69 SHA512 00c5035ccf1132f48cb50b9d13c8a07ea004888a7fb610dbcac142d0a711ad9b3b547d5b090d3d88b8fffa8aecc56cfc7f68d4208abde574d1aaf503d55cbf7c WHIRLPOOL b1436b93f1fb73c222dd211e75229007f38f196a6658ea71e9950faa08762599242abd186f78e9ce3eac6187773f5e71b84ca04ab5e20568a5a203f4203a5ac8
 MISC ChangeLog 21209 SHA256 d14f068aa33c388215fda4fe7471524fc8a0cbe19ca2bf4bd7797f3a605bdd96 SHA512 b84d9940b71165e4245b2cd4a6b531ff5837a2656ebf95a71e5b27a9fefcd13e9558687aad79ece814c4af0f0847b69eef7bad4745574f8b8acff040ec9fd9ec WHIRLPOOL e3b472204d51b863b38008d1297ec6e2614b4cfe70c8d2ed0d8609f1856298068a6ac18c226c3403e61173d0494009e809692e882794749403e4bdb4247e7589
 MISC ChangeLog-2015 103777 SHA256 4b0a5d5630eac8d95c57f5bd440e8f743db364db91e3027efb52541230383724 SHA512 acea97a4adc6157a818db9afdcda514cf050cd85c5619531063c2acf74642f86c286b413976404c50d9af3cce6c4da2edea087c7a43ffec2516436a3f47d3e56 WHIRLPOOL 2c7a7b3baae65fcc0234689e1e9cc70cb89b80c96fc28eee359489c485bbe8f401605352b4f6dde3b5b58a3ae39cff8b6c81c6be5e5ee1f1d68aba8b91cbe226
diff --git a/media-libs/mesa/mesa-17.3.0_rc4.ebuild b/media-libs/mesa/mesa-17.3.0_rc4.ebuild
new file mode 100644
index 000000000000..03a35c8a2c1c
--- /dev/null
+++ b/media-libs/mesa/mesa-17.3.0_rc4.ebuild
@@ -0,0 +1,585 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	if ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}