Version bump to 10.3.1.

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

3 files changed, 554 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 5dae26aae4dd..73d162fcebec 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.579 2014/10/16 14:59:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.580 2014/10/18 21:48:04 mattst88 Exp $
+
+*mesa-10.3.1 (18 Oct 2014)
+
+  18 Oct 2014; Matt Turner <mattst88@gentoo.org> +mesa-10.3.1.ebuild:
+  Version bump to 10.3.1.
 
   16 Oct 2014; Mike Frysinger <vapier@gentoo.org> mesa-10.3.0.ebuild:
   Require newer llvm for radeonsi to match configure checks.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 53384a52b5ea..bd1aeb86928b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -26,6 +26,7 @@ DIST MesaLib-10.2.6.tar.bz2 7127766 SHA256 193314d2adba98e43697d726739ac46b4299a
 DIST MesaLib-10.2.7.tar.bz2 7107753 SHA256 27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f SHA512 c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71 WHIRLPOOL ab546652eec6066616cd05b608be3481877611614bea1a78f04124cfde537de0cf6c6e789e1ca09695b7f8c75a542e43c66eb94a4f0aaf20d950d304815840ed
 DIST MesaLib-10.2.8.tar.bz2 7113716 SHA256 1ef9ad3f241788d454f2ff8c9d65b6849dfc31c8fe91f70fd2930b81c8af1398 SHA512 dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b WHIRLPOOL b54cddecbea167bd501f75c3590050d1cddf44b5a3caa9ce9b8565c6dfc10ce6ba9cae58ff8155e9d1e2aed1656dc596d62a5a026dc11d27ce962c9fd1d9d13e
 DIST MesaLib-10.3.0.tar.bz2 7252038 SHA256 0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5 SHA512 c5edc62dcd953b67307cd8a10921ad3f07bd72cdb81ca69f68706a757fd6c5e439f05f546e401e0b5e6923e0decdf34f0b48dcc1d8a758508a7f8fedb734442c WHIRLPOOL 36933e02dc3d24c4849d7c18221af15ebc2850e44d8a743e1234835e6d3b9698ead842f8943823929f2b41f74ce110271733c52718ae422cd24df9a187357981
+DIST MesaLib-10.3.1.tar.bz2 7256300 SHA256 b081d077d717e5d56f2d59677490856052c41573e50378ff86d6c72456714add SHA512 d5a9bfe3a4debafff9a80486e1c93b9afe4eee062bc9fafb630c4c98680672a1991571eb5bffcecee67a09761e47463df9eaa715711feacc28c806935297894d WHIRLPOOL cace8d29ce803962523744e6c4c193f9fb6bae4fff04976e37093351501749af2c5dbbcd070cf23928f31af2af7aeb5aa693e8b087fe82fc67fcce1bcf7c60b4
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST MesaLib-7.11.2.tar.bz2 6257280 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 SHA512 f9f93aeb5ba3e4f0cdd7041a7bba6cd18dd8f58446b796849f43c6037297011df826017c32e03f03c8527d4afd3b9096e9ae3cbfb3c86b4ad145c66867198c21 WHIRLPOOL 0cf1b328b95e4f09e549c8adb2f6dc67e36c48ef570c1a5fda73efad54b8327cbec896d67bd01838be8bba7274f32704feca3fde8bb68bf1141563d17e8be707
 DIST MesaLib-8.0.4.tar.bz2 5737052 SHA256 02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e SHA512 b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57 WHIRLPOOL 5371a13e93e2d43264e2580e1e5e28ed85b6bfbdda9dd89104b1c18e62d35417e20b0ed8f13d8c54f58b83875fac9348d57f14ba08e4a88599e5fc0202502173
@@ -49,28 +50,29 @@ EBUILD mesa-10.2.6.ebuild 14755 SHA256 41cc3d27cd61ae089b25d27a4fef379896508ed97
 EBUILD mesa-10.2.7.ebuild 14914 SHA256 a3ffe7dfc70d2768628ffb557f295adbff409280d9a229f7b47a4a17be069550 SHA512 eb18bafd749175c3ac53bb7f1323518b64e5df1738497d2a9f5a3d571e8cebc302290518ac79dbc87b15db308a0dbb32f3c3ac72f74bb57359afb138b507c1b6 WHIRLPOOL b504867ab9a3ab0bdf82f664ae782189769fb360eee38ec34875d63954ea9e3faf444cc388a797d420fabd9babc89e485298d1818ea98e8e7460531a3e0d7871
 EBUILD mesa-10.2.8.ebuild 14810 SHA256 576bea1950ce5ee020a0dc9a17ab7557c6304d4225684108595ea9751a3b2913 SHA512 ff87428b11cfa34bab397f933da904da00002c79ff2a6286a292cb811607cac6b62145af2155376f269f1ec9c87e0bf940c7a0d64345f210bbcad0064eaf2884 WHIRLPOOL 9badfad16b21c4fef213f498500aa2e41ab3209a0ea8544154ad1b6b4cbd2615e051e6dadd2be9c7e1008ccaf944be122eda84c1588862ea3f7ff6426cdc6e46
 EBUILD mesa-10.3.0.ebuild 14885 SHA256 a465e6bedd999ce1d340ae93152687554796ca9f6deb958f6323620cff636e7d SHA512 f6c2cb4cb35ef9a48101e8be49a4240075887fc8f9f61c21895156588e2ab12704334c09480801b17e74fa97c8c4b0d9cbf51be9c17889faad60ed3d6191fcfb WHIRLPOOL 2919b88baf49845bfcafa3acf81ff4d5af0cf9fd45d44afe132eb7ec6ad0614aebec1c30fd52ed5aee031b1247723c227e0c7ccc1985cf38b96549afe1955afd
+EBUILD mesa-10.3.1.ebuild 14887 SHA256 97e2eae29316391c136f164278f0e0fc04c052ab2ad67ef72984c3a7a775b4a2 SHA512 9bf9fe43159dfbd68a7ceb34a88d8226b911169819e9880c9bd11bff740a1fdfa08164a05b8513ef1cd2430a6909ce14262a4dd619f1c17f007cdfbb02c34838 WHIRLPOOL 5ed99eaace351e3ebe6a7fe877271a796508783610610e98347fe5f219d7ec8eb0e0f2aedf7b4b70a58e155155a92ad54bbf026300b553ce1ffdf3eb5a3dc93a
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
 EBUILD mesa-7.11.2.ebuild 9993 SHA256 7b53334b0ce4ccd58e0a6cf64c1211f985321f0a7bc345a3fc5340738798a4aa SHA512 5f6dd871a7ff804ffc6da7b3f8d936595dfa7b1e9d0fe6ce728c8ebf90c4ad8f38231d7a565fa3fce8eeb855ee1bd53abec1e71a6ff0c9c7b5e38c11511d1445 WHIRLPOOL d1fabc18aa97e308058ca2878bdf591c241047ef3b89e145936c859b3524e96cee6077a96d2622bc1ed4ed698c9d0bc2c3e2dacd5bd8b3794bad35f1df387133
 EBUILD mesa-8.0.4-r1.ebuild 10791 SHA256 99d033fcc41f3053bc46793022ba0f7a05b490ee813889022b202568937edff2 SHA512 b8f9b906827f3c66473feb90b3022c671b49783c411a23f61985e3361e9e8545397ba64b0e96cc0314d7f8a004aa31f7a23be57457908b9fb2774ad06e0ff1e3 WHIRLPOOL 12088fffae079e20c38881251f67948fec22d4dab2da46010d24f4b685fb14a783126bdcd1be977eb19a23e41225f897485d7e180a84a2b251b3882d0eb95a64
 EBUILD mesa-9.0.3.ebuild 11113 SHA256 ef9c8cab66b5d57787ed19ccef7e945589a652abdc9eda54cadb41f1e8ab7ebc SHA512 e5d4261beaa7f93c7382b2eab572bda5424b02c2eadcfea5e81ca8a0439fbc40f76a7c3887a57b73249e2c6a8599a42f3a536485ec7ec2ec6d06d4d3cae2901a WHIRLPOOL 91734df6565e97391d86ff5122e33820b82ae74ca8a7ff4c83b825a568ea87a79b1378d612b5f83a40abb5f98f4d71a84718e114a5c5a9bca5aaf9c426a7fdd8
 EBUILD mesa-9.1.6.ebuild 11043 SHA256 4e614a3bb2be81876d09618ed357ed36bde336b53e57794fa14c888990569b1d SHA512 d109bdc955ecc0e6357691c42be1bbde1cb3c2fb27b2a5b6c5013c5d54e587f5f9d486ed03dba1440346e4c4d3ed9366b7f5327754a497d4b2cc25e0b7660e6a WHIRLPOOL b421eb3bbd229a23ae3853745f17116ed77a5cfbdb0dd0b252a664a20de002655dfea626a42f10933eb14b9538f6562ce5b1deb74af3156b2df4510aeba41211
 EBUILD mesa-9.2.5-r1.ebuild 13934 SHA256 f23057faf60d26d7234eb79448efa568700418cbe27abf5dad12ae2e5b6df3fc SHA512 7bc40298c615f01aff79a5fa3f6a285f7e2359ea85c83be98f28cd587eea8026f7e9dbe37cc0176252a07606a682e1be59be91fe8e97c4872ca2bbeb8ef825c0 WHIRLPOOL 01b1f5938ced676b7b0ded85aa14d9ceeb844e3587c5ed527d67f1f40f3b47feaad49137209b21d9388d1209d407ff139d49c814bb5d2d8b41bcd1ab430a7a7d
-MISC ChangeLog 93362 SHA256 3130e402cd75c91c2e2857e6c8643ecdc4790871354c68ed19944e15b217cb37 SHA512 4559040865a422319e04fa5341b7395cd551ed58e379df458375018b414c040bc5e51a7012286cc888b69d1dd1a7fc0987e905ecde5acbedd91604402df01916 WHIRLPOOL 2b0c053b522cd7a2e10e7b17314e789da299d9d8b572f58aa0346c691a5476605126b93d6ccb1cd5e8b7ad8a63dc58884255093ee92b7d083703e81d3425e1f2
+MISC ChangeLog 93489 SHA256 e6ad6901e5fd9ad5e4801af8f8c526a7a678513a47a31606d038b85a54eb55a0 SHA512 4bfd8a99fc4000bb428387595fc1dafaddb46fbe2b906a3935a4a7dac5580d3190ae2df96350866601f31c69720010a3e8eaf7286df4ac77330f70889d07ab6a WHIRLPOOL e1c5523b63b737ef3f5aed6aa7dd254c6ab5105eb216af2597f84dc32ddde9a90aa682cfdb2dce0eb01a7279b94303e949109e10ee462e61ac0b045a407b143d
 MISC metadata.xml 2288 SHA256 ae8d2bd2670f9d5409d42b364f56e30a676419ae934fe5c7f7abe8608f95e2ac SHA512 79eeb3773c6f3632f896f31d2266b59e958310a436610fc7676e10465fcbcf205d2dfbe3b31554c92af6a28bf4a59a571ff7104084cb1cb44e33e4cbdc5eed99 WHIRLPOOL a12aa115cc8fa5330070bb4a62ec57d886cfde8d33d23deac5c63b8fb6db40c6dd71c9bab60b2aca2d30e0a2085aac4a0c25b1248dd2289b745c828c78b5b19d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUP91vAAoJEPGu1DbS6WIAMkYQAIeOb8ol2Tuq7Nf84+7n5EZm
-vdNtO+9Q5ZIY/eavBv9U/cIy+bvUFoobgSYsy9LCvOJ4GR28Fb5JOPrjUd1aDW4K
-zhKviyn2ky26j+fYG/lQI+kx4eWhjrx1DGzacR6VP6Hs56JYnpMZYBmBhJ0CN0GU
-UFF0dMrroAq7i3IJup9tRaUcSyYXvw/MKQ+mOWvwEvb/arha2hvKqWar5naIsTGW
-5jeZbBawR9iyYbxU7KtIOQUBhnUQSd0BcZM69VhX481Bix/tIjTEaeP4cvjb3bLa
-gW26k0Lwx6/Tnj3/4knesbZ3aSJ5b2CvVO8OhyEZyx7lo8BB738t4Dr9v6oTBaTZ
-ogZmWdUGYXQEpkznLRUz759qNWGSHLjMR2wCVewLLsOh9vossy6F+7xjznRY1iaN
-03OG7XIzCJEGdjcZEbqD5LF0oIrjm/4f/xPa66GkFkX8rcKk0P6vmxNDTQvddVFq
-J+gWMfl1LaJevNJFP8QLETfY2t2s1VHxHZIlOce9DWxR7s3F7mUabsaEGK0xVJ8c
-s2ySTWb0ut6V/fAz1bBsSDkQ+XYvoAnnzBf/yN/f5UOBKM9m7culRz15ak3tDg6z
-gA14Qn2TcdXsPIx9UWqC187rWVbemKLD/GuoP/tlUGlhgaC/+XkEsRkVIs1/G81G
-U6qkua/Zv9fRyip+0ls6
-=86Pm
+iQIcBAEBCAAGBQJUQuBxAAoJEA/daC2XTKcq66YP/1IkhqSR8sD71Dk29UgLdAkf
+X6mI4qjjLdFPeudQWvVuM/UFVSOeILqie1I6vmpiLWYR8zU6ZcTpzsJrtqc2rCo7
+TYtNs0b6hMF1ZySCOb/m56aum2JlTcgk9Q8ecF5aqB7y5GPSEgMG7lW5jYS+OdZQ
+MatRzTPIk/qcoFQG84E4hlYZEdpoWaW8S0OcHzlF+JSxtjSr1dTjH2UFGW6FXCpT
+S3o4J0XbPdchkyCJspG2284W9ucgyQfShvQp9U/cdajatJ3ehXXAHylKdiKkCLtO
+bOmJRrf3caKpwxslUEIf80laU5J7rWrAd+kdt1psQFS986OPKmqotU9imbH3UMKL
+Q87VMDwTvEzRWhHK4DnVWjH+9pnfH4EyWSmGviPXNtiWCNBncXPrZjlhDGxANfa9
+Y6vi7WXgIqe50Lbid49rJh/A5Ud0hPU5fLnbrTADYFtvAMhwuxsqryade5b9+mCS
+lHfLys79yVnwzRokJBYxTNWUQB3C+opVptH8rd1ds5YPjwCDWTZzBUB8xd1O6Mm2
+UhjtekWKADqe+tpXG4Jvq3ni4Rt20+Qk3cLM/PxIOOUoa56rx6gFg1gy16rVuMy7
+rw9fh8t4MDS5e3wQPitcrB4ZH6zfUN2S8PfbLNljo527mnJVFtYj9mWbWXvWObFm
+cTxwtoQVZr9mkpeO9MQd
+=Ug+M
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.3.1.ebuild b/media-libs/mesa/mesa-10.3.1.ebuild
new file mode 100644
index 000000000000..16b378d02809
--- /dev/null
+++ b/media-libs/mesa/mesa-10.3.1.ebuild
@@ -0,0 +1,532 @@
+# 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.3.1.ebuild,v 1.1 2014/10/18 21:48:04 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"
+
+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
+	vdpau wayland xvmc xa kernel_FreeBSD"
+
+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
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	dri3? ( >=virtual/libudev-215:=[${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) \
+		--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
+}