each nvidia-drivers pkg now specifies what Xorg version it's compatible with. Just pull in the best nvidia-drivers version possible now.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 23 insertions, 8 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 496e96a6e105..8d2943d56abf 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.368 2008/11/19 22:46:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.369 2008/12/13 04:24:17 cardoe Exp $
+
+  13 Dec 2008; Doug Goldstein <cardoe@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.2.ebuild:
+  each nvidia-drivers pkg now specifies what Xorg version it's compatible
+  with. Just pull in the best nvidia-drivers version possible now.
 
   19 Nov 2008; Luca Barbato <lu_zero@gentoo.org> xorg-server-1.5.2.ebuild:
   ati-drivers now support xorg 1.5
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d9c5facf3464..7b27dccada37 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -52,7 +55,14 @@ DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69
 DIST xorg-server-1.4.2.tar.bz2 6216638 RMD160 6f12b28d7e4186dfbdec3c9116c65e6831ed2e54 SHA1 385348721ecb6da4bc51a2b7ee5784de6be0a8b6 SHA256 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
 DIST xorg-server-1.5.2.tar.bz2 5615666 RMD160 a5693c99cf2b20a94c29cfd267a0bc27626d2914 SHA1 fc8b5ed20af34f504d55a004c35ebacbc603b339 SHA256 2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18356 RMD160 6c1611797bca8b0a27b5014a361804af5eb3363a SHA1 27e910f3215676611600af2cd386246468e64088 SHA256 b6a8d2eb16ed9fc7f49f39695097cb73483892e596e67a0c2a8cbcc6c28f836c
-EBUILD xorg-server-1.4.2.ebuild 18089 RMD160 33f65772d1266edb77eb60a14c094bd727001494 SHA1 9204efbb8c9040ecaba69a5899f48390c903256f SHA256 7605477f6b641c2b8d2c7e7310f2cb637de44867e702cfbf8d42d899113ad5ac
-EBUILD xorg-server-1.5.2.ebuild 16572 RMD160 b4af55b7df463519dec4899fef1ac7f99f791d6f SHA1 e9a35f00f50cbaafb2c99e28e1871bbcd2c8e8d0 SHA256 5a67c44b911a02eaba4f175282ac92339e11ebc435ecab795a79af88d6c4d0c3
-MISC ChangeLog 88422 RMD160 273a7a4d424e1e95fa38c09d8788aa163c7c508b SHA1 6af08282fd9df7df52cfd2d5f283d6af297773a9 SHA256 ea727939f57a03ef9ebc2e73482c96653549bc57c714ae57d32b87ebfb531252
+EBUILD xorg-server-1.4.2.ebuild 18079 RMD160 d9b46d0bb9c002c1cd5399d0959044442b564418 SHA1 1afe5e271ee448564ddab9214fcb38b126314d00 SHA256 e52c813909e5177c54c291249a0a85304d9c1e8c68211c090f9e85830a51b1e8
+EBUILD xorg-server-1.5.2.ebuild 16560 RMD160 415af1c69396cf3ec7506b6f6d98b596775b530c SHA1 3b62c352b82c4460c2f25f1372cf24fec0e51b9e SHA256 bd65dd7c89afdb9e011caa9500398b02a5bfe712a24aa075e49822003c232d9a
+MISC ChangeLog 88667 RMD160 4a6c1eb0129b0a8f5248307a81c1ce5f65e21732 SHA1 d872dde2d78673ed29fc1026662639c04d1ece5c SHA256 09c400664e138abe6d4f27d1c82b7eae74c6a7be66737be0307deed56d2845be
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklDOPkACgkQoeSe8B0zEfwzsQCggVK8UMPzQxZ5sxWVtAQmeHMF
+48YAoIselvibckOewPvkDzltfutSrDiZ
+=gR2c
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index 18388a883de3..d894a1c3ef5f 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.2.ebuild,v 1.7 2008/11/01 23:40:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.8 2008/12/13 04:24:17 cardoe Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -270,7 +270,7 @@ PDEPEND="
 		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
 		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
 		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.433 )
-		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 	)"
 LICENSE="${LICENSE} MIT"
 
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
index 522d987e95a9..cd37cb603f01 100644
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5.2.ebuild,v 1.9 2008/11/19 22:46:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.10 2008/12/13 04:24:17 cardoe Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -228,7 +228,7 @@ PDEPEND="
 		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
 		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 )
 		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
-		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-173.14.09 )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 )
 		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
 		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )