Drop old.

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

3 files changed, 18 insertions, 550 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index bb5d8c10c7fe..285e55bf0faf 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.622 2015/03/01 19:35:16 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.623 2015/03/01 19:36:46 mattst88 Exp $
+
+  01 Mar 2015; Matt Turner <mattst88@gentoo.org> -mesa-10.3.5.ebuild:
+  Drop old.
 
   01 Mar 2015; Matt Turner <mattst88@gentoo.org>
   +files/mesa-10.3.7-format_utils.c.patch, mesa-10.3.7-r1.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 0157a1e5a64e..ff3e539a2620 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -18,7 +18,6 @@ AUX mesa-9.2-dont-require-llvm-for-r300.patch 524 SHA256 7e57cb037a57c8c4ef49be9
 DIST MesaLib-10.0.4.tar.bz2 6794593 SHA256 ff6eb552becb25a318e53ac56b95a8c2d49e83ad674d87f52e811c0a20c25a40 SHA512 5e5d42def9b867436beaa1f1a2a73e80ce098efcbb840a37c2977410be87dbf88dab994dc5ebbca90b4dc9d13966742924dc73893d3f93bc3d95b61c9149fae5 WHIRLPOOL 965eb710ecd8d3916de6bdb04f36e8ea2a9fbbac1004913c235b06c0f2dc872842495c3dbc0a784c4769d90d1e0cef9bf9ca00394a6bc9aa4d890bde9037238d
 DIST MesaLib-10.1.6.tar.bz2 6956684 SHA256 cde60e06b340d7598802fe4a4484b3fb8befd714f9ab9caabe1f27d3149e8815 SHA512 7611b3e4b1154b3cc1abd466d70fb219fdeb4a49e18f3e31a0f1e4e59c2af2e00b2150156e7ae2d9cecf547311666b2d4ab50c9fb76c9cfd4b89cedde4f0e244 WHIRLPOOL aa03e8dbe7ee661c4de0641f1846ffd487bb2d1a08ad5c7249aaa7d14a8bc7f957f979c7977fc591833e357ef574f7fbc74cfc25d11f8add5381d78976019168
 DIST MesaLib-10.2.8.tar.bz2 7113716 SHA256 1ef9ad3f241788d454f2ff8c9d65b6849dfc31c8fe91f70fd2930b81c8af1398 SHA512 dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b WHIRLPOOL b54cddecbea167bd501f75c3590050d1cddf44b5a3caa9ce9b8565c6dfc10ce6ba9cae58ff8155e9d1e2aed1656dc596d62a5a026dc11d27ce962c9fd1d9d13e
-DIST MesaLib-10.3.5.tar.bz2 7283615 SHA256 eb75d2790f1606d59d50a6acaa637b6c75f2155b3e0eca3d5099165c0d9556ae SHA512 4aebf726e51da7ce55d82da407e50741aa0b0c009de59979b4c7b8643e3d3542e52ae100fdcc25c764518953344bc60ad00a730537850e02a9c6f43ed21d0fee WHIRLPOOL 4d450a8eb793efb7d5162fe1a07e2533df06e0d2f250de6946378eed209e3821e8f110619b503387e1e605bcc880a5da73f51786e2c52328a59e94f25b0c82aa
 DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
 DIST MesaLib-10.4.3.tar.bz2 7504749 SHA256 ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad SHA512 b59ce48fb663d3ea1c5400fd43cc90983d244068bc45fd809cb175ab64e416473a45d81ccb9274661d8a9a2d7753c4f57726bfe294aea801cb266fd76a732901 WHIRLPOOL 7ef298f400c5caa6757c8ec9a2764236896dc4d517564e2d6411423a43381843cf3cc7dedd1eb1dd884d9f1cd7111458c1f188ff959fc530df2cdb459ed10faf
 DIST MesaLib-10.4.4.tar.bz2 7507100 SHA256 f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c SHA512 72d289d051bcb676ea93714c73f43e3decddaf1877e39bc7b9f092946b79d4e9c40dd534187a9eae81c844f8f9843bc6d0a804e5f22fae0cafc2b482859c7357 WHIRLPOOL ec89fcf5ac70170d8253a7b5d41dd0f46dc666e1b39d6b981d1a0169fbe360efa26c6f550c5391122baf1745f70786bc8a6a6b5d070404a455374aa358800e04
@@ -36,7 +35,6 @@ DIST mesa-9.2-gentoo-patches-04.tar.xz 4200 SHA256 f7d530fe703a1b14a6e75f37a995a
 EBUILD mesa-10.0.4.ebuild 13888 SHA256 85ee7d46ef6302f0ad2fedc604d2928121f955274fcb0ddf2439deb6e3dee40c SHA512 64b58cf26c1802c43ad2c0a30a3912c97345390cdcc09119fc39cda20d6684df9907f90e99a609fede3496c6a8644ee6cd3d15b555085d1c02fd987f20b00b76 WHIRLPOOL 44e87b135ae41b1cbc54925a753779d09502b1b281a3646d0e18f3061bde5e817a5f905329442f6b925eb1a1e8232d607b0c3d77ddcd7606152abaf1dc6fdeed
 EBUILD mesa-10.1.6.ebuild 14210 SHA256 197ef375a865ffb71b09daea02a57d422f297aeb9b7c07208e4b3ac332485fa5 SHA512 288b2da00e10350134806da7902374a6815ce15a488c351528f6ebee1a592b3680c1d04e73ce5527a4ef5e730daf03c54e795874da1c160bd2fd2fdf286f882d WHIRLPOOL 3884494bc4cf64fc1e19a5352c345ef968e6d8b041d5752935f48b738a52cc0c0772fd53495edd999e844a46b15c7c08619c4583a2a35a467bd8f2b788ce2c42
 EBUILD mesa-10.2.8.ebuild 14971 SHA256 13c738620bdd571e152bc45ccf2773aebb95e86868182234f0eaacaf3b3750c4 SHA512 2223c328dd2d06c8735a8e72c2406b6a997d8ccce847f6c0494bf7f553ef39bf73f2fbb3359eabb09bf48f14e695b80e936032743efc761a3dd3e1f73803f49a WHIRLPOOL 3f384e50478c31adad7ea9cc0dc98fe433ba10aff0686ce775e6e87a752e270a825176753dc97d4b699a92747f600c55cda4a34560bd54f5bd55b93d9982a36e
-EBUILD mesa-10.3.5.ebuild 14933 SHA256 c755e4d4971013020b2798ec488186cb5297626b350efacea7ac3c93160e7797 SHA512 a26b153251259fdc5cc1fce4478fd504b7ae9208e2776d10a15ff0cf801af54ec26343a08897be9e5c26d3a4f78ac73111c1d2f5838ab01eb26fe1563a8f28dc WHIRLPOOL b571b41918aef53b3f131d7d09e709d41ce68f4714a15693a6ef41a52b110639d5d103df05f839fcdcdc019eb67c1eb5de865c9502de11633450081219346fa4
 EBUILD mesa-10.3.7-r1.ebuild 15043 SHA256 ed88e81b942b37b2ea77b81e8800b2fcef9b842dcee53f003a5a578d28dd9bcf SHA512 9f9f71a2da2751e8a63df2995a5dcc2736248b9ed03494fba16c481ba3410c5b0091472b6bd697d1675e3bf491321285989c718c0d4161fc889023aa3390f90d WHIRLPOOL d76f0525697b5a34cf92a4d3b3197d2ecb3b412c9f246aa04b5d43296066bfaca0b878f08f234c1d8ec51a7c93423492f6031831c51f3ffdcffb989242872a88
 EBUILD mesa-10.3.7-r2.ebuild 13923 SHA256 5824043f36c6c6bfad999ea43c3ee235dc994099f34838f259b8dbfcd6927e6c SHA512 7108ff2703940e73ccaa0a4dbddb926af671a6554e508a0c5674f1eb3a675ba8026a0816e8272e48c789fcba9bc069a7c0f2321b272edd02cbe58c85924a0a4c WHIRLPOOL d0bdfd3400c9145e4cc2ce51ff4453b980b4e501d5c0c91e45ee58506a66d57597879070ce8bbaa9d8e2decce0004014b7b09da558d8b101069dd7e8bc786f15
 EBUILD mesa-10.4.3.ebuild 13840 SHA256 51736954b467dd112973539c2e492454384b34bdc954da0a6e91a5a8fed42b61 SHA512 e7485a93adb4a7c15e6c42c8c20fe074883eeab51f6faf63d6068884cce7fa04e57d1eb76e51c12ec497ae542aa6434f86ae85a17506fa8186d73ecb970bdafe WHIRLPOOL 5b1f00e7694118303f4b9a5a432d7f4ee42bc37321b7f2749a5ac977f173fac5906b01770d2df071b3fa1042e1f9bff2c691ccc05799687e0f952b0100d7d1e4
@@ -48,22 +46,22 @@ EBUILD mesa-8.0.4-r1.ebuild 10823 SHA256 761568a982c1bc3f0ef9bc02d8cac3f4715a7b4
 EBUILD mesa-9.0.3.ebuild 11145 SHA256 379a630b8fed1b34d257a935f7bac35b695e4b66b6be0cdc8960f374d8bff834 SHA512 55a765bfdc4ff99f29681d75d55298795000d35390adb7ab1a8a8c7c376ee5fcf31992ffd5e9339e1dd1f228788f3f147a31dddc141f658e4eea334ce41ee386 WHIRLPOOL 624501d0d91dc5f9a46ae974edd325fd61b642e8c31564538bd69b4bd63eccb0409f129336d6cd116acd67586dc2262ee401072699b9f498add64973c5c44f0c
 EBUILD mesa-9.1.6.ebuild 11075 SHA256 eb99e3b72fc2398fd9719caf780f9e3738db295572964f168102eeb6542f6c8a SHA512 2a406cd612f5ffc905adb76dbcf153e4bc61f010f9192949760aaa6809d4bbf05a533c23c823df3bb1b1b07ab3e1e6f4ee2ea14c2231a4c93973bd40c5411879 WHIRLPOOL 64c34ae571a1dd28a877e8be2bb2adcbd864d94bd53ae9769bcf61ac9716401de678bdcdd42e20b716e8611604b394eb1e7967925815458373ed505b6565eac5
 EBUILD mesa-9.2.5-r1.ebuild 13966 SHA256 224dffb84e94cfef85977df598fae25c3d156f2914cf6f9e9d56c60d033d00de SHA512 63f08a5427fe4f475f643bf58f2f4b320b3f393b32ea7e8e4b25677d4774f0f5055135c459b779205ae68ec079544ac9c9131e1a2bad8f149d6c481aa84b7cbe WHIRLPOOL 6d8b0f4563a603a6d029ac5a5acbcc38456b82dea281101d62f2c25bce65db374bf9ab6b374f67f3efad7ca54b126f16294d8ae42e7cea2f902f4ae17da5323b
-MISC ChangeLog 99546 SHA256 c61c311fc918da93a081b764cffe8337b50efee81ae81639c8416eb2c760adcf SHA512 9d4259cf6e3c70012d2c15a7abde99ac44d7beb7839403127c885167f7140d4f0f8955942b7c67d23f83ec3a3a4ebe0d4735bc7d0dd62fa3d5c1b4412c79ba89 WHIRLPOOL d4aff986a427f7cf4bf812dd77ac80fd61d700967f6f84f341751bbabf44eaf656ffd3950e0e419db3c33afd5ff87c5ff6fddd0fc60df61ce0d454b267a46970
+MISC ChangeLog 99629 SHA256 9f54d1a679bf618b2104ed4f590a83fb127fb962a3f02846d2d8874666e21fc6 SHA512 c80fca178273379169a7aa3f0feb38789abd7542e2a08f19b7ac3686319cefc59cdd49868d9a3c90f38bea10bf17d0f1bbb2cba785d67f54249bc31055f4655d WHIRLPOOL 5c940ae837e8425423e16360d3e9856bb20d88c04b07212859f57c8c8c64d62a97b704749e03f9035de4a0e434bcb37a76d633557cbcc8e2bad3a710493144cf
 MISC metadata.xml 2404 SHA256 5f1078b6c20d702857df5c10bf06090287ea6778018c9a41a3e5c32609d320ae SHA512 2fb42a0145c765e26bae2b44c0e43641e7f6948a0b6e238827eb44e612521dfc5defaa2a0d5c9cd70f76512280fa9849ba71241f22b164be9858d7db0aff9007 WHIRLPOOL 4af80f8aada5bcbe5e7f0dbe94ec10b81c3b50a4cad87c932772f43bac76722c6d2d10dfd8e5323284b009369296372ef68028b64f3f8e7eb267c60479df6368
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU82n2AAoJEA/daC2XTKcqGDoQAIV7FDdT4cWubMJcNUL+jxde
-0G/t8jYmvzA+em4JD7d2sfgOcp4tFebnsBCwfXaO4pB2TGa2vjGcxVPpa8fQ2duL
-0zAptXpKeGd4GI6deEHR06L0Pccv7vaS0xeTxcwRv0tGo4ybONTHc/sILR5KZtVa
-fGiWXcesVaKuTkdktSYTQXmSjtAT4FDtfcsiWhDZGE0zTwLpCiGv3x6Eddmi+c6o
-9CVnFwYK5ZHyTNEV3lK3tBur9atHslD8Y5sno3knJSeN2lZPjZSSBTpEnlwEjrLG
-iYgZf63NML66SbKCikvRAEXmuxbCRbfxWlP0ucLmqZiM6DzVzDHNBegyFYcfZeI/
-JbrFsdNFszPHO8e3FEeGQuoGbbyEBMOe9kfIzMm2mXxqNNU5qReUXlNzVK4Kbr18
-sJWBiH6Z/vyGShY1qz5/T99EPUZF5iVhe8K1S71Qe06RRvd84OS9z7omiABqJdJZ
-j6pcDYYt1nJtwYD9+t7zbjIpfz93WAaFgU15Nw7Cm17eqv4jlLfSdtpSPwyd4Hkt
-agR0LlT+DIG71nUZxeSyfPflB7z91Oe93xPBMCOVz46B8HD9NbOe4IHbAUjWljhH
-I2qihDvW5HK5X5YuSHHvcaq4EVTv+GLs2NWy1v+YlBQUysVkaMe1ygbUIjjKAiqk
-b3TNsHxkBivXGNkI8xuv
-=0umS
+iQIcBAEBCAAGBQJU82pQAAoJEA/daC2XTKcqP9wQAKl09FpUip+dguqD6flSiEaS
+sEZ0Fpp8X4Uzcfjg0a7Q+oNhQpYM3a4UcyxkTCmPTs6RTsnt+fJxnPEo/pxJucqt
+HFJkuORMfBTITbSZaRvU3qC+43dsEUjL26Is7kn3sSkBrP0XLvD+IGxYUrW/uPtP
+goGiuMwOO02khQX+MqkBIpqVohsR10dUkOY69wmsJqVsouIHqr0OfSi21u+l+hR0
+gJieceX1MIzJWxfi6hApeQXCfgsJuJ/GAbSQbLmjYt/b87ghS4woYOtMLABYUjQg
+znDgBFgvRLkbtIsAxsUREgy0wwUBhpT4g83enSU+jS3S/cj1EB3Ue8ND6n5Fx/AM
+0g1+9wR+q/ApV+aQyCrNe91hpQ3UCMX7oP7q9OH6er7dg3jWuMHcxMHdKqf3PIj4
+lLwQTQ4dRXEDtrQhYGkRwM5i0RlZRFB35l2Pb0utsaJjRvSQInRLSnhjKVl33PnC
+RwAUPUmuZ6BP2yQIb/w990z2iO7t3m0h4vg/cPHfXSWLlY6nTCBVZPJ5qAXI374K
+Ppxx4O4NcxhW0ZUaUs0Wh4/b4JSqwbYgihsERlgBJQlgxajHlZAJB5+1Q4uTA4l9
+70TcfL3yPlDPQ/H8B4MzKHUcUahp2Z0sWTJUlPWj3F7PwXgcA6HmYcfUp4+IosJw
+Zlk+7un1RyzLH1JFN8dz
+=LteQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.3.5.ebuild b/media-libs/mesa/mesa-10.3.5.ebuild
deleted file mode 100644
index 20bc4c332f82..000000000000
--- a/media-libs/mesa/mesa-10.3.5.ebuild
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.5.ebuild,v 1.3 2015/02/28 22:23:01 mattst88 Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${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/.0/}"
-
-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"
-RESTRICT="!bindist? ( bindist )"
-
-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 +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-	+udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		llvm
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	openmax? ( gallium )
-	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 )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# 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
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${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}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-		video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
-	)
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${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}
-	${PYTHON_DEPS}
-	llvm? (
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=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.16-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}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# 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
-
-	# 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
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_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}-10.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 openmax omx)
-			$(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
-
-	# on abi_x86_32 hardened we need to have asm disable  
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(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 osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-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}"
-				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() {
-	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() {
-	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}
-
-	# 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
-
-	# 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
-
-	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
-}
-
-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
-}