Version bump to 10.5.4, bug #547686.

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

3 files changed, 477 insertions, 17 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index e16bb47ab4c0..e38c80e2b5f3 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.636 2015/04/08 17:59:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.637 2015/04/27 23:06:16 mattst88 Exp $
+
+*mesa-10.5.4 (27 Apr 2015)
+
+  27 Apr 2015; Matt Turner <mattst88@gentoo.org> +mesa-10.5.4.ebuild:
+  Version bump to 10.5.4, bug #547686.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> mesa-10.2.8.ebuild,
   mesa-10.3.7-r1.ebuild, mesa-10.3.7-r2.ebuild, mesa-10.4.4.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2eb21e9175ac..a4713d58abb4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -15,6 +15,7 @@ DIST MesaLib-10.4.4.tar.bz2 7507100 SHA256 f18a967e9c4d80e054b2fdff8c130ce6e6d1f
 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-10.5.4.tar.xz 6988284 SHA256 b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803 SHA512 e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5 WHIRLPOOL 91e83f526e50aac2047f944e89a11b38b5fb9bad2617148da5a5bb90502600e0933fb3d7c68bf3ef5f23be89aa3d76d58433a92cfc39649aaa523ab80d25f1be
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 EBUILD mesa-10.2.8.ebuild 14991 SHA256 c887da5cbb99fb638d57ff6c7aace27bbc208d1ad091b325215d633ba6a432b1 SHA512 15c9f4fcc2259bad08571cec34a1cfd03f3c2a5684c3c8fffaabb4db191e5ab97893d673da4fae38f22d9d3e45d0e9e87b2b9494dfef4d61b9520be92e480c27 WHIRLPOOL fa3ccd71661bf4d6d43a9f1ccdf81b9dfb80c9e6c33739a6dc798295e0727bdb20eecc9140f000d169ff7775eee47283869762979e99a502fed03b2ee349a741
 EBUILD mesa-10.3.7-r1.ebuild 15061 SHA256 1486ddb1018de72f78cccf2d663b8f66261bbef8dfb27b31d3c4f5070408dd1e SHA512 49ea576786a1e16323802f71883cef0af07cc8275d7ec9c347fedb726e2d5636cd67fb65d2b02bb869ddfc2e3e63d3892b3b59aaf9a91c8fdafe08730867f618 WHIRLPOOL e63c74f1e72d246d8a9be431aa5571cf53e7ab736058a5c7e9bce1ae87daaf991a7e44c04d5db5e83071f292457c833f688a0db8e2b621d30c39a7b7ba890ae3
@@ -22,25 +23,24 @@ EBUILD mesa-10.3.7-r2.ebuild 13943 SHA256 816a4e222da79376379e6561b7abac1ce5f083
 EBUILD mesa-10.4.4.ebuild 13880 SHA256 ab8036797e5dbee0f53608cf72fa00cdcb39702f5169aba8d508e68306a2bb2f SHA512 ad0a96d6a517e3bca7b73ccf8b9c77f67e4f7ec70851654f079cf899602c24d6198000b1feb702fd7399750f5d2e2e232133f231d171de91abd9a711caeed388 WHIRLPOOL aea87107075a644ee674b93aae3dab44d91a932efff97b1ed36a63b9b50d97bb1a3b1007dbab3c68f4817a53a03a19fe9d0f6a72ea69fe2e2a3b132742b3fa00
 EBUILD mesa-10.5.1.ebuild 12629 SHA256 e2cba61ce0d1787a6fa43b095e63a8ce81c3e4c380746ec7c795ae58702d4e1f SHA512 4ae70feb9784fbfd4c979817f46f41d5482d7ca35423d88eb9f7b1c2a2387c2048537be82feff30ad4ec2113555efb4ae6d6e084294dfa6a83430cc06fb15972 WHIRLPOOL 6d96e15cc34e008f81f18230faa3be201646b1e391ec29bbd3750df26fc566f552687902577415652451cfaacb2ded47670aa2134d7505aa7f449f4fb6a40a68
 EBUILD mesa-10.5.2.ebuild 12520 SHA256 3abc098a633985b3c485d575c95c9a8f89f4ec34fcb1d8d051756b9daaef7d1c SHA512 510a7be58866bc14222087bbbcbb8c5222bc83534be2ceb973bf96cd8e9c4e2619168a414e7472bb11c8e6a0ed6d29adec9cdf7067209339bcc48541de22f95a WHIRLPOOL 25fdb30346640b6e92efd557feea8044581aa0edf0f86d5bab73bb7467fb5d89e3dd25d5a98d5bfe41943dca753390647ecc3adb0777c161c03a475b0bc238f8
+EBUILD mesa-10.5.4.ebuild 12527 SHA256 f9576967ed290cb8203247e528b0d0293dcf295961809b46bb28202162b64695 SHA512 d8eda63e39b7bab6a4a440c2463840d74726d285c0f7ae73db3c3e9703efa4a3638e1e8186d0ba3c2dec02b501f2aa0d1aa4ff72790d59c67c3bcbdd6fc612a0 WHIRLPOOL 494bf56367217f6964d0f760a472a25b8f8586427b396889d74b57ff90a9b85748c37cbef81e7ad118bd66e3bdae23840a10e51f209107c31fa42e5aa00666a1
 EBUILD mesa-7.10.3.ebuild 9834 SHA256 2365eae41e795a722548fb4d8a6c72216b3d5a4b287014f8de5242a017ec5c2a SHA512 1cb57bf082d93bfd91bb0d68d7978c1339dd20477efe84e050fbf6c869313292819e158ae2620602d651023463f6cb9ab4ec40199732338a2c5168ef6e5281e4 WHIRLPOOL 329e68844422b3fc81485825067b916b6cec0b2723d87b4c7682bdecf25a51a466792f04fe0f72332767912714c9fac1fdfe284ae17b68add5019113be008681
-MISC ChangeLog 102088 SHA256 e6144486f8431d86b2527980113ff39d6b6a60d25c4bddee709dad27c35521c8 SHA512 d156509fab5f7475dcd44dc7704dedf5b45318621d1a7d6625e2bfc3204d79da47c277318544ac569d06464b4ec11ef3926e358120bf5093c24630f302c2f370 WHIRLPOOL 1f36074c84e5e497f9ccfe25e5906012769cfa3c61ef847c1ef11f94a761ad89cae698c1ef1867cff9ca140954cd6d9c481614885c4332e7fbdf1127c0bb89c2
+MISC ChangeLog 102228 SHA256 69b465ba5f5227a0a37357f1a2c39a9fca1ba252f3f0a37c74507eaba5b90010 SHA512 28cd6b56d8a104f49393acc6feb1a27d327bbf0b6cb89a437ca76e638df31a9d3f1d9c5ef83171a4673ba8a017e2e859dadf484d8f4729767eb75e62c1f191a1 WHIRLPOOL 4568533fc21ac36ca12203b89bc7d34cc1a6aee56b2a967603bb9177f95d91a0ed7bfa0690e2dcfd2673bf41fb2f2c8672074e484330ed7125d520388fd1be2c
 MISC metadata.xml 1937 SHA256 b1c243ea287b20ad89f349d4d6274735d0bee6fd4b3309c6a9a0fbc063633c2e SHA512 445b1923de09a43ee10b6df629e48dd114003a2edf482de865f16816b2011d90b058e7cbc5e81face2ffdbac3cb94443f35aeea5cea93a9213f77a8aa822b459 WHIRLPOOL 56eb282ac574bff06e7dbc0bcb26b364ee1fd7827975327d59e3a94530c1cd7e7f843fe6be0bdab9a5956e34301ea3148c17e30b757fb904434a706ae6889023
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWygXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONjMQAM2UGxxhc9lJxFdPWpUe4eGV
-hrE1Q9MkwMm6sxWAQQOKDjbm2r+aJuUpRLlqKY56bQt2xLd+QRgvw352PQt9ug9c
-7N3nahDkLstomhZfeLdMBMBz+q5LhaRT3dBbjrSuD+4cR4sipmkCEPPro7S18h5v
-Mc4sVaMCDdkbWktyLuRh9ZAS362SqQA6d9+ZoV8mJcT/1w+tfbBERR/xqbyzoKxS
-7H8u7MwjQKBFTg95S2oxEhVFhgMphVjeNNST3tjriXNCmTo1aPco94jb87+BjbbB
-LSkBSCLnPwlLirFWnrMkU3yzmnGPllZ2BhxyYELvaSsnxVtP2gEkjrdC7j6p16K5
-5k7xW9lTSOvZFC9nIMceVe8gIASPQsnYal8nLyMrPxBc6Qtc7/vnYWJ95g33kVFw
-ZB/ppLs6SJjKPQtoNTXKSjOvlWgOlC38iTInhSvppVgWeXGB/Xx38iek4rrn6Ngf
-NU19BK0vzz62T4wI7jSYjflD7ULGZQ6EZBOf4cutMS5399pzzr26+/g4wSje68Zi
-lvvHvx8h3taP8oiWTvJ6+iErmZab4WqkrPJihZJT9ao57ZL0XlnC4yrnlEYK72xP
-uAMQRkh0ttAOqW9vTQhLEW7gLoBVxmbbdDfCdUog1XxK4t5fhOfnbIFrWfoAPgWi
-tKzRTY9BXoPzRRnztpJt
-=iTPE
+iQIcBAEBCAAGBQJVPsDsAAoJEA/daC2XTKcqO7IP/1SaPttg5F77Lp26WTahryQk
+0OLWIbYA6FGDou+lvBDYgQWwmORaDD1/3mUHakQYGvq5hktPCMB0FsGKn8Is8NzE
+V2YKuHaiteLqzmUXrhWckP4PPfweyYd0Cx1eg01GvhKubngnNrnRJbN838N+/EFf
+hKDg1j/nOPvTgk32w1fmOiTBu5ZO82LLRcD2rIOZJ/XUPgYA8mvNUHaOX2P6BFoI
+01wpKUyQLARyd0WPzaMl/clrxSxEykJChzZi5APlvN9vyagshMXilRrdgbXwc3M/
+ZR4cjbnF4Fpt89pAsfdwDFGfgHr9iPzBYqcFPZKWhiATctFJ/dgxkwKR5AsyJyH7
+hw3umIUMQm57/mFm0F7e4FKhmS9d0SYK8vxGFDzKi84iV1TQzobHRQOYQT/uwWUJ
+yvPOPaAm6LFO1gG0oY/0akU0neJoOiXZi+0LiOKCkiEcdEJEseJkNwYURShxAJEK
+yHy3Wuwf4BW69AgQlCLijKas3tzMICq4lzcWUZGw0pUpm0pHjNz9iM+V1oNz/5mu
+uQv5WPbwJzPC4Z2qmr/wpUANkzEZwKx3qZvJnED1phAdzFgkHjxyOQsHIDdvQ1xv
+uZQX46XU98CgP1qhKM3aPsO/Ovtwi8ibuIGFVkgp6pcARpxdP/JytB6AyIxoLuz+
+l6UbNCjhmpcpuc98Pnxc
+=FciE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.5.4.ebuild b/media-libs/mesa/mesa-10.5.4.ebuild
new file mode 100644
index 000000000000..7574dd477c6e
--- /dev/null
+++ b/media-libs/mesa/mesa-10.5.4.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.4.ebuild,v 1.1 2015/04/27 23:06:16 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}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+[[ ${PV} == "9999" ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+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
+}