Combine the dri USE flag into the opengl USE flag, since there's no way to control...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index aae62dd0e3e98111a0f14c1664758ca1f1d0e4e9..1d3a2cab93c1da9c77e2bcc9daa9f7a6880938fb 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.187 2004/11/03 08:33:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.188 2004/11/03 09:13:26 spyderous Exp $
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Combine the dri USE flag into the opengl USE flag, since there's no way to
+  control just the build of the 3D drivers at present.
 
   03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 1db03df0b5bad316583d05af8426023180548070..920841be7fdb84a428958030dad9335489f575dc 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 8fc9750e3b216a3948576f82b298bcb0 ChangeLog 41316
-MD5 615cb030342b95f53b7788997830a0b6 xorg-x11-6.8.0-r2.ebuild 45717
+MD5 1205c1bdcc7c3a59f256240e862a6870 ChangeLog 41532
+MD5 c804b9f466f3c33b2b335682b2a0a14a xorg-x11-6.8.0-r2.ebuild 45614
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 b7a56cbcde55a013564f056f87e59867 files/digest-xorg-x11-6.8.0-r2 908

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index c320c602a24bb08384aa671207d630a0c317b3cb..d43255e1ee43960a02a020a68c32540398fe10e6 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.42 2004/11/03 08:33:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.43 2004/11/03 09:13:26 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -34,9 +34,9 @@ inherit eutils flag-o-matic toolchain-funcs x11
 RESTRICT="nostrip"
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc dri font-server
-       hardened insecure-drivers ipv6 mmx nls opengl pam sdk sse static
-       truetype-fonts type1-fonts uclibc xprint xv"
+IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
+       insecure-drivers ipv6 mmx nls opengl pam sdk sse static truetype-fonts
+       type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.6"
@@ -227,10 +227,6 @@ pkg_setup() {
                die "The dmx and doc USE flags are temporarily incompatible and result in a dead build."
        fi
 
-       if use dri && ! use opengl; then
-               die "The dri USE flag requires the opengl flag."
-       fi
-
        if use xv && ! use opengl; then
                eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996"
                eerror "The xv USE flag currently requires the opengl flag."
@@ -416,21 +412,20 @@ host_def_setup() {
                        # echo "#define XF86ExtraCardDrivers via" >> ${HOSTCONF}
                fi
 
+               # Do we want the glx extension? This will turn off XF86DRI if it's off.
+               # DRI can't build if glx isn't built, so keep this below DRI define.
+               # Do this before hppa so they can turn DRI off
+               use_build opengl BuildGlxExt
+               use_build opengl BuildGLXLibrary
+               use_build opengl BuildXF86DRI
+
                if use hppa; then
                        echo "#define DoLoadableServer NO" >> ${HOSTCONF}
                        echo "#define BuildXF86DRI NO" >> config/cf/host.def
                        echo "#undef DriDrivers" >> config/cf/host.def
                        echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
-               else
-                       # Do we want direct rendering support in drivers?
-                       use_build dri BuildXF86DRI
                fi
 
-               # Do we want the glx extension? This will turn off XF86DRI if it's off.
-               # DRI can't build if glx isn't built, so keep this below DRI define.
-               use_build opengl BuildGlxExt
-               use_build opengl BuildGLXLibrary
-
                # Make xv optional for more minimal builds
                use_build xv BuildXvLibrary
                use_build xv BuildXvExt