Unbreaking kdrive, part 4: Move all the kdrive setup code out to a separate function kdrive_setup(). Make variables local to that function.

Package-Manager: portage-2.1.2_pre3-r8

3 files changed, 94 insertions, 83 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f9698e5708d3..dedcf1a27489 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.184 2006/10/25 18:25:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.185 2006/10/25 18:59:31 dberkholz Exp $
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 4: Move all the kdrive setup code out to a separate
+  function kdrive_setup(). Make variables local to that function.
 
   25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.1.1-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index af4aa8654f5e..fd056068decf 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -125,18 +125,18 @@ EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e
 MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569
 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569
 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569
-EBUILD xorg-server-1.1.1-r1.ebuild 17188 RMD160 c718ea3ecd60342ed856fb63c03bdff1d44935f0 SHA1 6b9f20b3d8052b1bccfaa02582a5602fde27f8d4 SHA256 f93cdf3effcdc0d262e9d6ff87f89b7d667607bc535c310522bed49ac53a484b
-MD5 2ca95bc40b459eccb42f499f20978eed xorg-server-1.1.1-r1.ebuild 17188
-RMD160 c718ea3ecd60342ed856fb63c03bdff1d44935f0 xorg-server-1.1.1-r1.ebuild 17188
-SHA256 f93cdf3effcdc0d262e9d6ff87f89b7d667607bc535c310522bed49ac53a484b xorg-server-1.1.1-r1.ebuild 17188
+EBUILD xorg-server-1.1.1-r1.ebuild 17210 RMD160 73b645cd9199b3bbc3bc54746eb6873da77e060c SHA1 6550159387ce0706f8d84bdb20ee73e9ebddb6cd SHA256 93e2339ca4dd99b784e6917362840b7f5398c38b3b635665c4d9a46652d0bb93
+MD5 ba587e5171987953c688e02bbf328836 xorg-server-1.1.1-r1.ebuild 17210
+RMD160 73b645cd9199b3bbc3bc54746eb6873da77e060c xorg-server-1.1.1-r1.ebuild 17210
+SHA256 93e2339ca4dd99b784e6917362840b7f5398c38b3b635665c4d9a46652d0bb93 xorg-server-1.1.1-r1.ebuild 17210
 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-MISC ChangeLog 38179 RMD160 8069b43853be07b91eba548a49ac01aced4c53f1 SHA1 36898d9f3f9494f487e07270c03cc487960e2441 SHA256 b79093e52e7dc934b6dc3e42a43bbca1a301af7d7aed632c3755c595036226ba
-MD5 105f4de735ba07700d444b47805a0288 ChangeLog 38179
-RMD160 8069b43853be07b91eba548a49ac01aced4c53f1 ChangeLog 38179
-SHA256 b79093e52e7dc934b6dc3e42a43bbca1a301af7d7aed632c3755c595036226ba ChangeLog 38179
+MISC ChangeLog 38410 RMD160 26f239415a52a8930ac190d285295dbb5f3a1bec SHA1 ea88352c8481c804a57c3b27a3bd16e7ad756a42 SHA256 fb32eba58959bbfffeb5a0c3ed18a216eea15ab2e77b206146fcc0cda678af1e
+MD5 bbc64f22b52663faed777bfc47510417 ChangeLog 38410
+RMD160 26f239415a52a8930ac190d285295dbb5f3a1bec ChangeLog 38410
+SHA256 fb32eba58959bbfffeb5a0c3ed18a216eea15ab2e77b206146fcc0cda678af1e ChangeLog 38410
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index 532e4fecdee6..551f9eb2f3bb 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.19 2006/10/25 18:25:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.20 2006/10/25 18:59:31 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -352,79 +352,7 @@ src_unpack() {
 
 	# Set up kdrive servers to build
 	if use kdrive; then
-		einfo "Removing unused kdrive drivers ..."
-
-		# Some kdrive servers require fbdev and vesa
-		local kdrive_fbdev="radeon neomagic sis siliconmotion"
-		# Some kdrive servers require just vesa
-		local kdrive_vesa="chips mach64 mga nv glint r128 via"
-
-		for card in ${IUSE_VIDEO_CARDS}; do
-			real_card=${card#video_cards_}
-
-			# Differences between VIDEO_CARDS name and kdrive server name
-			real_card=${real_card/glint/pm2}
-			real_card=${real_card/radeon/ati}
-			real_card=${real_card/%nv/nvidia}
-			real_card=${real_card/siliconmotion/smi}
-			real_card=${real_card/%sis/sis300}
-
-			disable_card=0
-
-			# Check whether it's a valid kdrive server before we waste time
-			# on the rest of this
-			if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
-				continue
-			fi
-
-			if ! use ${card}; then
-				if use x86; then
-					# Some kdrive servers require fbdev and vesa
-					for i in ${kdrive_fbdev}; do
-						if use video_cards_${i}; then
-							if [[ ${real_card} = fbdev ]] \
-								|| [[ ${real_card} = vesa ]]; then
-								continue 2 # Don't disable
-							fi
-						fi
-					done
-
-					# Some kdrive servers require just vesa
-					for i in ${kdrive_vesa}; do
-						if use video_cards_${i}; then
-							if [[ ${real_card} = vesa ]]; then
-								continue 2 # Don't disable
-							fi
-						fi
-					done
-				fi
-				disable_card=1
-			# Bug #150052
-			# fbdev is the only VIDEO_CARDS setting that works on non-x86
-			elif ! use x86 \
-				&& [[ ${real_card} != fbdev ]]; then
-				ewarn "  $real_card does not work on your architecture; disabling."
-				disable_card=1
-			fi
-
-			if [[ $disable_card = 1 ]]; then
-				ebegin "  ${real_card}"
-				sed -i \
-					-e "s:\b${real_card}\b::g" \
-					${S}/hw/kdrive/Makefile.am \
-					|| die "sed of ${real_card} failed"
-				eend
-			fi
-
-		done
-
-		# smi and via are the only things on line 2. If line 2 ends up blank,
-		# we need to get rid of the backslash at the end of line 1.
-		if ! use video_cards_siliconmotion && ! use video_cards_via; then
-			sed -i \
-				-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
-				${S}/hw/kdrive/Makefile.am
-		fi
+		kdrive_setup
 	fi
 
 	# Make sure eautoreconf gets run if we need the autoconf/make
@@ -478,6 +406,84 @@ pkg_postrm() {
 	fi
 }
 
+kdrive_setup() {
+	local card real_card disable_card kdrive_fbdev kdrive_vesa
+
+	einfo "Removing unused kdrive drivers ..."
+
+	# Some kdrive servers require fbdev and vesa
+	kdrive_fbdev="radeon neomagic sis siliconmotion"
+	# Some kdrive servers require just vesa
+	kdrive_vesa="chips mach64 mga nv glint r128 via"
+
+	for card in ${IUSE_VIDEO_CARDS}; do
+		real_card=${card#video_cards_}
+
+		# Differences between VIDEO_CARDS name and kdrive server name
+		real_card=${real_card/glint/pm2}
+		real_card=${real_card/radeon/ati}
+		real_card=${real_card/%nv/nvidia}
+		real_card=${real_card/siliconmotion/smi}
+		real_card=${real_card/%sis/sis300}
+
+		disable_card=0
+
+		# Check whether it's a valid kdrive server before we waste time
+		# on the rest of this
+		if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then
+			continue
+		fi
+
+		if ! use ${card}; then
+			if use x86; then
+				# Some kdrive servers require fbdev and vesa
+				for i in ${kdrive_fbdev}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = fbdev ]] \
+							|| [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+						fi
+				done
+
+				# Some kdrive servers require just vesa
+				for i in ${kdrive_vesa}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+					fi
+				done
+			fi
+			disable_card=1
+		# Bug #150052
+		# fbdev is the only VIDEO_CARDS setting that works on non-x86
+		elif ! use x86 \
+			&& [[ ${real_card} != fbdev ]]; then
+			ewarn "  $real_card does not work on your architecture; disabling."
+			disable_card=1
+		fi
+
+		if [[ $disable_card = 1 ]]; then
+			ebegin "  ${real_card}"
+			sed -i \
+				-e "s:\b${real_card}\b::g" \
+				${S}/hw/kdrive/Makefile.am \
+				|| die "sed of ${real_card} failed"
+			eend
+		fi
+
+	done
+
+	# smi and via are the only things on line 2. If line 2 ends up blank,
+	# we need to get rid of the backslash at the end of line 1.
+	if ! use video_cards_siliconmotion && ! use video_cards_via; then
+		sed -i \
+			-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
+			${S}/hw/kdrive/Makefile.am
+	fi
+}
+
 dynamic_libgl_install() {
 	# next section is to setup the dynamic libGL stuff
 	ebegin "Moving GL files for dynamic switching"