summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-09-19 03:16:10 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-09-19 03:16:10 +0000
commit6830f3e3c91b7b35df85c03225d1c6e97d447849 (patch)
treeec276d4af40f25f6368e28cd256367257afa7181 /x11-base
parentNo nvidia drivers work on fbsd with xorg-server 1.4 yet. (diff)
downloadgentoo-2-6830f3e3c91b7b35df85c03225d1c6e97d447849.tar.gz
gentoo-2-6830f3e3c91b7b35df85c03225d1c6e97d447849.tar.bz2
gentoo-2-6830f3e3c91b7b35df85c03225d1c6e97d447849.zip
Restore Nvidia binary driver support with today's release.
(Portage version: 2.1.3.9)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.4-r1.ebuild11
2 files changed, 10 insertions, 7 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b5dbfa2ed5ba..6485fbfafacc 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.273 2007/09/14 09:21:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.274 2007/09/19 03:16:10 dberkholz Exp $
+
+ 19 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ xorg-server-1.4-r1.ebuild:
+ Restore Nvidia binary driver support with today's release.
14 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
xorg-server-1.4-r1.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
index 47c1c24b5e91..9f7417439fe3 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r1.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.4-r1.ebuild,v 1.4 2007/09/14 09:21:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.5 2007/09/19 03:16:10 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -99,9 +99,9 @@ IUSE_VIDEO_CARDS="
video_cards_via
video_cards_vmware
video_cards_voodoo
- video_cards_xgi"
-# video_cards_fglrx
-# video_cards_nvidia"
+ video_cards_xgi
+ video_cards_nvidia"
+# video_cards_fglrx"
IUSE_SERVERS="dmx kdrive xorg"
IUSE="${IUSE_VIDEO_CARDS}
${IUSE_INPUT_DEVICES}
@@ -265,10 +265,9 @@ PDEPEND="
video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
- !x11-drivers/nvidia-drivers
+ video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.19 )
!x11-drivers/ati-drivers
)"
-# video_cards_nvidia? ( x11-drivers/nvidia-drivers )
# video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.37.6 )
LICENSE="${LICENSE} MIT"