Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other servers require them. This replaces the existing fix for bug #136370 and should also fix bug #152797.

Package-Manager: portage-2.1.2_pre3-r8

3 files changed, 41 insertions, 17 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1a63ec852952..f9698e5708d3 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.183 2006/10/25 07:18:47 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.184 2006/10/25 18:25:24 dberkholz Exp $
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other
+  servers require them. This replaces the existing fix for bug #136370 and
+  should also fix bug #152797.
 
   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 c040014cc3d9..af4aa8654f5e 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 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-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.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 37907 RMD160 485cda21b59e99e8dacb95ad4b388491dca8368a SHA1 ced85cc5104b42372b65d48336dd8010610b388e SHA256 ade67b53013a9c8ac41b8bccdc84c9c1a8ecc7bc741553639923e9af2ad44162
-MD5 f470021e64479f83555912b04e98aa2d ChangeLog 37907
-RMD160 485cda21b59e99e8dacb95ad4b388491dca8368a ChangeLog 37907
-SHA256 ade67b53013a9c8ac41b8bccdc84c9c1a8ecc7bc741553639923e9af2ad44162 ChangeLog 37907
+MISC ChangeLog 38179 RMD160 8069b43853be07b91eba548a49ac01aced4c53f1 SHA1 36898d9f3f9494f487e07270c03cc487960e2441 SHA256 b79093e52e7dc934b6dc3e42a43bbca1a301af7d7aed632c3755c595036226ba
+MD5 105f4de735ba07700d444b47805a0288 ChangeLog 38179
+RMD160 8069b43853be07b91eba548a49ac01aced4c53f1 ChangeLog 38179
+SHA256 b79093e52e7dc934b6dc3e42a43bbca1a301af7d7aed632c3755c595036226ba ChangeLog 38179
 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 5561f7582ea9..532e4fecdee6 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.18 2006/10/25 07:18:47 dberkholz Exp $
+# $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 $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -353,6 +353,12 @@ 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_}
 
@@ -372,13 +378,25 @@ src_unpack() {
 			fi
 
 			if ! use ${card}; then
-				# (bug #136370) Radeon needs fbdev and vesa
-				if use x86 \
-					&& use video_cards_radeon; then
-					if [[ ${real_card} = fbdev ]] \
-						|| [[ ${real_card} = vesa ]]; then
-						continue
-					fi
+				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