Drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

5 files changed, 19 insertions, 1012 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 39e21c6a30d1..26fb2ef34da9 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.540 2014/03/08 02:47:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.541 2014/03/08 02:52:46 mattst88 Exp $
+
+  08 Mar 2014; Matt Turner <mattst88@gentoo.org> -mesa-9.2.5.ebuild,
+  -mesa-10.0.2-r1.ebuild, -files/mesa-10.0.2-update-glxext.h.patch:
+  Drop old.
 
 *mesa-10.1.0 (08 Mar 2014)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8aea6271e949..8b0288ec222c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,12 +7,10 @@ AUX eselect-mesa.conf.8.0.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe
 AUX eselect-mesa.conf.8.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31322f9fb663e5a103f69221 SHA512 58eacf1304ebaa0116ea3c53fafdddb8c94738e31daad8546ac33b46dc51b81a6bccb48c167afe792c7fd41ca5054d8e66123f524b0623ad3e603ed4872f9dc4 WHIRLPOOL 7af55e3cb9448f4b3b4c463443e078a5559588371767e10b5890918d84bfeb16797f11ffabf9aaa205db70c550c5dfc18fe709b3a2e00746d93d4bf4944124b1
 AUX eselect-mesa.conf.9.2 1676 SHA256 bcf5f77140b4695f147d4cd3c2db4b954fb57eccfd4475c7f7c4866edda8436e SHA512 d0061359638c0d9729ba1035fd7740c84d59f538adc11af2ee671b5ddbc83c420159efbefcc39ea680f06d20507f1e1d76b528712a07baeca901a413ba7b55df WHIRLPOOL 0fc650223a1910305bb2c4b7b946ac8b83b5b1ba0b79b586a96303a369b30c9c03dc658a6e8e9a29c5c4605f3865e245be0a0e6a27c40ac37402e8a2616b3ace
 AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883
-AUX mesa-10.0.2-update-glxext.h.patch 1192 SHA256 b3f93a105c23f4b97cd0c63a98211060298a2acbc87f8d898698dc78ad23dd6d SHA512 4ee36d1fd71ff43ad5b186789a6a36499e56cb5568c405d19321613580527c06600f0c9fb812caa0dd639d322eded1f0222cdbfb096a40bf993c080cfdc28e30 WHIRLPOOL a1c23dd2178119fdb1f5431be33f41c4c280d86b8ab001732a7868e7845625b19070a25e03b325427eeed929531b7147f602529cc40f90465c4e13cfe6229b7a
 AUX mesa-8.0-dont-require-llvm-for-r300.patch 916 SHA256 560f224a12b47fb86bd2ecbe7dc32c79e2be9a26321a79921f83527656ed553a SHA512 ce637b9210517375ae2c77981e0882d161e2027801356b80ec31d50157e52eecdb2ca3b9dc3787c789b39005fcd4cf73290e0879bd5e25638d33ef2cd5e443b8 WHIRLPOOL a14401c13deb209f0ce2e72c360a33ece1d87bd62be79ca8fcef46db29d75f0f4e60b5ef0527bf0bf6196d99a6d2f11da332537beb8c7627b1d7e810a3cfb2e8
 AUX mesa-8.0.4-configure-bsd.patch 482 SHA256 5e217191f37a49b56d0404605b51a88f0a3ee0a271a74fd8d25e7b6685e57017 SHA512 efc924315b461c310e632068ec31520048e9d22fe6c35fa47e2c650e778114c6757ff9e4095094d6fa0bb4f82f45217ed9f5320a58de1a2559776a159b722631 WHIRLPOOL 46353a6eb942037d20e07007f7dbe68350d3131d58d4065db133b5655fe9cc88142b6d3c7797602d764d40f622830bf578c559f8868965b240a4bf911bafa034
 AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca27903a40bf3b0a39325613f8a66a718407aa28504fbf SHA512 a2e7ed3b9b51c3a9a98d83c8fdeb8b777a4877fac25e969b01ff92d6971c10dda9f64e6310c739597ad7ba04106c72925ee5931417f2b8d764f9bd799efd2142 WHIRLPOOL a82863366507835ec0a6562f70389e0d050fd23ea25e7c113ef4a0e1298a1543afa8c1fa51c90ece83f41ac6f3bda6083fd50b8f1292b863cd320186fba8f732
 AUX mesa-9.2-dont-require-llvm-for-r300.patch 524 SHA256 7e57cb037a57c8c4ef49be93d6f53bd9f002d918bf91c77158da4a4980fbbd66 SHA512 c5b4b40636a4bab64338a0be730f10ec546ff1da31fdde83c628485a5569cc021042fdb17e2ddbc39b86ab6e72e805ed28af9a98ebed320d23084e2575d6437b WHIRLPOOL 7c896f1be7353c964247fd60f517bb100779a02f08166ca509d4b2924c3cd45aba4cc5d45f0eeb171c4ef5d105e5a93316bd24af1342510ba8bde385ea709854
-DIST MesaLib-10.0.2.tar.bz2 6784325 SHA256 4502a8e2dfa53e15d8fff89c153e6b14824fe82e49bd101e7edc02fa8cf76a7e SHA512 15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24 WHIRLPOOL 99fac4867bacf83a7ffe56b055bee6aca6b571f9cf2ce3d80e69315e86a54d9089d40c8e034da40056b8b83b03b9abebc5c35e0e752266ae3d3172114e8a0132
 DIST MesaLib-10.0.3.tar.bz2 6789384 SHA256 298e1950675e14f3386ec29d9b58e733b5e1eb7cf33a804787071852f5ecb2ff SHA512 e864c4d63336977b2917d83926331163198d47023228cc71f47c67251f675102dbab4551e032aa1dfcb4cbda1f98f15ff4565acef54a33ed8c50af32f52a52da WHIRLPOOL 51109148ea2033769ec8905778a2f843fa0da642be7087c592fbbcabbadcabdb7a90f2a8c65437de29f0228a185692c581c9e966cf0150cdddb1dbf6f755c7c8
 DIST MesaLib-10.1.0.tar.bz2 6908005 SHA256 5941c3d4772a9f447f51569dfca48e01af98080bc996991d00a13f900dab2230 SHA512 a8c57e50c360f3d4ebc850de6b24b87175100cedcbb48ceace2b228f654d29ffa97ec24118ad8e0f281fee80750568fdb2f8b58866713424889c69387e3a6adb WHIRLPOOL 1504057d84e91c2ef39da3659c34f48dd49351f2e7bd08fa893aa0afd542071f6a84deb3e90cec531722b0cb10edee3c609c8d53f9a84f615809bb4c513b260c
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
@@ -24,9 +22,7 @@ DIST MesaLib-9.2.5.tar.bz2 6678076 SHA256 b46ab9efed176df0591993397594d712ada9da
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b SHA512 0dcd60bd40efa25c9895150b6c0230e6582ff42ba0bafae49290e170948ee99ff25be321e7d3d503b3f465eeedcd145fc46b312a54d9bc4d3577fd5e61c3439b WHIRLPOOL 8a4a5c250430ebc08d7081158c6cc41ea7b5718662ef0327e5829c2f26069be0bed7a0df12c82434c58d364926404c929ca9881847554b74906db195b12d6576
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
-DIST mesa-9.2-gentoo-patches-03.tar.xz 2108 SHA256 46467bc8b07a930b61214ab5b50dd2ce8ffcd9cb683a050581f3a3a676b8763e SHA512 81d3a904e67373504f227accdca5cdbce4e6c0627122db7748f72fb7ef49a5bdce226766cdc3486404170e842fffc48306d753f6444cd61a6b5346f8d48404a0 WHIRLPOOL 2dff1e3c8c33758651ad054f02029e11b2c501a63604ccff841796184835de9f6aaaae09e5127bbfccc2e89239d472c4918aee1b34410b3e34b017915196d0a5
 DIST mesa-9.2-gentoo-patches-04.tar.xz 4200 SHA256 f7d530fe703a1b14a6e75f37a995a4402b339f4ae2fa76e8d92106902a273061 SHA512 b3f2031197bf11134860dd5bd378e725d2ac4481f4dcc3b9328eb0817b9d4bc19e8f21b4249aab954441a34553a97bf549c538c5333d9dd670c9c6577de3def9 WHIRLPOOL 0fa660f5532902a3ccdc64896397af9197c752936a72fcdfda79add70900dfb50f7ee47be0a1c400e6ea65964b8ed9d5690a650e47539a7baf54212fc09f6f28
-EBUILD mesa-10.0.2-r1.ebuild 13065 SHA256 b2c0df5539d1cfc79ac90e705a0822e8c79c1b82b5b42ab0225819e6561444bf SHA512 19ecf429b1e3c7b03730f0d2158817d30faa366004597eaf67ff368521c1ffd915f724149bba3c56a61a04c62ee23492fd3a1f15a70309c94eeaf422daff06e1 WHIRLPOOL 9556cd6945edcf4bc40d45e040c9a00ffc674a0557bd0f624266da6f098fd696274011a86bb2da68bf21105d0c2231f108e2afbed7f329d89bd4f2dfd2d1a15b
 EBUILD mesa-10.0.3.ebuild 13720 SHA256 10bf7f85b6df9742d159f529dc0d92cd85377b8f8409974f003f3e8e271c1031 SHA512 40d190b9b71f415e678efcf896dea23c78e573685a769d732dfce536c2797a70b96acf648dc981cc95dd5637ee05f345036d33946f9ac428a2fe9dc87b11ae8a WHIRLPOOL 3fd0a834a3de9fc6bbd6d4910233deca64a528d9a7546d680c6723ecfd0efa9e58b928cd6d5c7a2c2fb02e135afd2804724489ab63db24db6cc6d3655ad2cea4
 EBUILD mesa-10.1.0.ebuild 13837 SHA256 40410e057c2977c93661a3d96e09f08d02d2cbb708c94a9bde851bd0970d7753 SHA512 a5e4403a82371b17314f008bb99096f7f602e03de9366ab2d111c839436f7fb80a35324e26a32779b84405ead417340fae9876197c99123683de2dc93fd7e2a3 WHIRLPOOL d6995b3c65a23d56c6a4ed625a115c871a2724763cef12012dcfb67d55fb256c6206494c54a0462a556ee9674574a09a9bf185c01e099f137668cf1522524d0b
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
@@ -35,23 +31,22 @@ EBUILD mesa-8.0.4-r1.ebuild 10781 SHA256 1b62281c25288f440354da2174c88ad421f25db
 EBUILD mesa-9.0.3.ebuild 11102 SHA256 89964cd4b42ef13098ed2ff18927824251ed01322eb788bc4c3e0c68c7ac4db3 SHA512 1b561d589029d213f66eec1e73044f43fada79bac2ebded4f2bc10c92cd7aadaf056aa7e5aeb186794515212d1e366aee4268271f71def9e317525a558d36f75 WHIRLPOOL 805c370457a0cf4017f5a4217249a2befe42b7730f032edba580f1e268af5706a1815def41e6ddae84e2c2d1f8606adf751e3c6016b426f0e4138a22141749a0
 EBUILD mesa-9.1.6.ebuild 11033 SHA256 b6783455dece114dbeeedfdc04f52e6c59835bc58965845b577dff59d3167f44 SHA512 7e6675fab5c25d5370606002ae7b94023a6f7c78e77af929da90773280c4276661d96c7a0259010b87ea829050d3519cb461ab6a9d0970cc608e2eb0ebfc9240 WHIRLPOOL 044ad192979971f37150417194c42a7cc70f0b0f08d25f2cf1342ab54d7a75d48266ee94f41a273fea8f230873941e2d1165d3b7dd9f9f003afaef408c86fa86
 EBUILD mesa-9.2.5-r1.ebuild 13694 SHA256 723dc142aeb1f3d491a02b3807cde093b64472eb02d68d77474827400ff6d8ae SHA512 2da417b9c4668df1a216107ad42a72e32ea1163fa702c96cc8bc2759c707d0f6e4c38b45f4df3c5812309aad51590b5cdc1cb813be276ee6b4bdb444b4e79297 WHIRLPOOL 02a8eea008a71b568d6ec5eaf841451bc2f5460a302a3f81185876d5308e3e3e5d981aee31f905ff5cf47a72de868a96e338edafbd953eecb30755e14148f316
-EBUILD mesa-9.2.5.ebuild 12962 SHA256 fd511d718481252cedbb30dd354bc135c9efd22da5b63a3b792417b29d683d85 SHA512 a530fd55793b5e74890bd2f5e940ac23ef5b7b4b5ca338a3b16e2a388536d9b7ad093b28adb803a36f7b59e970caf154ee29c5ce191caa0bc19c2d588edebbf0 WHIRLPOOL 8566fea4f448aca8969be2746e583279ccb40aa02c23c8248f68d45fab3828ba6fc27a2ddc25b411fcf07fd142e039493fda1107c5bd32f3519a85d54403683e
-MISC ChangeLog 87312 SHA256 95c5dc4ab55049dabf7fa5d495885329dc9e4b9190af3c02b4f4908d16b0522d SHA512 bf6b9219648082350b4f4ff93afaa76b6ab9fa990c0449a1b9dca87a03fd5ad4eb1a869b6d90f6298d0aa8ed0c174ee7352b101d2608cbd70066bd8b1352a295 WHIRLPOOL 30c25fb82dd0603529e3a12ac21c1d86e6d2dc44a5be562b4ce90bba79b630f1c4d0959e340fe5e6e3bbde5cb62365b0b72ddfac44bebc5e359d47b7a9739376
+MISC ChangeLog 87462 SHA256 07e98d8c16c8ef8fd26adda87fb17a049c79a09057648f482a545fdccb30b88f SHA512 72aa431b58072e263281b25d334ad1ba6fce03b8eb5f8ca46fdbb848046982109a20631f3639d761c21c60a32bb80167bd0242f18864fd65a6c4f1215d08f3a6 WHIRLPOOL 2fea25bcbc618fe4576afe000b5410b626948b0d3c687b0b2041846170063bb257a33e0079b756700795b1258b3533968f51beffe6853cb418a534758a6acf0a
 MISC metadata.xml 2241 SHA256 51802f81e76d6e39c22980ae63ce2f20470121ad6679f81f8a9ec3c7cf37c3ac SHA512 a5a1d3b595cc328420c89e76cc580b3ba1786931b826110f4133d77c71f1b95cdf743bea4317e9189b468b42701257778ac43b7adadae58a0fdb650a4f8d073b WHIRLPOOL 765a963e3575ebe50b2b76053b1c9b800cf084be4f98105419b3dfa4c684b4c4cca5c411f6fd161dcaef3e52428e3722b6b160055c664c3c3ba14692892c8dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTGoTpAAoJEA/daC2XTKcqVHMQAKn+UUs0On7RV98gqLYVkYVs
-ZqDnrBl1i+s0/tE9BbnwIr2swF3pwt8IimyCA66fmiaGoqxXr8HxNxxjaJxJra4E
-6yqDQJYXLmB1qumC289ixbJAv4mhg5U00Ph22tJ+tClzuUVNPFZWrqVVGV28OgTy
-Q4yvbDpXwwI/qdrKpwaOUBuugimiuOwzlDieufjIp04ltR+fMGHQ4gcdq4MGubCY
-+ILDKps/DZ0Enx17XV8BfZZpJx6GH6jwRiGrE1NRoDW9xU+CO2xDgUDjnCj8p9jF
-0jIMvaRSZwXm76cJrRmusCGkXeoWmUGh0C7p1RJ79Y+iQyYPIlo4/aHwJkP/i0v6
-lUOj8CLvJm3+aFMDPT75klW1/IYW5myK9lXKiUPxbtpiseytg+lt3PjZGtXKVMMk
-oKTM9b1DYF7iE7BGu5SJ8z+yHjWq9pB6765CygQ8x0x5f5Bn2hYr/H9Lk+ABG3yi
-JxUrPWm7H9Q2ZyDAo06a5kLvuf5RlKWCy9K9MA8U2NzMPL2Aa+q2QRT3c0Gu1nE8
-vaYUwftolqgCSvY3WMomF/iJJ4R9l777JF5nh5t8ue7RAfimM9FQCXn6nDwh5OS6
-oHbKMgVVaG5KZxZhp//S+dpdko3fc3T/9ZfoTSjV0vK/hULVQSU4pHLzImOQ1rL8
-fh0AoXoqHHufbMANpOqK
-=Bb0s
+iQIcBAEBCAAGBQJTGoYSAAoJEA/daC2XTKcq2ooP/3kl8A8TsmeRl/CTH7rsmzLt
+LmV4eO4Bnz6R3S3TSV4Mx+Lr0MbxDmRn/O6FwiTGUIDeBrn+6TldYB8XcXUjGDHa
+rKpaiRtKg5bJe0LCUfGbQKp1sEPlZZdFD4Vs8wqzVLQJ0aKaM74fmuUYbn+o4dty
+F0QQTc5FiYAW8NfSXIw5vH/s/lHKKCA0FJiJ8Vu80iMaflq/9KtOqj3AV0AzXX84
+PEGjhmBdqnTmZJC/+TMOckFRiX+0r1mf1/vL1QM6hK6yCj86jcchTAEZJ7lYFiTR
+7xVUfGoVDV4OUoXUkWaIxGVlNu/yUv+AjhyexLZhGb729Ai8FWdltgjS4qYmfP4b
+2WCfQlNVNs+q9LrNsLGaYjG3nC/QtKBg9LvttOj/3eJTTZDkeTtal68GbUbWOgZm
+zNJOgkSR3q98EgCVCShEd0jajG8qSlId5MgK//SHd1IFMPQj9T1UEu+nW+/SdV+/
+G+Xq3WVhEwU200BZuH5f3JcfJDDDXot0/x90CcNHwLEWwjrAHPhjFJusDZenGZZL
+pJDKvCk7jv7oFEpR/DNZ1Vb5eoqsjnLwVhHMxUVFvm49bzp/X53dTJFg8uiSNppz
+Me/RNiI/FhG3aEAzPT+NVhAqRjd55bMxAJen/EXcWQJicIoOVDwlwnlz85dE/Oc+
+weI2QqBQ4Hq6OXUymwxz
+=RCJJ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch b/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch
deleted file mode 100644
index b4dfb8ab5d99..000000000000
--- a/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur Mesa-10.0.2.orig/include/GL/glxext.h Mesa-10.0.2/include/GL/glxext.h
---- Mesa-10.0.2.orig/include/GL/glxext.h	2014-01-26 10:43:47.082996517 -0800
-+++ Mesa-10.0.2/include/GL/glxext.h	2014-01-26 10:44:19.378000149 -0800
-@@ -49,6 +49,7 @@
- 
- #ifndef GLX_VERSION_1_3
- #define GLX_VERSION_1_3 1
-+typedef XID GLXContextID;
- typedef struct __GLXFBConfigRec *GLXFBConfig;
- typedef XID GLXWindow;
- typedef XID GLXPbuffer;
-@@ -272,7 +273,6 @@
- 
- #ifndef GLX_EXT_import_context
- #define GLX_EXT_import_context 1
--typedef XID GLXContextID;
- #define GLX_SHARE_CONTEXT_EXT             0x800A
- #define GLX_VISUAL_ID_EXT                 0x800B
- #define GLX_SCREEN_EXT                    0x800C
-@@ -433,6 +433,14 @@
- #endif
- #endif /* GLX_NV_copy_image */
- 
-+#ifndef GLX_NV_delay_before_swap
-+#define GLX_NV_delay_before_swap 1
-+typedef Bool ( *PFNGLXDELAYBEFORESWAPNVPROC) (Display *dpy, GLXDrawable drawable, GLfloat seconds);
-+#ifdef GLX_GLXEXT_PROTOTYPES
-+Bool glXDelayBeforeSwapNV (Display *dpy, GLXDrawable drawable, GLfloat seconds);
-+#endif
-+#endif /* GLX_NV_delay_before_swap */
-+
- #ifndef GLX_NV_float_buffer
- #define GLX_NV_float_buffer 1
- #define GLX_FLOAT_COMPONENTS_NV           0x20B0
diff --git a/media-libs/mesa/mesa-10.0.2-r1.ebuild b/media-libs/mesa/mesa-10.0.2-r1.ebuild
deleted file mode 100644
index 9f4bc320fd69..000000000000
--- a/media-libs/mesa/mesa-10.0.2-r1.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.0.2-r1.ebuild,v 1.2 2014/01/26 20:25:07 chithanh Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
-	llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler
-	selinux vdpau wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.49"
-# 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-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,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
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
-	>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# Bug 491644
-	epatch "${FILESDIR}"/mesa-10.0.2-update-glxext.h.patch
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/mesa-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-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 llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable openvg gallium-egl)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		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-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_with llvm-shared-libs) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	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}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			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
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	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() {
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# 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
-
-	# 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
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! 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
-}
-
-# $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
-}
diff --git a/media-libs/mesa/mesa-9.2.5.ebuild b/media-libs/mesa/mesa-9.2.5.ebuild
deleted file mode 100644
index 097cb2100697..000000000000
--- a/media-libs/mesa/mesa-9.2.5.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5.ebuild,v 1.6 2014/02/04 20:49:01 chithanh Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-SRC_PATCHES="mirror://gentoo/${PN}-9.2-gentoo-patches-03.tar.xz"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
-	llvm-shared-libs opencl	openvg osmesa pax_kernel pic r600-llvm-compiler
-	selinux vdpau wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		llvm-shared-libs
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# 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-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,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
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-		>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
-		>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-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")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		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-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		$(use_with llvm-shared-libs) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	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}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			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
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	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
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# 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
-
-	# 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
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! 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
-}
-
-# $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
-}