summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-12-06 08:41:24 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-12-06 08:41:24 +0000
commitd817588138707dd625383be8261b2520f4f8792a (patch)
treed42f3604394227403979db2ff7f2790bf0250d2f /games-strategy/scorched3d
parentfix fontconfig patch (Manifest recommit) (diff)
downloadgentoo-2-d817588138707dd625383be8261b2520f4f8792a.tar.gz
gentoo-2-d817588138707dd625383be8261b2520f4f8792a.tar.bz2
gentoo-2-d817588138707dd625383be8261b2520f4f8792a.zip
wxGTK checking fix supplied by Kristiaan Lenaerts via bug #73527
Diffstat (limited to 'games-strategy/scorched3d')
-rw-r--r--games-strategy/scorched3d/ChangeLog5
-rw-r--r--games-strategy/scorched3d/scorched3d-38.ebuild17
2 files changed, 12 insertions, 10 deletions
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/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() {