Apply patch for bug #461696 and be more precise with llvm dependencies.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

10 files changed, 871 insertions, 20 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d32c0c203bb0..6c19174781fe 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.470 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.471 2013/05/09 20:15:10 chithanh Exp $
+
+*mesa-9.1.2-r1 (09 May 2013)
+*mesa-9.2_pre20130509 (09 May 2013)
+
+  09 May 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-9.1.2-r1.ebuild, +mesa-9.2_pre20130509.ebuild, mesa-7.10.3.ebuild,
+  mesa-7.11.2.ebuild, mesa-8.0.4-r1.ebuild, mesa-9.0.1.ebuild,
+  mesa-9.0.2.ebuild, mesa-9.0.3.ebuild:
+  Apply patch for bug #461696 and be more precise with llvm dependencies.
 
   06 May 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   mesa-7.11.2.ebuild, mesa-8.0.4-r1.ebuild, mesa-9.0.1.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 929213318e51..a44d0dc39c9b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -20,19 +20,23 @@ DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
 DIST mesa-9.1-gentoo-patches-01.tar.bz2 1162 SHA256 f068c3ee3a97da8107ee1f96801e92076ad87224086c97c42ebca2cb0b7407ac SHA512 cc55fa3eb4ec66eaba8f441687942520304556d5ead6cf08cdbf0d23efbc271c71ab728de803aa992a1ee5f0f9c231ebc638a09782a49b738e52b89a8468981a WHIRLPOOL 1483eccaeb918bdb68ec493ac925d21c366d26ad7a222d9fe4f7fa44724fd7183079e42f42ba8e85cb7f4fd15b3a0c091cd477954e85071b5f562f4fe0356113
 DIST mesa-9.1-gentoo-patches-03.tar.bz2 2416 SHA256 0d149d6f414c3b632e6903a11aee9fa1e626f76c94901d16cf2d8b4e6a0be748 SHA512 f35b8f2ed3c71d35e6ccdcf1e7184016e46fcb634730472a4303b37c6e749dac5ff157cb3a49dc74506f6843b0c882ede18e12593b9abfb0ff79e9dcc4964a6e WHIRLPOOL 10ceb792987307a3fcd2a4a98dacd5caeeb9e2eadd82e839b6e3e0479f653f36f464f0553f4cd64bd8369f38f342a937b1a84cf6ad6ef77bb7eac13ba9c20a2c
+DIST mesa-9.1-gentoo-patches-04.tar.bz2 3024 SHA256 1d5bfa32e6337b2978a4924e17d6f2d91207adfc41002db0f80e569e0da58520 SHA512 fbca0357e70239464532e9630b062e0d25ca2e6ce2810f77cdf064ee65b82901ccf74d3e095d534ce47b835d12b235eeab8316fc72edb2ec98ca6c8739d69762 WHIRLPOOL 8ec4e395bf0fe036a0627a40ed2d5f220b6102a0fec7fbf568f5e8148595ca005ba8af808aa406e571aad60f5d313b50935e2e02792d0460b4917db369df80dc
 DIST mesa-9.2_pre20130404-gentoo-patches-01.tar.bz2 14890 SHA256 0e9d0c707494ae96a39e028659c4a013d11110d19ecb791a0a999222ee49885f SHA512 1eec47fc3a7b3511d64634350b51cb646fd3272e3b713c0e59a4a09dfa9cd8d56fe3a75423e6b31b69b6b0c73f86ac3a444e9a296296e2cb2608bfd3cb96a7fd WHIRLPOOL d01f6c022693aa308b7376092fd5f6f119cb182ee8fa15e8cf6b3035a6a292a9ee676b8f545f8fdfa5674625a9cfe5b86c25a3936b6c82c9c08627d424aa7b7f
 DIST mesa-9.2_pre20130404.tar.xz 4655504 SHA256 59fd8b0ab0adf35949a8111d5d535969b9d741b0a9bcaab3a8b73c59a51652b2 SHA512 f82bcaf5aad872666061029ee098c553784f868ec24612acb362337d3e5174323edff975886b5ee9517d50f2df08c9ebccbafad11850bdad95115725a9beeec5 WHIRLPOOL bbc423dcbe3a4ebdd1fe381a526f3aff5bd609b2d50354ff0f8b957f4d66c12cd108f1becf7a9f1d0a3d836ce5379bae3eae3882d6877f0c29d78898bcfee379
 DIST mesa-9.2_pre20130427.tar.xz 4793628 SHA256 288e2f284c6933240654ef70a1957e515bb5d0b58f73add52e3487c19c180f7a SHA512 653cadd8003a1345b19485a24b8cd01f99f327dc34722e81827d7d67e0d79995ed390e20524b29dab43581d7feea5bbb8562b0f77addf9384c0634b1150d619a WHIRLPOOL ad0a8b2215869c3de0fcccaf9396dda3179eea7a8fa70e5d656b8e2a5b5cfff8c1c097706036ec9a9b84a73989458c3589da6cf7038560d5144ba96bd321136f
-EBUILD mesa-7.10.3.ebuild 9833 SHA256 0539d7b38201da07040eae24c996346d5e3fc2c9c2cd7271a91886bbfa8a503c SHA512 e87083af5e10b923863369f225a3791adb91c085933aea7c449f879510a3202c63b849abc89b272ded7b90428413ec5480cf14d101eba3756b8d2603d8798d27 WHIRLPOOL 722c321abbc61ba2ac5f7f727b370d760ab17c0da0baddc353aa45acfc874f762f68066010b451f7e048b7f9f50b5a59d88eeb6f0cedf9159ac4efb54143f7ef
-EBUILD mesa-7.11.2.ebuild 9985 SHA256 f9dd87f86be2a1fe8bfa518d5badec254fc4e642e3aa9a921c1f65e35e05288b SHA512 c3c2c923fd6d2344db7f824f6b4401c90ec61a7acfb4c7f4abf9c8a15753f5f3384526461b1470f7818224932da6db5a44bde468735ccf2dd67c1172af3fa513 WHIRLPOOL 32257dfc140dee2a68bd1f8dbe94a165b724a71ebda14e8a419bee29d4bd1716417a95f0f6af04fd7332e2aa558ff529102edc03711f6617f81a9fc4d69662b7
-EBUILD mesa-8.0.4-r1.ebuild 10863 SHA256 7221df986100020b570c3fb9ba36c9bc8fb16a7cc612404295a916779e4e2647 SHA512 bb229df721cf03220f674eab12cbf9fb5f70bdccba3c3c8d924eabd0603eeb379c8addbbfa2a0e222f5c858feb73c2ee0facf52bcde1d3e6477cf523ed7a2f28 WHIRLPOOL 1c41286a4a27b47419c5bbe790a8c0a3a8bc40b9a0b65037874798a8a33910b5cdc3936813b98127b2b67daa48129827390d94cbcb9cd991aed5198ce716a452
-EBUILD mesa-9.0.1.ebuild 11106 SHA256 4fa4d9617f4731f2dfedb8d47034afa570903a92b880a7e65d33134ff9d5757c SHA512 d0b754086c6d6774ca93f163c200f3b144e4b16f43314cf0ffd84a88c26bd732c6a747024c73d8248f16ec3489ad7e4b95c2f62340db002189bbd2d267d8c465 WHIRLPOOL cac98a404d1ca76e381533f39b55a00e46b71c1218b18a8b2eee82b5210e9942ec4a561053c4ada01145aabf2bc693162f0387a91e1dd4ae2683eb73181d2c1b
-EBUILD mesa-9.0.2.ebuild 11116 SHA256 3f573c62123c6fac081be162a193d67902d7ae4198c55a7c30fcb58e91d2ae9d SHA512 0aa5f448890d7b4543494d42f2d7493e34d26264088a56caf8b9b7222ba0bba3cba54fd86f355b0eae426fbe040d9f9e968251330766c478e2f876b07f984ca3 WHIRLPOOL e084752a4dc8a40826f3fedeaf0dbc43e247e9be8316436aada32929f87cef735dfac6bcb948397ec6041d78655a9cfe3589243dafd73082635a3345101d7797
-EBUILD mesa-9.0.3.ebuild 11087 SHA256 7b43d81d35fba962f2d576e3e48f9d3757f6b3a4e74e91325bb66205cfe173f5 SHA512 a4e9d13b6457ea729d70bf453e56271066dd8b860cf54cc58154367e602b71c2542aa94c45a9f402c72f0907139a495dd060968b12c0081511a6dbfa0fde737f WHIRLPOOL 321285079805dfd126997544233b6070c0960ad9c7c6301883c17ab55a318add45d63105b7de94e75945821dd0291376281a955687c347b3ae2bd326dceed9b8
+DIST mesa-9.2_pre20130509.tar.xz 4875084 SHA256 b315050b90aa68d0ffdcab4094b254b9a7029ccc4487b564e8502d417fe67131 SHA512 a40aa105ab46ddbb4aad46025e35ca496286e9a120d54db212945aaf60bf4502834447c62670f1da4ad3b833ca03bf3a421466188d3c66aeda50a75cf6f8f761 WHIRLPOOL 2c056458a84cac1f5d8d3e4a37a162e54851bf4d6d7369ab08dcea4a93ee6b02d21a34f744b0367e1df056b780935c3d380a94caf13cce3da7c89bc07d9df09e
+EBUILD mesa-7.10.3.ebuild 9838 SHA256 f88db0ff29bc43c9f51249306a3fc0eae5f6209b7bdff15cae8d0286906e4811 SHA512 4ab516b5150eb4e1dd4845c92c1e0473c4343cfd00627a8ee4061e391e5419de4e5229b57b2443d8ae38bc7a3cb51819d3628b7c7aeab35bd70d08e2009c6435 WHIRLPOOL 6a55bf7e5f09b18df524923f263db04c55f61714696ce3981a145b0d61e06cd2b94e83b94b6aa359dbafea381e2c58a4f5f4e3fa9515876967c3ab609e3db116
+EBUILD mesa-7.11.2.ebuild 9988 SHA256 e50e8ef022edd0a19b6463be04be8bd2e91859bf4c064003681faeb94ab2e438 SHA512 936df08a1fbfddcf13c33a9c2cf762644d0b8fc18136fa59840b5c50657ba2177397b6ee53329a3009abb8270e7c725011231fc45724b158cba078899705cc27 WHIRLPOOL 594f01c08f8488054a1ce886e518b2feec0b542914289193967b64d77cacb8c5664d4225408c353e26eec6655107be53071370a04cfa0ddef33775f93fe5b55d
+EBUILD mesa-8.0.4-r1.ebuild 10866 SHA256 5c32dea8910a194a5f68fd6cbbd67a2b2228d4b8d9566e4e69fe843c1a4e24c8 SHA512 81cbf5cf54519d725054466315284bc00bf1d66b12f32449c10f97f6f3d10fbbc7209929103982e8c438376d438093e52a4ee19ea7f8e3bc026bafbf3e355893 WHIRLPOOL 0b6c6e9d4f9ed99684f3a9113eefee06e0af0832350dd6a664dc723703178047611404081fcf968322e5e34cb3d724bf5cdba9dc2fca43ff1e941b14395141cc
+EBUILD mesa-9.0.1.ebuild 11109 SHA256 72524f5197094110183f9fa7e707e785f0eebdccbab1abdb3c4db48ba39f3228 SHA512 88b66a617946fdb5d19a9bf8e5f1075be401319437d18c1d77090fed03087d30adc71521549344ed3df29f087efe3df165b48a0dc8051f185b6f45e2f399a6bc WHIRLPOOL 176e3c71dff00bd94b6c7d603c5884486248213917cefa289f1967d8a9851564e987caed119941419c5f96206dd6cdf89bdafaf1867346d8d5db3969769d4ec4
+EBUILD mesa-9.0.2.ebuild 11119 SHA256 4793172450aecd72f796de7b2a5578a89b80fcb04730e2362eeebc845daa04c2 SHA512 b8769d558be510ede9db5e1636df4c995cad04969b00c1138e14543fd5fea34c65a36b5312366e2ae3e912eb565b73bdb4b9734d6132a9f5c6ce555d03a1527b WHIRLPOOL 0dd45f88823e792bf654c32bc99a14add8db9da6367a58241a7c7262579652f1339e24ee94e8d8ff75518486c398f495169280164311ef4f1b3c753f115a0b68
+EBUILD mesa-9.0.3.ebuild 11090 SHA256 9f37e3e2daee8874d05adde22958ab2ea300ea6d4c9b92412231751e7f821618 SHA512 a9bd9b257fa808b2c2467ec1f5e0f55dbe9ac86e618edb27530e44fc959ca59a4b4f1e9fde873be46268dad96a2b57abbb84188735e85bdaf880b6e5c58ab4c6 WHIRLPOOL c04c35068948adbcff61ca538611d828611652777f3f3c5d644150fb8fc52a68c396e93ec1ed18830368a6808c8f2128061256c6b4f3c6dba48034d450cc7f58
 EBUILD mesa-9.1.1.ebuild 10990 SHA256 95e5c318bde526b82c419737bc73d451be47357a1607ce6faccc85a1c729256a SHA512 0bf60745a83c931eb5b208460f4460f58b0081a32a463b1940c54a061be9917aafc6e6c88d8f1c1413a8802939912e5a74c8557cc163b4b918b7a430a06bce92 WHIRLPOOL 0dc3faeca905e87d25b426d3c5530cfe75865151699a53eb5e30f52c504bdd5554f33c27eee35e96fcf16212f069820bed1cc2f3fd06e226ab234af1b3d876fe
+EBUILD mesa-9.1.2-r1.ebuild 11003 SHA256 76bb1688aa658e73260cd5bd2caa37cca009c001ce1cb255b5e1724d11a8b364 SHA512 7f0b6cb1df6ebe220967f9d226503569e444514f828c1b97a47d0fa29b400ad32cc7e703d9ab1d2f21b1aa33c8570e030bf202f99b327741d6171eff4172d668 WHIRLPOOL c098ea89e5e1b60db394f00a00bda768e24a082848912ed7e283e48ce279cdd631a4b1e6772f59fada1ab479c318f961a40649322c2255457b5c8704822a6f78
 EBUILD mesa-9.1.2.ebuild 11000 SHA256 a6ffe032d225f5e0c4c437dbf3dde3fdfdbc73ba183ba69e88e75fb9a470e07a SHA512 f6104ec1c8a897f1b09bece843a13533c2dcd9971100e104d619bd39f23d89d2a1fcf5fc7bbb569c68557d0d98aafd9fd59dfab1dae48cfb3a68a16b0784f74e WHIRLPOOL 100625331ff49721407ced8b0e69dbfc282850319a0e7fffbc1833ccfc2a776348872bee2c597ff83c474b5051e3d51a0718473e108293963f0cf6a990f7a2ac
 EBUILD mesa-9.1.ebuild 10988 SHA256 97e819e9c0b614157c773b9d0209ff66b1a3af4a28a7437f4eb5b1feb44e981f SHA512 71c1654787e4b6cdc925eea13901687c8ca7333766c629e236ba3deb46eb0ff063dc8621a0d3fe164f5d3b80381efaa2ff8ccf40268b4ca346da115d903a1516 WHIRLPOOL b6e8fe21ed317b23e24b2c9e2693820906e74c3593f1b1d0f9f65cb3154a2d6dac96555616be629be8ad3a059ea955198703fa91c1dfb676187bae173351f8a9
 EBUILD mesa-9.2_pre20130404.ebuild 11003 SHA256 895e15b0a070ea1929d2336d8b6da3877d63468a47f0f57316ed4652c67c7d9d SHA512 0ba8c8232ed32080db4145f96460dd5897bdc59816eeea4d2526e16aa8aa1f56593276cf6e16e4ace9b5980ece46faf89473451153b2ee1201125d75c0c28d13 WHIRLPOOL 5f7bd3f515b2e9d8a05e981380f8f9dea1d8fc6a1692e06e70e0a4ea114a3b7f09e1408d7f6919ee3413b2d2f7ec72d2ddfb2204123cf7868c713db86ea240e8
 EBUILD mesa-9.2_pre20130427.ebuild 11022 SHA256 8816a73fa8ce96564cf744daf3ecebf95deff70cd942db467eb004fffc494edf SHA512 6b3e510d32fe496cf5e884031e6a0861a542dcd1275a6057fa58487377ee66e00de2123ac162ce73885ea7376d972f5756a472607c74659a1fbf40b1acb15c49 WHIRLPOOL 46e17f573d7107bdca2d2d46ad30abec509b838ef9f26f0bcbffc6792e59da7d7aeb98b422415afe392020c33a3b26be662b40474048aa6742fa32c2ba449123
-MISC ChangeLog 76422 SHA256 72744763d89162a7a2df07cbde96d2eebd46110567ca03fba8cb79b13bbb763f SHA512 b869261b996204d8bf94a743c36e5f237b6e9dc39fd31799a15762a07b5773b941dbb6f7ed8e371796d1375ef65550bab80db9d2977440844a19ee6f71c251a2 WHIRLPOOL f8079b919c6ce2c62fa0134fa9c7f135720ecd25620a3163903e47fd836f0290e45f1fd9fb773ac13581c44b3a95c6bb7e919608fb693077e8c61304a13f59b5
+EBUILD mesa-9.2_pre20130509.ebuild 11022 SHA256 1623500462a03fdc91996ff838d7450efd11de07788a8f96e25c4fe33ffce997 SHA512 dc9daf3fef0583b4179cc395510cd74c8ff82c2035ad862c51da92fb683547d7bf0e8fd2c0efbe9eb992bbbdab13c6c0c2828f3bc083cf21f129115e30b860e6 WHIRLPOOL f67ec074d51c1d2a88aad68579eb65a97818c19c47b6371d8c660f3f14bd23f351f5351516de364b63d84b778e044cb94ea682a22f83dca47ec1b13b53687f67
+MISC ChangeLog 76810 SHA256 c5773d9fadb86308010d98ad16e1a4e5b8b6574989d3cf8871cd54d5b3e47508 SHA512 b749ff40d6c7de301f696f16ecf9c662af43224554326f0f0ae8d826fa4997abd6f601c0df84c711892df328de5c0dd068adfcef8bd51817ebc92ce1dd4d9733 WHIRLPOOL 78462b194f03a36a9d63cbd5c97838d8fbe16ffb31ab2de97c6bda98432de45fd467406d7d316500cbf0d0ba719f841becd8509c391c094ecc1d62569452fe27
 MISC metadata.xml 1986 SHA256 7a518f3eb77d4b51d4dc5c5cd347bebdc2c849e43d17d1057afeae6be2dc13ad SHA512 1dccfd236b8b8e39560d5056281e774979cd8e2299623b34c2e0f0d9e1ae84906932cfbc0ab15bdd1effc1d82cb484ca4d23acf7cd8d849a33a82f9ee2c60b90 WHIRLPOOL 14e19a3782775f7ca600526f1bf852ed55e328585b7e095a8ab239697ca351f812bf914205166faf714420d179ac7e36b6d1b10fe74188a028c580d40640e31c
diff --git a/media-libs/mesa/mesa-7.10.3.ebuild b/media-libs/mesa/mesa-7.10.3.ebuild
index 016d5cb68535..8d035ceceae7 100644
--- a/media-libs/mesa/mesa-7.10.3.ebuild
+++ b/media-libs/mesa/mesa-7.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.15 2012/10/24 19:13:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.16 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=3
 
diff --git a/media-libs/mesa/mesa-7.11.2.ebuild b/media-libs/mesa/mesa-7.11.2.ebuild
index 8650745b8671..be71496407ea 100644
--- a/media-libs/mesa/mesa-7.11.2.ebuild
+++ b/media-libs/mesa/mesa-7.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.16 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.17 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=3
 
@@ -74,7 +74,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 		x11-libs/motif
 		!x11-libs/libGLw )
 	gallium? (
-		llvm? ( <sys-devel/llvm-3.3 )
+		llvm? ( <sys-devel/llvm-3.3_rc )
 	)
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
diff --git a/media-libs/mesa/mesa-8.0.4-r1.ebuild b/media-libs/mesa/mesa-8.0.4-r1.ebuild
index b3bc3994ff84..771ab0b3f12d 100644
--- a/media-libs/mesa/mesa-8.0.4-r1.ebuild
+++ b/media-libs/mesa/mesa-8.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.4-r1.ebuild,v 1.12 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.4-r1.ebuild,v 1.13 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=4
 
@@ -111,7 +111,7 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND="${RDEPEND}
-	llvm? ( >=sys-devel/llvm-2.9 <sys-devel/llvm-3.3 )
+	llvm? ( >=sys-devel/llvm-2.9 <sys-devel/llvm-3.3_rc )
 	=dev-lang/python-2*
 	dev-libs/libxml2[python]
 	virtual/pkgconfig
diff --git a/media-libs/mesa/mesa-9.0.1.ebuild b/media-libs/mesa/mesa-9.0.1.ebuild
index 75958361f276..5d192098cc5b 100644
--- a/media-libs/mesa/mesa-9.0.1.ebuild
+++ b/media-libs/mesa/mesa-9.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.17 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.18 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=4
 
@@ -117,7 +117,7 @@ done
 DEPEND="${RDEPEND}
 	llvm? (
 		>=sys-devel/llvm-2.9
-		<sys-devel/llvm-3.3
+		<sys-devel/llvm-3.3_rc
 		r600-llvm-compiler? ( =sys-devel/llvm-3.1* )
 		video_cards_radeonsi? ( =sys-devel/llvm-3.1* )
 	)
diff --git a/media-libs/mesa/mesa-9.0.2.ebuild b/media-libs/mesa/mesa-9.0.2.ebuild
index eb3e84c78e65..62b24bc337fc 100644
--- a/media-libs/mesa/mesa-9.0.2.ebuild
+++ b/media-libs/mesa/mesa-9.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.2.ebuild,v 1.3 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.2.ebuild,v 1.4 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=4
 
@@ -117,7 +117,7 @@ done
 DEPEND="${RDEPEND}
 	llvm? (
 		>=sys-devel/llvm-2.9
-		<sys-devel/llvm-3.3
+		<sys-devel/llvm-3.3_rc
 		r600-llvm-compiler? ( =sys-devel/llvm-3.1* )
 		video_cards_radeonsi? ( =sys-devel/llvm-3.1* )
 	)
diff --git a/media-libs/mesa/mesa-9.0.3.ebuild b/media-libs/mesa/mesa-9.0.3.ebuild
index 6b50a1b0617b..0928b1fff559 100644
--- a/media-libs/mesa/mesa-9.0.3.ebuild
+++ b/media-libs/mesa/mesa-9.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.3.ebuild,v 1.4 2013/05/06 15:58:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.3.ebuild,v 1.5 2013/05/09 20:15:10 chithanh Exp $
 
 EAPI=4
 
@@ -114,7 +114,7 @@ done
 DEPEND="${RDEPEND}
 	llvm? (
 		>=sys-devel/llvm-2.9
-		<sys-devel/llvm-3.3
+		<sys-devel/llvm-3.3_rc
 		r600-llvm-compiler? ( =sys-devel/llvm-3.1* )
 		video_cards_radeonsi? ( =sys-devel/llvm-3.1* )
 	)
diff --git a/media-libs/mesa/mesa-9.1.2-r1.ebuild b/media-libs/mesa/mesa-9.1.2-r1.ebuild
new file mode 100644
index 000000000000..df84df8ef9a9
--- /dev/null
+++ b/media-libs/mesa/mesa-9.1.2-r1.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.2-r1.ebuild,v 1.1 2013/05/09 20:15:10 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 flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_rc/-rc}"
+MY_SRC_P="${MY_PN}Lib-${PV/_rc/-rc}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-04.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 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} 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
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	wayland xvmc xa xorg kernel_FreeBSD"
+
+REQUIRED_USE="
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	xa?  ( gallium )
+	xorg?  ( gallium )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	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.42"
+# 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
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/eselect-opengl-1.2.7
+	dev-libs/expat
+	gbm? ( virtual/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8.1
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
+	xorg? (
+		x11-base/xorg-server:=[-minimal]
+		x11-libs/libdrm[libkms]
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+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
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+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-single-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}-8.1-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
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+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
+		if ! use video_cards_i915; 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
+	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
+
+	econf \
+		--enable-dri \
+		--enable-glx \
+		$(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 shared-glapi) \
+		$(use_enable xa) \
+		$(use_enable xorg) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
+
+	# 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 "${S}/$(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 "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(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
+}
+
+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
+
+	# 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_pre20130509.ebuild b/media-libs/mesa/mesa-9.2_pre20130509.ebuild
new file mode 100644
index 000000000000..b5ef18300818
--- /dev/null
+++ b/media-libs/mesa/mesa-9.2_pre20130509.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2_pre20130509.ebuild,v 1.1 2013/05/09 20:15:10 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 flag-o-matic python-single-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/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${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 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} 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
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	wayland xvmc xa xorg kernel_FreeBSD"
+
+REQUIRED_USE="
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	wayland? ( egl )
+	xa?  ( gallium )
+	xorg?  ( gallium )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	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.44"
+# 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
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/eselect-opengl-1.2.7
+	dev-libs/expat
+	gbm? ( virtual/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8.1
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
+	xorg? (
+		x11-base/xorg-server:=
+		x11-libs/libdrm[libkms]
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+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
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+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-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+	mv "${WORKDIR}"/${PN}-* "${WORKDIR}/${MY_P}" || die
+}
+
+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}-8.1-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
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+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
+		if ! use video_cards_i915; 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
+	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
+
+	econf \
+		--enable-dri \
+		--enable-glx \
+		$(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 shared-glapi) \
+		$(use_enable xa) \
+		$(use_enable xorg) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
+
+	# 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 "${S}/$(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 "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(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
+}
+
+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
+
+	# 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
+}