From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Mon, 6 Dec 2004 08:41:24 +0000 (+0000)
Subject: wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a63d021fc08650f5dcfae44dfc2801c7353c0b1;p=gentoo.git

wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527
---

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 5484032453f6..51905d68568f 100644
--- 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.14 2004/12/05 11:14:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.15 2004/12/06 08:41:24 mr_bones_ Exp $
+
+  06 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> scorched3d-38.ebuild:
+  wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527
 
 *scorched3d-38 (05 Dec 2004)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 9d2eaa2c13eb..e352b52e583c 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,5 +1,5 @@
-MD5 483636698aacdb37f6c7da6e8dd53745 ChangeLog 1911
-MD5 850024ab7c7b1bfdd581b9bc837f9f07 scorched3d-38.ebuild 1357
+MD5 f07ebe785009468ba576c5b36db510d9 ChangeLog 2056
+MD5 e26609ee3ae17bff9b7c5cea939100a2 scorched3d-38.ebuild 1222
 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 3622ded57c2e..08a88fbb7684 100644
--- a/games-strategy/scorched3d/scorched3d-38.ebuild
+++ b/games-strategy/scorched3d/scorched3d-38.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2004/12/05 11:14:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-38.ebuild,v 1.2 2004/12/06 08:41:24 mr_bones_ Exp $
 
-inherit games
+inherit wxwidgets games
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="mysql"
+IUSE="mysql gtk2"
 
 DEPEND=">=media-libs/libsdl-1.0.1
 	media-libs/sdl-net
@@ -24,13 +24,12 @@ DEPEND=">=media-libs/libsdl-1.0.1
 S="${WORKDIR}/scorched"
 
 pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "${PN} will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
+	if ! use gtk2; then
+		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
+	else
+		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	fi
+	games_pkg_setup
 }
 
 src_compile() {