media-libs/mesa: bumpt to 9.1.2

Package-Manager: portage-2.1.11.62
RepoMan-Options: --force

2 files changed, 31 insertions, 58 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e51f5e80..1337a029 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,28 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX eselect-mesa.conf.8.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31322f9fb663e5a103f69221 SHA512 58eacf1304ebaa0116ea3c53fafdddb8c94738e31daad8546ac33b46dc51b81a6bccb48c167afe792c7fd41ca5054d8e66123f524b0623ad3e603ed4872f9dc4 WHIRLPOOL 7af55e3cb9448f4b3b4c463443e078a5559588371767e10b5890918d84bfeb16797f11ffabf9aaa205db70c550c5dfc18fe709b3a2e00746d93d4bf4944124b1
 AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883
 AUX mesa-8.0-dont-require-llvm-for-r300.patch 916 SHA256 560f224a12b47fb86bd2ecbe7dc32c79e2be9a26321a79921f83527656ed553a SHA512 ce637b9210517375ae2c77981e0882d161e2027801356b80ec31d50157e52eecdb2ca3b9dc3787c789b39005fcd4cf73290e0879bd5e25638d33ef2cd5e443b8 WHIRLPOOL a14401c13deb209f0ce2e72c360a33ece1d87bd62be79ca8fcef46db29d75f0f4e60b5ef0527bf0bf6196d99a6d2f11da332537beb8c7627b1d7e810a3cfb2e8
 AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca27903a40bf3b0a39325613f8a66a718407aa28504fbf SHA512 a2e7ed3b9b51c3a9a98d83c8fdeb8b777a4877fac25e969b01ff92d6971c10dda9f64e6310c739597ad7ba04106c72925ee5931417f2b8d764f9bd799efd2142 WHIRLPOOL a82863366507835ec0a6562f70389e0d050fd23ea25e7c113ef4a0e1298a1543afa8c1fa51c90ece83f41ac6f3bda6083fd50b8f1292b863cd320186fba8f732
 AUX mesa-9.0.1-remove-debug_symbol_name_glibc.patch 737 SHA256 66b9ad32cc2c07c731b71e487ff1c71961cb4151eadc2333d9b977cbb4457979 SHA512 0505969eef8f03f249c452a155e48b3c6b842e56b85e3383350a2b5c041bb759dd196729f9dce335e035a79630d5cd0274fc4c8de57a185217c7a999872720c7 WHIRLPOOL affa42d72c30e1dd959690ae9105d973c561ece9a9db8e7bf304f6f6ff72a957b06dba83205e4e4adde156291c0fc2313cc5821b70489cf8176c3284456fa29f
-DIST MesaLib-9.0.1.tar.bz2 6115959 SHA256 57a7ba83bace3f3a7dc0929fe026ef5f0ad454234ec4ad8a3e0d31650a75db6f SHA512 0f074eadffe3d6cddc4b402d259df9bac2d1147093d77d35bd66a9e1f0cf4569c80f03e0c98d55c9b5924d81bcef535f21b458064bb65f626c08e5265fb820b9 WHIRLPOOL a9e589836f9165e945d9b0fc636b74f2e497c6e198afc9d14a69b1fe181b49f2655ae06340692dbfb749c1570ef19e58ee2d63558d632e1eaed09d7562e4c71a
-EBUILD mesa-9.0.1-r99.ebuild 11027 SHA256 1e3c7d55b9371158df7d3e867a3e6aa89f881ce3b3d9237029e0fd9f759a5884 SHA512 dcf927af7d1537a16ead57308a5f7a57463c4eb461c1967f9c354ab0b8abf7fe5d43eb14def103170748d71cdff27a7b2806d1ec8a0ae053e68b6b71c4a2465b WHIRLPOOL 49cf22dbaa5cb63dd517416d156228841da41ad19d0c0be0febadd99d76963cd8e8960a4aa90732e14b1c44e0ba356a8a7465b062ca6a4a2f621f1f4eac9305c
+DIST MesaLib-9.1.2.tar.bz2 6122642 SHA256 0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db SHA512 80a09c76b43ad039d8d577f0d9e2b33038847aa8815a1a5251badec626dfe2e7b4c0dfa445f8ce388d4af052147da388ebac0c3265f48e42e3fda4147bfaa578 WHIRLPOOL ea5fe473813111ae08d64bbe9183a11454449ccf419cc689f644afc127ce7b1fd8cb5344682afae13f7db0a2d1d3b90ae418802805d4cee2f6d46d1d26953d1d
+DIST mesa-9.1-gentoo-patches-05.tar.bz2 3301 SHA256 975ff594dc1eb2aa46f8079b3bd3e2e34d08c47c6c76c66ece6c967c40278d63 SHA512 5f4393d09108d520130e7bc5e0513a73581b16682ad9826f7828a1aa052ca0f2841f9b1fcae43cc108f0ba6c54ae131504603f2e422ca3b71aceb337019a2256 WHIRLPOOL 6e640d2d660e9dd669497f378810c12913e64a2623a66a31e73cdf3e55a3d71c94a039f7e3c4ab8aaf23720ab85e7dbf7649cac7d64ab9cd5ff2f24840d31b02
+EBUILD mesa-9.1.2-r99.ebuild 10937 SHA256 2aa09c6cb848f4f361e8b8c45d9f10973439a6b7112248ec6d6f5f532ea6a82f SHA512 45dab07e328c9e509e5a39ea68fd9c3021171ca4cec79232808120831e0196c7fd998dbc42860b4d853b46cf6b3e5936b7abf2bfadb6b7ab7e24b80571588bcc WHIRLPOOL bac603959804343f9bb8703f0be129238d28716a61ffc868624fb015b9942b746d0a43ad1b10eb3c681577250375d6892147f2fbc4f63042ed579ba3d3144464
 MISC metadata.xml 1655 SHA256 10685b37193fccd3f7f91c1c32b69181994ff82c86c868dbced4acfe26582c1a SHA512 402df88cb1b632927b81ff5e6c832802bf99eadcd86309e4f3b8de8caf756ae1c1075f8d5819cb9c39888ad5d66df695e035ace669823b40d930a31b9494bfb3 WHIRLPOOL 081b23fc5341a1cbbdfb4b850efa7b2708e3f2924222186b7dd8cf142b387b5761cc36ac3b78a9a1e3adfe3b56b03f018131a31d332ca5c5e45cfff67b84ddb0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRhqtFAAoJEJOE+m71LUu6w3YP/2HEIDATF7mlKAy8xcotnV4U
-4RSO+mtduGBN2H4Ko6Nzj/B1SGmYLqInCLnkJvA9mmsYwu63D1cwKaovtPg6lTHM
-R6R9F/5k8pce+HVFrGKCfm8AI7N0FMXOTHGOesw1Inq5EyRiOkqlpmxG3YC8IGF+
-+R6mFFVztQYaq/jjJKhHBKdocDhbui1q+KT2ZFo7i0LxzxkR7JRRWuPNKEk8XAZs
-EulxjbjiFRzQMfFmiDgEhvcGGK9wqkzt4IzYIO8uMISH0zEj7PF8J2tmITXQdro8
-LmPrhmAChS/oR1vJ4LoULLb++ZwD62je6kJqQdooMlpYThCz3B8c+TXrqL4o0VNk
-5+Q8sIL0q2cJWiknHqH61mpKg4XYldHm03ICoiwqhcZATGZO+swLXEFLe5vlxZK7
-w9ASZEDTzoRg2silheu5V4MtxtUhnQkFCSnKwLv65khgeLp/iuuue5+h+GGn7S1v
-dqKmyU2JumCxM73gMHMsXmWutfMrDAf1U/8c95eAsSbbOwfalkeAGQyfaEiXL+ab
-1aTZ4OvlaxABntRjNO2+JIHFxPEWO3VX0VmHJPyS5x9lHpn84hoiNNYN/Tf1+cA0
-znXz++Duf3bl3PqoNe8RRLUqaalB1Jok6AMwiu1VqFy4xTbbwZE3/c39ZAa7tu2z
-r5Nxe+AqJ+h9jG+LOm3x
-=sLkf
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-9.0.1-r99.ebuild b/media-libs/mesa/mesa-9.1.2-r99.ebuild
index 1e66d7d4..68554020 100644
--- a/media-libs/mesa/mesa-9.0.1-r99.ebuild
+++ b/media-libs/mesa/mesa-9.1.2-r99.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.1.ebuild,v 1.1 2012/11/19 03:52:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.2-r1.ebuild,v 1.5 2013/05/23 17:40:12 ago Exp $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
@@ -11,20 +11,22 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit base autotools multilib flag-o-matic toolchain-funcs ${GIT_ECLASS}
+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/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+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/${P}-gentoo-patches-01.tar.bz2"
+SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-05.tar.bz2"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
@@ -46,21 +48,19 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+	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="
-	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	gbm?    ( shared-glapi )
-	g3dvl? ( || ( vdpau xvmc ) )
-	vdpau? ( g3dvl )
+	gles1?  ( egl )
+	gles2?  ( egl )
 	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 )
@@ -74,29 +74,26 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.39"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
-# gtest file collision bug #411825
-RDEPEND="!<x11-base/xorg-server-1.7
+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.6
+	>=app-admin/eselect-opengl-1.2.7
 	dev-libs/expat
-	gbm? (
-		virtual/udev
-		x11-libs/libdrm[libkms]
-	)
+	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 )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
 	xorg? (
-		x11-base/xorg-server
+		x11-base/xorg-server:=[-minimal]
 		x11-libs/libdrm[libkms]
 	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
@@ -117,15 +114,14 @@ 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 )
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
-	=dev-lang/python-2*
-	dev-libs/libxml2[python]
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	x11-misc/makedepend
 	>=x11-proto/dri2proto-2.6
 	>=x11-proto/glproto-1.4.15-r1
 	>=x11-proto/xextproto-7.0.99.1
@@ -145,13 +141,13 @@ QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
 pkg_setup() {
 	# workaround toc-issue wrt #386545
 	use ppc64 && append-flags -mminimal-toc
+
+	python-single-r1_pkg_setup
 }
 
 src_unpack() {
 	default
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	fi
+	[[ $PV = 9999* ]] && git-2_src_unpack
 }
 
 src_prepare() {
@@ -221,7 +217,6 @@ src_configure() {
 
 	if use gallium; then
 		myconf+="
-			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable r600-llvm-compiler)
@@ -252,6 +247,7 @@ src_configure() {
 		"
 	fi
 
+	# build fails with BSD indent, bug #428112
 	use userland_GNU || export INDENT=cat
 
 	econf \
@@ -271,6 +267,7 @@ src_configure() {
 		$(use_enable xorg) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
 		${myconf}
 }
 
@@ -283,11 +280,6 @@ src_install() {
 		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