Version bump to 10.1.1, bug #508472.

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

3 files changed, 515 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index ffef1351a179..8d5e88b707ff 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.553 2014/04/19 17:47:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.554 2014/04/28 22:10:44 mattst88 Exp $
+
+*mesa-10.1.1 (28 Apr 2014)
+
+  28 Apr 2014; Matt Turner <mattst88@gentoo.org> +mesa-10.1.1.ebuild:
+  Version bump to 10.1.1, bug #508472.
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> mesa-10.0.4.ebuild:
   Stable for sparc, wrt bug #500368
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7532a38bb1a2..70101f343ec5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -13,6 +13,7 @@ AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca279
 AUX mesa-9.2-dont-require-llvm-for-r300.patch 524 SHA256 7e57cb037a57c8c4ef49be93d6f53bd9f002d918bf91c77158da4a4980fbbd66 SHA512 c5b4b40636a4bab64338a0be730f10ec546ff1da31fdde83c628485a5569cc021042fdb17e2ddbc39b86ab6e72e805ed28af9a98ebed320d23084e2575d6437b WHIRLPOOL 7c896f1be7353c964247fd60f517bb100779a02f08166ca509d4b2924c3cd45aba4cc5d45f0eeb171c4ef5d105e5a93316bd24af1342510ba8bde385ea709854
 DIST MesaLib-10.0.4.tar.bz2 6794593 SHA256 ff6eb552becb25a318e53ac56b95a8c2d49e83ad674d87f52e811c0a20c25a40 SHA512 5e5d42def9b867436beaa1f1a2a73e80ce098efcbb840a37c2977410be87dbf88dab994dc5ebbca90b4dc9d13966742924dc73893d3f93bc3d95b61c9149fae5 WHIRLPOOL 965eb710ecd8d3916de6bdb04f36e8ea2a9fbbac1004913c235b06c0f2dc872842495c3dbc0a784c4769d90d1e0cef9bf9ca00394a6bc9aa4d890bde9037238d
 DIST MesaLib-10.1.0.tar.bz2 6908005 SHA256 5941c3d4772a9f447f51569dfca48e01af98080bc996991d00a13f900dab2230 SHA512 a8c57e50c360f3d4ebc850de6b24b87175100cedcbb48ceace2b228f654d29ffa97ec24118ad8e0f281fee80750568fdb2f8b58866713424889c69387e3a6adb WHIRLPOOL 1504057d84e91c2ef39da3659c34f48dd49351f2e7bd08fa893aa0afd542071f6a84deb3e90cec531722b0cb10edee3c609c8d53f9a84f615809bb4c513b260c
+DIST MesaLib-10.1.1.tar.bz2 6948871 SHA256 f3ae730ed81fffcb1ec59076813f9955157da7a1dd9ba23a6b1b8ff8cf6798b0 SHA512 f136d25f6da47bb9f582eafa2f89804b1eae9f0b834a1513cf9f940ef5bd8f438b72600d992d4d9436d2899e0a91d48f4eaabb24bd149c71d3192af5e386dec7 WHIRLPOOL 6a5833c660570f5e987c7afad92d79a3a9021f21bedf9eb95309d5572fca9fabdd9eb26f9062f784d09f7376aa590d82ac1091823aafaefadbfc8af7eadf6718
 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
@@ -25,28 +26,29 @@ DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f565
 DIST mesa-9.2-gentoo-patches-04.tar.xz 4200 SHA256 f7d530fe703a1b14a6e75f37a995a4402b339f4ae2fa76e8d92106902a273061 SHA512 b3f2031197bf11134860dd5bd378e725d2ac4481f4dcc3b9328eb0817b9d4bc19e8f21b4249aab954441a34553a97bf549c538c5333d9dd670c9c6577de3def9 WHIRLPOOL 0fa660f5532902a3ccdc64896397af9197c752936a72fcdfda79add70900dfb50f7ee47be0a1c400e6ea65964b8ed9d5690a650e47539a7baf54212fc09f6f28
 EBUILD mesa-10.0.4.ebuild 13707 SHA256 bf6fe63e6ddc485023fa7dfefeb37b4b56e427c6d68febc024375d0c3258162e SHA512 7ab84c2e3d949d2114aed64649183fd02e3a65097a1304e4cf840178306108f11a63745537c64ba175b5b599b719070931a36611e60163150138df46707681a7 WHIRLPOOL b98d638bfc0fbde3c680c18bd4e130f423cbd6e57155931de8c66866645596cd5e103091ab1634ebedb911716a872d5410aa58c4b2e0518ab82439855d1e698f
 EBUILD mesa-10.1.0.ebuild 13800 SHA256 65f94cb8c9818b21f06262ce03870db8bd202e94e06eb4ae22feec0d6d93a7e7 SHA512 0eb342ac37f665a045079cbefec0a272986df852a11696d00702451d5c0320fdd2a259c421fda1669f4188495870fe99c274ee71378ea9e96e6ee7848cf81b6b WHIRLPOOL 5d293f612e35dcee269da43868008bafb19c21960dd6f87d8058b66e0e95f4d25eb55e200ca0644ae6944cef47a6e7bddd248a88a0f18b77a03ef672d0add1b9
+EBUILD mesa-10.1.1.ebuild 13454 SHA256 f8435d13ddef1607242c93ffc69f5d65f219d5f0f6e8fcd829db878b8b821c1a SHA512 383b56704554f2bc92c63f97c92d7a3eeae6329a079f44b9c6ef9f91dbfe031115fe8f38e0815923d3e3967c0c9fbf119c04de221b044ab5927954b7b13cde7b WHIRLPOOL eeeb4c898f899f7e0a72e55e7d081bab876f68382c976d66ff655205f13fbfd06625ab4b5cd2f8741f35fc4d3529168068647070e0ab9e53669e4d8e025a29cb
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
 EBUILD mesa-7.11.2.ebuild 9983 SHA256 e73e54da27a1ecbae6d5e6f094514240572c22f17be4ba5b332ce8619deea8e7 SHA512 db8594d2c150761fb0dc2c90272470910e7ca15e4e1307256e3901a5076b2dab2aedf594d28f753d64517a82422a9c5a22f8052dcb84d7513bc93a3fb96336e6 WHIRLPOOL 26715e57e8f8c55678db9edf500e259b8e2c315a65a4bf89bb2ac76e284a17249fbf5865788ddbbb640d6389c074d0138c7f9c336f05225d0b6a9c5381ea7b54
 EBUILD mesa-8.0.4-r1.ebuild 10781 SHA256 1b62281c25288f440354da2174c88ad421f25db152c8a92f9b6355a1b9843c7d SHA512 5a8ba6be94ee2eb4ef633ed60120835cabdce92749208ec31e4298644b314f54d9c56b5249ee763f61b16ddd46efe97e914059f1d396aac62eea227b8c7c223c WHIRLPOOL 20c09649ff6daf0d1ed9625ba9c3963b1fb91bc6d244e9dc38fdb36cab9bf011e9247e65c06cc59be2eeeffb35c53f6df4c0e6c2259aa7eb115866dcab032d0e
 EBUILD mesa-9.0.3.ebuild 11102 SHA256 89964cd4b42ef13098ed2ff18927824251ed01322eb788bc4c3e0c68c7ac4db3 SHA512 1b561d589029d213f66eec1e73044f43fada79bac2ebded4f2bc10c92cd7aadaf056aa7e5aeb186794515212d1e366aee4268271f71def9e317525a558d36f75 WHIRLPOOL 805c370457a0cf4017f5a4217249a2befe42b7730f032edba580f1e268af5706a1815def41e6ddae84e2c2d1f8606adf751e3c6016b426f0e4138a22141749a0
 EBUILD mesa-9.1.6.ebuild 11033 SHA256 b6783455dece114dbeeedfdc04f52e6c59835bc58965845b577dff59d3167f44 SHA512 7e6675fab5c25d5370606002ae7b94023a6f7c78e77af929da90773280c4276661d96c7a0259010b87ea829050d3519cb461ab6a9d0970cc608e2eb0ebfc9240 WHIRLPOOL 044ad192979971f37150417194c42a7cc70f0b0f08d25f2cf1342ab54d7a75d48266ee94f41a273fea8f230873941e2d1165d3b7dd9f9f003afaef408c86fa86
 EBUILD mesa-9.2.5-r1.ebuild 13694 SHA256 723dc142aeb1f3d491a02b3807cde093b64472eb02d68d77474827400ff6d8ae SHA512 2da417b9c4668df1a216107ad42a72e32ea1163fa702c96cc8bc2759c707d0f6e4c38b45f4df3c5812309aad51590b5cdc1cb813be276ee6b4bdb444b4e79297 WHIRLPOOL 02a8eea008a71b568d6ec5eaf841451bc2f5460a302a3f81185876d5308e3e3e5d981aee31f905ff5cf47a72de868a96e338edafbd953eecb30755e14148f316
-MISC ChangeLog 88930 SHA256 943d4ff6f6afa57f27279a7ab7897e7df51dcda560c2c7f72f9258ec9e596da1 SHA512 050245fcccd5f3e2b1244166940e1e17912d5eab52d693a979eb71b0849933a264d155df06394bfb737a8fc00ef00fd91c440d81c6210950091bbdbe87b90df8 WHIRLPOOL 0035630d80979c769a8a1e81057d11bc100d34967d9dd68f0a5106c80711f7bc634dd273e8ae5649b72fa4080bb5c322916aef0c163eeac8b096658c8a68fbb7
+MISC ChangeLog 89073 SHA256 1969bd81970af8ca83310b0ee19ee80082be5d1962a646c60cefb43b1e795099 SHA512 96d260daf03b7b813fa295758bbc90e4334f267fb2b9822e82fb07edbd6819ba44f4e09caa1ebf18789f694e4e561ed539c35dbef569020a0aa0b04419aa1401 WHIRLPOOL 3ff2579463ef6661511f420b70ff5353d3d7671a90aa64ba5a59d7e6b763971fa420e7a4a3d2f020419288145e86abfff605643dfef6882fa58419b6d1edc1e6
 MISC metadata.xml 2196 SHA256 33d1df23b11468492b2d5985ba1944859684def22979da01940b93f16fdcfd91 SHA512 ea3d907e30ecb4278ea7c2d5ab3df229ad94d9f9f006aeffb6f61ecbe741a84873025bc2334582fd67f1a8d420492c473c02140775ca44340e3814dcd2e9b015 WHIRLPOOL 4d5aa6bec90a6ac4ed2b43eba0a851e4fbc095f3bfee3790e3b76174e9847ef9974bcce38eadfb18308b035dc1dfceffb33e4933b4a7617df76c5099fbee12b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUraaAAoJELp701BxlEWf5gAQAKWruqWkmPn00sJmxrkuAVFI
-TbkcdUiHddMZlvpyHBrxrnzoxqFXbgPXJQjLNnl0fXEmHwWI31Hvan2klN6L1bbs
-IkZYDJiC1JIvsj3/Mij8Vn+4RVZAmJZlAtDiEVcAQMHhWTSrKfNm7GlDjCynNMQ2
-+ltZyHtDmMloEXetYXdGb1/Sc4TRNXntbkSD5ZL4766WEYns+3c3bMnG0TByMLPK
-hpLV9OpOMkfLo8/Kf0mLe14JqKgGwkxTF8BV397DdBH8N37rtndQfGz76OlQ5Bri
-W46bNAVUNNZfi5GPK7PXAuCvFoKYdNIxPaB4Xh84lvaCB2ekJw5u3/33YF/nq1gD
-ESvN/GEp4EK2PEevU9gYIVCTKgL0z+gecAOwl7REh0GVSynqGxz89irladpbSbjq
-uJB/c2TkP/DOuMcYUhaqVlSSM4ibZ37ORXqx4vnSxVz4tslEs3gf4/RdJ1o2Z+S+
-tcXhhEN8zilQNjdmBHOgARUTbrD01JFcvUbGLsBgq0D6pXA7gZsSGBQX81nar3zz
-TdfqmNGt1JVn6mQMGiFchTfu4ikSbse0dJqUX0t9nCjN+d79POy+4cWDmpJzt/o1
-tQBS7m2OK1HDyszLwp07pXYsKQmxgukYGD6q9TIpknLeBtDyXbDB6TEVBxlgjGp1
-cCd1TbHX3pB9VYA9ry4p
-=i/0v
+iQIcBAEBCAAGBQJTXtJ+AAoJEA/daC2XTKcqpQAP/0exeSaNYzoGF3W0i5ORfMOi
+4pgp+ArcevT8IhKIknvWjc0CgEqeEeyz2wM+SBHi9GfafxIWEWAo4LUOtcCqTBL7
+AG0VXPvoALj3i1UL033FLJuzv3NZKO4x/5nWLOLXFh/zuUdN5mzN2FRkaQe9mJrN
+h/4MsZd3kJs5smAsyxTIeK9VCqjxefNkNZlZK08IkTmqwv9wR78ADDMpuVXB03he
+gcb+bHWxpNBteqzUn9uXgASyiZ9B4mHc5CtOv3CrWbXpV97Ic27he2vB0yj7n+jY
+/NmE9Pk+nXu6V/4/c5jAj50EZwqu+h7lzAM9uZtdAEhYppZ7ag2Q5Ka2RAw89dcX
+JecQlpiC9TgfaR4mIW6rCeMvUcB0islVLhYxBuD12gdnjgDYkmvvNkSeOmNJF6r4
+TyxUh3vWHnUEf8pD5ICRzyzwGo/lH/eAVBfDFWT73pm7/XUvSIzJQVgmuoZG7QDU
+4SqHxzYSKZLzXJ7ISaV3xCtCFZXX6BaTqqYhREkv5tMLxDATcXAZfrYNTPnmurGs
+LT/7ajh8sLNhpngj8X0IZzq7qEgHZMuYKkaZ2jQ9Kn2y1XgJtXOn+C3eJQAZuBpL
+bjwAvUEs5O5sGSZMDR21HabJMTQhZb7CYipIxNV3NcJFbmEKauVwrd9XsApJpQ4o
+0cC1ChFMKJQrmJz8NlqE
+=z8g/
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.1.1.ebuild b/media-libs/mesa/mesa-10.1.1.ebuild
new file mode 100644
index 000000000000..14a8090aa84b
--- /dev/null
+++ b/media-libs/mesa/mesa-10.1.1.ebuild
@@ -0,0 +1,493 @@
+# 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.1.1.ebuild,v 1.1 2014/04/28 22:10:44 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 ${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 pic r600-llvm-compiler selinux
+	vdpau wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	opencl? (
+		gallium
+		video_cards_r600? ( r600-llvm-compiler )
+		video_cards_radeon? ( r600-llvm-compiler )
+		video_cards_radeonsi? ( r600-llvm-compiler )
+	)
+	gles1?  ( egl )
+	gles2?  ( egl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_ilo?    ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+	${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.52"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/eselect-opengl-1.2.7
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
+	dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
+	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}]
+	llvm? (
+		video_cards_radeonsi? ( || (
+			dev-libs/elfutils[${MULTILIB_USEDEP}]
+			dev-libs/libelf[${MULTILIB_USEDEP}]
+			) )
+		video_cards_r600? ( || (
+			dev-libs/elfutils[${MULTILIB_USEDEP}]
+			dev-libs/libelf[${MULTILIB_USEDEP}]
+			) )
+		!video_cards_r600? (
+			video_cards_radeon? ( || (
+				dev-libs/elfutils[${MULTILIB_USEDEP}]
+				dev-libs/libelf[${MULTILIB_USEDEP}]
+				) )
+		)
+		>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+	)
+	opencl? (
+				app-admin/eselect-opencl
+				dev-libs/libclc
+			)
+	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? (
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	opencl? (
+				>=sys-devel/llvm-3.3-r3[video_cards_radeon,${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
+				>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
+	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
+	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+"
+
+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}-9.2-dont-require-llvm-for-r300.patch
+
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+	fi
+
+	base_src_prepare
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+
+	# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
+			$(use_enable openvg gallium-egl)
+			$(use_enable r600-llvm-compiler)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_ilo ilo
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	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 !pic asm) \
+		--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
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}