nvidia-settings is now part of nvidia-drivers; bug #182638

Package-Manager: portage-2.1.3_rc4

3 files changed, 21 insertions, 14 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index 0c3ce5ad2418..8adac0d59607 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/sensors-applet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.25 2007/06/14 21:01:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.26 2007/06/23 01:49:58 dang Exp $
+
+  23 Jun 2007; Daniel Gryniewicz <dang@gentoo.org>
+  sensors-applet-1.7.12.ebuild:
+  nvidia-settings is now part of nvidia-drivers; bug #182638
 
   14 Jun 2007; Daniel Gryniewicz <dang@gentoo.org>
   sensors-applet-1.7.12.ebuild:
diff --git a/gnome-extra/sensors-applet/Manifest b/gnome-extra/sensors-applet/Manifest
index 9290f14ac4eb..308fe59e84d6 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -12,18 +12,18 @@ EBUILD sensors-applet-1.6.ebuild 839 RMD160 54f3bb21bd4a9e408dc6257ba3e6ed746344
 MD5 be15730e1150f5e07fa7788432ee3cdc sensors-applet-1.6.ebuild 839
 RMD160 54f3bb21bd4a9e408dc6257ba3e6ed7463445435 sensors-applet-1.6.ebuild 839
 SHA256 280168fb066d32a271ed15521812bb9ac9554496b15c361924c38089e34b7a5e sensors-applet-1.6.ebuild 839
-EBUILD sensors-applet-1.7.12.ebuild 1185 RMD160 144c92acb5a1b792ed07973734009157df7926a3 SHA1 9329d0259ec2f25a3bc59ab38d46a45d72df5e4b SHA256 4d00689d4bf47cdee75bb5f21c3852767c7342e66202ccaf1f62823419ba620d
-MD5 9558ca5d66acb0e004daac81603db9cf sensors-applet-1.7.12.ebuild 1185
-RMD160 144c92acb5a1b792ed07973734009157df7926a3 sensors-applet-1.7.12.ebuild 1185
-SHA256 4d00689d4bf47cdee75bb5f21c3852767c7342e66202ccaf1f62823419ba620d sensors-applet-1.7.12.ebuild 1185
+EBUILD sensors-applet-1.7.12.ebuild 1236 RMD160 4ae24726f0e32f86e2fbd72343eb0f4a1f74d629 SHA1 f5aa21f15a2d3185ad03197f64e98e43dda3ee43 SHA256 e30447a4004d28507a29ebc03cfb8fe67e706c7a565a2447820c6902d649c02a
+MD5 daaca6972fad886944e2433938d271e0 sensors-applet-1.7.12.ebuild 1236
+RMD160 4ae24726f0e32f86e2fbd72343eb0f4a1f74d629 sensors-applet-1.7.12.ebuild 1236
+SHA256 e30447a4004d28507a29ebc03cfb8fe67e706c7a565a2447820c6902d649c02a sensors-applet-1.7.12.ebuild 1236
 EBUILD sensors-applet-1.7.9.ebuild 1036 RMD160 418c2eca90ba28e01160b48786c74d15592db744 SHA1 80dde6212ad95460868ec3c15b75162d78a83df7 SHA256 e196efa18f9bef11b071069d2b8355b98d1a7b103facff6e741f5536d71e5a12
 MD5 5a428884b964d49980215e44696fb19e sensors-applet-1.7.9.ebuild 1036
 RMD160 418c2eca90ba28e01160b48786c74d15592db744 sensors-applet-1.7.9.ebuild 1036
 SHA256 e196efa18f9bef11b071069d2b8355b98d1a7b103facff6e741f5536d71e5a12 sensors-applet-1.7.9.ebuild 1036
-MISC ChangeLog 4272 RMD160 5b5657496ec88279f5f50c61eca54c67dbb9853c SHA1 f6b279769288f48be02d5cb898f9f1cf1521077d SHA256 88fe41d9b482e5d4a3ed1c8d3a542ba84bd523173a3f8da5df4def6fa20062c1
-MD5 8f3cdfa35cc1136bbed968244cf8e99f ChangeLog 4272
-RMD160 5b5657496ec88279f5f50c61eca54c67dbb9853c ChangeLog 4272
-SHA256 88fe41d9b482e5d4a3ed1c8d3a542ba84bd523173a3f8da5df4def6fa20062c1 ChangeLog 4272
+MISC ChangeLog 4417 RMD160 8edf4cd6dc8825b8b6273b049e0c0e4f8e92854b SHA1 33b60ce8f194235ea9272355403f37d684e5b3a9 SHA256 0c83edd258b6743ac5b9d1f06a563b8c63c3fa943072615c01a4669f9b71c2ed
+MD5 b53a1efe2cd4ee53c51b7a5d8e472f99 ChangeLog 4417
+RMD160 8edf4cd6dc8825b8b6273b049e0c0e4f8e92854b ChangeLog 4417
+SHA256 0c83edd258b6743ac5b9d1f06a563b8c63c3fa943072615c01a4669f9b71c2ed ChangeLog 4417
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -40,7 +40,7 @@ SHA256 bf3c15011e555e8208653286231716687edccf49475f7e8c25c59131cbd544b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGcazPomPajV0RnrERArajAJwJAXBmw9qLov46PmTHYPiLUCd8HgCfW11m
-izZVHAae9l1caCQg1A8bmnA=
-=plD5
+iD8DBQFGfHxsomPajV0RnrERAp8BAJ4jS16FO8xPLd12SStw/6GQQ+gz0ACeMCr2
+L9LUy8UQqAQUXethYB7MhcY=
+=Ov2D
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/sensors-applet/sensors-applet-1.7.12.ebuild b/gnome-extra/sensors-applet/sensors-applet-1.7.12.ebuild
index e08ff3a09320..995db76b698e 100644
--- a/gnome-extra/sensors-applet/sensors-applet-1.7.12.ebuild
+++ b/gnome-extra/sensors-applet/sensors-applet-1.7.12.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/gnome-extra/sensors-applet/sensors-applet-1.7.12.ebuild,v 1.5 2007/06/14 21:01:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-1.7.12.ebuild,v 1.6 2007/06/23 01:49:58 dang Exp $
 
 inherit gnome2 eutils
 
@@ -23,7 +23,10 @@ RDEPEND="
 	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
 	libnotify? ( >=x11-libs/libnotify-0.4.0 )
 	lm_sensors? ( sys-apps/lm_sensors )
-	nvidia? ( media-video/nvidia-settings )"
+	nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09
+		media-video/nvidia-settings
+	) )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12