Restore Nvidia binary driver support with today's release.

Package-Manager: portage-2.1.3.9

3 files changed, 28 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b5dbfa2ed5ba..6485fbfafacc 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.273 2007/09/14 09:21:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.274 2007/09/19 03:16:10 dberkholz Exp $
+
+  19 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  Restore Nvidia binary driver support with today's release.
 
   14 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.4-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index eec0df72901b..83fc0de42a90 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-client-leak.patch 363 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a SHA1 67ee249858947cea7fcd9a08db3ff3e81cd0036e SHA256 5969bf63e88ab4030c6913237379b76fb55e9e1f249a058eb17487a4b7103b87
 MD5 c46eeebdde41ceb57f1dca6ef4b1a8b7 files/1.2.0-client-leak.patch 363
 RMD160 788a7468df4305319ee3a05137ce0b90e76b982a files/1.2.0-client-leak.patch 363
@@ -99,14 +102,14 @@ EBUILD xorg-server-1.3.0.0.ebuild 16691 RMD160 4ec79082172906fb3670b5248be1072b6
 MD5 5f7c606c236f626a581ef59b958958f9 xorg-server-1.3.0.0.ebuild 16691
 RMD160 4ec79082172906fb3670b5248be1072b659e5c85 xorg-server-1.3.0.0.ebuild 16691
 SHA256 f8919bad312e15161da442f2d98190f5370824d0ae995b46adcfc17e19bf2d62 xorg-server-1.3.0.0.ebuild 16691
-EBUILD xorg-server-1.4-r1.ebuild 17764 RMD160 933a0ca75ea2132b456a2b4e1786c7b4b73c5c60 SHA1 2e3b89e9af57e3889f015dc23fd2af3aa2b742b5 SHA256 3a43cb8a64d5507f95ab42cdac844cfdb6d5e6d6a8777c62b93f427aa2b5e3b6
-MD5 33754b5e29559af474c5d39925770924 xorg-server-1.4-r1.ebuild 17764
-RMD160 933a0ca75ea2132b456a2b4e1786c7b4b73c5c60 xorg-server-1.4-r1.ebuild 17764
-SHA256 3a43cb8a64d5507f95ab42cdac844cfdb6d5e6d6a8777c62b93f427aa2b5e3b6 xorg-server-1.4-r1.ebuild 17764
-MISC ChangeLog 58283 RMD160 56f7522ed4354c997a419743337aedba039a51de SHA1 07f25db9dccbed43fe0dbaca99c4f3a84119d113 SHA256 14dc588ed46396c31d3dc61e4426ee2085a733e1bb902dd7e3a2592d60eb3612
-MD5 80b56849fd3b86a85e888360de7182db ChangeLog 58283
-RMD160 56f7522ed4354c997a419743337aedba039a51de ChangeLog 58283
-SHA256 14dc588ed46396c31d3dc61e4426ee2085a733e1bb902dd7e3a2592d60eb3612 ChangeLog 58283
+EBUILD xorg-server-1.4-r1.ebuild 17744 RMD160 2949e3b6788a90930417d5992e07f19527925433 SHA1 4d2a1c26b2ffb99b1656e4dcf643c0ce9fc3f789 SHA256 859933442e285bc243ea34b809ba3c184a7efe4b733e30bb0bfc11aa233ca326
+MD5 b20fa97c5dceb441daf94054d58c7634 xorg-server-1.4-r1.ebuild 17744
+RMD160 2949e3b6788a90930417d5992e07f19527925433 xorg-server-1.4-r1.ebuild 17744
+SHA256 859933442e285bc243ea34b809ba3c184a7efe4b733e30bb0bfc11aa233ca326 xorg-server-1.4-r1.ebuild 17744
+MISC ChangeLog 58429 RMD160 f01dbc8024a108a04aec46c5f2d18403e66fdf91 SHA1 3007c42ce8836e8cc39c5bd22737d33c132f9dad SHA256 793cde3d123ea1c736d0eacf70de28a667ff54a09001e2cb65f2646bded822a3
+MD5 9aea6663ecf4b0635955d5d0fe90c02f ChangeLog 58429
+RMD160 f01dbc8024a108a04aec46c5f2d18403e66fdf91 ChangeLog 58429
+SHA256 793cde3d123ea1c736d0eacf70de28a667ff54a09001e2cb65f2646bded822a3 ChangeLog 58429
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -120,3 +123,10 @@ SHA256 ae8d04a5e64f7aedd5cc910085a1db5ce1638012a3bfedeab142ce99b0d3968a files/di
 MD5 a786bf92e7f6a676ca17c72643400702 files/digest-xorg-server-1.4-r1 500
 RMD160 d88df94e7c8c7a0e16aff8d597ce8e7e570331b2 files/digest-xorg-server-1.4-r1 500
 SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/digest-xorg-server-1.4-r1 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFG8JTfXVaO67S1rtsRAnpwAKDuIBRHI+jeRzEweqTJwGZVXQKhtwCdExVu
+HvdAlPv0dKvAhQg1+nEr9R8=
+=eYyw
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
index 47c1c24b5e91..9f7417439fe3 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r1.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.4-r1.ebuild,v 1.4 2007/09/14 09:21:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.5 2007/09/19 03:16:10 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -99,9 +99,9 @@ IUSE_VIDEO_CARDS="
 	video_cards_via
 	video_cards_vmware
 	video_cards_voodoo
-	video_cards_xgi"
-#	video_cards_fglrx
-#	video_cards_nvidia"
+	video_cards_xgi
+	video_cards_nvidia"
+#	video_cards_fglrx"
 IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
@@ -265,10 +265,9 @@ PDEPEND="
 		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
 		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
 		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-		!x11-drivers/nvidia-drivers
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.19 )
 		!x11-drivers/ati-drivers
 	)"
-#		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 #		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
 LICENSE="${LICENSE} MIT"