Version bump to 10.5.6.

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

3 files changed, 477 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 511b36528383..fd234f3d3ea8 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.641 2015/05/24 04:30:12 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.642 2015/05/24 18:11:12 mattst88 Exp $
+
+*mesa-10.5.6 (24 May 2015)
+
+  24 May 2015; Matt Turner <mattst88@gentoo.org> +mesa-10.5.6.ebuild:
+  Version bump to 10.5.6.
 
   24 May 2015; Matt Turner <mattst88@gentoo.org> mesa-10.2.8.ebuild,
   mesa-10.3.7-r1.ebuild, mesa-10.3.7-r2.ebuild, mesa-10.4.6.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d8bd35329a1c..6b45d53599c3 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -15,6 +15,7 @@ DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST mesa-10.5.4.tar.xz 6988284 SHA256 b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803 SHA512 e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5 WHIRLPOOL 91e83f526e50aac2047f944e89a11b38b5fb9bad2617148da5a5bb90502600e0933fb3d7c68bf3ef5f23be89aa3d76d58433a92cfc39649aaa523ab80d25f1be
 DIST mesa-10.5.5.tar.xz 6989964 SHA256 4ac4e4ea3414f1cadb1467f2f173f9e56170d31e8674f7953a46f0549d319f28 SHA512 d339f598bfdbe14388d3213b166bed5f89e67535b0ccc09d47f434e2669ed3c5d4c23a1c86f3e180d90e8ba1175f9de24f62b16364f072ac6bb695b57e519b61 WHIRLPOOL d824732ed0f6dd2377b183e8676f8b1e7685f078ed5e3f6a536157ac272928a190c710dc8d77b5e89bcff83ccd2d8f805ea6cf6413780fa6420d704e5bcd84b0
+DIST mesa-10.5.6.tar.xz 6991136 SHA256 66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595 SHA512 691a757755a76a85ac0877617bad7491037dda9445fc36499e9fc32d0fbfb3d3cdf8666bc45596a4d8e0b6fea40860e86e5e2ef1adc041b23cb5990aceaf4903 WHIRLPOOL 379cbd0dfb86672a1280641897c4c2ace4274a0b2db188ce3e7ade099db6beb3a73be25e7d1e0cff5418f5110540923d872e84693e33b79e576336e26ad9b670
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 EBUILD mesa-10.2.8.ebuild 14640 SHA256 be10cd6a5733a18ce12565585f0b339d1c4eacc3162b7d1073a8142e13abf222 SHA512 923ad8071d832aa4a8e9e58ac730a38bfd62c4cf539db93b3ca6123a03d4c8d1e7624430b9fe06c2db5159993107d4d7bb38dd15572df074d0b754f06b8f554b WHIRLPOOL f8ee6d3350d62bf940a58d0ab03cfb0ce6c6b32e838ee50ae1368afb7fb7df06b75e120f7e5e505398fa51aa7c75c2d6da17a981fb859cf0aae12ddf3e81daac
 EBUILD mesa-10.3.7-r1.ebuild 14710 SHA256 3b431fb3df2541a0b479ec0984335aef1a615409fb38304dc05c7727c7fe8aad SHA512 7484e9961cef9d59dd9f166aead3c4c64ac320270d034a1da0a7dd8ccfc311df81ed1addb04f3df977df2927be17f6ffe9cb1c306141f573bb1bbf801c43c888 WHIRLPOOL 19ad7a7894d62b8ec78bf66440ccf7f30e1c4c1e3a9332dfa00a5dcc102578ef8d705dae95f8eb207403eac2e2fb6aed1b8253c654f62e7afe924e56688a5d29
@@ -22,23 +23,24 @@ EBUILD mesa-10.3.7-r2.ebuild 13592 SHA256 1dd7207e1b62b119686eaca980a90c26be47aa
 EBUILD mesa-10.4.6.ebuild 13529 SHA256 d20a50c4462486da75b13676598429922a656763c029e72de7064d5ed98b7327 SHA512 86854420937b92f973c91414e47166d636ba276af85d87327f4bd6d21cfb0d8aee542498c46af42ab5d38535769fb7fbe2a9c450612fd1dcb984bc0a9842f1ca WHIRLPOOL 7d368b49df0f7a36f695c1cdde9632f55b954e0d71361534bba07f4ddd1b7dc5d052dcfc209f0bea4e68cef225f366c16f833b358ac09156885cc67419aeb8a6
 EBUILD mesa-10.5.4.ebuild 12527 SHA256 f9576967ed290cb8203247e528b0d0293dcf295961809b46bb28202162b64695 SHA512 d8eda63e39b7bab6a4a440c2463840d74726d285c0f7ae73db3c3e9703efa4a3638e1e8186d0ba3c2dec02b501f2aa0d1aa4ff72790d59c67c3bcbdd6fc612a0 WHIRLPOOL 494bf56367217f6964d0f760a472a25b8f8586427b396889d74b57ff90a9b85748c37cbef81e7ad118bd66e3bdae23840a10e51f209107c31fa42e5aa00666a1
 EBUILD mesa-10.5.5.ebuild 12527 SHA256 c50c78921b6f2b0f193803233735782402c5cea991f1c597c31e5c2ef553c09b SHA512 51545089ef503e34550e251df139ebdeced73326fde79ae625b7446b3d263d62e4aef9e2dc2cfab973986021589e4ca4e4770ead32c251fa3506dbc5bab171b5 WHIRLPOOL 75a8f2138979aba76fb989a4b5ce422e4766aaae8df9676158053be4854e4a2bc279c81262034b77288ccd991a7fb3dbb52d7e72f9907f37b726d8a6d94fea34
+EBUILD mesa-10.5.6.ebuild 12527 SHA256 f109807f25db58e4b631b2820a0896e910a247b4987545bcf634a60aa7f2e0c5 SHA512 987ac393885c71b33de325ae5a3551d8db6181af23e4cd2fcce27d5f162a64a10b98d72f14d618264c877249ef8589ae97ff04ed173caafb95c0c9652be0b268 WHIRLPOOL 051f3b3f47cc1ce69623a191a3362148f3e14815073f91a423286253fe8e2182de735b3efccdeef2a3bca2fe75cc58a5c730b63dc5ee0cb9ce4e556bd9e06311
 EBUILD mesa-7.10.3.ebuild 9834 SHA256 2365eae41e795a722548fb4d8a6c72216b3d5a4b287014f8de5242a017ec5c2a SHA512 1cb57bf082d93bfd91bb0d68d7978c1339dd20477efe84e050fbf6c869313292819e158ae2620602d651023463f6cb9ab4ec40199732338a2c5168ef6e5281e4 WHIRLPOOL 329e68844422b3fc81485825067b916b6cec0b2723d87b4c7682bdecf25a51a466792f04fe0f72332767912714c9fac1fdfe284ae17b68add5019113be008681
-MISC ChangeLog 102795 SHA256 3f0ad83b12db487c4e933ae72d1ca1032a4baae02b3d83adea1654317fe49291 SHA512 fe2b49d77bce6b95814d577d3f0eff6ecf8a2de8525b3526b42778fc5413ce7f80980a62eecae762aac72421816e156d2509f6bd6983eb56b6633de306850e5c WHIRLPOOL 0fd817ffc81e0d809aa69acb87c084ce9cd2fb949a85e88637b48190c03f7caa1a29c8e2f601e0a3b20f708e392109b8a29363b814cda0f60ddb6beb3b3278a6
+MISC ChangeLog 102920 SHA256 466dca6babfe9ca1842db1c086407f017acf76cede6d1bd70a467224e0dd0185 SHA512 12c6fc49456a4ebdc39617872a9b2827810c9a09efb06b0b12721770be481935a315c9509db014474483a2cb9759cd71e4ef1d8b8fb64d2202ec1f3d24781371 WHIRLPOOL 15192348c6afc54aa2ebd7103815c063a9c0be27ad508797f10e17322946378ac4dc918a5299443147571f080272d4ac8a3d8d50e8bb323dfe1979ba1ff9b43c
 MISC metadata.xml 1854 SHA256 b60b4d587e093ccf61c0d6840982145e406bb3f6f68bf208a9e08d0a98a960c8 SHA512 e9d40790143c9a4560b3287510e12578ddbeb17f9a22f72a60cabe0c2921f7019612d37fe32b95006f5508bc56565f438df3acca297762616e888e2b675f6bc7 WHIRLPOOL 6fb4932c93a021d6060f9aa0e1b0baf194083b9e0f981771557b2affd3639981df1495b56f160ac99e839059fb65ed18715c4a728919308733872f5d87806ea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVYVPsAAoJEA/daC2XTKcqFXYP/ir+4oT7JOYz+pDAkgTBUqUU
-67ZJQjRrDgslzBFecAecfQgixbpfEtQpzcUqZWAfcqERtBwdofvIiDuP6gAoBsji
-symAuytS5oIQvAn+PR4kxCICzSHlFoXtGFNLRhX7XkTNgX/c3sKIjk0jVc3kInq5
-04CfIPIDfmeGWigfSVFUZqcmK5kywqbJc4xIADS3HrhAGgmVUYZF87MNnRIFiosA
-SlwMJvQiWWOvmvcETGZ6HH0kAhzK51d+Em06pGjoubgAq4Nfbp5UPQdjjoTmAtBw
-xxu8hKOJHG75A/opJkDF29qapNsEE4em0vWLp8Wi/nX2qerJoh65Mh2PY3Jlc5zm
-BoUCvrT8GrEQnudfX0MpnMKkPeZh8E5lh6yFGO7ZX5Cf9/aziz0ddUjeixSIBbpe
-sNNTM4r7xgGlC3bjFUOZAvqIXEfUJd75SxQOED8/254XKUTHV0io3tPBgOtDu1yn
-Rw5tU+/X+U/AjJgkCsS8B79c/BPAuT6fKnIdn2HVbOs+6qubTn098BohWBMdN+ly
-mpOfiUm5CkyfFkz8zbyKHiBeOzb5pfF8JAzDqUFxJxPRsCsXc4oMiJPOOZfsoINB
-PIlownqLWd7IV2YkGbFIKCX/OKzGNt2KfdJwDNzJO1iBL5bbtDDHGr/MEdISv6iV
-WEbfjnWs+lRUyDCLSpRt
-=igeC
+iQIcBAEBCAAGBQJVYhRbAAoJEA/daC2XTKcqWgYP/jsNFpUtSkGyVINowgfgTdvq
+cLiDfXGpHo7OootdurivdfqgNQdS0kirOJ7K0nA94JKiiuWKUu8PEvtPvb82f4tH
+CAz1gwOhbKIcw1Hi9T0uv+Zl/ndJo10kvb6B/wdX8F309dUbZ1rtgexIB9vQ9msh
+iGhD5SM8xNizK+mLXp/dPWZNcuUQSPXAYkmkgUQzAe9fIWnAAWAv8HkZIkScGQ60
+r9wJ7yPLbJz1Z0lWKtEPDG7JGwATFryP6xNQdIOvJsxvbL1JhzyitOn8HmHguCpy
+PmqBBeIFf0I74PFdCQsRpe49fb6pIwZlgyqSxwMImckGitjzRItyTeV3lrNFrS5I
+qy1VsjAP/DJkZuD2gpZPY3eDjBM9suq4/QiuOibJQfvtP1weAt2b3/5HZecmcYh5
+0MHrczjXP3El5shNYIMzBo8+Lb67kCWHumylHKc/Zpoc+UbCqzFr1iu77mwE6tSN
+ElcxVUd3ERn7FHPTNVi8GnS9MTgV1Z4KYBPqvoZkyE8fzm0rxNo1p6pzMR6REu6S
+KqR+74gcKaPpvf3h6wYxSLNs4vuSqa1lO440NVCZiW1WLCVNBDMsvRcnxXXdtyxZ
+YDrSN558kJSiS3nW4rxjDw/hYwDmhJk8oJy9PbZgVzMjhpYrUg8xeFDIB6+T8esy
+8+8RsbkGAsIWFehznBkU
+=bazO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.5.6.ebuild b/media-libs/mesa/mesa-10.5.6.ebuild
new file mode 100644
index 000000000000..ceacdeeb4413
--- /dev/null
+++ b/media-libs/mesa/mesa-10.5.6.ebuild
@@ -0,0 +1,455 @@
+# 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.5.6.ebuild,v 1.1 2015/05/24 18:11:12 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=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+if [[ $PV == 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+	wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	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 llvm )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+	${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.57"
+# 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-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
+	>=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}]
+	x11-libs/libXfixes:=[${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? (
+			video_cards_radeon? ( || (
+				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				) )
+		)
+		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				|| (
+					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				)
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.35.0:=[${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}
+	llvm? (
+		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/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.17-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}]
+"
+[[ ${PV} == "9999" ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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*/libGL.so*"
+QA_WX_LOAD="usr/lib*/libGL.so*"
+
+pkg_setup() {
+	# 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_prepare() {
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	eautoreconf
+}
+
+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 d3d9 nine)
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openmax omx)
+			$(use_enable vaapi va)
+			$(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-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_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(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}"
+
+	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}
+
+	# 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
+
+	if ! 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
+}