another shot at bug #73527

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 51905d68568f8ad87ac1677464c9612aa03a8bc3..d6101e243e58ac41f8ab4fc796478b1e1ab7e797 100644 (file)
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.15 2004/12/06 08:41:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.16 2004/12/09 06:15:28 mr_bones_ Exp $
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.ebuild:
+  another shot at bug #73527
 
   06 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.ebuild:
   wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527

diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index e352b52e583c2099c70cd77dd5fe3ea4ae41cbb8..42e4e42d2108c335b510a4ad3a93daa207f7f73d 100644 (file)
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,5 +1,5 @@
-MD5 f07ebe785009468ba576c5b36db510d9 ChangeLog 2056
-MD5 e26609ee3ae17bff9b7c5cea939100a2 scorched3d-38.ebuild 1222
+MD5 45556eeb9a54e9ea293c9e6ca9d0e8ca ChangeLog 2163
+MD5 c5ed27c2b1f3514ddced5c6311dd44e7 scorched3d-38.ebuild 1391
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 d93bed374142e6a8ec90a132101eb9ec scorched3d-37.2.ebuild 1792
 MD5 bf37ba272f5fc422e42646617544ef00 files/37-GLEXT.patch 466

diff --git a/games-strategy/scorched3d/scorched3d-38.ebuild b/games-strategy/scorched3d/scorched3d-38.ebuild
index 08a88fbb768484eba0ae5fc5cd49d0681c81a40d..80311960e18bf2d5ebe6fb9ff9123acd2770e95d 100644 (file)
--- a/games-strategy/scorched3d/scorched3d-38.ebuild
+++ b/games-strategy/scorched3d/scorched3d-38.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-strategy/scorched3d/scorched3d-38.ebuild,v 1.2 2004/12/06 08:41:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-38.ebuild,v 1.3 2004/12/09 06:15:28 mr_bones_ Exp $
 
 inherit wxwidgets games
 
@@ -24,15 +24,20 @@ DEPEND=">=media-libs/libsdl-1.0.1
 S="${WORKDIR}/scorched"
 
 pkg_setup() {
-       if ! use gtk2; then
-               need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-       else
+       if use gtk2; then
                need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
+       else
+               need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
        fi
        games_pkg_setup
 }
 
 src_compile() {
+       if use gtk2; then
+               need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
+       else
+               need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
+       fi
        egamesconf \
                --disable-dependency-tracking \
                --exec_prefix="${GAMES_PREFIX}" \