Only provide virtual/glu and virtual/opengl if USE=opengl. Also don't create GLU...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index be9e204c41a140cd0f711006ac8155d48cb6ad9a..c3f9f43216bb024d30947ead91347256ad51bd91 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.220 2004/11/21 22:49:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.221 2004/11/21 22:53:44 spyderous Exp $
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Only provide virtual/glu and virtual/opengl if USE=opengl. Also don't create
+  GLU symlinks when USE=-opengl, since GLU isn't built.
 
   21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 35304be0d2b2b85924b6bdf7fd844a7fa0740e9b..61ae5bd36f654a7912a04df6d8b83d40db2cf8e8 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340
-MD5 9f20164897d37a505e791675c6e1672c ChangeLog 50328
+MD5 f6a48c675f63c55e95a3e743e99d652d ChangeLog 50547
 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246
 MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789
-MD5 8ccd2fc328e13e7157b4375b6f9fd898 xorg-x11-6.8.0-r4.ebuild 52009
+MD5 e9569dd33e26083ee04fda21e9a81a8d xorg-x11-6.8.0-r4.ebuild 52061
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 0cf2a47553cdebe85dd3b814ad3505fc1ed14d10..8d448a597b9b2c113ec667cde1294735d84a5d66 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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-r4.ebuild,v 1.11 2004/11/21 22:49:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.12 2004/11/21 22:53:44 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -135,8 +135,8 @@ PDEPEND="x86? (
                !uclibc? ( x11-terms/xterm )"
 
 PROVIDE="virtual/x11
-       virtual/opengl
-       virtual/glu
+       opengl? ( virtual/opengl )
+       opengl? ( virtual/glu )
        virtual/xft"
 
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
@@ -344,7 +344,9 @@ src_install() {
        etc_files_install
 
        # We move libGLU to /usr/lib now
-       dosym libGLU.so.1.3 /usr/$(get_libdir)/libMesaGLU.so
+       if ! use opengl; then
+               dosym libGLU.so.1.3 /usr/$(get_libdir)/libMesaGLU.so
+       fi
 
        if use opengl; then
                setup_dynamic_libgl