Version bump to 10.5.2. Fixes bugs 542808 and 542812.

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

3 files changed, 478 insertions, 18 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index fd4c4c96ce59..51ba8c335033 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.632 2015/03/24 11:46:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.633 2015/03/28 19:53:47 mattst88 Exp $
+
+*mesa-10.5.2 (28 Mar 2015)
+
+  28 Mar 2015; Matt Turner <mattst88@gentoo.org> +mesa-10.5.2.ebuild:
+  Version bump to 10.5.2. Fixes bugs 542808 and 542812.
 
   24 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   mesa-10.5.1.ebuild:
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index be39bd9291a3..24567bcb31fb 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -14,31 +14,31 @@ DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c
 DIST MesaLib-10.4.4.tar.bz2 7507100 SHA256 f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c SHA512 72d289d051bcb676ea93714c73f43e3decddaf1877e39bc7b9f092946b79d4e9c40dd534187a9eae81c844f8f9843bc6d0a804e5f22fae0cafc2b482859c7357 WHIRLPOOL ec89fcf5ac70170d8253a7b5d41dd0f46dc666e1b39d6b981d1a0169fbe360efa26c6f550c5391122baf1745f70786bc8a6a6b5d070404a455374aa358800e04
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST mesa-10.5.1.tar.xz 6973916 SHA256 ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679 SHA512 71d7154b6950637f14289f8f4e6a846636264a3b794a47b2774e685e2ddf36593d4291ff9e5e24b302ce7d35b925702b1373ea11249bdb8c51537e0411ca9003 WHIRLPOOL 8c3768ca0a82655b1c7fc6cbe4625f1dceb935e9933dddacc36ca917f7773ee42a78e4c48be0116d52528665169207fba8f5f0b3ee58c2cf3970b328bd831648
+DIST mesa-10.5.2.tar.xz 6975500 SHA256 2f4b6fb77c3e7d6f861558d0884a3073f575e1e673dad8d1b0624e78e9c4dd44 SHA512 306c242ea0df54cf3e491bafa85da5687c0be35ffa24c5fde8bff5134b0b952667677e3f83fa68aa44a47fd298e2072ad5a7e7e1ad0b79f56bc1d88b8738e614 WHIRLPOOL f08d0e5afc97c98ac479d33a5a9a6f5665da83f173413b9e8b7f0fc0eec8e9bb0eb1e34884c62b561185bfb708966df93579025d21918108d59dbc9d654deaa0
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 EBUILD mesa-10.2.8.ebuild 14993 SHA256 b52dad1287968ea7d4624e1a46e500ac418bb567e928fdc7fb4518e30415e198 SHA512 e968ceab359b59602f717b5121c44ddddfda6ac2b5870778df38d07577fe023c21e513dcc34bba94412db66422b28ccbf1aa3a9b25d0159e85d6acec8eb7123d WHIRLPOOL 94390c1542f9291f16145ee431f30b574372afcc11d6fd778b5be927ae099b7d724b43e8dff447c9d13cda823ea0d3f097968f256f25f7438f4059a271d3b779
 EBUILD mesa-10.3.7-r1.ebuild 15063 SHA256 b7f7ef7dd6b34dc87024e31c4250214bf0f8405bf3a083abafdf5d5a6d0c237b SHA512 051e435fcc70894bd598a39545a7a928bd58c2ef75ae0d4d1134b8767c2cba6f2588016c593c1844deeaf35048aeb28132653175cc33108b06efab45aac22f8e WHIRLPOOL 48068017bfef4c48a2398ad4014d278b22f2332abee24a961017dfdca5f9d6baf4f176d1e80b8408f68c374b850f7d23ed3c2afa39d4d7f6fe650d1f7e61fb95
 EBUILD mesa-10.3.7-r2.ebuild 13945 SHA256 9a68029b60377228b94ad20f8335c486fa63acfad331ca2dfe7aa3b63c929130 SHA512 7f4c411776086b5c8763d1978311d338fde2b6bcba3f0cc11acef934d5b7014193b6e75b47abcfbaa6b6639e3a6cb721e74c8d46acebe532778df49528224867 WHIRLPOOL 4bfdc01646def19cf2c81c68ce82723600743a54bfa9cd5a1bf3ee78ec13e1308c9b43504de18f5519951f3b493345b9e591111308ca9de63f3dcba97155daa0
 EBUILD mesa-10.4.4.ebuild 13882 SHA256 2da30b2726be54b3d0c5b527c9c4d77f3bfc03458e33e4f6ef8d9c08ecc2f61b SHA512 165a834938790bea30e9b15fe1f8a7b9443e2261b3b9e2a7a806f7b2be1bd0d9c45f29ee406000c7493ef1d5564a27c30f4dee6a3a77f654c687c8aef6c39084 WHIRLPOOL 51c72efdd02b82d2283bcde52edcb3a5fc639cbaff044dbce540fbb3b6396833bf26dd3fb3d2fd5d3e2569b6af9b0dbd464707346baca287863613ee1eb9d5a2
 EBUILD mesa-10.5.1.ebuild 12631 SHA256 a9fd1ed180d8a78e4b505ceea90db20cdd89cefa2a62b1003fae77b5ce58eb6b SHA512 f37df8e52516dcc4683af362ad332349c4da3eba6342348e9125138792d7ec90e74d5e32a190371969ba1b49041fbaf1fe0747736a7381860b3ab352adfaedea WHIRLPOOL 9412c1440acc92bfc8d8c118fa9c0f926e9da0fc418f74c5cfa37aa68538d277c2bc5270753823eba45b598de2b7dd06883c39fb195841a37c28e46d670163be
+EBUILD mesa-10.5.2.ebuild 12522 SHA256 0b770a708f31bbcde861dbf87ae8d244e64787311d1c71ed0fcc65c1df086cfa SHA512 daa992d65e1363a04dfc84716ed2a2535cf4f56731fbcc103233f13f670242a0d7aa619c358fec990b2328adbb50b974d5cdac18066ccdfde5e9101f46b2f7ed WHIRLPOOL 2458d5e5d7050087c5a9c6debee223cabb42200563e6e42dfaa84f153f762d164645ebf67b2274db6051c05186b262a83223f6f7607e26eebbc600139cb2dcfe
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 74f720308774a1ec5eb34247c5d95387de6cf3f548f3ef732e872f39b92f5018 SHA512 54871242df8ff2550bf46815f2f4a66af63681cad04590a2f9ee0d008f2e025d52a4e55727fff81678398b0291d4a54a1563284e94544cece337920a96fc93e3 WHIRLPOOL cfe191eb30d36f1f22a082ef0e37fe4f283a57800f8c892c65d4cfe2ad150d1d20fb671349d6f0944624c40632090449ecfd99750a4c1a69001800987fc74f55
-MISC ChangeLog 101341 SHA256 e74b680bcf79848fa5eed533c90da64d712b87a75c7cbb986eb0f1d97af72320 SHA512 e8fc4ad82a8761a4c5a3d62bfa36485a8bbd26747a5d29c77f4e1a9364cebbe193ea18c30c3d5d636aa21dd084f18adea5ae3a71a2555ffb0781133960bf74da WHIRLPOOL 69deaddaaab401a77a73eaa3cb5a7a2a2ebabfb5d9318fcfcba7b6646ef8a12695115263c12e6e70e60996e10e003b2cd11549eef3b1a6867b3bfb59078f447f
+MISC ChangeLog 101496 SHA256 b36a94931da662fdc159445036d05009aab2fa32c49ef5bb5f6f59cc8a568263 SHA512 c8681ab00e0fb2d21ebcf11fdf6f4a30ac0834a74eab5725004a83c438eb61de82ae07065f69f141b299f88b12c15ebcfcc1762e5f2751ed3a08105b59dcc998 WHIRLPOOL 5e3444f5921170857ef36164e8694a6197d30ffa18a78f80a88cc9a1ac8a8804567d63df3f40af0ea2e1e9784bc2c0361fcd248cfd96791f8f36fc5285b9f30e
 MISC metadata.xml 1937 SHA256 b1c243ea287b20ad89f349d4d6274735d0bee6fd4b3309c6a9a0fbc063633c2e SHA512 445b1923de09a43ee10b6df629e48dd114003a2edf482de865f16816b2011d90b058e7cbc5e81face2ffdbac3cb94443f35aeea5cea93a9213f77a8aa822b459 WHIRLPOOL 56eb282ac574bff06e7dbc0bcb26b364ee1fd7827975327d59e3a94530c1cd7e7f843fe6be0bdab9a5956e34301ea3148c17e30b757fb904434a706ae6889023
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVEU7NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYREJMP/28A8ZzuvBcv6RhqoK1K6Vrv
-F4zSXDMSTNviZ5HEuvrSuWeC8Xl0yMdT5NWA3ZIDGkmceZOhxbc/6cRNDDRi7lrb
-mob+SnrrRO4GZWXnt2GWgcgIAaUrGIHIXDftHwv4NnB23+Zu4RclRwC53nL3Zmr2
-fTAQQnq3bXwNX6gkkeFvvkjsZA1hhlXRil7sRy2fyNeNdeHCb54EaoYdAal38Q9J
-cplVaroVUhHfajdmT6LMaDGQc6IZ4Vq8QeNMQFTzojjtUQkJyuM8NpJIc7oj9DTK
-HF96A8PjC2vmcjDt6uZ8ncd0QtZWCwRIKAIZJ5M7eGg5UlbXcKdWpSJV4GPDUR+0
-CFVgROqF4HL+AeenaVonp6+/99ZGd2vlAzxTf+YVnctBmyS6EBI/ZpPlIWq9HkkL
-txDlcHqq/s9HRRDysdRoGXKEJ3yhpv5CgQpWjN+f4VM4dzPMhZTG3tB2mr9HhdQG
-cI4ikFppmuD8qyCoVHUaWMhKdEQfKAqL7tWlPMbOZGjjOxWOAaRyKXmkXVqgmYWE
-ekLYbt3hVsBuVJaPd/3Whmez+Zp8i8NYwb3a/SjmX5YHBdKlToxtVMatZG2x9xFe
-8ZSkqPDFqALgWUrBUOFinNphoAO42GNNXkOjMjZ5LEij+5gUcb92s0LLYPw6lxCr
-boDkBMdP9yFHrKzJqlSB
-=oqXS
+iQIcBAEBCAAGBQJVFwbRAAoJEA/daC2XTKcqYvAQAIaJf58bZUcCO8GLlIHOM/ZB
+qRCvf7VN9bLJTLH771far7bnLmteoxzp/F9L09uHsQobANlkiBcVcLfkzhwWZhex
++tbNJEqvFCvzDYYZXrD1hjq0gmRmauzBLRg+UBKseXZemxRjxNYYBKANtj6SPVYK
+b4+mv14++xJvWB9Bo5e6/FMBK1JJ1HF/R+psWLDJsXmg3mkdgcoQN+oSDJ5XgIdv
+BKD/UjDDIyZCjKfi5rEfHX6K2JT9NLQk0/7oCReHjRzrUitjARIcZKGCB3lsnplo
+5kG+1vJrwkaoiAcZokaxU7byC5jIEJvkxPysbq/4gOG+f1DrncUYA2YbhQy8w9Ga
+jXrHHMRJoGMHCmYG2c5xOsoZz5yaRIocJUZsnBbRzuQpScBdChMAFRhsGn+Qq5iw
+53wjh3EnrkVr36HBD0qK2T2ypubnU7N//feaiw/CxaXZFSzVzjlmAkkefmGsA39c
+oRYFk+kiv5ZTsvKKjeoMu5e70WDOxr48HfxsGb6jhmf35LiTCnx7uZBcZymrb+Bm
+/v8rb4ut0r79ftlswwS5B0BGT15PpDrMUVNnRNAFYC2TkGLvK15jgyYqv5V1vB3B
+50PboBt31F+bNS6Y1h/fExJyAPbm/W14VOis/zEHvJ6fGCXYEAkkkwF6dNq0jwS+
+oLueCrGCCdzMIfqLRMiH
+=ADu+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.5.2.ebuild b/media-libs/mesa/mesa-10.5.2.ebuild
new file mode 100644
index 000000000000..30af76d567d9
--- /dev/null
+++ b/media-libs/mesa/mesa-10.5.2.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.2.ebuild,v 1.1 2015/03/28 19:53:47 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 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 )
+	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-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/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-admin/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
+}