summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-01-28 23:25:22 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-01-28 23:25:22 +0000
commit96a942f7c1502bd52dda2fa6d57f9c8aa02fb862 (patch)
tree0bf7bc4bbf31f3afbb7f8422ce7afc231e430f81 /x11-base
parentSecond pass. Cleanup by moving arch-conditional parts to ends of blocks. Add ... (diff)
downloadgentoo-2-96a942f7c1502bd52dda2fa6d57f9c8aa02fb862.tar.gz
gentoo-2-96a942f7c1502bd52dda2fa6d57f9c8aa02fb862.tar.bz2
gentoo-2-96a942f7c1502bd52dda2fa6d57f9c8aa02fb862.zip
Restore USE=3dfx, glide-v3 doesn't work on all archs for which voodoo cards work.
(Portage version: 2.1_pre4)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild12
2 files changed, 12 insertions, 7 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index e736a8c732b1..742c9ef0fb05 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.512 2006/01/28 23:20:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.513 2006/01/28 23:25:22 spyderous Exp $
+
+ 28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-7.0-r1.ebuild:
+ Restore USE=3dfx, glide-v3 doesn't work on all archs for which voodoo cards
+ work.
28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-7.0-r1.ebuild:
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 0097576706f2..3a453481f1f4 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.4 2006/01/28 23:20:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.5 2006/01/28 23:25:22 spyderous Exp $
inherit eutils
@@ -91,6 +91,7 @@ IUSE_VIDEO_CARDS="
video_cards_fglrx"
IUSE="${IUSE_VIDEO_CARDS}
${IUSE_INPUT_DEVICES}
+ 3dfx
xprint"
# Collision protect will scream bloody murder if we install over old versions
@@ -261,7 +262,7 @@ RDEPEND="${RDEPEND}
video_cards_vmware? ( x11-drivers/xf86-video-vmware )
video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
- video_cards_3dfx? ( >=media-libs/glide-v3-3.10 )
+ video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
video_cards_nvidia? ( media-video/nvidia-glx )
video_cards_fglrx? ( x11-drivers/ati-drivers )
)
@@ -301,6 +302,8 @@ RDEPEND="${RDEPEND}
x11-drivers/xf86-video-via
x11-drivers/xf86-video-voodoo
+ 3dfx? ( >=media-libs/glide-v3-3.10 )
+
sparc? ( x11-drivers/xf86-video-sunbw2
x11-drivers/xf86-video-suncg14
x11-drivers/xf86-video-suncg3
@@ -309,11 +312,8 @@ RDEPEND="${RDEPEND}
x11-drivers/xf86-video-sunleo
x11-drivers/xf86-video-suntcx
)
- x86? ( x11-drivers/xf86-video-vmware
- >=media-libs/glide-v3-3.10
- )
+ x86? ( x11-drivers/xf86-video-vmware )
amd64? ( x11-drivers/xf86-video-vmware )
- alpha? ( >=media-libs/glide-v3-3.10 )
)
)"