Fix DEPEND for new nvidia stuff. Stable x86.

Package-Manager: portage-2.1.1_pre2-r5

3 files changed, 34 insertions, 15 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 04f000e2ce8f..6423503abc60 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.24 2006/07/07 14:25:51 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.25 2006/07/07 22:51:09 azarah Exp $
+
+  07 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-settings-1.0.20051122-r3.ebuild:
+  Fix DEPEND for new nvidia stuff.  Stable x86.
 
 *nvidia-settings-1.0.20060516-r1 (07 Jul 2006)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index c25eb4229194..9e940e41aea7 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 MD5 596d93feba5f2012ed21d3b44bfd0b10 files/icon/nvidia-settings.desktop 194
 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 files/icon/nvidia-settings.desktop 194
@@ -30,10 +33,10 @@ EBUILD nvidia-settings-1.0.20051122-r2.ebuild 1756 RMD160 9e99c38f80522434fd2d67
 MD5 de224fd54ba4e9440b3629559f8d8112 nvidia-settings-1.0.20051122-r2.ebuild 1756
 RMD160 9e99c38f80522434fd2d67be2f2eef403a3d41a4 nvidia-settings-1.0.20051122-r2.ebuild 1756
 SHA256 163272bee70e109ba4e3d70a1e6a7e2bc15a1bad56bd4da729ab48197c69929f nvidia-settings-1.0.20051122-r2.ebuild 1756
-EBUILD nvidia-settings-1.0.20051122-r3.ebuild 2869 RMD160 d0baaa09a4bb9549b4841c5d91c3e9024b377f25 SHA1 bb2b62844d39257ddfdc8190c7b75df34319f297 SHA256 08a61f904f64300a69105bca89e4f4575decf1cc39c17bb36cf60279aadd0e3b
-MD5 211487adcbde506556b4ae85e1049c75 nvidia-settings-1.0.20051122-r3.ebuild 2869
-RMD160 d0baaa09a4bb9549b4841c5d91c3e9024b377f25 nvidia-settings-1.0.20051122-r3.ebuild 2869
-SHA256 08a61f904f64300a69105bca89e4f4575decf1cc39c17bb36cf60279aadd0e3b nvidia-settings-1.0.20051122-r3.ebuild 2869
+EBUILD nvidia-settings-1.0.20051122-r3.ebuild 3134 RMD160 d2f793a1d0f36951b7304ecb5b31e2dc356bd943 SHA1 1b149b492a98756618381996b86c2c0e05a39197 SHA256 1f1c3ba0c9a2fe00f6bb02f9dfe8292e3f2b56975b53a17a3616fe4e58dfd31f
+MD5 9d87eb293ae4d6f8f2c686d709999ab7 nvidia-settings-1.0.20051122-r3.ebuild 3134
+RMD160 d2f793a1d0f36951b7304ecb5b31e2dc356bd943 nvidia-settings-1.0.20051122-r3.ebuild 3134
+SHA256 1f1c3ba0c9a2fe00f6bb02f9dfe8292e3f2b56975b53a17a3616fe4e58dfd31f nvidia-settings-1.0.20051122-r3.ebuild 3134
 EBUILD nvidia-settings-1.0.20051122.ebuild 1607 RMD160 b60790be2b6382765fbfa4ac5dbadd974210528d SHA1 2428332f59fbd8884bd97aba6d88d7267fa766de SHA256 a8cce57fa8344a1d817509f7c3a2d91a3e9ebed5809f427f0b83daf90141e63a
 MD5 e7136664ccde2a8050e6b17b803fbdb0 nvidia-settings-1.0.20051122.ebuild 1607
 RMD160 b60790be2b6382765fbfa4ac5dbadd974210528d nvidia-settings-1.0.20051122.ebuild 1607
@@ -58,10 +61,10 @@ EBUILD nvidia-settings-1.0.7167.ebuild 1322 RMD160 6143fa709b600b5d0e15cf005efb8
 MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
 RMD160 6143fa709b600b5d0e15cf005efb8758c3667303 nvidia-settings-1.0.7167.ebuild 1322
 SHA256 137ade9e89ccbf46cba0d2021042595868ab3df68adfc3318fb44297aaf3c75d nvidia-settings-1.0.7167.ebuild 1322
-MISC ChangeLog 4686 RMD160 7e1b5bbafc336e14e8c6ed92a5d1b5323cce68d1 SHA1 751ec6c3a0b50ca47d583d7d79f6d4074fea309a SHA256 ed361716c2b7e1a237548de14afbbe3d576782a7cd9aec91353a88448e6f82d5
-MD5 9d8f07bceaa8a1409a43e50214720816 ChangeLog 4686
-RMD160 7e1b5bbafc336e14e8c6ed92a5d1b5323cce68d1 ChangeLog 4686
-SHA256 ed361716c2b7e1a237548de14afbbe3d576782a7cd9aec91353a88448e6f82d5 ChangeLog 4686
+MISC ChangeLog 4827 RMD160 a918b3b103ca5b475538bd569d9b0e60a034da07 SHA1 ab691125d04058d6b9f3bb59909462384e6a35f7 SHA256 283e2447ed850c777dd009d990d35776093dc3133cec1358d3fba9b4b48f3841
+MD5 b628747a2fef9663a2b12d9a48371f00 ChangeLog 4827
+RMD160 a918b3b103ca5b475538bd569d9b0e60a034da07 ChangeLog 4827
+SHA256 283e2447ed850c777dd009d990d35776093dc3133cec1358d3fba9b4b48f3841 ChangeLog 4827
 MISC metadata.xml 300 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf SHA1 c09bb78e0f50c4c1baf741d6fc7abda39fdf338b SHA256 8e7d769dbca123b81bed99b71048e93a8f860219e894c8abc7569d0cc3e948e8
 MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf metadata.xml 300
@@ -99,3 +102,10 @@ SHA256 aae449265f321d357fe7aea7ed0c2033030c009fc1afe3f5e4b711a07f855dc3 files/di
 MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76
 RMD160 8d23a933330ada159d95b7aa9c75cd7b2d10ee6c files/digest-nvidia-settings-1.0.7167 76
 SHA256 d20f525816ba251a7bc49354fe138775788ff394c5e21292f6ad58c584d0adbc files/digest-nvidia-settings-1.0.7167 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEruXA1ZcsMnZjRyIRArcQAJ4gBcQ57sPdB2lVypL4d6nXiijVOgCeJ32Q
+QyGz+0MoNPkDMApMv79K4g4=
+=GRCX
+-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
index a00a7fd051c0..b3f39be9a3e6 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.3 2006/04/19 14:49:39 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.4 2006/07/07 22:51:09 azarah Exp $
 
 inherit eutils toolchain-funcs multilib
 
-NVIDIA_VERSION="1.0.7664"
+NVIDIA_VERSION="1.0.6629"
+# The following were added to work with the new nvidia-drivers and
+# nvidia-legacy-drivers ebuilds.  This will be cleaned up once we remove
+# nvidia-kernel and nvidia-glx from portage.
+NVIDIA_NEW_VERSION="1.0.8762"
+NVIDIA_LEGACY_VERSION="1.0.7182"
 S="${WORKDIR}/${PN}-1.0"
 DESCRIPTION="NVIDIA Linux X11 Settings Utility"
 HOMEPAGE="http://www.nvidia.com/"
@@ -14,7 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE=
 
 # xorg-server is used in the depends as nvidia-settings builds against some
@@ -31,9 +36,9 @@ DEPEND="virtual/libc
 				x11-misc/gccmakedep )
 			virtual/x11
 		)"
-RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
-		|| ( >=media-video/nvidia-kernel-${NVIDIA_VERSION}
-			>=media-video/nvidia-freebsd-${NVIDIA_VERSION} )
+RDEPEND="|| ( >=media-video/nvidia-glx-${NVIDIA_VERSION}
+			>=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION}
+			>=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )
 		>=x11-libs/gtk+-2
 		|| ( (	x11-base/xorg-server
 				x11-libs/libXt )