Push Gentoo Prefix changes from x11 overlay, as approved

Package-Manager: portage-2.1.9.35/cvs/Linux i686

3 files changed, 22 insertions, 14 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 0815f7868ccd..445cc37d91e9 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.307 2011/01/12 00:14:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.308 2011/01/27 16:44:03 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> mesa-7.10.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
 *mesa-7.10 (12 Jan 2011)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index df095be8021f..bfa7a8228015 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,10 +6,10 @@ DIST MesaLib-7.8.2.tar.bz2 5138463 RMD160 d06c95bc36304b8ef72211b5defd3ac338fe79
 DIST MesaLib-7.9.1.tar.bz2 5640520 RMD160 5d83557160dc13f98647889bab351712c7b67316 SHA1 a442f77072c690ccd8c2659664929684f74d82fd SHA256 403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721
 DIST MesaLib-7.9.tar.bz2 5678494 RMD160 4aad7da22324556dcd3e833d149d8ae8de1fce7d SHA1 5afc7f6f4ee02a1ca39f29ef261cc14e8787d892 SHA256 e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
 DIST mesa-7.9.1-gentoo-patches-01.tar.bz2 2139 RMD160 9db0129c3aca3ed63c0b6665ac2f061997364c05 SHA1 b41022dfcf554d8460c96804d3d97224d05e7607 SHA256 b2b593a3cc529913a34a59c017dad4a51ae82e8b2dd4bf333a52260c3cab0aa1
-EBUILD mesa-7.10.ebuild 8947 RMD160 c9cf73c2f7180c97a383fcf8c14c33d879ac7fc8 SHA1 457e99e6ddde7c1d9046da9be7b8b0152e1d09cb SHA256 91cfc84efa3b8b10a275a10df0b33688a3ff72f020b44077f3a3267b0ae6a5b2
+EBUILD mesa-7.10.ebuild 9287 RMD160 246f697b69a4f7e211e33e5cfc042e8e952b9784 SHA1 ce13b8a9208d78392b9b4d2cea4a4f0c08bb9b1f SHA256 cc616dd15bf90d29a0dcaf3a20c873227035f13d9dd8c3185274bc0831495f92
 EBUILD mesa-7.7.1.ebuild 5919 RMD160 97633f16c396dea545630420c1b0e9c7a4cf1ead SHA1 7301512aed33c77a580580eadf7d8f8242d4a748 SHA256 c75b73aa1b31aeec6279aa8afc9eef8e0e154748bbdd5e8662bdb6b0a9b6af09
 EBUILD mesa-7.8.2.ebuild 6589 RMD160 fbcbf95df7b7876727bae39104609063fa7a75d3 SHA1 444761f93664438095caaa398b4a6cb68cc136ea SHA256 aa6b629f9b0bf603c7e5c1bec7e0d3f196df70b048bbf43e0e822e1f1cd52049
 EBUILD mesa-7.9.1.ebuild 8830 RMD160 73ea9156498e503068f5ae3a653b50b0026c9ee1 SHA1 11639ab09fcdf9d528c62845b156eb72847faf85 SHA256 bf4e4dbeafba6dbbf080386e12f8997021f74d08fa35189c2425a46c4ffe17ff
 EBUILD mesa-7.9.ebuild 8869 RMD160 59d6db323f0d44242d37edc6e0848ad6bcc5b5d5 SHA1 61a8806d4818f7e394b7ca5f5b47b959cc769150 SHA256 d63a341c6fde5fd3638fd9ff6dfb85baaa70e7859c6d93fe3759a859f7026561
-MISC ChangeLog 52257 RMD160 761f37cc125a96885893208636daacd92dadd3fa SHA1 24e1516c9b1a6d30dae054c1218b8fcd66fd7186 SHA256 8dfc6a68f601b14faaf1814d15845ee7a4ca5170c0be0473c4fab990ef443367
+MISC ChangeLog 52385 RMD160 94a6fa6c648a7029447d430dfd155c1d8a5dec2a SHA1 29b3924c9e3ba9adcc6f6be6025654260f6eec97 SHA256 6e8cce65ed34cf2bafeee0bc35ced609363c4c1786e08199b245adf203eb4cc7
 MISC metadata.xml 560 RMD160 7c8109dd5de8c3a809ae27690d50f9d85e201ac9 SHA1 6d640e373282205f6755c647bb907e9b66ab390a SHA256 67727cfae939284efe0ce0a48b1c5d54193bf5bf1c63f9b41b621dbc937f9f37
diff --git a/media-libs/mesa/mesa-7.10.ebuild b/media-libs/mesa/mesa-7.10.ebuild
index 496d349a0408..e4f80870b202 100644
--- a/media-libs/mesa/mesa-7.10.ebuild
+++ b/media-libs/mesa/mesa-7.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.1 2011/01/12 00:14:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.2 2011/01/27 16:44:03 darkside Exp $
 
 EAPI=3
 
@@ -35,7 +35,7 @@ fi
 
 LICENSE="LGPL-2 kilgard"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="intel"
 RADEON_CARDS="radeon"
@@ -140,6 +140,11 @@ src_prepare() {
 			-e "s/-DHAVE_POSIX_MEMALIGN//" \
 			configure.ac || die
 	fi
+	# 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
+		sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
+	fi
 
 	# In order for mesa to complete it's build process we need to use a tool
 	# that it compiles. When we cross compile this clearly does not work
@@ -238,9 +243,9 @@ src_install() {
 	fi
 	# Remove redundant headers
 	# GLUT thing
-	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+	rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed."
 	# Glew includes
-	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+	rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \
 		|| die "Removing glew includes failed."
 
 	# Install config file for eselect mesa
@@ -252,15 +257,15 @@ src_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x
-		for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+		for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
 					|| die "Failed to move ${x}"
 			fi
 		done
-		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+		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}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
 					|| die "Failed to move ${x}"
 			fi
 		done
@@ -272,7 +277,7 @@ src_install() {
 			dodir /usr/$(get_libdir)/mesa
 			for x in ${gallium_drivers[@]}; do
 				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${D}/usr/$(get_libdir)/dri/${x}" "${D}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+					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
@@ -281,13 +286,13 @@ src_install() {
 					fi
 				fi
 			done
-			for x in "${D}"/usr/$(get_libdir)/dri/*.so; do
+			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 "${D}"/usr/$(get_libdir)/dri || die "pushd failed"
+			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