Updated DEPEND and IUSE and closing bug #63062.

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index f14c5dad6926f8f7e98ff1c3def431d4e2f352f3..88f6384a9f3ed98a3afc236ef3c04e3019642395 100644 (file)
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.8 2004/07/02 01:50:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.9 2004/11/23 20:11:39 wolf31o2 Exp $
+
+  23 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake2-icculus-0.15-r1.ebuild:
+  Updated DEPEND and IUSE and closing bug #63062.
 
   01 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
   quake2-icculus-0.15-r1.ebuild:

diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 95d8da426e9d9daaa6a30894bbfad7c861d27812..cc04290624865f45ec1940cbe42d0b053c779aa6 100644 (file)
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,12 +1,12 @@
-MD5 dcbaa0ab50c92845f72d808657f1c9a3 ChangeLog 1438
+MD5 90b416a8ac53bfefd4c036774a11b1d1 ChangeLog 1575
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 287c0dae768b3e3e05797e80e308bc4d quake2-icculus-0.15-r1.ebuild 4406
+MD5 49ccda36303c815b4b2c407b5b1eba6f quake2-icculus-0.15-r1.ebuild 4433
 MD5 2219e82edb75f4e2a9fa232afc365c5d files/0.15-Makefile-gcc3.patch 787
+MD5 d767ab81dded19a075fc660fdd3f83fd files/0.15-Makefile-noopts.patch 766
 MD5 ad5de2e8c5c06b69b3b5a2dd926a758f files/0.15-Makefile-optflags.patch 260
+MD5 4247988d46cf59b63b9e668fa1045492 files/0.15-gentoo-path.patch 1693
 MD5 fa58facee98afc741e1928b77be65065 files/README-postinstall 2695
+MD5 c95a6c91b14235134b9ac58fdee7c5eb files/digest-quake2-icculus-0.15-r1 248
 MD5 da3eb5b7690c63cbf1f2796f2e3aa969 files/q2ded.start 42
 MD5 2baa3c18b4ee41b7174014771b692f80 files/quake2.start 43
 MD5 b4df11798b5b2777a1097c4d9a61c0df files/sdlquake2.start 46
-MD5 d767ab81dded19a075fc660fdd3f83fd files/0.15-Makefile-noopts.patch 766
-MD5 4247988d46cf59b63b9e668fa1045492 files/0.15-gentoo-path.patch 1693
-MD5 c95a6c91b14235134b9ac58fdee7c5eb files/digest-quake2-icculus-0.15-r1 248

diff --git a/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild
index 46af350a9c89baf2efcacd34aba97d148c957dfc..124065b3895816df6565c0d6c9c4ec360bed7d43 100644 (file)
--- a/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.15-r1.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/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild,v 1.9 2004/07/02 01:50:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild,v 1.10 2004/11/23 20:11:39 wolf31o2 Exp $
 
 inherit eutils gcc games
 
@@ -15,16 +15,15 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
-IUSE="arts svga X sdl aalib opengl noqmax rogue xatrix"
+IUSE="arts svga sdl aalib dedicated opengl noqmax rogue xatrix"
 
-# default to X11 if svga/X/sdl/aalib are not in USE
+# default to X11 if svga/opengl/sdl/aalib/dedicated are not in USE
 RDEPEND="virtual/libc
        opengl? ( virtual/opengl )
        svga? ( media-libs/svgalib )
-       X? ( virtual/x11 )
        sdl? ( media-libs/libsdl )
        aalib? ( media-libs/aalib )
-       !svga? ( !X? ( !sdl? ( !aalib? ( virtual/x11 ) ) ) )
+       !svga? ( !opengl? ( !sdl? ( !aalib? ( !dedicated? ( virtual/x11 ) ) ) ) )
        arts? ( kde-base/arts )"
 DEPEND="${RDEPEND}
        >=sys-apps/sed-4
@@ -74,7 +73,7 @@ yesno() {
 
 src_compile() {
        BUILD_X11=$(yesno X)
-       use sdl || use X || use svga || use aalib || BUILD_X11=YES
+       use sdl || use opengl || use svga || use aalib || BUILD_X11=YES
 
        # xatrix fails to build
        # rogue fails to build
@@ -88,7 +87,7 @@ src_compile() {
                        BUILD_SDLQUAKE2=$(yesno sdl) \
                        BUILD_SVGA=$(yesno svga) \
                        BUILD_X11=${BUILD_X11} \
-                       BUILD_GLX=$(yesno opengl X) \
+                       BUILD_GLX=$(yesno opengl) \
                        BUILD_SDL=$(yesno sdl) \
                        BUILD_SDLGL=$(yesno sdl opengl) \
                        BUILD_CTFDLL=YES \