New snapshot.

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 444 insertions, 3 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d6c81004a785..ca472e0dac90 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.408 2012/07/21 22:02:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.409 2012/07/24 22:25:36 chithanh Exp $
+
+*mesa-8.1_rc1_pre20120724 (24 Jul 2012)
+
+  24 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-8.1_rc1_pre20120724.ebuild, metadata.xml:
+  New snapshot.
 
 *mesa-8.0.4 (21 Jul 2012)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7e2b877a2811..8524cfef553a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -11,11 +11,13 @@ DIST MesaLib-8.0.4.tar.bz2 5737052 SHA256 02ed19f4f5f6535dda03a9932a81438aa78ea7
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 RMD160 acc52b4f05b82a98e7994dc005699630270de360 SHA1 f38c616eeacbeebe597ed4bc98b84a41caa18108 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 RMD160 45196d33a7e2f6d3766ddf9cf5e5ab1b5becff18 SHA1 51e567e8549477160ddceaa2a618dd6dfe3656e1 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b
 DIST mesa-8.0.3-gentoo-patches-02.tar.bz2 1858 SHA256 554e2f49ff4e33b4eb64c50d010f3be4ae302ab01af2794feff2ea73c0eb7104 SHA512 efe7212fed36143096b6eab0f99558361723023a99e6e37e2ca047fa18168c1d85ef614b5bcc55d259fa30d5468c322e7c1ecce28e5b28dc1585ee7badbd5ac4 WHIRLPOOL 3fda1876bbedcba2533176a931c8300681e34bc9b5555a53cef218f2db431a18ddb1d11a3bfd7497106107932c85ded40178e8a2dc5b9ccd03fb452b061028b5
+DIST mesa-8.1_rc1_pre20120724.tar.xz 4871824 SHA256 d6cea776d7600a9c58334a78525f60956392d5c446a993bec9e9f63bc825c138 SHA512 457abe450e59649737e9c91fada18805f6789c86f49610d6b21102df6dca55976faaebfdd5078bff5017a5b52a532cfa79fec3cac2d7e17ac3162f5467d7a74c WHIRLPOOL f99984d215085119af9d6e889376228d73fa959e2191e884431ff0556d97cfe6521c82693c92d6fd155e73253f027978de8e08a96c6085728f3a132ec1c48dd6
 EBUILD mesa-7.10.3.ebuild 9842 SHA256 655c8ccabf2b476cf5e0c5c8936ceb04ad91f6fa2e009bae2103978368914da6 SHA512 dd3c07dc2ef1ccfca8693671f23a88abf7d325e6a518468cc4fa5ea7b4a7b44049de96b3a6ed105239aeea4f80498f41200eb1ed0e97dd5bbbac656737e84a22 WHIRLPOOL 3b6288a6c1c9011a5c0b17097db25fc6b98c78657613d38de0d8a5707a42d3f2a143c583c0439591c783715178c91ad1a338fa8d4f79aff59d5e1672b30bb2a0
 EBUILD mesa-7.11.2.ebuild 9991 SHA256 bfb44d32edbdb69fd5f3acfe13064fb2d5132681130dc83baf704736e9309df3 SHA512 3f8c28c80fee1ce7bef852a132721abcba1c23567a17ffcd28e2536763ecc1bb7f2a4be44718ef3cc2b6e1c4ef29fd1e32e30fb648e280e6d21409237a55b1aa WHIRLPOOL 06190c007e9c25255fa0752ba2de96ba17cafc5bc2e74148ed595bb2c6e5a2f0a4959e01fa43a3ac0f8a20537503c34a13e46dd4c327d24434ef836dd7c9bf3e
 EBUILD mesa-7.11.ebuild 9998 SHA256 6331d9a272cf58684bdefa3a87b2f7b428bf70233d56954a1e515ed39b6b5fbc SHA512 63ef247bbe196af503c3f5bc358018fcd4390e816fbc0048bbd0fced535d033d5726bac4318061368b70857ed597c4cdc3bebd6acc87fad3b1a9bb5c4e857c73 WHIRLPOOL 67e0426c126186ff58b740c251435cce6e13f1e7cbce69173f66305d92526e33ce049610acd57014686e3ba565cdc1d4b5d71913355ac1416ab64e0ba01d7191
 EBUILD mesa-8.0.3-r1.ebuild 10837 SHA256 150016d8d1abfcd26b92840d09b9a8bdadb69eb99186f7866be1a3b4614481cd SHA512 7948a3f9c597d3f19f6b9010b2c293cf82e8bd786ea23e0423463b6de5166b0589806d287d77d3886f2c9d510e0d3a5aa29c8c58743fc476d11dd9a8ede91e32 WHIRLPOOL fe1c4d1fcbd1baef924101cea6906c1a9e42e0175a70ea88e09b9c880884188dec513fb3321ed96d65aa625febb318381989a2e748a4fdbc1cfcbfd10df148ed
 EBUILD mesa-8.0.3.ebuild 10677 SHA256 4796ba40c2716200b492ef0640247d0e84b1fa9dc8d5f35aee532125bb517e55 SHA512 9417da8706b3bfa024b533635b9b3baf9cf0e7033c565bcdc3d64d0b16f9bb7a9b6d3aed667fe930de991eec2137b20442becd4bf78c1e22d1bf052f63ec24a0 WHIRLPOOL 5f92e62dfdac5277f22e06d50364881b5dd1b56c2a9e303da847c7b9f12276bdaf6d22a1fed9baa748d06058a84aefbe5151456fb81fd1cae6642339fa753284
 EBUILD mesa-8.0.4.ebuild 10840 SHA256 88cea27f029d400b3dc124b8a8b90b46c2225eeffa6a8344305c17224b017ece SHA512 310767241b0ae3063129bce82cea63fb5342ec7353d1e4e5eb1d99709cbd77e4cfff4f72ccdd14696d2c5f8a8a504d2b5b86cef141ac6781f470f4cd16dde6c5 WHIRLPOOL aefa80ad0f0a8fa6caefe48133b10c1ade5608019b841327ae8a2917f7abb519fae79320b6c2c5d400893381139344c8b748101722fa2f8e6b0764520c7acca4
-MISC ChangeLog 66795 SHA256 fc8352f5e4bfddd9e81a6a713ed6159d826a440a40838fa7080ffbed889cabac SHA512 2bd01a1b35218f99edba1101134c1af63e524c5c56d1006aa86576ba1facaee80d42216b88513f5898b71b67e8e72cab569aa8520f91b0baf5a4fbd7ee44a29e WHIRLPOOL 2bd6e85effdc79e2b6d6c02aed82786f24991c74a992bb6bd4ff1195fb4aa2c3bbfa868dd2406ac9429190b5e68a301b19a74c0f066a30baa93cb0b4b0d98bbc
-MISC metadata.xml 1719 SHA256 48b27a829c1fee92ff4119093789a4cf8f57d56bea30df6d6fac26b13f80cabb SHA512 9661ef0f185db6209e9f3cd4e5a53932f7b67afe9d701412c48b9a05fc6d3a4ee4221f383797ae5eff0256de190263a0020ff455f0a36e26cd226da13c0d671a WHIRLPOOL 892cc3be9e0a2065b100431058d92611048fbbc75f0dbe688904e676fbb3bc98ccc0a623481162182c48834dcb0a603d7d1c98a9e8ec1b2bed3522ac262227c5
+EBUILD mesa-8.1_rc1_pre20120724.ebuild 11283 SHA256 dbbb76d1dbcfb1ed191569b6ecd2bc65cfc09ed5695a8b5b21c9a638b4324594 SHA512 d9aff2068d829a6bec569a518cca92c1f324b9691ed928ce3531c9f0e11e13ec55dce62845ab51b9b77f0b11ff3643787cd1f79db4bc9583881355ea5de097ac WHIRLPOOL da4fb1e9024502a45764d8ca89923c745088f201a0610a9ae74b100fe7ce036e34224e050b8364755291ea177e3bf3a6639e964dd6f0d0eeeaa006f2b44c43d1
+MISC ChangeLog 66972 SHA256 b8b51183ac070d8ec5f5a5cb9c8d495cdaa08ad706ad40ef7b54384421ea9010 SHA512 7d2c835cb146e78f6cc3635c15056d4f3d3453615cab0942f9a4c0c4cf131ff89d6bded3a0ccf0d5a0734555a9745eee5d9e08784db0d5721e731f00bfe28d34 WHIRLPOOL 55e0e8c812f960666eb46161cdbe16ab076f572b190c1fb7c11eced953b7f39024f73a1d3faaa4bfc373f97d70f2fce3f320bc3edb5330eaf5715ef09ebb4884
+MISC metadata.xml 1892 SHA256 dada89abde4af18c3a548d01c1f9e25792a2dc2008aaf9ce856a6188c302df2c SHA512 0e2dbbe0bf8625ca35cb283bd30ba4f1119fcdb00233ca7c054dd29a2dfb2cf7e6fd0e204620e83ecedf7c72784c41e843a566888bca89ceccbb29d9f009b2bc WHIRLPOOL 321eba59fbac32a001a918c37180984a15c713ca6bb83d09eab577bfa07a7ff401cfd083150f6779af8e3f6607e9be13298bd50048bec6938b0ed36cad8f1dac
diff --git a/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild b/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild
new file mode 100644
index 000000000000..e2b519e02927
--- /dev/null
+++ b/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild,v 1.1 2012/07/24 22:25:36 chithanh Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools multilib flag-o-matic toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${SRC_PATCHES}"
+fi
+
+# The code is MIT/X11.
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-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 d3d debug +egl g3dvl +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="
+	d3d?    ( gallium )
+	g3dvl?  ( gallium )
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	g3dvl? ( || ( vdpau xvmc ) )
+	vdpau? ( g3dvl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	xa?  ( gallium )
+	xorg?  ( gallium )
+	xvmc?  ( g3dvl )
+	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.34"
+# not a runtime dependency of this package, but dependency of packages which
+# depend on this package, bug #342393
+EXTERNAL_DEPEND="
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
+"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+# gtest file collision bug #411825
+RDEPEND="${EXTERNAL_DEPEND}
+	dev-util/indent
+	!<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.6
+	dev-libs/expat
+	gbm? ( sys-fs/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8
+	d3d? ( app-emulation/wine )
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( dev-libs/wayland )
+	xorg? (
+		x11-base/xorg-server
+		x11-libs/libdrm[libkms]
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? (
+		>=sys-devel/llvm-2.9
+		r600-llvm-compiler? ( >=sys-devel/llvm-3.1 )
+		video_cards_radeonsi? ( >=sys-devel/llvm-3.1 )
+	)
+	=dev-lang/python-2*
+	dev-libs/libxml2[python]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	x11-misc/makedepend
+	>=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
+}
+
+src_unpack() {
+	default
+	if [[ ${PV} = 9999* ]]; then
+		git-2_src_unpack
+	fi
+	mv "${WORKDIR}"/${PN}-*/ "${WORKDIR}"/${MY_P} || die
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	# relax the requirement that r300 must have llvm, bug 380303
+	epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch
+
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+	fi
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+
+	# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="
+			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
+			$(use_enable gallium gallium-egl)
+		"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d d3d1x)
+			$(use_enable g3dvl gallium-g3dvl)
+			$(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
+
+	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} \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Save the glsl-compiler for later use
+	if ! tc-is-cross-compiler; then
+		dobin "${S}"/src/glsl/glsl_compiler
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		local x
+		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
+		dodir ${gl_dir}/{lib,extensions,include/GL}
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
+			if [ -d ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}"
+					fi
+				fi
+			done
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 0934a9d7c90c..b682aaaf2424 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -15,6 +15,7 @@
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
+	<flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
@@ -22,6 +23,7 @@
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
+	<flag name='xorg'>Enable the X.org state tracker (DDX replacement) for Gallium3D.</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>