diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2006-07-07 22:51:09 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2006-07-07 22:51:09 +0000 |
| commit | bda7930b3d799f40eb6b7d44812852eca88c5318 (patch) | |
| tree | eeece909e80d457eff4d6dde8416daa1a3674512 /media-video | |
| parent | add GNOME 2.14.2 meta (diff) | |
| download | gentoo-2-bda7930b3d799f40eb6b7d44812852eca88c5318.tar.gz gentoo-2-bda7930b3d799f40eb6b7d44812852eca88c5318.tar.bz2 gentoo-2-bda7930b3d799f40eb6b7d44812852eca88c5318.zip | |
Fix DEPEND for new nvidia stuff. Stable x86.
(Portage version: 2.1.1_pre2-r5)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/nvidia-settings/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild | 17 |
2 files changed, 16 insertions, 7 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/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 ) |