Make changes requested from upstream

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 20 insertions, 17 deletions

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index d0ec0c263264..8db4c9ba05f0 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.7 2006/07/20 21:57:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.8 2006/07/22 03:02:05 mr_bones_ Exp $
+
+  22 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  warzone2100-2.0.3.ebuild:
+  Make changes requested from upstream
 
   20 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/0.2.2-clparse.c.patch, -files/warzone2100-0.2.2-headers.patch,
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index aa13f512fdf0..562a1c299df6 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -3,14 +3,14 @@ MD5 9cd6c6aad6b63c681796167287cbb4a2 files/warzone2100-2.0.3-16bpp.patch 2675
 RMD160 4cb1d04b7d0efd84a0486a423b625944344e51ae files/warzone2100-2.0.3-16bpp.patch 2675
 SHA256 5d3f08e601cf06a436a6d37b0474f7026f60a408c7d4775ef259133ae498301a files/warzone2100-2.0.3-16bpp.patch 2675
 DIST warzone-2.0.3.tar.bz2 19902273 RMD160 10fc56a2930346d41d517f4df6f3b0b9b001b183 SHA1 68bdfba90c0380178b1ce8ced0b49bd480ad1f35 SHA256 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749
-EBUILD warzone2100-2.0.3.ebuild 1425 RMD160 d5de7096e971baa5ac4022234b3dab4b63ab2459 SHA1 7cf9938807cf811f8ef286be035b982504d5afac SHA256 5e79c333e2e91aad49fd84edcfb2db726efc608b00dfd08b38d91282cc8a870d
-MD5 18d0293e2c5d8664d4ba40bfb45b42f9 warzone2100-2.0.3.ebuild 1425
-RMD160 d5de7096e971baa5ac4022234b3dab4b63ab2459 warzone2100-2.0.3.ebuild 1425
-SHA256 5e79c333e2e91aad49fd84edcfb2db726efc608b00dfd08b38d91282cc8a870d warzone2100-2.0.3.ebuild 1425
-MISC ChangeLog 1659 RMD160 19a1a4bba155f4e800dafa0abfaa95323657c684 SHA1 d22494b8d693ceb7266fd95a5bfa81adc3bed1b0 SHA256 2adce60ec1baa5ad98f17814e322e059f7aad009888e329741e9ea87b397403a
-MD5 2228cb8fc4e73c3924337591fdd7da91 ChangeLog 1659
-RMD160 19a1a4bba155f4e800dafa0abfaa95323657c684 ChangeLog 1659
-SHA256 2adce60ec1baa5ad98f17814e322e059f7aad009888e329741e9ea87b397403a ChangeLog 1659
+EBUILD warzone2100-2.0.3.ebuild 1471 RMD160 2a2793a4e652e55aa637b4447f64cc6ec54db2a7 SHA1 278f6d183a7c5e984b1912fcf2b848914790870c SHA256 a7b57b07e938cec516775b15e1db2666a8aa342091be4bdbd4ed8d66dc78ce4e
+MD5 be1d87c011bd8578ff65e482f6617702 warzone2100-2.0.3.ebuild 1471
+RMD160 2a2793a4e652e55aa637b4447f64cc6ec54db2a7 warzone2100-2.0.3.ebuild 1471
+SHA256 a7b57b07e938cec516775b15e1db2666a8aa342091be4bdbd4ed8d66dc78ce4e warzone2100-2.0.3.ebuild 1471
+MISC ChangeLog 1782 RMD160 ed33c7932e93e9d211923d7a033fad92883153b6 SHA1 9f0e583fa57ee6157db6ed9d0059f712db92a311 SHA256 410f9c338114937c169f0828bbb77aa1c4f42f63fbf8bfc25a7b29bfd499754b
+MD5 6d1376fe5b4cebfa2e6da7afea6f1347 ChangeLog 1782
+RMD160 ed33c7932e93e9d211923d7a033fad92883153b6 ChangeLog 1782
+SHA256 410f9c338114937c169f0828bbb77aa1c4f42f63fbf8bfc25a7b29bfd499754b ChangeLog 1782
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
diff --git a/games-strategy/warzone2100/warzone2100-2.0.3.ebuild b/games-strategy/warzone2100/warzone2100-2.0.3.ebuild
index 4c84060f42c1..8271803f3061 100644
--- a/games-strategy/warzone2100/warzone2100-2.0.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-2.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.3.ebuild,v 1.2 2006/07/20 21:57:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.3.ebuild,v 1.3 2006/07/22 03:02:05 mr_bones_ Exp $
 
-inherit eutils versionator games
+inherit debug eutils versionator games
 
 MY_PV="$(get_version_component_range -2 ${PV})"
 DESCRIPTION="3D real-time strategy game"
@@ -12,9 +12,11 @@ SRC_URI="http://download.gna.org/warzone/releases/${MY_PV}/warzone-${PV}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+# upstream requested debug support
+IUSE="debug mp3"
 
 RDEPEND="dev-games/physfs
+	mp3? ( >=media-libs/libmad-0.15 )
 	media-libs/jpeg
 	media-libs/libogg
 	media-libs/libpng
@@ -33,10 +35,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	sed -i \
-		-e 's/-m32 //' \
-		configure \
-		|| die "sed failed"
 	epatch "${FILESDIR}/${P}-16bpp.patch"
 }
 
@@ -44,7 +42,8 @@ src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
 		--with-ogg \
-		--without-mp3 \
+		$(use_with mp3) \
+		$(use_enable debug) \
 		|| die "egamesconf failed"
 
 	emake || die "emake failed"