diff options
| author |   Kristopher Kersey <augustus@gentoo.org> | 2006-07-07 14:04:56 +0000 |
|---|---|---|
| committer | Kristopher Kersey <augustus@gentoo.org> | 2006-07-07 14:04:56 +0000 |
| commit | 358f5d415d088857564136142a7e0b2c9e43a29a (patch) | |
| tree | b9b8a288d19656240bb5f821a792a9127102fc5b /x11-base/xorg-x11 | |
| parent | Stable on x86 and amd64 for bug #139505. (diff) | |
| download | gentoo-2-358f5d415d088857564136142a7e0b2c9e43a29a.tar.gz gentoo-2-358f5d415d088857564136142a7e0b2c9e43a29a.tar.bz2 gentoo-2-358f5d415d088857564136142a7e0b2c9e43a29a.zip | |
Added || dependancy on x11-drivers/nvidia-drivers or x11-drivers/nvidia-legacy-drivers when nvidia is specified.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'x11-base/xorg-x11')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 98d7061a50cb..1411f8eba0e9 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.560 2006/07/07 02:39:04 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.561 2006/07/07 14:04:56 augustus Exp $ + + 07 Jul 2006; Kristopher Kersey <augustus@gentoo.org> + xorg-x11-7.0-r1.ebuild: + Added || dependancy on x11-drivers/nvidia-drivers or + x11-drivers/nvidia-legacy-drivers when nvidia is specified. 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: Update to my new email address. diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild index 5bfee0fc6b30..240883bf613b 100644 --- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.25 2006/06/30 15:05:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.26 2006/07/07 14:04:56 augustus Exp $ inherit eutils @@ -281,7 +281,9 @@ RDEPEND="${RDEPEND} video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - video_cards_nvidia? ( media-video/nvidia-glx ) + video_cards_nvidia? ( || ( media-video/nvidia-glx + x11-drivers/nvidia-drivers + x11-drivers/nvidia-legacy-drivers ) ) video_cards_fglrx? ( x11-drivers/ati-drivers ) ) ( |