Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver.

Package-Manager: portage-2.1.1_pre4-r1

4 files changed, 27 insertions, 23 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 3f8e528db4a2..844ceade9dce 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.149 2006/07/19 14:36:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.150 2006/08/02 16:33:37 dberkholz Exp $
+
+  02 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver.
 
   19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-server-1.0.2-r7.ebuild:
   Stable on hppa.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b679d0869f0b..4a034650294e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -76,18 +76,18 @@ EBUILD xorg-server-1.0.2-r7.ebuild 6180 RMD160 d1748b4267c3c3cc1feb11207363e4a5c
 MD5 01f2a045449329d5b101e84f3d973c01 xorg-server-1.0.2-r7.ebuild 6180
 RMD160 d1748b4267c3c3cc1feb11207363e4a5c6c0ceed xorg-server-1.0.2-r7.ebuild 6180
 SHA256 e494d7527228f994346aa2781c1d5be1752a46f9309a94dbaa6c1b81cbef3320 xorg-server-1.0.2-r7.ebuild 6180
-EBUILD xorg-server-1.1.0-r1.ebuild 24184 RMD160 ffdaa3dc3574c0873ab11e2a43ed68f4e944457a SHA1 8e9980452d742e98b01c2bfa040ee62b8c34bed6 SHA256 cd222531f4306b48a564be3d9cd148827abf4639a121871c28ed93866d8dbe8d
-MD5 74209bacc97a8c4f494e0f4c2be9a533 xorg-server-1.1.0-r1.ebuild 24184
-RMD160 ffdaa3dc3574c0873ab11e2a43ed68f4e944457a xorg-server-1.1.0-r1.ebuild 24184
-SHA256 cd222531f4306b48a564be3d9cd148827abf4639a121871c28ed93866d8dbe8d xorg-server-1.1.0-r1.ebuild 24184
-EBUILD xorg-server-1.1.1.ebuild 24091 RMD160 9e34a274de55ff26a78bf436b7b99195d1b46c98 SHA1 18e4aa80b987310afefd24ae65539b3db6968cbd SHA256 386cc62c9d1d93361b8f3bf5d83f27cb471ec19b82b1d0563f6f7b5ea5c6f9b4
-MD5 480b5e816868a36a534106442021781b xorg-server-1.1.1.ebuild 24091
-RMD160 9e34a274de55ff26a78bf436b7b99195d1b46c98 xorg-server-1.1.1.ebuild 24091
-SHA256 386cc62c9d1d93361b8f3bf5d83f27cb471ec19b82b1d0563f6f7b5ea5c6f9b4 xorg-server-1.1.1.ebuild 24091
-MISC ChangeLog 31016 RMD160 b2792aefa9163c32c7de3093f5bf8334c64b703b SHA1 ea8e75cf76fe303bc40eee7e3197dae8a2690175 SHA256 8d701b7b7374e01906ddb4b70c0def4849948aa71ff363c887706f6f34820f0a
-MD5 1dfac2561c87dacaea6730baa2bc196d ChangeLog 31016
-RMD160 b2792aefa9163c32c7de3093f5bf8334c64b703b ChangeLog 31016
-SHA256 8d701b7b7374e01906ddb4b70c0def4849948aa71ff363c887706f6f34820f0a ChangeLog 31016
+EBUILD xorg-server-1.1.0-r1.ebuild 24213 RMD160 44fa08e7d2cd938c4cf79decf8e24350d815ac56 SHA1 8dd47e6b2c7d27896add8d1889457f19fb8431df SHA256 1886b39a0e5a3db044194c875ca9d84def0c24c5746ce03463af28505b20bf30
+MD5 d11f57d9ab50b7026a612b23551c03fa xorg-server-1.1.0-r1.ebuild 24213
+RMD160 44fa08e7d2cd938c4cf79decf8e24350d815ac56 xorg-server-1.1.0-r1.ebuild 24213
+SHA256 1886b39a0e5a3db044194c875ca9d84def0c24c5746ce03463af28505b20bf30 xorg-server-1.1.0-r1.ebuild 24213
+EBUILD xorg-server-1.1.1.ebuild 24120 RMD160 469d4f5867e1b415fca34e43fa60bfa6395dca08 SHA1 aaf3b8b414e5a49dfc58833e99ec1aebbc6be94a SHA256 06a81e5a8d6efd372618c1e3c618ede388663afef71ab60fe90e1c6d8b5906e5
+MD5 c8baa98b4bc5d315411de856fac486ea xorg-server-1.1.1.ebuild 24120
+RMD160 469d4f5867e1b415fca34e43fa60bfa6395dca08 xorg-server-1.1.1.ebuild 24120
+SHA256 06a81e5a8d6efd372618c1e3c618ede388663afef71ab60fe90e1c6d8b5906e5 xorg-server-1.1.1.ebuild 24120
+MISC ChangeLog 31203 RMD160 4501a31ec666eabe6fe4afabdbd85d87df18c221 SHA1 4278ba36b03fa27445a39b90320af198b66337ac SHA256 ed476d66b1e15b21d94738157ca05501f1dcb5da0cbea53c51d5fe1278e2a87a
+MD5 6a704fa8eeb1d30da44bc571d85b0edf ChangeLog 31203
+RMD160 4501a31ec666eabe6fe4afabdbd85d87df18c221 ChangeLog 31203
+SHA256 ed476d66b1e15b21d94738157ca05501f1dcb5da0cbea53c51d5fe1278e2a87a ChangeLog 31203
 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.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index a3856059befe..0bf6ef2d4404 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-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.0-r1.ebuild,v 1.13 2006/07/16 17:59:41 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.14 2006/08/02 16:33:37 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -102,10 +102,10 @@ IUSE_VIDEO_CARDS="
 	video_cards_vga
 	video_cards_via
 	video_cards_vmware
-	video_cards_voodoo"
+	video_cards_voodoo
 
+	video_cards_fglrx"
 #	video_cards_nvidia
-#	video_cards_fglrx"
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
@@ -146,8 +146,7 @@ RDEPEND="x11-libs/libXfont
 	kdrive? ( sdl? ( media-libs/libsdl ) )
 	!media-video/nvidia-glx
 	!x11-drivers/nvidia-drivers
-	!x11-drivers/nvidia-legacy-drivers
-	!x11-drivers/ati-drivers"
+	!x11-drivers/nvidia-legacy-drivers"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
@@ -326,6 +325,7 @@ PDEPEND="
 				video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
 
 				video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+				video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
 			)
 			!minimal? (
 				>=x11-drivers/xf86-video-dummy-0.2.0
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
index 8e48b19a6de2..30d948c404d9 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1.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.ebuild,v 1.3 2006/07/16 17:58:02 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.4 2006/08/02 16:33:37 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -98,10 +98,10 @@ IUSE_VIDEO_CARDS="
 	video_cards_vga
 	video_cards_via
 	video_cards_vmware
-	video_cards_voodoo"
+	video_cards_voodoo
 
+	video_cards_fglrx"
 #	video_cards_nvidia
-#	video_cards_fglrx"
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
@@ -142,8 +142,7 @@ RDEPEND="x11-libs/libXfont
 	kdrive? ( sdl? ( media-libs/libsdl ) )
 	!media-video/nvidia-glx
 	!x11-drivers/nvidia-drivers
-	!x11-drivers/nvidia-legacy-drivers
-	!x11-drivers/ati-drivers"
+	!x11-drivers/nvidia-legacy-drivers"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
@@ -322,6 +321,7 @@ PDEPEND="
 				video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
 
 				video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+				video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 )
 			)
 			!minimal? (
 				>=x11-drivers/xf86-video-dummy-0.2.0