diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-08-27 08:22:04 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-08-27 08:22:04 +0000 |
| commit | 34c30ba633cd86507fa55303cd3d2357df3f9fb5 (patch) | |
| tree | 71fc42f0f520b104ae31baf0ea160329cd451468 /x11-base | |
| parent | clean out older, non-modX ebuild (diff) | |
| download | gentoo-2-34c30ba633cd86507fa55303cd3d2357df3f9fb5.tar.gz gentoo-2-34c30ba633cd86507fa55303cd3d2357df3f9fb5.tar.bz2 gentoo-2-34c30ba633cd86507fa55303cd3d2357df3f9fb5.zip | |
Allow 7.1-compatible nvidia-drivers and nvidia-legacy-drivers.
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 15 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1.ebuild | 15 |
3 files changed, 23 insertions, 13 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index dbef71a1e88c..d9a8e1e2e7ae 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.159 2006/08/26 02:54:55 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.160 2006/08/27 08:22:04 dberkholz Exp $ + + 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + Allow 7.1-compatible nvidia-drivers and nvidia-legacy-drivers. 26 Aug 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild index 28d8d3d2a649..f2723f434825 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.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-server/xorg-server-1.1.0-r1.ebuild,v 1.16 2006/08/26 02:54:55 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.17 2006/08/27 08:22:04 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -104,8 +104,8 @@ IUSE_VIDEO_CARDS=" video_cards_vmware video_cards_voodoo - video_cards_fglrx" -# video_cards_nvidia + video_cards_fglrx + video_cards_nvidia" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -144,9 +144,7 @@ RDEPEND="x11-libs/libXfont >=x11-libs/libxkbui-1.0.2 x11-libs/liblbxutil kdrive? ( sdl? ( media-libs/libsdl ) ) - !media-video/nvidia-glx - !x11-drivers/nvidia-drivers - !x11-drivers/nvidia-legacy-drivers" + !media-video/nvidia-glx" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent # Xpm is dmx- and xorgcfg-dependent, pulls in Xt @@ -326,6 +324,11 @@ PDEPEND=" video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 ) + video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-1.0.8774 + >=x11-drivers/nvidia-legacy-drivers-1.0.7184 + ) + ) ) !minimal? ( >=x11-drivers/xf86-video-dummy-0.2.0 diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild index 87fb7da6d58e..b6c313e872fe 100644 --- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.1.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-server/xorg-server-1.1.1.ebuild,v 1.13 2006/08/26 08:27:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.14 2006/08/27 08:22:04 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -100,8 +100,8 @@ IUSE_VIDEO_CARDS=" video_cards_vmware video_cards_voodoo - video_cards_fglrx" -# video_cards_nvidia + video_cards_fglrx + video_cards_nvidia" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -140,9 +140,7 @@ RDEPEND="x11-libs/libXfont >=x11-libs/libxkbui-1.0.2 x11-libs/liblbxutil kdrive? ( sdl? ( media-libs/libsdl ) ) - !media-video/nvidia-glx - !x11-drivers/nvidia-drivers - !x11-drivers/nvidia-legacy-drivers" + !media-video/nvidia-glx" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent # Xpm is dmx- and xorgcfg-dependent, pulls in Xt @@ -263,6 +261,11 @@ PDEPEND=" video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 ) + video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-1.0.8774 + >=x11-drivers/nvidia-legacy-drivers-1.0.7184 + ) + ) )" LICENSE="${LICENSE} MIT" |