summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-01-28 23:25:22 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-01-28 23:25:22 +0000
commit3b79a05d7717d5edd9fcbba476e831519318f613 (patch)
treedd21b5be56381b5ba27d4bb3033bf44261601e7e /x11-base/xorg-x11
parentSecond pass. Cleanup by moving arch-conditional parts to ends of blocks. Add ... (diff)
downloadhistorical-3b79a05d7717d5edd9fcbba476e831519318f613.tar.gz
historical-3b79a05d7717d5edd9fcbba476e831519318f613.tar.bz2
historical-3b79a05d7717d5edd9fcbba476e831519318f613.zip
Restore USE=3dfx, glide-v3 doesn't work on all archs for which voodoo cards work.
Package-Manager: portage-2.1_pre4
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest12
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild12
3 files changed, 18 insertions, 13 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/Manifest b/x11-base/xorg-x11/Manifest
index b7b8a81e3c04..6dd421db56b9 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 62c6d0361945d1d890920db3b961eea5 ChangeLog 114368
-RMD160 1cb74a1b953e3e83e87727489d0b17e7d5f30270 ChangeLog 114368
-SHA256 ba91c073265c29da1b241e54eeae7645aa436f83d49736d81e55952891a17b1c ChangeLog 114368
+MD5 f32051465ca4151c01972d59c61e877c ChangeLog 114536
+RMD160 10afa396c4f9111a83ceb5f11f6b66a7adfa4b04 ChangeLog 114536
+SHA256 967695aec38bd61894540c2d6f71c878d69f26f54e083c7b9d2bd59fd47520c5 ChangeLog 114536
MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
@@ -28,9 +28,9 @@ SHA256 8318e0d8d3ae52fd2206ca57e83217d43c052716d5ae317d434f4926f4aa48c0 xorg-x11
MD5 fd0a1f5519f3c1704de9c3744b7670ec xorg-x11-6.8.99.15-r4.ebuild 54157
RMD160 aa87ce403b2398d82061197321a41f3c26cffc22 xorg-x11-6.8.99.15-r4.ebuild 54157
SHA256 a776983eb4bd04de304af15a6bfb3a68ee558d48a164a26fd8aaadbb47d4be93 xorg-x11-6.8.99.15-r4.ebuild 54157
-MD5 76ad8a7d120fa59b7eec9d62a6fa4ab0 xorg-x11-7.0-r1.ebuild 12775
-RMD160 9fee2e9156ca6f16e30d0b83ca7597a7be2315f3 xorg-x11-7.0-r1.ebuild 12775
-SHA256 198f5e02f36880d1e699f479824d0cdc27a55f2e91a3092dcef568d2f0700792 xorg-x11-7.0-r1.ebuild 12775
+MD5 38e4c9083c2fa0347bfd3c37d8221eb9 xorg-x11-7.0-r1.ebuild 12755
+RMD160 0d613aff1052dde213a10cda481d51a99254e40d xorg-x11-7.0-r1.ebuild 12755
+SHA256 b178b5a2370d07e30c527355babc8d839551870457ad3116d67e717ebf8295c4 xorg-x11-7.0-r1.ebuild 12755
MD5 b8256074d549617ad13279d98fdaafb9 xorg-x11-7.0.ebuild 3726
RMD160 04a4b2ec7794ef3f67a122e82a870d7487d8a8bc xorg-x11-7.0.ebuild 3726
SHA256 4cf8b8fdb8e6391a98d099aa26ca3ce10155e1a3b869b4fd5226c71e25a6a4b7 xorg-x11-7.0.ebuild 3726
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 )
)
)"