Remove VIDEO_CARDS flags for binary drivers and block binary ati and nvidia drivers, since none of them work yet with 1.3. Since we aren't yet sure which versions will, block them unconditionally for now and add appropriate dependencies later.

Package-Manager: portage-2.1.2.5

3 files changed, 21 insertions, 27 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 34afaea014e0..f97eff472594 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.232 2007/04/29 06:32:58 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.233 2007/05/01 05:44:20 dberkholz Exp $
+
+  01 May 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0.ebuild:
+  Remove VIDEO_CARDS flags for binary drivers and block binary ati and nvidia
+  drivers, since none of them work yet with 1.3. Since we aren't yet sure
+  which versions will, block them unconditionally for now and add appropriate
+  dependencies later.
 
   29 Apr 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.2.0-r3.ebuild:
   Stable on x86, bug #175465.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4caf8d90aedf..10d7c72226de 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
 MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
@@ -127,14 +124,14 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
-EBUILD xorg-server-1.3.0.0.ebuild 16319 RMD160 a7b7a894b15e3e666994074dc68b2bdb2297d414 SHA1 3cc272533865bb8b990163515e2643eb45883dfe SHA256 59e108dfe9f85799fc7ac48a0c68295b85674078c249f9e78523b5c3e8ea2491
-MD5 17040103d415d180d802d579f9dbdce8 xorg-server-1.3.0.0.ebuild 16319
-RMD160 a7b7a894b15e3e666994074dc68b2bdb2297d414 xorg-server-1.3.0.0.ebuild 16319
-SHA256 59e108dfe9f85799fc7ac48a0c68295b85674078c249f9e78523b5c3e8ea2491 xorg-server-1.3.0.0.ebuild 16319
-MISC ChangeLog 49245 RMD160 1c6eff372ff9de2873758fbe6afcf73f2c66c1c4 SHA1 8f5120ba6efec4cb6cf900a6cc2b008bb8a74cb1 SHA256 fcf55d0a00f58a945132a20b2af652e3667d42951d7919ab6a550ae0c270990d
-MD5 9f6035bba3fef54735f082c20156cfdf ChangeLog 49245
-RMD160 1c6eff372ff9de2873758fbe6afcf73f2c66c1c4 ChangeLog 49245
-SHA256 fcf55d0a00f58a945132a20b2af652e3667d42951d7919ab6a550ae0c270990d ChangeLog 49245
+EBUILD xorg-server-1.3.0.0.ebuild 16219 RMD160 7f9dfc1551bbcd7dbd0f06a505a7313d4dd0d3b7 SHA1 d2ecfb165a4f287692d0351191782620ce871e91 SHA256 efc8d687c153ba75a74aee7ac9f2b0273eee04c8c83a10d3b2a4f4aad3f51dfe
+MD5 1c0a99bb730621c7a977d49ddfba0aa3 xorg-server-1.3.0.0.ebuild 16219
+RMD160 7f9dfc1551bbcd7dbd0f06a505a7313d4dd0d3b7 xorg-server-1.3.0.0.ebuild 16219
+SHA256 efc8d687c153ba75a74aee7ac9f2b0273eee04c8c83a10d3b2a4f4aad3f51dfe xorg-server-1.3.0.0.ebuild 16219
+MISC ChangeLog 49587 RMD160 db3555443ba0baffb49baeede95601bb4fe57688 SHA1 4da6624adb4d89a0979a1dcf1c6b0f854cf266e7 SHA256 e78fd4fd577043a4990ffc81b8677ca988d4e827fa08e40895b10e143dafd26f
+MD5 60aaa24a019b1ead5586cda338f99301 ChangeLog 49587
+RMD160 db3555443ba0baffb49baeede95601bb4fe57688 ChangeLog 49587
+SHA256 e78fd4fd577043a4990ffc81b8677ca988d4e827fa08e40895b10e143dafd26f ChangeLog 49587
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -166,10 +163,3 @@ SHA256 c1013b629f0a3186dc286d28768fdfd34261c14b07d08e52d4149a32875302c8 files/di
 MD5 f5088a38f31782713a97f0cf19bfbbd1 files/digest-xorg-server-1.3.0.0 512
 RMD160 70dafff2a513850c2631793f877a2ffe294758c6 files/digest-xorg-server-1.3.0.0 512
 SHA256 ae8d04a5e64f7aedd5cc910085a1db5ce1638012a3bfedeab142ce99b0d3968a files/digest-xorg-server-1.3.0.0 512
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGNDyBQlM6RnzZP+IRAsoKAJ46t9r8Jk0rcmUR70jd6iGOR61I5QCgtohP
-+a2bqwAIP0H2bfKAjTb0/TM=
-=JWlE
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
index a27464d41f66..2de9d86d1944 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.0.0.ebuild,v 1.2 2007/04/22 04:20:31 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.3 2007/05/01 05:44:20 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -98,10 +98,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_vga
 	video_cards_via
 	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_fglrx
-	video_cards_nvidia"
+	video_cards_voodoo"
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
@@ -260,12 +257,12 @@ 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 )
 		video_cards_nvidia? ( || (
-				>=x11-drivers/nvidia-drivers-1.0.8774
-				>=x11-drivers/nvidia-legacy-drivers-1.0.7184
 			)
 		)
+		!x11-drivers/nvidia-drivers
+		!x11-drivers/nvidia-legacy-drivers
+		!x11-drivers/ati-drivers
 	)"
 LICENSE="${LICENSE} MIT"