Version bump.

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

3 files changed, 429 insertions, 2 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 94811598efe8..b0978af2fda7 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.468 2013/04/28 13:47:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.469 2013/05/02 17:01:24 chithanh Exp $
+
+*mesa-9.1.2 (02 May 2013)
+
+  02 May 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-9.1.2.ebuild:
+  Version bump.
 
 *mesa-9.2_pre20130427 (28 Apr 2013)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d4e589f084d7..598f7d239296 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -13,11 +13,13 @@ DIST MesaLib-9.0.1.tar.bz2 6115959 SHA256 57a7ba83bace3f3a7dc0929fe026ef5f0ad454
 DIST MesaLib-9.0.2.tar.bz2 6132857 SHA256 75bf31f26c6e7b5515e610c1005fd1be1f7eeb2c9e6859848dab879c355ad64e SHA512 1f04562c04a87a2c761a2ccb729f2aa228b19a0044d3c56e7da08382143331843cc98aee226558c045dc275ca7f14d7754dfe19b633ca1463bc3f30fac01e9cc WHIRLPOOL d947dc3edf14a989883a74103f17e0ede1b27ea9686b9ad6510cb40b7e131ff293e8c409ff5c6f450a61e03f2bc7de5428adc2e6d6791ddb4a9bc10b86cb5472
 DIST MesaLib-9.0.3.tar.bz2 6137208 SHA256 ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 SHA512 2685706670356ca82c36a9fc30bfdabe9429e37ba670ece4a44634222430f828dfd5f15b116d78e3a9a6c432cf6ee3cf3a44bd132f896b81cc0bf1e1076dfdc5 WHIRLPOOL e0e4d867de8bd8c97f25e10cd6aed6c5490224e25cc6413b0de0c7bfa4112e5f63d2aa135a3d3ea028257d1ad0340e1a69f38c270eb148ce68c8fb7cd4317f58
 DIST MesaLib-9.1.1.tar.bz2 6122510 SHA256 3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb SHA512 3a0cd1cc71d44b78f6a99536acd1eaa50d56a5ce26d0a247bde8f3e52e02c61097c23d26ee358dc91a4876cbaa14d0bb32c23f04837eb09808fd5fab842d154e WHIRLPOOL 22bbbeac8fe6a7f6c08401ffaee166380b4c0436910bce167eb6ec171800ce5b268f04c0ec72013c001b8b56fae562e57796f92e19d86f06da528f1b83f28392
+DIST MesaLib-9.1.2.tar.bz2 6122642 SHA256 0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db SHA512 80a09c76b43ad039d8d577f0d9e2b33038847aa8815a1a5251badec626dfe2e7b4c0dfa445f8ce388d4af052147da388ebac0c3265f48e42e3fda4147bfaa578 WHIRLPOOL ea5fe473813111ae08d64bbe9183a11454449ccf419cc689f644afc127ce7b1fd8cb5344682afae13f7db0a2d1d3b90ae418802805d4cee2f6d46d1d26953d1d
 DIST MesaLib-9.1.tar.bz2 6125400 SHA256 af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b SHA512 9475361e3e3ce0e8ad632003b6e41944d3750de3d5a1a774a2e9cb1f04fd0df8f27e6f47e31f08808c3f4506f683cbda53570617f1db1dd0657b07e4bac36a19 WHIRLPOOL 09488fc64f72818cf4baa3acb9c859a230e400749273f287b03645bfbc4679969037ad5eae1504de595becfd35d533fbdd6a9b37cd9aca41d62c2b9bf28991e1
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b SHA512 0dcd60bd40efa25c9895150b6c0230e6582ff42ba0bafae49290e170948ee99ff25be321e7d3d503b3f465eeedcd145fc46b312a54d9bc4d3577fd5e61c3439b WHIRLPOOL 8a4a5c250430ebc08d7081158c6cc41ea7b5718662ef0327e5829c2f26069be0bed7a0df12c82434c58d364926404c929ca9881847554b74906db195b12d6576
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
 DIST mesa-9.1-gentoo-patches-01.tar.bz2 1162 SHA256 f068c3ee3a97da8107ee1f96801e92076ad87224086c97c42ebca2cb0b7407ac SHA512 cc55fa3eb4ec66eaba8f441687942520304556d5ead6cf08cdbf0d23efbc271c71ab728de803aa992a1ee5f0f9c231ebc638a09782a49b738e52b89a8468981a WHIRLPOOL 1483eccaeb918bdb68ec493ac925d21c366d26ad7a222d9fe4f7fa44724fd7183079e42f42ba8e85cb7f4fd15b3a0c091cd477954e85071b5f562f4fe0356113
+DIST mesa-9.1-gentoo-patches-02.tar.bz2 2118 SHA256 0f3df10b81226ff880ff300ffb65aab6564072b3c420cd41f5eee5599fc29965 SHA512 7d2be7f936a692e562ffe45fee12c0841d3d70b2dd05e50962c5106fad17464db2f877f48e37fd552142275483233f67855444e3f44dbb909103a815d0596ccd WHIRLPOOL c3bb1794f0a0fd48235589bceb5c456eb45429daa71185d20734111e649d0d0ad208ea9724446802752254f827a9c29cc766f2a41936ce79d8e2a8137710e6bc
 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
@@ -28,8 +30,9 @@ EBUILD mesa-9.0.1.ebuild 11084 SHA256 3d2d5c41166a64c39322e9f77b7aeb571de94fcef0
 EBUILD mesa-9.0.2.ebuild 11094 SHA256 76c6873a3e966bfa60ed97c2fab03d9d1329864ecf27e9c1ec534bfc9e938d03 SHA512 ac26a331edf347d86d161fd4752ed63666b3df7aa927053acc39b9eafa25c1d427807eab0d4de4299cbadf5dc30fc2d7bf845e9ac5b251c30773e9ca14c7dbaf WHIRLPOOL f1ef46ca5cd41fc45531c7cce76c483e51bc09811d76de07383a231946b54c7774deb857a9182be243292be72668ea6c56eab617b054cbd953e7094d4c20d278
 EBUILD mesa-9.0.3.ebuild 11065 SHA256 b2fbbde969886a0cd94624d772bf22f908c72f8ea0dcc13be37461bfd8d1d78a SHA512 a9550a4fd8edc532b483985c1e6e6f77be81d68c222e49cb93b7c61b6e39cefa019d01031cbafbf5efe66184f9290905ceaa6536441cfa54e3d17181b3816329 WHIRLPOOL 596b8a2d15a4549c916b324fd53bdc566c0bdd30e2571faffb3d9813c9b6b452f20f5f564d74dccb11390782f85e0c754a7e77d5ba2fa933417b290bb271ab05
 EBUILD mesa-9.1.1.ebuild 10990 SHA256 95e5c318bde526b82c419737bc73d451be47357a1607ce6faccc85a1c729256a SHA512 0bf60745a83c931eb5b208460f4460f58b0081a32a463b1940c54a061be9917aafc6e6c88d8f1c1413a8802939912e5a74c8557cc163b4b918b7a430a06bce92 WHIRLPOOL 0dc3faeca905e87d25b426d3c5530cfe75865151699a53eb5e30f52c504bdd5554f33c27eee35e96fcf16212f069820bed1cc2f3fd06e226ab234af1b3d876fe
+EBUILD mesa-9.1.2.ebuild 11000 SHA256 342224aa863b2703689d6a5f076781634937d73a05a02330ffdf6d88b0eba965 SHA512 cafd4650843ddb255aca853f3568e41191f9aa6534a90e7caf31087d104b3acf2ad559474df566ee885d1961b2b6ae2b359884c547b2527ceba4d9c52755dcb6 WHIRLPOOL ae62b2153c483ba185b0a11c1d51004b1fd079d5b904ed97a2f155a495969c1ed157b188feb88bce82465e62bcee0e3b4db2f3f7f27ecd05ac664182dd7e97db
 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 76051 SHA256 edad75293a0d9cae18eb7d974abf6b47e9d9be38ced50dbd1dcdf57ebaf4030b SHA512 fe102fe6238eb2eb0536a4a4a21ca57b0b21d92ec3d6c10b470f1a1aef53a3211be5236c79140b5d8bd81eba34df06ba41c113fc6c7246100810975efe274943 WHIRLPOOL 9ea772fe338114591add969a9174aeba420b4d363d1e595480ac602028e76879b47055cc98a5185645b9af2709959bfb313cc73582d9524718a7b4cca4157e97
+MISC ChangeLog 76186 SHA256 0a7b719981e91c52b98b82f8a3f590f29578e8b69f410899ca9537f6c0645cab SHA512 8c1dc5af7d7d213ed5716f81783351d24fb9fe24884cb2d8a14bf2fc6215f3ac5e7f39b099a6cde1e3dfd051dbd912cb84b82996af47a3ebd5923f6ea0aa77bf WHIRLPOOL da2f70a6f125fd8dfa2fc4fd5aa491a37764c0c83795fe8834f0ab293542c501eb2392902aba1f6c3f7d81ff9fdbd9987157372b65c68527993971c4f9a6e932
 MISC metadata.xml 1986 SHA256 7a518f3eb77d4b51d4dc5c5cd347bebdc2c849e43d17d1057afeae6be2dc13ad SHA512 1dccfd236b8b8e39560d5056281e774979cd8e2299623b34c2e0f0d9e1ae84906932cfbc0ab15bdd1effc1d82cb484ca4d23acf7cd8d849a33a82f9ee2c60b90 WHIRLPOOL 14e19a3782775f7ca600526f1bf852ed55e328585b7e095a8ab239697ca351f812bf914205166faf714420d179ac7e36b6d1b10fe74188a028c580d40640e31c
diff --git a/media-libs/mesa/mesa-9.1.2.ebuild b/media-libs/mesa/mesa-9.1.2.ebuild
new file mode 100644
index 000000000000..17938dac8393
--- /dev/null
+++ b/media-libs/mesa/mesa-9.1.2.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.ebuild,v 1.1 2013/05/02 17:01:24 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-02.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
+}