diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2010-08-30 22:41:34 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2010-08-30 22:41:34 +0000 |
| commit | 48c0662f92f9e18a3302a0eec1e44395d2ae46e3 (patch) | |
| tree | 2a47551b8d9b93d44e69323c6289ef94e99b390c /x11-drivers/nvidia-drivers | |
| parent | Add version 1.2.2 back since app-admin/chef-* depends upon it (diff) | |
| download | gentoo-2-48c0662f92f9e18a3302a0eec1e44395d2ae46e3.tar.gz gentoo-2-48c0662f92f9e18a3302a0eec1e44395d2ae46e3.tar.bz2 gentoo-2-48c0662f92f9e18a3302a0eec1e44395d2ae46e3.zip | |
fix up blocker with media-video/nvidia-settings
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers/nvidia-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild | 4 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 80c7d04b02ed..ebb53ae05133 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.249 2010/08/30 21:38:01 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.250 2010/08/30 22:41:34 cardoe Exp $ + + 30 Aug 2010; Doug Goldstein <cardoe@gentoo.org> + nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: + fix up blocker with media-video/nvidia-settings 30 Aug 2010; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild index 742945b80883..ba8b8387e7b4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.4 2010/08/30 21:39:57 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.5 2010/08/30 22:41:34 cardoe Exp $ EAPI="2" @@ -27,7 +27,7 @@ COMMON="<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 - !media-video/nvidia-settings" + !<media-video/nvidia-settings-256.52" DEPEND="${COMMON} kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild index e782672b6be7..dcf01e9726e0 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.5 2010/08/30 21:39:57 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.6 2010/08/30 22:41:34 cardoe Exp $ EAPI="2" @@ -27,7 +27,7 @@ COMMON="<x11-base/xorg-server-1.9.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) >=app-admin/eselect-opengl-1.0.9 - !media-video/nvidia-settings" + !<media-video/nvidia-settings-256.52" DEPEND="${COMMON} kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} |