Fix building when both classic and gallium are disabled, bug #347125

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

3 files changed, 44 insertions, 33 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 8bf1cbe3d082..2d2d40c71e8e 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.295 2010/11/28 21:36:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.296 2010/11/29 18:23:36 chithanh Exp $
+
+  29 Nov 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-7.9.ebuild:
+  Fix building when both classic and gallium are disabled, bug #347125
 
 *mesa-7.9 (28 Nov 2010)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 44f49f2843ea..178713a22d2b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,6 +4,7 @@ DIST MesaLib-7.8.2.tar.bz2 5138463 RMD160 d06c95bc36304b8ef72211b5defd3ac338fe79
 DIST MesaLib-7.9.tar.bz2 5678494 RMD160 4aad7da22324556dcd3e833d149d8ae8de1fce7d SHA1 5afc7f6f4ee02a1ca39f29ef261cc14e8787d892 SHA256 e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
 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.ebuild 8533 RMD160 419c0da1063b04d5574464facd53de067aa3c5ad SHA1 d135243241a54ae15a86e8ba6640a8171843683e SHA256 8c52d155edc691937b2b3f1ebcbb137c471bb281ae819a2f3553bc4ecf6a2534
-MISC ChangeLog 50729 RMD160 4bfd14c521a3d1b7340b567193a71fb8c39f6734 SHA1 6ec42f7574a60ede3929e4de1f2a5a71d3061569 SHA256 a5cc3efa7fcb5a859f25eb5cf6aab42939455b8b5eef616099b7681633191fdb
+EBUILD mesa-7.9.ebuild 8753 RMD160 fbc716befd030dda8f9df3050657ba7477593b98 SHA1 d0f6402c023e585b5350417847a7ad56250a086e SHA256 3e617002e975562defc0f2969da980d070d6eb481f2f7cf0ccb466a90720ff4d
+MISC ChangeLog 50889 RMD160 019969973b0993884dacc9ceae46978a2399da9a SHA1 bc7908825b5282fcb1449bd67981a45b32f8419f SHA256 7727eb057c1ef9468c296c75f8d0db9214819dc352577ed027d10b77ea3e07b0
+MISC mesa-7.9.ebuild.orig 8529 RMD160 66afbd9bbeed57b1fc57c30534a97f61e5e04a3e SHA1 03f3cd58cd7abeda3c22d97e4efb62704c05ee51 SHA256 8659b0505ba17c918e5e83a277ea69f547a3217dbe6e4c0379f7f4c8794c9dfe
 MISC metadata.xml 560 RMD160 7c8109dd5de8c3a809ae27690d50f9d85e201ac9 SHA1 6d640e373282205f6755c647bb907e9b66ab390a SHA256 67727cfae939284efe0ce0a48b1c5d54193bf5bf1c63f9b41b621dbc937f9f37
diff --git a/media-libs/mesa/mesa-7.9.ebuild b/media-libs/mesa/mesa-7.9.ebuild
index 32244a0223cf..ef0557b1bdd9 100644
--- a/media-libs/mesa/mesa-7.9.ebuild
+++ b/media-libs/mesa/mesa-7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.ebuild,v 1.1 2010/11/28 21:36:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.ebuild,v 1.2 2010/11/29 18:23:36 chithanh Exp $
 
 EAPI=3
 
@@ -174,6 +174,10 @@ src_configure() {
 	fi
 
 	myconf="${myconf} $(use_enable gallium)"
+	if use !gallium && use !classic; then
+		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
+		ewarn "drivers will be built."
+	fi
 	if use gallium; then
 		elog "You have enabled gallium infrastructure."
 		elog "This infrastructure currently support these drivers:"
@@ -255,36 +259,38 @@ src_install() {
 		done
 	eend $?
 
-	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 )
-		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}" \
-					|| die "Failed to move ${x}"
-				insinto "/usr/$(get_libdir)/dri/"
-				if [ -f "${S}/$(get_libdir)/${x}" ]; then
-					insopts -m0755
-					doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}"
+	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 )
+			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}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}"
+					fi
 				fi
-			fi
-		done
-		for x in "${D}"/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"
-		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 $?
+			done
+			for x in "${D}"/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"
+			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
 }
 
 pkg_postinst() {