Unbreaking kdrive, part 2: Instead of checking whether a certain VIDEO_CARDS setting is in a long list of invalid cards for non-x86 systems, check whether it's the single valid setting; Check whether VIDEO_CARDS settings are valid kdrive servers before moving into the more complex processing.

Package-Manager: portage-2.1.2_pre3-r8

3 files changed, 27 insertions, 17 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index d7cec737e91d..1a63ec852952 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.182 2006/10/25 06:35:02 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.183 2006/10/25 07:18:47 dberkholz Exp $
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 2: Instead of checking whether a certain VIDEO_CARDS
+  setting is in a long list of invalid cards for non-x86 systems, check
+  whether it's the single valid setting; Check whether VIDEO_CARDS settings
+  are valid kdrive servers before moving into the more complex processing.
 
   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 7f6d2ddad696..c040014cc3d9 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 16677 RMD160 1705e35dc0105c8c6f0165a33921631d820562e1 SHA1 4770dc5a393e6212ebae880696ee2198c8619ef1 SHA256 b7f09082eef1fc940b2a25ba912a73ba174d9d1db75072b4e03791d367c57ef7
-MD5 40e1a52d626926b25e2c55f7da589111 xorg-server-1.1.1-r1.ebuild 16677
-RMD160 1705e35dc0105c8c6f0165a33921631d820562e1 xorg-server-1.1.1-r1.ebuild 16677
-SHA256 b7f09082eef1fc940b2a25ba912a73ba174d9d1db75072b4e03791d367c57ef7 xorg-server-1.1.1-r1.ebuild 16677
+EBUILD xorg-server-1.1.1-r1.ebuild 16678 RMD160 f162ef7f66e705f3f0050af52e6ec7ffcfc027ff SHA1 b574bdfb9375a658ed4e339a5dfa70478bc8a9e2 SHA256 82365930889daec9d14448a5cf07ca2e4d4e5ff18c8e75084410510715c44990
+MD5 d2430cd0810e2ef4950098c33ad4a01e xorg-server-1.1.1-r1.ebuild 16678
+RMD160 f162ef7f66e705f3f0050af52e6ec7ffcfc027ff xorg-server-1.1.1-r1.ebuild 16678
+SHA256 82365930889daec9d14448a5cf07ca2e4d4e5ff18c8e75084410510715c44990 xorg-server-1.1.1-r1.ebuild 16678
 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 37518 RMD160 569378a4636aae149245d1b3923d5bb40a8749ab SHA1 f7eef2e17a06473293399c62104dca5f1db4ee3b SHA256 71ff514667c872ca34a78a0428433381ad95fffce699f10ad4a25acba6ad703e
-MD5 972c57b0c55433f7243656d7567c36bf ChangeLog 37518
-RMD160 569378a4636aae149245d1b3923d5bb40a8749ab ChangeLog 37518
-SHA256 71ff514667c872ca34a78a0428433381ad95fffce699f10ad4a25acba6ad703e ChangeLog 37518
+MISC ChangeLog 37907 RMD160 485cda21b59e99e8dacb95ad4b388491dca8368a SHA1 ced85cc5104b42372b65d48336dd8010610b388e SHA256 ade67b53013a9c8ac41b8bccdc84c9c1a8ecc7bc741553639923e9af2ad44162
+MD5 f470021e64479f83555912b04e98aa2d ChangeLog 37907
+RMD160 485cda21b59e99e8dacb95ad4b388491dca8368a ChangeLog 37907
+SHA256 ade67b53013a9c8ac41b8bccdc84c9c1a8ecc7bc741553639923e9af2ad44162 ChangeLog 37907
 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 b66c624a52a0..5561f7582ea9 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.17 2006/10/25 06:35:02 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.18 2006/10/25 07:18:47 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -351,11 +351,6 @@ src_unpack() {
 	x-modular_patch_source
 
 	# Set up kdrive servers to build
-	# Bug #150052 - anything that uses vm86.h is broken on non-x86 arches.
-	# That translates into the following set:
-	vm86_devices="chips epson glint i810 mach64 mga neomagic
-		nv r128 radeon siliconmotion vesa via"
-
 	if use kdrive; then
 		einfo "Removing unused kdrive drivers ..."
 		for card in ${IUSE_VIDEO_CARDS}; do
@@ -369,6 +364,13 @@ src_unpack() {
 			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
 				# (bug #136370) Radeon needs fbdev and vesa
 				if use x86 \
@@ -380,8 +382,9 @@ src_unpack() {
 				fi
 				disable_card=1
 			# Bug #150052
-			elif ! use x86 &&
-				[[ ${vm86_devices/${card#video_cards_}/} != ${vm86_devices} ]]; then
+			# 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