gentoo resync : 03.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-03 08:36:22 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-03 08:36:22 +0000
commit: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch)
tree: 021998302365c5652e37824b6c26d4d969a62055 /media-libs
parent: 70b82ae359a5538711e103b0e8dfb92654296644 (diff)
45 files changed, 364 insertions, 2272 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1668346562d9..de8471d5c19d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5de0d55d5196..f2b3df433945 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,6 +3,6 @@ DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
 DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
-EBUILD alsa-lib-1.1.6-r1.ebuild 2053 BLAKE2B bc0e36299d0c566f48ebd0b607714ac3428ec700a5341c81edb77f8c26d727157e481609215294e02a5d99c7273256a6db0c84f65d2a1529e20006fb4309dcb8 SHA512 58ebfa4f95f0994cdcb817cfde5f6f123efe20c70d8817895411073a2e83fcadc2b36be46d0b52a9e7d3370bb0ce57cbe95206cba06f315f1e1803643ffb6417
+EBUILD alsa-lib-1.1.6-r1.ebuild 2052 BLAKE2B ab8d6f6ad1dcbc6e5a6fdbc170b893c3e2c7072eb2da2b01b8de9fd1f09eee04277cd33eb2faacda4808ebebd25cb06a18e565a4e8a5acd3320b1e09546d53fb SHA512 37f83ccc02dac53f535724eb72efdc87a76440534e2baf585a41c30c8974a70f193fc80a4ab768aa851f028b0eee6be0b2e8e6e92989f6410b307cdf461572a6
 EBUILD alsa-lib-1.1.7.ebuild 2063 BLAKE2B b3a5a74cfb2772f4a88699067ba8bad9971de795732450eb704eae5ece252830a3bbb2a06b436a1672043ddf138ed1ea5d855e856afba21a2d20e0409ac4915b SHA512 c868b015979edb7cc8a8b1d59c4f361ddd012ad4753c4597413caae27f4a023787e23786f44ba721de401fc696715a8e2837219c53598dca5e19860358b043ff
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index b02cc4e06a44..8f1d59d33668 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 81d2c3408340..d22a0f391022 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -2,5 +2,5 @@ AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595b
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
-EBUILD alsa-oss-1.1.6.ebuild 918 BLAKE2B 879674551dae920a6c8ea69ec8f998ba3c328d8445b26a11152e0076db821d32625f64c4ab64b4532839b56ad68ba1aee9a948a3fd38028739ae00d078d72c9e SHA512 b8042b7d62c68ba4a2de0b6ee53eb8d531dafc8323b265c3ea4e0e547156972f8a19e40cf47a7978627ce31702173d101843a901aff2bf49c662b6efae06a26c
+EBUILD alsa-oss-1.1.6.ebuild 917 BLAKE2B 37f9a79d10c064f2f51f8b5b651560a4bfe1faff1bc27a349fd5557001104264a62a7e98b63569727641bf4045fd9dd5424c663a4e1af4aa4558c3e0f91e4905 SHA512 d41e8a23f5702add459a9994931831ad3ad1965839149d2c54b23d7e0bf0b169a305ba738d3a94484a1d7af4afed50162fce6786ad554cecb96291eec1ebc530
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
index 7566a8cba60b..c45ce7de476b 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 84ecb77c4f5e..6bbddf502eee 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,11 +1,9 @@
 AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
-DIST glm-0.9.9.0.tar.gz 2716220 BLAKE2B fa48b318532cacd7d89325c615005b028e88b0702ed9248543f7d9a8e201dd6c130a63498d335289c452708dc627ebafc9654888b6db23ff238352fee638f236 SHA512 b7a6996cb98bc334130c33a339275b50ea28d8dfce300f3d14ac52edf0b5c38bf216d318f411e898edef428876c0b2d1f6a6e951f160f31425fe0852ad150421
-DIST glm-0.9.9.1.tar.gz 4572043 BLAKE2B 6715c2f755b8127923db766d485f6587e879cb3456a318b386ec5ff32e184ca385513916edb60dbaebf3295225aa86b154418bdce88c5070c135df7527f00ca4 SHA512 7b29796abd1d29a6877e3600be15dfa7856149ab8abafa7018835e47dedd3c53b0a2c707f6ddbc3510a0d7b9e58c549298f956cd675c7969d91491b85ccf8e7f
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
+DIST glm-0.9.9.3.tar.gz 4577239 BLAKE2B 167312e95a43417dba59481b1d45976d9249af9fda9ebb6d0ec598e706bc2469b8c0928877683d47335e0c55ee881a20c1c7f648dd77e183880f7c2792bd5277 SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
 EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.0.ebuild 865 BLAKE2B 69b9fb6daadd63ba3b5691b6c8cfaa3b2afc072a0894f81ac95908d968f5060e24129497db2ea11f93604bf38f7d700ee769472918f05a55df17b7484f5b3001 SHA512 bffa26d68e2d034fd7802c9ad4b174f843c1fe773f40e3e36a56237e4605d63c50c6bcbf6e8145a6ce29fc53ebbd8852fe1157e2ae33c60e0fd11ba9b2e2d127
-EBUILD glm-0.9.9.1.ebuild 865 BLAKE2B 69b9fb6daadd63ba3b5691b6c8cfaa3b2afc072a0894f81ac95908d968f5060e24129497db2ea11f93604bf38f7d700ee769472918f05a55df17b7484f5b3001 SHA512 bffa26d68e2d034fd7802c9ad4b174f843c1fe773f40e3e36a56237e4605d63c50c6bcbf6e8145a6ce29fc53ebbd8852fe1157e2ae33c60e0fd11ba9b2e2d127
 EBUILD glm-0.9.9.2.ebuild 865 BLAKE2B 69b9fb6daadd63ba3b5691b6c8cfaa3b2afc072a0894f81ac95908d968f5060e24129497db2ea11f93604bf38f7d700ee769472918f05a55df17b7484f5b3001 SHA512 bffa26d68e2d034fd7802c9ad4b174f843c1fe773f40e3e36a56237e4605d63c50c6bcbf6e8145a6ce29fc53ebbd8852fe1157e2ae33c60e0fd11ba9b2e2d127
+EBUILD glm-0.9.9.3.ebuild 862 BLAKE2B 9b34afe8021029980017534376e5fb49faeb7e5ec1ebf17859424cfcacdfc4cd10a3943df9bfae3888cd5317e024ceaaafbbdc6590c75ae908b3cec6c030f017 SHA512 7f004b7285c6304a2e268b7cf6f14f7bb8e79a5ca23bf181446797afe8c57731cf19995448f8cc88c967006418d03f6799ef23ee3471b4a8a13a2e3b60d6a71a
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.9.1.ebuild b/media-libs/glm/glm-0.9.9.1.ebuild
deleted file mode 100644
index 8f93505e3279..000000000000
--- a/media-libs/glm/glm-0.9.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-RDEPEND="virtual/opengl"
-
-src_configure() {
-	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/glm/glm-0.9.9.0.ebuild b/media-libs/glm/glm-0.9.9.3.ebuild
index 8f93505e3279..6d61f3165def 100644
--- a/media-libs/glm/glm-0.9.9.0.ebuild
+++ b/media-libs/glm/glm-0.9.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index fc947b129b18..13030cb5847b 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,13 +3,13 @@ DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d6981959204
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 DIST harfbuzz-1.9.0.tar.bz2 3870586 BLAKE2B 53aa631145662fc0fa1bb80e6b438de7d68d5f8f55d163e62a7c6153b250ab2e1c4de327194ba566682a4033e632f0ebc2915250760f721a2a2f2b97e9e6c844 SHA512 fed98e4e67a518a7bee4f3222f8e595bfa529cab12d42707577c639b7bf9a6d771646e63859bd70850bbf93300780e3b0538483e6b73332721e6c2ce5a17a0c2
-DIST harfbuzz-2.0.0.tar.bz2 4320539 BLAKE2B 5a28233a956477754e73b5fb556b7ad4c089dc6f3ebd86060ac2a39cdbf39ac64ed5cfe5b33a1454b9fa5c59ba566d6c69bff8ac0d9d6954e3715fc4739e2381 SHA512 1c782d0b8c0b85f2a3d116d6e41fa688cf8d6c00becde89af6e5f7232a5e272563aea325824d9868f68fdca3f3df4375658234cb7d7198940d6f7e67c33b158f
 DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
+DIST harfbuzz-2.1.0.tar.bz2 4375308 BLAKE2B c9581e4c6756e1c4e9cf82af9b078c7470fe07d3d2b3bc13e54c08b9007a2d9eb3ac3254462fca5843ab2b8f23b220b13226c5d4b67e80ccc487bc7d4e18ce7c SHA512 cf34ea5ace9f7ff0ef31768432bbbf3b66d909491cc571b4330c418df40be4fe57bf61bea60f94a4f76f25f687dd7f2401d46eae81c7b1d37f1e25295eb3d664
 EBUILD harfbuzz-1.7.6.ebuild 3241 BLAKE2B 3886cc3cceb195e62d5dd5b31d4243dbbc8ed218609dc3a65455b9e83f98b5471159039f5fef106d361a240af992257da1f87b43a4ad05a1960f9410dffc051b SHA512 cbc34d68ec264add1f34e9c1c629a0b5351803df370dac7bdfd89da94aabb60b22a3be2202a566d3d31b48e187ef1d7a9bf2dd659c8ed7e203f838eede55645b
 EBUILD harfbuzz-1.8.1.ebuild 3196 BLAKE2B 1e66c1d87d91571ac977a0eb6803a9c710c6d16e3590dfc975cbfedd4924103ad7f1a733ecefaa16003aff0774ef0d31cf2cadd398e35a4faaa89b8fd5e4aa35 SHA512 0741642501ffbf7b14d82c2303b44aac104d17ed74c86ac34f5d1173e10dfef243c81b371600d56bce98eccb0a0ac1c662eba28edea9dbc1d81c23225c5d7a81
 EBUILD harfbuzz-1.8.8.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
 EBUILD harfbuzz-1.9.0.ebuild 3028 BLAKE2B 55735f2884fa899662c2e8737fc1c1e68e388d3943f51775f5d552628ad74164b55821af02f6e10dd24e9e06ee5f41e2a2aa2dece5e18e58ef465afb83df010c SHA512 4c1554d6db2b8942be88de1d498327f0d0aee8d65864c1c914331468545a5a62488dcd53544875ce3cf6c95f741c32bfa6979cac46840e03af03622ea09f6c13
-EBUILD harfbuzz-2.0.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 EBUILD harfbuzz-2.0.2.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.1.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.0.ebuild
index 85491d783cd9..85491d783cd9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.0.ebuild
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 2ebb12929360..7869ced9325b 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,4 +1,4 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.5.1-r1.ebuild 2135 BLAKE2B 427818b23daee4bdf7baee40a7fdf7ce42d7f9f5b93ea3040f6bc9d4626777ef937b8c8b6b27583fce672db4983c3dfb872a50fa7ee75739fa3cab8cad009900 SHA512 ba36d6d96b4ed7ee4699748aea87687a10427b86494af67ada1a3683a54aabc72ff35839ec1ac16fd86dd4dc54e5443b8ee41cde435328848240969eeaa3ea82
+EBUILD imlib2-1.5.1-r1.ebuild 2129 BLAKE2B b69b61b6180d4cc064e0089cadcee156516c0f1b32ed37de6793efb5797d98cda73a1886bdf58c3794653c477df123a445764a27e51836cca5af49b8387ac0ed SHA512 8bcaecc99f04d637257e7fc1d3cc83994dd98c64efa14ba18b51454e3b1b105eca67ea5916f2723f1cbc06cd94026b46d381e940b87c4a275154ebf673c21e7e
 EBUILD imlib2-1.5.1.ebuild 1965 BLAKE2B 7da6e8ba071a76ac60fe4e84482c4755d2c73f6cd5239b72aeaee28937addd59d01b31c0f66b764a780d9159d89d1915a353f096bfa1a5dfb44c3ad7344f7ec0 SHA512 4ab5ded399a3df668baace65b1cecfe410fa25494ccd4e05badeda46ae671dd72891d42940711c3ef2448e18c715cb3d108ab475fc21d0af97007eed448d903c
 MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index b324395625ce..676e7933a928 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index c8ce414bebbf..5ab03d050298 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,3 +1,3 @@
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
-EBUILD libchamplain-0.12.16.ebuild 1609 BLAKE2B 15963cc53511fb190ea8f105afa56bbedc9c586f43d3c7e6db0e6034d5306d3a4c7852caf60615ae81bff18a4a6dad18e236b13783217a59e90356eb677cff18 SHA512 5d45092261e5c5917cc511e0edc563656f834bc7c8fcf431c8159b2813abbbccae450ee0c4449094887e7b15c56465bb1cb1139138f031ca0bf8de438155d5db
+EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-libs/libchamplain/libchamplain-0.12.16.ebuild b/media-libs/libchamplain/libchamplain-0.12.16.ebuild
index 8f081e3d8b9c..6803cb051dfa 100644
--- a/media-libs/libchamplain/libchamplain-0.12.16.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ RDEPEND="
 	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 41563f833a12..d32bc441c333 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,5 +1,5 @@
 AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
-EBUILD libheif-1.3.2-r1.ebuild 1249 BLAKE2B 233f3d365a62e624a021de959e626e99fb25db14a4b8895f4d27f92ec4e0a6d65cab27484e3b8f2c46c1b4b6035f9a08e3b08350f0d48d8db197da759227cf97 SHA512 0fdbb43b6fe4c1cd485007e27b82c74bdc8b1b050aceb4783172e3b69ac084a0f1cf3cedc21e540d7f6bd3c1d808aaf6dca7da6e526527ceab0936f1203ad452
+EBUILD libheif-1.3.2-r1.ebuild 1247 BLAKE2B 5c420043fad3797adcdddbe1604f6264a110596495edb2a74bc8ad6eefed7ea985fd5f11d0e3901c442132f6423e0853086bddbde9203d1f79185f222eec91c0 SHA512 cf43868c006597926163c7a095248c375a09f4bf33406a9d6e7b2819f8536a48ac76f413635ac4b380a884d43bc2f3f47a2a0c49162084d776e07b731876c0c1
 EBUILD libheif-9999.ebuild 1325 BLAKE2B b13d52b4593ca62e796208564edb6a6696e86bfe3d0539ca74277027de4d9db7b89867667fb29b9af1f5eed8c583d337b34ed6a4083292ba681963b5ed871fe1 SHA512 ede20f379e5807387acd892472f8190e7ba71a522b027e1297a37bd722832bff6125ad43a94ce5e0ee6d33ec5beb80b1e93793e27e5d2550c8e83f4db24f9504
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild
index aedf7a7e2591..a18e6d840ab7 100644
--- a/media-libs/libheif/libheif-1.3.2-r1.ebuild
+++ b/media-libs/libheif/libheif-1.3.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch )
 fi
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index a1385f74004f..f7ae41598722 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -5,5 +5,5 @@ AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
 EBUILD libmad-0.15.1b-r8.ebuild 2262 BLAKE2B 83fc39bdfc1c0b0da64c42f3e46c2a38d627415c37ee04a587e73b5e6cbbb12bde3209dae4132a8057eba9db16439e92c190b42f2708193638d188c7ff729ff2 SHA512 bbb6344c0e0c5d6644d14d09c3c4cfaa9b8837c37e27a16232cd0d10af8776e099ca90b79939a077c7a4f8e86f17171a17ce323240c7c65a507bccaa9537b052
-EBUILD libmad-0.15.1b-r9.ebuild 2212 BLAKE2B e79813887af626d590a748c39c1da72e529154a6d2eaa1b40d5e65cb04d342d4c4df8fbf77092c2f37b6978edfd0b5dede657d3aab3c1f19afd204107714837d SHA512 450b9c5a877d9440ff61dce7c8730f4618f225959b6b1c68e3aabcd03ad08c97d661ca2bdbe735c44493379e7be1e5576c3d0389c67a96b93c8106cf9bf29a43
+EBUILD libmad-0.15.1b-r9.ebuild 2211 BLAKE2B 63a66c433ce4078e96b2cb44554afe3b711f28e73ca1d246e847b29df0320ce770b09eef403d9215f4c8dec3ad4f671eb7864c8dcfbb74fd48b0d7201b96f910 SHA512 a87617e88666eb3265df2eb7dedee238695edcfdcd409a7aa2fdd3b2bb9aa419c3aaf0467811f7f776a1537f5abce8251dd4ad581f830a2119c1fb343445c387
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 9d408b7cc86b..541827117d55 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index a2e5d9968680..fe2f6adff87c 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -4,5 +4,5 @@ AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f
 DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.2-r1.ebuild 1178 BLAKE2B 3773cc710c8193761d31f7899845b46a9034807b1035db4d3782baac2d79abf33bc993ad7c47e423a08cac435d965b9e6b28bbe1b8fdc3a66dfc8face76067dd SHA512 33f96e47638f83c69dae5860ad39ac889c079570b04ad0194390acd74a022bc9b6fcb6a67e7988988790bf8f91cad31496961a482b21d366d7a86da0533eba02
-EBUILD libmng-2.0.3.ebuild 1172 BLAKE2B 43a1a5fb1cdde913b36edbf5034aec6a250e026aa6df9f6f1db52db527558f8cd2b4d40effd4f01b295488184f9adbe5004d93fd35e0ff601192ceb0f33bcb9a SHA512 85a000bb7757d3745b00819705de38581a90b02d49571b68305ac099bf016be93390d34704ad772b64f0fb4204835afcbf2972d95aec66649d77232988dae30a
+EBUILD libmng-2.0.3.ebuild 1171 BLAKE2B 2c698f9b5f7b0e7d08a0fe0fa91b0d4036972eb66818f752b0d5b0cdada6bc727d1e6b3972f130f25113d744664c3e0ac53095e215d8e09f9c0e39fcdae36f31 SHA512 4b5bbe4ffb5163e8ae03884f770302dac29d69d47b6b424c670832cc18f8797e8c33e50360adb6704cc9af4b57e6b243d5a176517e76357a56b1b902d2edb187
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 48566bf2e6b6..1194f2098055 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 7b2162688e7a..03f6a7fb1c5d 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,8 @@
 DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1
 DIST libmtp-1.1.15.tar.gz 805983 BLAKE2B f464c58a9844706ecc066a4a744b525ac6e8020ab80e35b01eab2813562ea1452deb5e6fb4477eb243b6631c24f8bc11887ec35279cb6cd89e1a459aca6b36cb SHA512 c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a
+DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
 EBUILD libmtp-1.1.14.ebuild 1597 BLAKE2B fb0ff0ba1478dd9c6d8b1e6be56f88d288a0cce2294ff271a1c392881c009dbf41ee457ff8a97282e76faede81a35296fd04507d64c9bd5cdb425e593e50df93 SHA512 ed6d56fa731f121082cc27e7790530ef4c4a02885685a8f0fdaea693c963d0b9a18c6b74bba8772c4965d2d910590131cf4da96fdc1f35568c7135f4da11ccea
 EBUILD libmtp-1.1.15.ebuild 1598 BLAKE2B 77884c0c2d1e4ff58abf53d55e8fcc290aaa053fad947133a24692dde07937cc5d6503aaa6d31723e0996fa3a2f182e37be7766b204276b3324f5dc02bf78f7b SHA512 066fb35601f31f9d610b8951ae7789cda8a8b8f2cc8d77db4dface52bca8dd47d1005b524809fd3dcbde4f5bb3c02dd184bf820f3d24166daf1aa16bed40bf81
-EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a
+EBUILD libmtp-1.1.16.ebuild 1628 BLAKE2B bad7949d12c89c03d2d2ab92e83dd19943998aedf2b031f2ce0e60f811653654670388615c43177466fa10110ec077a83c95131df557584197f107624063bd49 SHA512 7942bb95447ea68b21c7da14a2236ba05ea73316350b3a7dfc40db4603a9f16311c3ab0d795278efcbf3550306009209239bdd53a13fec784d4a8ce2d1ca3da7
+EBUILD libmtp-9999.ebuild 1628 BLAKE2B bad7949d12c89c03d2d2ab92e83dd19943998aedf2b031f2ce0e60f811653654670388615c43177466fa10110ec077a83c95131df557584197f107624063bd49 SHA512 7942bb95447ea68b21c7da14a2236ba05ea73316350b3a7dfc40db4603a9f16311c3ab0d795278efcbf3550306009209239bdd53a13fec784d4a8ce2d1ca3da7
 MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
new file mode 100644
index 000000000000..412b5b9c4da3
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev user
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README TODO )
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	default
+
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm ChangeLog || die
+
+	if [[ ${PV} == 9999* ]]; then
+		if [[ -e /usr/share/gettext/config.rpath ]]; then
+			cp /usr/share/gettext/config.rpath . || die
+		else
+			touch config.rpath || die # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt mtpz)
+		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
+		--with-udev="$(get_udevdir)"
+		--with-udev-group=plugdev
+		--with-udev-mode=0660
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index b009b4abaff4..412b5b9c4da3 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils udev user
+EAPI=7
+
+inherit udev user
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
 HOMEPAGE="http://libmtp.sourceforge.net/"
 
 LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
@@ -21,11 +22,13 @@ IUSE="+crypt doc examples static-libs"
 
 RDEPEND="virtual/libusb:1
 	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>sys-devel/gettext-0.18.3
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS README TODO"
+DOCS=( AUTHORS README TODO )
 
 pkg_setup() {
 	enewgroup plugdev
@@ -35,33 +38,33 @@ src_prepare() {
 	default
 
 	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm -f ChangeLog
+	rm ChangeLog || die
 
 	if [[ ${PV} == 9999* ]]; then
-		local crpthf=config.rpath
-		local crpthd=/usr/share/gettext/${crpthf}
-		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
-			cp "${crpthd}" .
+		if [[ -e /usr/share/gettext/config.rpath ]]; then
+			cp /usr/share/gettext/config.rpath . || die
 		else
-			touch ${crpthf} # This is from upstream autogen.sh
+			touch config.rpath || die # This is from upstream autogen.sh
 		fi
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable crypt mtpz) \
-		--with-udev="$(get_udevdir)" \
-		--with-udev-group=plugdev \
+	local myeconfargs=(
+		$(use_enable crypt mtpz)
+		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
+		--with-udev="$(get_udevdir)"
+		--with-udev-group=plugdev
 		--with-udev-mode=0660
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name "*.la" -delete || die
 
 	if use examples; then
 		docinto examples
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 21640f0f1bf3..9c06f0817c30 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -6,5 +6,5 @@ AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
 EBUILD libquicktime-1.2.4-r2.ebuild 3879 BLAKE2B b464fdd272c974633dec17eadd38dc0f295ba81a63f8233d55767b63e31e0bba7670f27a8e04f47ecb8f367702249621834eac6f4a7346b41fa188fd67908d86 SHA512 4c5c9bb52ad4826871f7acb45fb00c90e603465084dd375b85b07a412dd59c43b9aab791350d14579d1dd29476389fa49d4a98fb4a517a595aa396add5e0e529
-EBUILD libquicktime-1.2.4-r3.ebuild 3842 BLAKE2B de10f3abb6953334a36794620f59590db74b3dd1f011bcaecc0cfe2886357a3c1c08cf6b09a2d56881d52d1c4ed11089759c7c50de0e200a9567373375dcbf4b SHA512 f5e033a195c0e691c723327821804048301a7c5f104119dc5e4ff40982efc16deba0f2566dbc5657bbf301fd0c2cd2617ae4d398ba7afec6e5f383dfb2e368b2
+EBUILD libquicktime-1.2.4-r3.ebuild 3841 BLAKE2B a00f1682c929b9e3b22b2a63bee72b3fd465de17cc78281a4c55e5316a51e0041b55f16b5659a6f629e9ec64bebf0cd285ba4fac9b2bb69bec690d28221dddae SHA512 b57517fda9b4a2f42495b1382a539c211f416cc8b976ea46862128c3f2549819ac12d7a09e765e7a609ed49e497766c3f85986fcb4f4bd7ae1194f736e285ed9
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 0c8dfc5c5db3..2940148b855b 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index abfaf10a236d..8050b3126a1c 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,6 +2,7 @@ AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25e
 AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
 AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd71b58fb53ff6e5efce8486e5009d05babff6fd5ee46e46bcea7386555bec0078d894fe81e211844fd6a366c855e2d72799932 SHA512 fdb54d6a8ee1fa1596dad2cf16cb389038167e4ccea123f68e54bd096600e90d86de254667c7dfc46f80ca62edae9f0f47fb3307c72bce5c142afb146870a9b1
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
-EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
+DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
 EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
+EBUILD libsdl2-2.0.9.ebuild 5075 BLAKE2B bf35d3cc67a55d41814d0638b6a20e8f27956b9de200217a4fe1b69b997f8060e771f71ec9dd7896460361895edd5cdf307d09be0b5066be41914b5f63325455 SHA512 a02686698af8eac11e0f1e85b96af51d33433f7338ff636d173994e3493423f88c25efcbb8dad4a5305f70c2deb6c63fbf734f0950fa872aa7b827128eb8e0a1
 MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index 08a462b416b2..252b7b88f628 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,9 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	gles? ( video )
@@ -28,10 +28,15 @@ RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	kms? (
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
+	)
 	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
 	nas? (
 		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
 	opengl? (
 		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
@@ -60,6 +65,9 @@ DEPEND="${RDEPEND}
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
 )
 
 PATCHES=(
@@ -120,6 +128,7 @@ multilib_src_configure() {
 		$(use_enable wayland video-wayland)
 		--disable-wayland-shared
 		--disable-video-mir
+		$(use_enable video_cards_vc4 video-rpi)
 		$(use_enable X video-x11)
 		--disable-x11-shared
 		$(use_enable X video-x11-xcursor)
@@ -134,6 +143,8 @@ multilib_src_configure() {
 		--disable-video-directfb
 		--disable-fusionsound
 		--disable-fusionsound-shared
+		$(use_enable kms video-kmsdrm)
+		--disable-kmsdrm-shared
 		$(use_enable video video-dummy)
 		$(use_enable opengl video-opengl)
 		--disable-video-opengles1
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 99c49f06a93f..8a2c23b43bef 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,6 +8,6 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 EBUILD libsndfile-1.0.28-r3.ebuild 1755 BLAKE2B 84df10cc6ee06a0604c0a764a41c3aec77aa78d8c500f79333b39d1f3948850ef9d508b29d3329927fdd967b74b55f916d59a6be40c9b5a80cd20dc4e0030027 SHA512 827aeb22ee8219e15501b6b5e3695989ec23afc6dbc3655a95369d8ccefb3cb63af36abb46429b6610283cb730b1aefee06225127ece017331cfd3f41ef9ea0d
-EBUILD libsndfile-1.0.28-r4.ebuild 1881 BLAKE2B 20c85cf60b86d6f5c6f049a06b5dca0acb93cba0ab8e71491d37f62d0a88da8bed27d21cbba82439d1722b2195d1880b808f8d1d1bbcf26118e2df3427b1a7c6 SHA512 d786771e152074b4be26d531bf8975f55b210798a6c4688e2c65f7db054d4f1248a1f1f4cc41896d8e3b5536faf9bbdabd29eece6ab4611af2539914dd85cade
+EBUILD libsndfile-1.0.28-r4.ebuild 1880 BLAKE2B 6870efc60ac745fce6ea4415e1d0992c9dc0576f0739a129dddc22e1a167c1ea5893479671c7826f471500f4d2d314780729ce44e7171576e88c3628d8f1bcff SHA512 3959aefef042c503f7a4d91d518b49eff5d000582203dda532871f9bdd39bc0d99ac9e476c86367204d8dd2f263ad5691add54513ec1268dfcbf5b8bc726ccc0
 EBUILD libsndfile-9999.ebuild 1772 BLAKE2B ca1c5369618ff9a92681c7899722248dd3c2ac13960838f8e7eae709dcc0ddbe2ab7ee935de136e409c5b96f2899c54959b90512b7d01491b062e66146b33e01 SHA512 82049c5932e75b23d14909128b3d051da1857df7d96059b2035d24940641aad37c6e00a39868bae417114fed754744a1aecd7dcaaa39da9143f97553b6e41814
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index c2ff18be5f4e..9fe185503507 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2911842add90..538146f9c159 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,7 @@
+AUX mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch 1294 BLAKE2B 2ff1fbfca0276baa6bc504ec31801cc0a61efb64ee46cd745d7f85413aa90d4153adeda23cc9f8534d79a884803d96579ad74efa6a98e1319622bcd7afe9a443 SHA512 40f920f9d9ce7e15d1b9b93753937bbba0bb1abc5848e55bd5b564b43d8507f6279530621bf81508990fb2735e8fc4bba6a5f1566b73424342b5d3e6db47a1c5
 DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B 753f0fa3780502d56927f9b0e6124b4728cb5aa3600de78585487fb8e178c6987a72b79fb56e6c310757d157f9f85f12b73a6889bd361b51b62fb1dc1c20eecd SHA512 22db2950d25a3d9393e7c622c783bd177c21695569c8a95683bf77e92318e1db85672a134d4bea30c1f49a24e52bc3a2c1a0ac15deafb3a8fcbfb6de6a18adc2
-DIST mesa-18.2.0.tar.xz 11331164 BLAKE2B e4e7c65a0c3c0716451157f7d026df8836399b5a25ca7ce77746b34f82e0c14d0bfcb965732f67c979190c2c2db68f272ffafa51b49613a510f186e9e8a01c93 SHA512 e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557
-DIST mesa-18.2.1.tar.xz 11374476 BLAKE2B f0f3b766d68550f8c395a1b1d1ffc7a9e532c22ee6b91d698db33a270c152e03ab656d4219301bc2e0e95ba6f0583017c4361add928ad8ab26378a1ec6958f36 SHA512 d249bdf79aad36db9a8d291b3a1a100d283893ac741f58f85ae7e5c90ca25c37f80a5fa6fc57945ffeb0b67b788e7ea146543ec790b22f144578fc4c1525b84d
-DIST mesa-18.2.2.tar.xz 11375608 BLAKE2B 0b2a1b60e72885b2b48335645c04c4d5720c0b426c256781f3e84e22955ac87d9abe19550f996e3ff964befcc2b959e8639dcad585b3ec777dd629f06623e5ec SHA512 35c27f0673abd35d0581db34b6ad646058523dd826ff751df718e1f9d6a996409a0c5b313fbbf177058d9610a53d646f858fb86537e3ea1000df5edbddcf043a
-DIST mesa-18.2.3.tar.xz 11376632 BLAKE2B b693e42918be9980d86fedf136e872d785b92b49272cbd5374907f7c3bc857ef5991852de5cf7da1b4f16420b0cf9926541219d3b1717b78fe6fc6c3cf2c3788 SHA512 20f512b1f3835b1c78b1f05f2e2125dc3437b61b8857e7ec62e0f9ac3be2ccb5b7ebe7e18f444da1117bc100d75e4b03cd2a0180f0f0b1cf760714b43bc7a664
+DIST mesa-18.2.4.tar.xz 11377556 BLAKE2B b11c33ade744fb976862fecccbcc4c97196a005e40a00ef02bd8d409b66b3aa11f97baee13f2aa92f2d7c5461b2ef44beae3103687dea9ee29e92439a068f08a SHA512 088d43b087f4005752e4db75eaa6897e0fcb6de7b9a1f2d2b2ce3b5557d1dff829022e0092e8b1038ff01182c863ca0f26c97b9adde34bca462d3fa24502bfde
 EBUILD mesa-18.1.9.ebuild 13412 BLAKE2B 976868904cf8b157abafad9d16a3e59bda73a272829e5c74f1d812ace952f77857e4cb3aca17b0fe750e64584119b402a01156b096094249e6cb0bdd136529d7 SHA512 6e2ac62053d96fc7af4311dd6b3dad379726c4c98f585077c31246e4e481e517c8a3a200d0d9b66da26dce08c63c1410c5573490ff74f7313f9f673b9fe78f05
-EBUILD mesa-18.2.0-r1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
-EBUILD mesa-18.2.1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
-EBUILD mesa-18.2.2-r1.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
-EBUILD mesa-18.2.2.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
-EBUILD mesa-18.2.3.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
-EBUILD mesa-9999.ebuild 13917 BLAKE2B c63466b004fb0d38806a65d365774e6425158f0da2069e1264f9a48c239afb0fbcbcba214b22cb7bea8296c54fa389face4147e015490c9c906b749edf9c4be2 SHA512 9b1a635be556b2f173f2985d236362c4c7759b0b6d72e2abce5861a702ab9378613d39bdff5ff5b112ea383e59ce442a725f8286971efdef93829f505e1fac22
+EBUILD mesa-18.2.4.ebuild 13962 BLAKE2B dff92fcb9af74489912a65bb5f6e4bd8e9d45c730cc8cacfabc18337660c3e040ee0cf9173ef44f284b7515e70adefa4e5f04a1f1292965b008fe27d213e2bd3 SHA512 399768dbb3f1da3a11e7b76c69abaf17bddef982d41ee6f1a563efdede2b514e602f8a99594fac6782cb0c017d3ef82949239309e62eab6dd1b546ee92c6056d
+EBUILD mesa-9999.ebuild 13936 BLAKE2B d7293687cb48f9e4fef624534f7a79f54846e3100d6b8b48e6c32e5c5c2f2b093fe7884aaf13e36cc5b98cfd44b51e54e92c7a3d7724d083ba274c5baae30fd1 SHA512 ae920b56e52315b999dc513e0711bfd0db98753e4d141689cc680ddf6b83c3cafd53e45211f34a6c1863097672603cd8a6cdaa383c4aa7565b35db7783a8f2f0
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch b/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch
new file mode 100644
index 000000000000..11d4f9cac07d
--- /dev/null
+++ b/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch
@@ -0,0 +1,34 @@
+From 7652931d33b36c93b2e84713baa8c283d568402e Mon Sep 17 00:00:00 2001
+From: Dylan Baker <dylan@pnwbakers.com>
+Date: Thu, 1 Nov 2018 14:12:57 -0700
+Subject: [PATCH] meson: link gallium nine with pthreads
+
+In some cases (not building with llvm, which automatically pulls in
+pthreads) nine needs to be directly linked with pthreads. Fixes building
+on x86 (32 bit) without llvm.
+
+Distro bug: https://bugs.gentoo.org/670094
+Fixes: 6b4c7047d57178d3362a710ad503057c6a582ca3
+       ("meson: build gallium nine state_tracker")
+Tested-by: Rafal Lalik <rafallalik@gmail.com>
+Reviewed-by: Matt Turner <mattst88@gmail.com>
+---
+ src/gallium/targets/d3dadapter9/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
+index bd05b4f9692..bc72b1110a0 100644
+--- a/src/gallium/targets/d3dadapter9/meson.build
++++ b/src/gallium/targets/d3dadapter9/meson.build
+@@ -53,7 +53,7 @@ libgallium_nine = shared_library(
+     libswkmsdri,
+   ],
+   dependencies : [
+-    dep_selinux, dep_expat, dep_libdrm, dep_llvm,
++    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
+     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
+     driver_i915, driver_svga,
+   ],
+-- 
+2.16.4
+
diff --git a/media-libs/mesa/mesa-18.2.0-r1.ebuild b/media-libs/mesa/mesa-18.2.0-r1.ebuild
deleted file mode 100644
index df9403207de3..000000000000
--- a/media-libs/mesa/mesa-18.2.0-r1.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-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}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	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.93"
-RDEPEND="
-	!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.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		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}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					app-eselect/eselect-opencl
-					dev-libs/libclc
-					virtual/libelf:0=[${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}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${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_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		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/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
-	if use d3d9; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-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
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		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_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		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
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-18.2.1.ebuild b/media-libs/mesa/mesa-18.2.1.ebuild
deleted file mode 100644
index df9403207de3..000000000000
--- a/media-libs/mesa/mesa-18.2.1.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-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}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	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.93"
-RDEPEND="
-	!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.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		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}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					app-eselect/eselect-opencl
-					dev-libs/libclc
-					virtual/libelf:0=[${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}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${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_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		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/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
-	if use d3d9; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-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
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		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_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		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
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-18.2.2-r1.ebuild b/media-libs/mesa/mesa-18.2.2-r1.ebuild
deleted file mode 100644
index 7728fa3de19b..000000000000
--- a/media-libs/mesa/mesa-18.2.2-r1.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-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}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	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.93"
-RDEPEND="
-	!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.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		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}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers]
-					dev-libs/libclc
-					virtual/libelf:0=[${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}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${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_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		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/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
-	if use d3d9; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-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
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		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_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		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
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-18.2.2.ebuild b/media-libs/mesa/mesa-18.2.2.ebuild
deleted file mode 100644
index df9403207de3..000000000000
--- a/media-libs/mesa/mesa-18.2.2.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-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
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-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}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	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.93"
-RDEPEND="
-	!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.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		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}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					app-eselect/eselect-opencl
-					dev-libs/libclc
-					virtual/libelf:0=[${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}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${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_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		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/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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_pretend() {
-	if use d3d9; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-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
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		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_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		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
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
-		gallium_enable video_cards_virgl virgl
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	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
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-18.2.3.ebuild b/media-libs/mesa/mesa-18.2.4.ebuild
index 7728fa3de19b..16b4ad7ea3b8 100644
--- a/media-libs/mesa/mesa-18.2.3.ebuild
+++ b/media-libs/mesa/mesa-18.2.4.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
 		)
 		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
@@ -231,6 +231,10 @@ x86? (
 	)
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-link-gallium-nine-with-pthreads.patch
+)
+
 llvm_check_deps() {
 	local flags=${MULTILIB_USEDEP}
 	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c50d8550e51c..23f29b41b350 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
 		)
 		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 31b9417f0197..32fe8ade7c8e 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,5 +2,5 @@ AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc083
 DIST raptor2-2.0.14.tar.gz 1877454 BLAKE2B 9c427d9184951d7fa385c12eaeffa35b504ddfc887a10d2bfb9cffdb34b8d0d16fd56a1033f57de3096a9bfbf72a7933a6dd4859bbbfdebd671386128318a2a0 SHA512 399e23f2c549df8f1d709d67129d3fcf7899a8cdcdd8071c165f2b4106f397cce05fc69a6d7b176857011bf95723c0909b6510eded12f82217f89925bc1ba7c2
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.14.ebuild 1654 BLAKE2B fc1cc4bdfca9fe92c0db896255cb21e92461b6c05141afc974d35ec03e6cdfc4821ab3dbb9da15de4365416088244b5078f2d349b1dda90e167dbeaa9640f193 SHA512 5ad6857a52489f1703ca5acbdc460d315906cebd955dd98b2135423f79699ccc6034a8acfd83d144b52a9f39938f7e6bd5cdc1b554953d930ae1e1106242ec1c
-EBUILD raptor-2.0.15-r1.ebuild 1580 BLAKE2B c469e05439a8c7c5a3964403089ba42c39bb8497379e1a20aedb3abb43393bee63d5a005dc9e26b36e43804a5bea1043b41ba43220bcc014eed06958d6ce67aa SHA512 36332021d7cd17f86fc4fed7f77aeed96ba76726d14f27f64a63a033600860b2b39d20b9a4cf98ef5f7547cca6678d6676d3c64572cf8ef657c94f6564df046c
+EBUILD raptor-2.0.15-r1.ebuild 1579 BLAKE2B 1c2c667f09d2233ab5df883bbc8e21a26dfe0a9efe871fcdfe0267b40016571161854b0dc95919410ccfad32b012698c3bc710a22709ade273b47b5faf6e4bc0 SHA512 d3ce93c9d90fa9bd9eeff75287e6cfe792b85f4f16b8a2e888f9d8a3fb0e2efbc2834c75a35d1f0992695d3ae1576c8caee363bc1c2bcaafe0485aeb592e761e
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
index f0b6ba1ed110..57740e7778fc 100644
--- a/media-libs/raptor/raptor-2.0.15-r1.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 9a748e3f39d7..658d8c5f544e 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,3 +1,5 @@
 DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
+DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 EBUILD sdl2-image-2.0.3.ebuild 1524 BLAKE2B 3bd4371703ad10beca949c54d87094e52ff1d6a0a0c5423d75eefa355e9bb0700082c5df94dcba93a5fe497efbbba6239eea4932c4e40dceec4d206d8c80e010 SHA512 316594122cb65267148c7478bdd40a52af21021992a6335a8b030152f24320b1f1a096aec5c0e5c23e446c1adeea62d51432a9f5d7ccb63255a07d2af2607439
+EBUILD sdl2-image-2.0.4.ebuild 1536 BLAKE2B 3de26895795ad82b49c2d842b30a2564de01063d3261b7c9d9b55c04e1d4a2c3e9e8942b1ddbe18fce495c1cd4695facd6a7ab99b5d616cef07217973ce9669e SHA512 3358a63d6dbd0218fc7cabfe6d6d19e77ab62634727922e182e05156e85984ca6a00e5f27b007b7dbbed901782f156ba1e63b4e5662fc20728a90222715308f1
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
new file mode 100644
index 000000000000..08cadf24d1c4
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-bmp
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		--disable-jpg-shared
+		--enable-lbm
+		--enable-pcx
+		$(use_enable png)
+		--disable-png-shared
+		--enable-pnm
+		--enable-tga
+		$(use_enable tiff tif)
+		--disable-tif-shared
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+		$(use_enable webp)
+		--disable-webp-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 65e3e0d5dee1..8f71272ff5f2 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,4 +1,6 @@
 AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
+DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3258 BLAKE2B d5962eba570d4b2a42589d498118977cbfdb7baf83c1422c3614920612a7cc6fdb5c3d0623fc74c9a24b5120beffd3ee2409cf8b19380cee0f13c54f879f3fe4 SHA512 5de83350d6b84e8b2cc6db63a786a9495b6d5b4b864634916b69c18ecbb0c2b46dfd14d881a14755c4483f3b1eae5f0b15f5e2a420a7b4cef69d8f6115c4124a
+EBUILD sdl2-mixer-2.0.4.ebuild 3236 BLAKE2B a6eddaeedb5ae8ef3f9b2a811a4ffc6639a874da5f29099e502455d76fb08d26f69e5085ed5461250de218fc3963581edda5f239d4455429782330b23733dafa SHA512 41cd4d0afcfaf8a1275b060ba3587f7063ac1b651c3deb7e76ae11d24d06cc8b968a2a8af0d33e5e1edd7a88fdd3a9477b04336be7ed2e77797cfaafa31070ea
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
new file mode 100644
index 000000000000..97b58879c407
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="SDL2_mixer-${PV}"
+inherit multilib-minimal
+
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	tremor? ( vorbis )
+"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		!mad? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	)
+	opus? ( >=media-libs/opusfile-0.2 )
+	vorbis? (
+		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+		!tremor? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-music-cmd
+		$(use_enable wav music-wave)
+		$(use_enable mod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		--disable-music-mod-modplug-shared
+		$(use_enable mikmod music-mod-mikmod)
+		--disable-music-mod-mikmod-shared
+		$(use_enable midi music-midi)
+		$(use_enable timidity music-midi-timidity)
+		$(use_enable fluidsynth music-midi-fluidsynth)
+		--disable-music-midi-fluidsynth-shared
+		$(use_enable vorbis music-ogg)
+		$(use_enable tremor music-ogg-tremor)
+		--disable-music-ogg-shared
+		$(use_enable flac music-flac)
+		--disable-music-flac-shared
+		$(use_enable mp3 music-mp3)
+		$(use_enable !mad music-mp3-mpg123)
+		--disable-music-mp3-mpg123-shared
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable opus music-opus)
+		--disable-music-opus-shared
+		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools ; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi && use fluidsynth; then
+		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+		ewarn "environment variable to the location of a SoundFont file"
+		ewarn "unless the game or application happens to do this for you."
+		if use timidity; then
+			ewarn "Failing to do so will result in Timidity being used instead."
+		else
+			ewarn "Failing to do so will result in silence."
+		fi
+	fi
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 49ad3080a5be..24d422040f2e 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -4,5 +4,5 @@ DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f
 EBUILD vulkan-layers-1.1.82.0.ebuild 1594 BLAKE2B 20b69a4cd5356a92655fc050ec427a0f7dc7ffd0a0197f6c6892cd65f62f6e27ab526caee3d2a02c303e15464b81c8279a9aec9a45281f551f8fc0c2cdde9614 SHA512 8bfa1cf9257ef9db85dcf5b92f4636004bc6818bc7335fadba84d6f88455fce7bea176b5ab12d8ce0b1061442a3d8e9e557e79b96cff9e7fe85c76d5a412bdb5
-EBUILD vulkan-layers-9999.ebuild 1594 BLAKE2B 20b69a4cd5356a92655fc050ec427a0f7dc7ffd0a0197f6c6892cd65f62f6e27ab526caee3d2a02c303e15464b81c8279a9aec9a45281f551f8fc0c2cdde9614 SHA512 8bfa1cf9257ef9db85dcf5b92f4636004bc6818bc7335fadba84d6f88455fce7bea176b5ab12d8ce0b1061442a3d8e9e557e79b96cff9e7fe85c76d5a412bdb5
+EBUILD vulkan-layers-9999.ebuild 1508 BLAKE2B 47de5940e633ed9920593da59c887cb8a5839c01f2e968053209d0ab1d46ef42971749860423ea1aa5856c095d51ab4ecbaf2b22ce45caf51fc0441b70c7e134 SHA512 06cc8debd5e1dfac433e2d18641e3a48288a8cb05d25acdb0814d71ff1adf3edfea95a9a5321b8cd7ea673a5912a0ebeba8743ef53c28af405a27803d099c5b2
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 3f6a62d453d7..3ea3133c0413 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -36,10 +36,6 @@ DEPEND="${PYTHON_DEPS}
 		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 		   )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
-	 )
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-03 08:36:22 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-03 08:36:22 +0000
commit	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch)
tree	021998302365c5652e37824b6c26d4d969a62055 /media-libs
parent	70b82ae359a5538711e103b0e8dfb92654296644 (diff)