commit:     b9cc2ddbb395f76ea305c76d5ebcc770fc25eb0c
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Tue Sep  5 05:41:55 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 13:39:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b9cc2ddb

media-libs/mesa: cleanup old versions

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 media-libs/mesa/Manifest                           |  22 +-
 media-libs/mesa/mesa-17.1.0.ebuild                 | 507 --------------------
 media-libs/mesa/mesa-17.1.1.ebuild                 | 507 --------------------
 media-libs/mesa/mesa-17.1.2.ebuild                 | 508 ---------------------
 media-libs/mesa/mesa-17.1.3.ebuild                 | 507 --------------------
 media-libs/mesa/mesa-17.1.4.ebuild                 | 507 --------------------
 media-libs/mesa/mesa-17.1.5.ebuild                 | 507 --------------------
 media-libs/mesa/mesa-17.1.6.ebuild                 | 507 --------------------
 .../{mesa-17.1.7.ebuild => mesa-17.1.8.ebuild}     |   0
 .../{mesa-17.2.0_rc6.ebuild => mesa-17.2.0.ebuild} |   0
 10 files changed, 4 insertions(+), 3568 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 56e3a7a..b285e7d 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,26 +7,12 @@ DIST mesa-13.0.5.tar.xz 9171480 SHA256 
bfcea7e2c801525a60895c8aff11aa68457ee9aa3
 DIST mesa-13.0.6.tar.xz 9179236 SHA256 
29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 
2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441
 WHIRLPOOL 
1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
 DIST mesa-17.0.6.tar.xz 9494872 SHA256 
89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 
537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf
 WHIRLPOOL 
f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
 DIST mesa-17.0.7.tar.xz 9460316 SHA256 
f6d75304a229c8d10443e219d6b6c0c342567dbab5a879ebe7cfa3c9139c4492 SHA512 
378d643cf63ec3ed5fd093c00079fb03375f6a87875d3583a5d4707d3d6b21934194b0f624f4ed261c9a05a2fe3e9f292dcd8466e82cfb95d919459e3eb635ea
 WHIRLPOOL 
a18d8a7b4ec1f27f715ce7b1bfc8310b331f6341cab53264a53dd0026b0ebf53d74d6a0d4692b20cd311ce702295a68604a0eedd9002afae67976da8bc5925fb
-DIST mesa-17.1.0.tar.xz 9849580 SHA256 
cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 SHA512 
9730e989ec2731e9b1df7515104d585af3fb7234f40fa13e8974910784db24c25e06d0c546af85de6a9c562212b6784932510c607f5f4b8061194a6429a64af3
 WHIRLPOOL 
f7ed68bd0888f58012aa9505cf078d0670e90aa3983e45cc3c60dc55594a19096edead339872d5a2111d563b195f11aba99caba60197a7b02bec58f0ff23d754
-DIST mesa-17.1.1.tar.xz 9854480 SHA256 
aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef SHA512 
4679b8c1a957e515e9f7a6658f2264d4c458379a37fa8f64c9ef03e817857a683fc527a8172d3ae68ca5ebc84a1a78264e18807704c5130c95efdf0431502bc7
 WHIRLPOOL 
e34aef05bc9f6256a717de1d47f445fedbe5981836724b31e6d0ee801a26b23da9c70acdbfc86d2b676f494ba2c47bf24d8ed0c5c8fb3774fba28443d47578d4
-DIST mesa-17.1.2.tar.xz 9837516 SHA256 
0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239 SHA512 
9df5e1a0336948a6ba338a9a8499b286543bc079f61f1cf85f6ecf98e05fab9a237777cde0d1e3f2153df9b07515cb8c1a08531d43f053783991ecdd32380d3b
 WHIRLPOOL 
81ce678cb95eb86c41fb00f01ad5f4ed207a20e8290d789f347377553da4ff7ebde56bdb41df03a94a30f6fc141c52833bf6da6c5a79ff85654c7806945b4bd5
-DIST mesa-17.1.3.tar.xz 9861256 SHA256 
5f1ee9a8aea2880f887884df2dea0c16dd1b13eb42fd2e52265db0dc1b380e8c SHA512 
b487d4f3d7717f379e7aaf66958bbef886fbae219e6e0333123c4623dc7db84109aca8cf07be08c0b79a74bdb198c704073fd549c6e85aa952ed3c97da1a8a94
 WHIRLPOOL 
f9e2634e8a4c9765739ca4db005901d4df077f954e9008c05ee26dfc10e008166e5128096db071e0e26f4bdf244ecb9f8767b8862b018a68d677a3579c789114
-DIST mesa-17.1.4.tar.xz 9899196 SHA256 
06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad SHA512 
cb8369f0edd3e17b4eee8da159b9dc487f8144d69fe4b95901e9aa6a924759866f26f91fc2ead7036707eecea41582185e7ce73d54f97bf310f198b72ee0a8e4
 WHIRLPOOL 
5c313d7b938c58a7e2f59b619161316629ee996025dc5810742c881716cfcee441a8b3641d644fa0bc4aeec6c44c4b1ce99f515a59159a3391cf4948c2bab45a
-DIST mesa-17.1.5.tar.xz 9901876 SHA256 
378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9 SHA512 
a12671afd812b304e1db690b123a9de16332608541f71cc3ee9128a3630c81416d46255e5bdbf19e14e85716b218f447987b555e3bc0081b8b6f392556fa21e2
 WHIRLPOOL 
b3a94172df5061774e7746ca9f2191f0f04ff375cb76406e22a694141d185f650ce04b3fa4f89b054aa3348f3562886982b5b725680d9ab1cdd6108900da91b7
-DIST mesa-17.1.6.tar.xz 9868932 SHA256 
0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 SHA512 
cf57f29a21208f0a9bc84157f806bcaf6fd0583352449fcb986b05773eeefc99c4040dc41b242782dd5aa9ff7f9c5312b17a4db82d87f600acf165b6acdfc95a
 WHIRLPOOL 
38d6043001798ea9876b55a45222b129596ae92ebb1cc2af36bb0cc8523acce11b38a658d0e8a8afad1b99a49f7d4cdc229b7a3cbb7c15d9858614a91a4994f8
-DIST mesa-17.1.7.tar.xz 9903812 SHA256 
69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5 SHA512 
a1cb22b78c74572bef720c132294a028413402520260afff3d46e79f8837dce35aafd8675a8d6834574a4a15ded3611f06dddd5a9fc5882a6dcedab63d0b3e35
 WHIRLPOOL 
100948b3b436e2331c6251adeb875efd0c316aa1442972d3e1060316bb2c37dc42a8d9a98a1eb31ebf1f680b836c81ee53a8091d32ddb939f113f71fa3d4480a
-DIST mesa-17.2.0-rc6.tar.xz 10408672 SHA256 
579d928682675b69b433521e4c44a21bd65c2ad021f43e9d4b98dd93002da5b1 SHA512 
5a7c0d987f13d6213b427af8a1da6da1c7a27388c24d7b764815faa4f11607d85e5bf9247180ccb22db835923e77e38a7446041564ac921f9223b4aefdb65697
 WHIRLPOOL 
3ac4224e033ce9c5c93270fc9d05c2bfaf3362ec5b67beb3825ca97cd6d120922b296c6e2bb997c1036b78b8c8b3f112c5d640fe306075274837eeafc7481d0d
+DIST mesa-17.1.8.tar.xz 9902800 SHA256 
75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 
d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b
 WHIRLPOOL 
8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f
+DIST mesa-17.2.0.tar.xz 10335284 SHA256 
3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 SHA512 
6ac39274fcf86a26ea5fe51aed486ba3d45b75e0d2f7cc17e1e71d4cf9a85420a832fe559a2ac7b215eda615fab99a2bd290c8388a48c52e13737e7e4ef8d4fd
 WHIRLPOOL 
3fec3810c23aa12f49c0fe561b6dbdbd5724a3bff513b21c273d5796c85eebdd889fb405a03f7cc0fe926a8289794e1872a0d04799c31122061a268faceacf36
 EBUILD mesa-13.0.5.ebuild 13658 SHA256 
c2d8750e43354a05926dd17e7bba27a9c348ea49d723ed3a0045f5b8dd34f639 SHA512 
30af415e1448909b0420080edf24b8006cc55d8b0b70d0d9b6f2c5f5d40b710c5ebb463f1203204de5e7e71bcb68564d490bd61be8c52362e0219d62074eb279
 WHIRLPOOL 
de6f514c8d879c41b7f63429d45790f133b1c60412262f0b38bffc5cae69f8621bbbbc988fc851f5c764a7867a5a22885391f80ab342ff4e84cf5b2bf0798a2c
 EBUILD mesa-13.0.6.ebuild 13584 SHA256 
3bfff928951edec571894f54fada7bb718e95e94f82806764731d09522b5304d SHA512 
1fb15e100deeb50f5de436e2ffe3e131ebe3badb820aa1ddef8cfa691426b42bd3fbe66fd55cd848f9c5f6de9b5dd396f6879813730fb0a234a96a818a71b1cc
 WHIRLPOOL 
6a7d6a0c01a847bfdb8bdeb3fa7ff558e4f3ac77b6f3f4334037ab3098f7763fe26de34378a49a57cbbefdec6ab22952cb0c948517b0885d882e0b92626af585
 EBUILD mesa-17.0.6.ebuild 13603 SHA256 
b4e554e727d9e35f77a83d5cb7ae8f19542e3e7ea367d3377496bc73f3e6da47 SHA512 
f0415ed538799bc0a74ff94563629b7b86372eba0aae17448e38c190be8211dcd48bad902b876ff54b7c9d65df4d83fd4a22cb197be9ab4d960202ee09d0beb7
 WHIRLPOOL 
c32a1c4d6a7fd06c9782ef980874ee6830b8477733b8c0f656e5a84a7ccd1f99cef19fdc1af913fdf5db62bc76bba75333afc20e96338b57f23a6b5534f152a6
 EBUILD mesa-17.0.7.ebuild 13611 SHA256 
06e11aa4c7e3a6bec9294c7028c907c5480dce3ee4c95052491712dbdb91a808 SHA512 
0fcfdc77728a7ab3d629bee9f399a59c1d63c593a6987d71f2766c2f3aba813ee6e36795f2d518e3309a14147a093b1616ab2fe0dfcdf43a2fcc498d62fbc0a2
 WHIRLPOOL 
92aca377f74604808a5ea904dde89bc48f26e3607a8bd3acef00e2eac50f6a011f177a224fbcb542f94cbeebc00e4757aec4abe0e501f19f9263c90b26494deb
-EBUILD mesa-17.1.0.ebuild 13521 SHA256 
99a67ea7c2b5dce88b2a0f9459d113b1bb447058e944151b48773f6c300f33f2 SHA512 
1f5041783a775d0d777cbb5775529b5143115d93a78febc9dc6cef61cea089a407ace42e9940139ff34bb95d19991aa2570ef95b2d80fa8f53da6d192ef8ebf1
 WHIRLPOOL 
513d4cf652a819595416f48440e066a103f5c548fe71fcbc9d29bbbd71ef4efb8dfc60cae96917b5100e540b9062bc3ae1ca44266e7bb98cf3611e541944fbaf
-EBUILD mesa-17.1.1.ebuild 13521 SHA256 
99a67ea7c2b5dce88b2a0f9459d113b1bb447058e944151b48773f6c300f33f2 SHA512 
1f5041783a775d0d777cbb5775529b5143115d93a78febc9dc6cef61cea089a407ace42e9940139ff34bb95d19991aa2570ef95b2d80fa8f53da6d192ef8ebf1
 WHIRLPOOL 
513d4cf652a819595416f48440e066a103f5c548fe71fcbc9d29bbbd71ef4efb8dfc60cae96917b5100e540b9062bc3ae1ca44266e7bb98cf3611e541944fbaf
-EBUILD mesa-17.1.2.ebuild 13563 SHA256 
7fe23c5eb390594f5918c8778c150b32e6cec8ab0c495ede694a37e0629f7c3c SHA512 
ae0bbf00dc5d8bc4c75069590a12e693be69b0d570882f314564b4341da271f1c56cf84a3ede35f660a01d3f921070d4dbcb599cb348e81f17558b574c8473b2
 WHIRLPOOL 
f922c043146e9a9e179d29c22e0bc1a8419cc20a529b0eeebaa0d6f276616a11bb4cda212134a2483e51b5b3086fa6780e40025f92f8d8baed8c5b7442d5cdaa
-EBUILD mesa-17.1.3.ebuild 13510 SHA256 
fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 
ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676
 WHIRLPOOL 
38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
-EBUILD mesa-17.1.4.ebuild 13510 SHA256 
fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 
ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676
 WHIRLPOOL 
38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
-EBUILD mesa-17.1.5.ebuild 13510 SHA256 
fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 
ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676
 WHIRLPOOL 
38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
-EBUILD mesa-17.1.6.ebuild 13510 SHA256 
fb31bfe5fa3f48e577f148df82d4aaf65357684e1f6798b8ec99557dea096504 SHA512 
ed870976b76a02d697b72f193dbeea49edf1d7e503250b2955dae7e26db2c19be5c3b81a8f99010e3650cd3ee680a4f3983c883ec336d0a2ab3fbdf029543676
 WHIRLPOOL 
38585d8528ae5c544fdfd8569025db782a51515756f9fa5983269d5b62c7f54cd3febcaf943786335c69bdefa1842ee3f39282a5ba52b52e2171e892d3f0f91d
-EBUILD mesa-17.1.7.ebuild 13510 SHA256 
68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 
5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d
 WHIRLPOOL 
b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2
-EBUILD mesa-17.2.0_rc6.ebuild 13540 SHA256 
6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 
d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59
 WHIRLPOOL 
3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846
+EBUILD mesa-17.1.8.ebuild 13510 SHA256 
68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 
5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d
 WHIRLPOOL 
b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2
+EBUILD mesa-17.2.0.ebuild 13540 SHA256 
6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 
d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59
 WHIRLPOOL 
3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846
 MISC metadata.xml 2536 SHA256 
d19b63eae85e1a25553e11db8b6e38b31f55810412d7e48680bd78fda4fe4808 SHA512 
1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666
 WHIRLPOOL 
561a884f9ea3bc15d070e52e53cf3ea461a94ee33f0b06778595c83ab9e35311367dbe37a681201d19cb0c9610fe7eebfb295e1cf116c2b040d286ee579676ac

diff --git a/media-libs/mesa/mesa-17.1.0.ebuild 
b/media-libs/mesa/mesa-17.1.0.ebuild
deleted file mode 100644
index 7d70091..0000000
--- a/media-libs/mesa/mesa-17.1.0.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-       eapply "${FILESDIR}"/${PN}-17-missing-fcntl_h.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.1.ebuild 
b/media-libs/mesa/mesa-17.1.1.ebuild
deleted file mode 100644
index 7d70091..0000000
--- a/media-libs/mesa/mesa-17.1.1.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-       eapply "${FILESDIR}"/${PN}-17-missing-fcntl_h.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.2.ebuild 
b/media-libs/mesa/mesa-17.1.2.ebuild
deleted file mode 100644
index 740515f..0000000
--- a/media-libs/mesa/mesa-17.1.2.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-       eapply "${FILESDIR}"/${PN}-17-missing-fcntl_h.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.3.ebuild 
b/media-libs/mesa/mesa-17.1.3.ebuild
deleted file mode 100644
index 4c8cef4..0000000
--- a/media-libs/mesa/mesa-17.1.3.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.4.ebuild 
b/media-libs/mesa/mesa-17.1.4.ebuild
deleted file mode 100644
index 4c8cef4..0000000
--- a/media-libs/mesa/mesa-17.1.4.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.5.ebuild 
b/media-libs/mesa/mesa-17.1.5.ebuild
deleted file mode 100644
index 4c8cef4..0000000
--- a/media-libs/mesa/mesa-17.1.5.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.6.ebuild 
b/media-libs/mesa/mesa-17.1.6.ebuild
deleted file mode 100644
index 4c8cef4..0000000
--- a/media-libs/mesa/mesa-17.1.6.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
-       GIT_ECLASS="git-r3"
-       EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/";
-
-if [[ $PV == 9999 ]]; then
-       SRC_URI=""
-else
-       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
-for card in ${VIDEO_CARDS}; do
-       IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-       vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
-       d3d9?   ( dri3 gallium )
-       llvm?   ( gallium )
-       opencl? ( gallium llvm )
-       openmax? ( gallium )
-       gles1?  ( egl )
-       gles2?  ( egl )
-       vaapi? ( gallium )
-       vdpau? ( gallium )
-       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-                 video_cards_radeonsi? ( llvm ) )
-       wayland? ( egl gbm )
-       xa?  ( gallium )
-       video_cards_freedreno?  ( gallium )
-       video_cards_intel?  ( classic )
-       video_cards_i915?   ( || ( classic gallium ) )
-       video_cards_i965?   ( classic )
-       video_cards_imx?    ( gallium )
-       video_cards_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_vivante? ( gallium gbm )
-       video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-       !<x11-base/xorg-server-1.7
-       !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-       classic? ( app-eselect/eselect-mesa )
-       gallium? ( app-eselect/eselect-mesa )
-       >=app-eselect/eselect-opengl-1.3.0
-       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-       llvm? (
-               video_cards_radeonsi? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
-               )
-               video_cards_r600? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               video_cards_radeon? (
-                       virtual/libelf:0=[${MULTILIB_USEDEP}]
-               )
-               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-       )
-       opencl? (
-                               app-eselect/eselect-opencl
-                               dev-libs/libclc
-                               virtual/libelf:0=[${MULTILIB_USEDEP}]
-                       )
-       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-       vaapi? (
-               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
-               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-       )
-       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
-       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
-
-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] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       llvm? (
-               video_cards_radeonsi? ( || (
-                       sys-devel/llvm[llvm_targets_AMDGPU]
-                       sys-devel/llvm[video_cards_radeon]
-               ) )
-       )
-       opencl? (
-                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
-                               >=sys-devel/gcc-4.6
-       )
-       sys-devel/gettext
-       virtual/pkgconfig
-       valgrind? ( dev-util/valgrind )
-       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-       dri3? (
-               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-       )
-       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-       sys-devel/bison
-       sys-devel/flex
-       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-       !pic? (
-               usr/lib*/libglapi.so.0.0.0
-               usr/lib*/libGLESv1_CM.so.1.1.0
-               usr/lib*/libGLESv2.so.2.0.0
-               usr/lib*/libGL.so.1.2.0
-               usr/lib*/libOSMesa.so.8.0.0
-       )
-)"
-
-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 || use opencl; then
-               llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
-       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
-
-       eautoreconf
-
-       eapply_user
-}
-
-multilib_src_configure() {
-       local myconf
-
-       if use classic; then
-               # Configurable DRI drivers
-               driver_enable swrast
-
-               # Intel code
-               driver_enable video_cards_i915 i915
-               driver_enable video_cards_i965 i965
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       driver_enable video_cards_intel i915 i965
-               fi
-
-               # Nouveau code
-               driver_enable video_cards_nouveau nouveau
-
-               # ATI code
-               driver_enable video_cards_r100 radeon
-               driver_enable video_cards_r200 r200
-               if ! use video_cards_r100 && \
-                               ! use video_cards_r200; then
-                       driver_enable video_cards_radeon radeon r200
-               fi
-       fi
-
-       if use egl; then
-               myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && 
echo ",wayland")$(use gbm && echo ",drm")"
-       fi
-
-       if use gallium; then
-               myconf+="
-                       $(use_enable d3d9 nine)
-                       $(use_enable llvm)
-                       $(use_enable openmax omx)
-                       $(use_enable vaapi va)
-                       $(use_enable vdpau)
-                       $(use_enable xa)
-                       $(use_enable xvmc)
-               "
-               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-               gallium_enable swrast
-               gallium_enable video_cards_vc4 vc4
-               gallium_enable video_cards_vivante etnaviv
-               gallium_enable video_cards_vmware svga
-               gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
-               gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
-               fi
-
-               gallium_enable video_cards_r300 r300
-               gallium_enable video_cards_r600 r600
-               gallium_enable video_cards_radeonsi radeonsi
-               if ! use video_cards_r300 && \
-                               ! use video_cards_r600; then
-                       gallium_enable video_cards_radeon r300 r600
-               fi
-
-               gallium_enable video_cards_freedreno freedreno
-               # opencl stuff
-               if use opencl; then
-                       myconf+="
-                               $(use_enable opencl)
-                               --with-clang-libdir="${EPREFIX}/usr/lib"
-                               "
-               fi
-       fi
-
-       if use vulkan; then
-               vulkan_enable video_cards_i965 intel
-               vulkan_enable video_cards_radeonsi radeon
-       fi
-
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
-       if [[ ${ABI} == x86 ]]; then
-               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-       fi
-
-       # on abi_x86_32 hardened we need to have asm disable
-       if [[ ${ABI} == x86* ]] && use pic; then
-               myconf+=" --disable-asm"
-       fi
-
-       if use gallium; then
-               myconf+=" $(use_enable osmesa gallium-osmesa)"
-       else
-               myconf+=" $(use_enable osmesa)"
-       fi
-
-       # build fails with BSD indent, bug #428112
-       use userland_GNU || export INDENT=cat
-
-       ECONF_SOURCE="${S}" \
-       econf \
-               --enable-dri \
-               --enable-glx \
-               --enable-shared-glapi \
-               $(use_enable !bindist texture-float) \
-               $(use_enable d3d9 nine) \
-               $(use_enable debug) \
-               $(use_enable dri3) \
-               $(use_enable egl) \
-               $(use_enable gbm) \
-               $(use_enable gles1) \
-               $(use_enable gles2) \
-               $(use_enable nptl glx-tls) \
-               $(use_enable unwind libunwind) \
-               --enable-valgrind=$(usex valgrind auto no) \
-               --enable-llvm-shared-libs \
-               --with-dri-drivers=${DRI_DRIVERS} \
-               --with-gallium-drivers=${GALLIUM_DRIVERS} \
-               --with-vulkan-drivers=${VULKAN_DRIVERS} \
-               PYTHON2="${PYTHON}" \
-               ${myconf}
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}"
-
-       if use classic || use gallium; then
-                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
-                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
-                       keepdir /usr/$(get_libdir)/dri
-                       dodir /usr/$(get_libdir)/mesa
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
-                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       if use classic; then
-                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
-                       fi
-                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       mv -f "${x}" "${x/dri/mesa}" \
-                                               || die "Failed to move ${x}"
-                               fi
-                       done
-                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
-                       ln -s ../mesa/*.so . || die "Creating symlink failed"
-                       # remove symlinks to drivers known to eselect
-                       for x in ${gallium_drivers[@]}; do
-                               if [ -f ${x} -o -L ${x} ]; then
-                                       rm "${x}" || die "Failed to remove ${x}"
-                               fi
-                       done
-                       popd
-               eend $?
-       fi
-       if use opencl; then
-               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
-               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-               dodir ${cl_dir}/{lib,include}
-               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-                       "${ED}"${cl_dir}
-               fi
-               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-                       mv -f "${ED}"/usr/include/CL \
-                       "${ED}"${cl_dir}/include
-               fi
-               eend $?
-       fi
-
-       if use openmax; then
-               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
-               doenvd "${T}"/99mesaxdgomx
-               keepdir /usr/share/mesa/xdg
-       fi
-}
-
-multilib_src_install_all() {
-       find "${ED}" -name '*.la' -delete
-       einstalldocs
-
-       if use !bindist; then
-               dodoc docs/patents.txt
-       fi
-
-       # Install config file for eselect mesa
-       insinto /usr/share/mesa
-       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-       if use llvm; then
-               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
-               pushd src/gallium/drivers/llvmpipe >/dev/null || die
-               emake ${llvm_tests}
-               pax-mark m ${llvm_tests}
-               popd >/dev/null || die
-       fi
-       emake check
-}
-
-pkg_postinst() {
-       # Switch to the xorg implementation.
-       echo
-       eselect opengl set --use-old ${OPENGL_DIR}
-
-       # Select classic/gallium drivers
-       if use classic || use gallium; then
-               eselect mesa set --auto
-       fi
-
-       # Switch to mesa opencl
-       if use opencl; then
-               eselect opencl set --use-old ${PN}
-       fi
-
-       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
-       if use openmax; then
-               ebegin "Registering OpenMAX drivers"
-               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-                       omxregister-bellagio
-               eend $?
-       fi
-
-       # warn about patent encumbered texture-float
-       if use !bindist; then
-               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
-               elog "enabled. Please see patents.txt for an explanation."
-       fi
-
-       if ! has_version media-libs/libtxc_dxtn; then
-               elog "Note that in order to have full S3TC support, it is 
necessary to install"
-               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
-               elog "textures in some apps, and some others even require this 
to run."
-       fi
-}
-
-pkg_prerm() {
-       if use openmax; then
-               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-       fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       DRI_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       DRI_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-gallium_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       GALLIUM_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       GALLIUM_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}
-
-vulkan_enable() {
-       case $# in
-               # for enabling unconditionally
-               1)
-                       VULKAN_DRIVERS+=",$1"
-                       ;;
-               *)
-                       if use $1; then
-                               shift
-                               for i in $@; do
-                                       VULKAN_DRIVERS+=",${i}"
-                               done
-                       fi
-                       ;;
-       esac
-}

diff --git a/media-libs/mesa/mesa-17.1.7.ebuild 
b/media-libs/mesa/mesa-17.1.8.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-17.1.7.ebuild
rename to media-libs/mesa/mesa-17.1.8.ebuild

diff --git a/media-libs/mesa/mesa-17.2.0_rc6.ebuild 
b/media-libs/mesa/mesa-17.2.0.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-17.2.0_rc6.ebuild
rename to media-libs/mesa/mesa-17.2.0.ebuild

Reply via email to