Address issue with wxGTK and unicode (bug #55967)

7 files changed, 20 insertions, 113 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 886cd131bbee..bd2db3f3d034 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2004/06/24 23:28:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.13 2004/07/04 09:59:14 mr_bones_ Exp $
+
+  04 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -scorched3d-37.1.ebuild, scorched3d-37.2.ebuild, -scorched3d-37.ebuild:
+  Address issue with wxGTK and unicode (bug #55967) - Thanks to eradicator
+  for the code from bug #39669.  Cleaned old versions
 
 *scorched3d-37.2 (01 Jun 2004)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index ecfb25a9500a..f46cd34e0a83 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,9 +1,5 @@
-MD5 f82431022f1282d2d107c338e07ed556 scorched3d-37.1.ebuild 1340
-MD5 03eb9c0b51c944018206c84c4e8b680f scorched3d-37.ebuild 1419
-MD5 81dd3c4ec16dd67bc421c33791db0792 ChangeLog 1527
+MD5 fd2c5f1176fe43e780cff8e940f14352 ChangeLog 1787
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 dbf0e3a57c971df308e78461e20dc121 scorched3d-37.2.ebuild 1434
-MD5 1cd0bae34b24d8ae3e833da0c7bb1e2c files/digest-scorched3d-37.1 73
-MD5 de9efa574d9abebfac01ed85605bc8c4 files/digest-scorched3d-37.2 73
-MD5 cb46314a3bc6f592f19a9798d01fa5b1 files/digest-scorched3d-37 71
+MD5 d93bed374142e6a8ec90a132101eb9ec scorched3d-37.2.ebuild 1792
 MD5 bf37ba272f5fc422e42646617544ef00 files/37-GLEXT.patch 466
+MD5 de9efa574d9abebfac01ed85605bc8c4 files/digest-scorched3d-37.2 73
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-37 b/games-strategy/scorched3d/files/digest-scorched3d-37
deleted file mode 100644
index 162e8bebe206..000000000000
--- a/games-strategy/scorched3d/files/digest-scorched3d-37
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e544ef83f5d61f7c4db9d8c605fb776 Scorched3D-37-src.tar.gz 18309912
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-37.1 b/games-strategy/scorched3d/files/digest-scorched3d-37.1
deleted file mode 100644
index b92c82191db6..000000000000
--- a/games-strategy/scorched3d/files/digest-scorched3d-37.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cdb264d164177316d3b01d8d4c6070b Scorched3D-37.1-src.tar.gz 18265420
diff --git a/games-strategy/scorched3d/scorched3d-37.1.ebuild b/games-strategy/scorched3d/scorched3d-37.1.ebuild
deleted file mode 100644
index cf6588bc9e87..000000000000
--- a/games-strategy/scorched3d/scorched3d-37.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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-37.1.ebuild,v 1.2 2004/06/24 23:28:57 agriffis Exp $
-
-inherit games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="mysql"
-
-RDEPEND=">=media-libs/libsdl-1.0.1
-	media-libs/sdl-net
-	media-libs/sdl-mixer
-	>=x11-libs/wxGTK-2.3.4
-	dev-games/ode
-	>=sys-libs/zlib-1.1.4
-	mysql? ( dev-db/mysql )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/scorched"
-
-src_compile() {
-	egamesconf \
-		--exec_prefix="${GAMES_PREFIX}" \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		`use_with mysql` \
-		|| die
-	sed -i \
-		-e "s:/usr/games/scorched3d/:${GAMES_DATADIR}/${PN}/:" \
-		src/scorched/Makefile \
-			|| die "sed src/scorched/Makefile failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin src/scorched/scorched3d || die "dogamesbin failed"
-	dodoc AUTHORS README TODO documentation/*.txt || die "dodoc failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -R data/ "${D}${GAMES_DATADIR}/${PN}" || die "cp failed (data)"
-	cp README "${D}${GAMES_DATADIR}/${PN}" || die "cp failed (README)"
-	prepgamesdirs
-}
diff --git a/games-strategy/scorched3d/scorched3d-37.2.ebuild b/games-strategy/scorched3d/scorched3d-37.2.ebuild
index fc2598059d26..395c046d66ca 100644
--- a/games-strategy/scorched3d/scorched3d-37.2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-37.2.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-37.2.ebuild,v 1.2 2004/06/24 23:28:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-37.2.ebuild,v 1.3 2004/07/04 09:59:14 mr_bones_ Exp $
 
 inherit games
 
@@ -25,6 +25,16 @@ DEPEND="${RDEPEND}
 
 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"
+	fi
+}
+
 src_compile() {
 	egamesconf \
 		--exec_prefix="${GAMES_PREFIX}" \
diff --git a/games-strategy/scorched3d/scorched3d-37.ebuild b/games-strategy/scorched3d/scorched3d-37.ebuild
deleted file mode 100644
index 1f5978ba6f0f..000000000000
--- a/games-strategy/scorched3d/scorched3d-37.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-37.ebuild,v 1.2 2004/06/24 23:28:57 agriffis Exp $
-
-inherit eutils games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="mysql"
-
-RDEPEND=">=media-libs/libsdl-1.0.1
-	media-libs/sdl-net
-	media-libs/sdl-mixer
-	>=x11-libs/wxGTK-2.3.4
-	dev-games/ode
-	>=sys-libs/zlib-1.1.4
-	mysql? ( dev-db/mysql )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/scorched"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-GLEXT.patch
-}
-
-src_compile() {
-	egamesconf \
-		--exec_prefix="${GAMES_PREFIX}" \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		`use_with mysql` \
-		|| die
-	sed -i \
-		"s:/usr/games/scorched3d/:${GAMES_DATADIR}/${PN}/:" \
-		src/scorched/Makefile \
-		|| die "sed src/scorched/Makefile failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin src/scorched/scorched3d || die "dogamesbin failed"
-	dodoc AUTHORS README TODO documentation/*.txt || die "dodoc failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -R data/ "${D}${GAMES_DATADIR}/${PN}" || die "cp failed (data)"
-	cp README "${D}${GAMES_DATADIR}/${PN}" || die "cp failed (README)"
-	prepgamesdirs
-}