diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-05-01 07:45:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-05-01 07:45:22 +0000 |
| commit | 61dfcc0dd90dd90de5cad3acf5c30b5adf559850 (patch) | |
| tree | c7521f85cf5008915fb5a4913d36a98e7289a87c /x11-base/xorg-server | |
| parent | Fixing up FEATURES=test, backporting vapier's changes to quilt-0.45-r1. (diff) | |
| download | gentoo-2-61dfcc0dd90dd90de5cad3acf5c30b5adf559850.tar.gz gentoo-2-61dfcc0dd90dd90de5cad3acf5c30b5adf559850.tar.bz2 gentoo-2-61dfcc0dd90dd90de5cad3acf5c30b5adf559850.zip | |
Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and blocking them is annoying for users.
(Portage version: 2.1.2.5)
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.3.0.0.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f97eff472594..daefde7782b2 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.233 2007/05/01 05:44:20 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.234 2007/05/01 07:45:22 drac Exp $ + + 01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild: + Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and + blocking them is annoying for users. 01 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; xorg-server-1.3.0.0.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild index 2de9d86d1944..6e53272b47b2 100644 --- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.3.0.0.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/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.3 2007/05/01 05:44:20 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.4 2007/05/01 07:45:22 drac Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -98,7 +98,8 @@ IUSE_VIDEO_CARDS=" video_cards_vga video_cards_via video_cards_vmware - video_cards_voodoo" + video_cards_voodoo + video_cards_nvidia" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -258,9 +259,10 @@ PDEPEND=" video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-1.0.9755-r1 ) ) - !x11-drivers/nvidia-drivers + !<x11-drivers/nvidia-drivers-1.0.9755-r1 !x11-drivers/nvidia-legacy-drivers !x11-drivers/ati-drivers )" |