Adjust dependencies, bug 404335.

(Portage version: 2.1.10.49/cvs/Linux i686)

6 files changed, 17 insertions, 7 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index c0af3c57a711..8b71d40ed879 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.115 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.116 2012/05/05 14:37:26 idl0r Exp $
+
+  05 May 2012; Christian Ruppert <idl0r@gentoo.org>
+  nvidia-settings-173.14.31.ebuild, nvidia-settings-275.43.ebuild,
+  nvidia-settings-290.10.ebuild, nvidia-settings-295.20.ebuild,
+  nvidia-settings-295.40.ebuild:
+  Adjust dependencies, bug 404335.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   nvidia-settings-173.14.31.ebuild, nvidia-settings-260.19.29.ebuild,
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild
index d5c4d1d49acb..63994ba7bd7b 100644
--- a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild,v 1.2 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild,v 1.3 2012/05/05 14:37:26 idl0r Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-173.14*
+RDEPEND="=x11-drivers/nvidia-drivers-173.14*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
index 139f1e51ca40..9ae8bc950207 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.7 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11
 	dev-libs/glib:2"
 
 RDEPEND="=x11-drivers/nvidia-drivers-2*
+	|| ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] )
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index 5978a86a9bba..8431d5faaa3c 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.9 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.10 2012/05/05 14:37:26 idl0r Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11
 	dev-libs/glib:2"
 
 RDEPEND="=x11-drivers/nvidia-drivers-2*
+	|| ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] )
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index bf9103e86d73..4fbb9d6ea020 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.9 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.10 2012/05/05 14:37:26 idl0r Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11
 	dev-libs/glib:2"
 
 RDEPEND="=x11-drivers/nvidia-drivers-2*
+	|| ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] )
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
index c1e01dd8b27a..5cf0eed07a44 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.7 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $
 
 EAPI=4
 
@@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11
 	dev-libs/glib:2"
 
 RDEPEND="=x11-drivers/nvidia-drivers-2*
+	|| ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] )
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig