fix compile with USE=-mp3. Patch from Harald van Dijk via bug #112483

Package-Manager: portage-2.0.51.22-r3

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index a43e72952f9b827dba028184de0dbadd2232f475..86ea7f74b299d220bda87154745ef1f491910b45 100644 (file)
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.2 2005/10/12 03:09:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.3 2005/11/15 22:00:09 mr_bones_ Exp $
+
+  15 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/warzone2100-0.2.2-headers.patch, warzone2100-0.2.2.ebuild:
+  fix compile with USE=-mp3.  Patch from Harald van Dijk via bug #112483
 
   12 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   warzone2100-0.2.2.ebuild:

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 8b85159aec5a3c08691080b976f26840b6520fea..a71aab263890c6ab2faf2b3801b5a0056aa839f0 100644 (file)
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,5 +1,6 @@
-MD5 fb67c84057b30c921ee1902785e49450 ChangeLog 637
-MD5 9e76c302897e454e4f4812dc1b3322e5 files/0.2.2-clparse.c.patch 413
-MD5 c2760647a592be7a727446029eff8d0c files/digest-warzone2100-0.2.2 72
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 10ffb15bd0b53b26237b94013cc67b94 warzone2100-0.2.2.ebuild 1509
+MD5 ad318b50284cf0ef5470b43291800901 warzone2100-0.2.2.ebuild 1541
+MD5 7e6c462fa217d2eabe2b7923061970df ChangeLog 835
+MD5 b102bdfd896bca6763c9494325976068 files/warzone2100-0.2.2-headers.patch 337
+MD5 c2760647a592be7a727446029eff8d0c files/digest-warzone2100-0.2.2 72
+MD5 9e76c302897e454e4f4812dc1b3322e5 files/0.2.2-clparse.c.patch 413

diff --git a/games-strategy/warzone2100/files/warzone2100-0.2.2-headers.patch b/games-strategy/warzone2100/files/warzone2100-0.2.2-headers.patch
new file mode 100644 (file)
index 0000000..8c5f70d
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-0.2.2-headers.patch
@@ -0,0 +1,21 @@
+--- warzone2100-0.2.2/lib/sound/cdaudio.c
++++ warzone2100-0.2.2/lib/sound/cdaudio.c
+@@ -1,3 +1,7 @@
++#include "frame.h"
++#include "audio.h"
++#include "cdaudio.h"
++
+ #ifdef WZ_CDA
+ 
+ #include <SDL/SDL.h>
+@@ -19,10 +23,6 @@
+ 
+ #endif
+ 
+-#include "frame.h"
+-#include "audio.h"
+-#include "cdaudio.h"
+-
+ #ifdef WZ_CDA
+ 
+ SDL_CD        *cdAudio_dev;

diff --git a/games-strategy/warzone2100/warzone2100-0.2.2.ebuild b/games-strategy/warzone2100/warzone2100-0.2.2.ebuild
index 164b1b2c124a4185b955854a08145c0be7c1946e..864d9bcfa2acf537db62b3e605aa75c168aff0c5 100644 (file)
--- a/games-strategy/warzone2100/warzone2100-0.2.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-0.2.2.ebuild,v 1.2 2005/10/12 03:09:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-0.2.2.ebuild,v 1.3 2005/11/15 22:00:09 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -23,16 +23,19 @@ DEPEND=">=media-libs/libsdl-1.2.8
 src_unpack() {
        unpack ${A}
 
-       sed s:DATADIR:"${GAMES_DATADIR}/${PN}/": \
+       sed -e "s:DATADIR:${GAMES_DATADIR}/${PN}/:" \
                "${FILESDIR}"/${PV}-clparse.c.patch > \
-               ${T}/${PV}-clparse.c.patch \
-       || die "sed failed"
-
-       sed -i 's: -m32::' ${S}/configure || die
-       sed -i 's:-m32::' ${S}/makerules/common.mk || die
-
-       cd ${S}
-       epatch ${T}/${PV}-clparse.c.patch || die "epatch failed"
+               "${T}"/${PV}-clparse.c.patch \
+               || die "sed failed"
+
+       cd "${S}"
+       sed -i \
+               -e 's: -m32::' configure || die
+       sed -i \
+               -e 's:-m32::' makerules/common.mk || die
+       epatch \
+               "${T}"/${PV}-clparse.c.patch \
+               "${FILESDIR}"/${P}-headers.patch
 }
 
 src_compile() {
@@ -43,7 +46,7 @@ src_compile() {
                $(use_with mp3) \
                CFLAGS="${CFLAGS}" \
                CPPFLAGS="${CXXFLAGS}" \
-       || die "egamesconf failed"
+               || die "egamesconf failed"
        emake || die "emake failed"
 }
 
@@ -52,6 +55,5 @@ src_install() {
        insinto "${GAMES_DATADIR}"/${PN}
        doins -r data/* || die "install data failed"
        dodoc AUTHORS CHANGELOG README || "install doc failed"
-
        prepgamesdirs
 }