roll up patches; EAPI=2; use emake to build objects (bug #273606)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 207 insertions, 73 deletions

diff --git a/games-arcade/gunocide2ex/ChangeLog b/games-arcade/gunocide2ex/ChangeLog
index d68f3233127c..0964c55d1606 100644
--- a/games-arcade/gunocide2ex/ChangeLog
+++ b/games-arcade/gunocide2ex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/gunocide2ex
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.9 2007/04/24 14:44:07 drizzt Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.10 2009/06/10 23:37:34 mr_bones_ Exp $
+
+  10 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/1.0-gcc3.patch, -files/1.0-gcc4.patch,
+  +files/gunocide2ex-1.0-build.patch, gunocide2ex-1.0.ebuild:
+  roll up patches; EAPI=2; use emake to build objects (bug #273606)
 
   24 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> gunocide2ex-1.0.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index 72e5d5338fa5..cc8ef42defd0 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,6 +1,5 @@
-AUX 1.0-gcc3.patch 251 RMD160 96107add9ce521f132c75a9c50e4618f49f68c5e SHA1 b808c0bb788c137540d5140f489847251ecd580a SHA256 6362efe929f04c62ede615b632257e49917dc86dc182817997954eaf9868a953
-AUX 1.0-gcc4.patch 808 RMD160 54c29ec565498e82c55fd177dccece2543914737 SHA1 a6458c7672e5f6f517908aad162a994bc0bdd228 SHA256 7206ce9d70e5d44664dd4044455c36874b690c5329583216d01d81fcbfa3ec87
+AUX gunocide2ex-1.0-build.patch 5419 RMD160 83cfff1446606149ba740c36f98781a0e3967d5f SHA1 403113c9e3554bf630cd533712c44a5ac3323b52 SHA256 05275b928ea8d8c0bd2328f1ea563a1b4086a16ee56906bfcd51adcaa661c1f8
 DIST g2ex-setup.run 30844481 RMD160 a3d1bfddefd3cdd882a1fb9ab576fd205349de61 SHA1 910e198859ce22e792c508cbdb5abfc081ec98b8 SHA256 85cf7ff402b73271e24867c7b0c162b258d61a69065d6a848ea0b74c301a4fbe
-EBUILD gunocide2ex-1.0.ebuild 2055 RMD160 dd5e690b092421b1639a074cdecdcdd35fe92213 SHA1 22b8e6e2597ad534c941af0eb3de81087f7cd3da SHA256 08a87e3d6d796a483b5940322c797084154f5b190a336efb4e9af00c59b6604d
-MISC ChangeLog 1238 RMD160 e0824532160181392ea1e8ae4e9e7194118e8e75 SHA1 809180dc41aabbecf6d281dfeb79bc453c296f32 SHA256 6abc5af818a1cf42e92d32278115ad179d585e2e1a9d7c4bd37a8b19a02e15bc
+EBUILD gunocide2ex-1.0.ebuild 1905 RMD160 37082050089ad019f1b041b5cde43a48036157bd SHA1 1148f76b9a4c8f1113274529157b098649b8e50c SHA256 59ae6a9a3b4eff33b25883647257f627c3bd862ea81ffe0370fc81f037df8b77
+MISC ChangeLog 1476 RMD160 83babf2b0d43245475b754811f02074fbbde8e8d SHA1 0a2fd77b0cf73764bdec8b37d336bfbc7da54a1d SHA256 4f9b6954bdf9d039859d6f15dd81009eafb66dd25cbeb0c0fe14bb4ab0ee79d3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/gunocide2ex/files/1.0-gcc3.patch b/games-arcade/gunocide2ex/files/1.0-gcc3.patch
deleted file mode 100644
index 570edbfe9de7..000000000000
--- a/games-arcade/gunocide2ex/files/1.0-gcc3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mmgr.cpp.orig	2003-11-14 11:19:51.184688368 -0500
-+++ src/mmgr.cpp	2003-11-14 11:19:59.107483920 -0500
-@@ -59,6 +59,7 @@
- #include <time.h>

- #include <stdarg.h>

- #include <new>

-+using namespace std;
- 

- #ifndef	WIN32

- #include <unistd.h>

diff --git a/games-arcade/gunocide2ex/files/1.0-gcc4.patch b/games-arcade/gunocide2ex/files/1.0-gcc4.patch
deleted file mode 100644
index 04bb3fd1fcd8..000000000000
--- a/games-arcade/gunocide2ex/files/1.0-gcc4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur work-orig/src/cEffects.cpp work/src/cEffects.cpp
---- work-orig/src/cEffects.cpp	2006-04-26 22:53:06.000000000 -0400
-+++ work/src/cEffects.cpp	2006-04-26 22:52:02.000000000 -0400
-@@ -180,7 +180,6 @@
- 	{

- 		if(!i->update())

- 			i=lEffects.erase(i);

--		if(i==NULL)break;

- 	}

- 

-     for(p=lParticles.begin();p!=lParticles.end();++p)

-@@ -190,8 +189,6 @@
- 		if(!p->active())

- 		{

- 			p=lParticles.erase(p);

--			if(p==NULL)

--				break;

- 		}

- 	}

- 

-diff -ur work-orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
---- work-orig/src/cParticleSys.cpp	2006-04-26 22:52:51.000000000 -0400
-+++ work/src/cParticleSys.cpp	2006-04-26 22:54:38.000000000 -0400
-@@ -81,9 +81,6 @@
- 		if(time-p->getstarttime()>p->getlifetime())
- 		{
- 			p=lParticles.erase(p);
--			if(p==NULL)
--				break;
--			
- 		}
- 	}
- 
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
new file mode 100644
index 000000000000..9abce6c01a2b
--- /dev/null
+++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
@@ -0,0 +1,178 @@
+diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
+--- work.orig/src/cEffects.cpp	2002-01-12 16:19:00.000000000 -0500
++++ work/src/cEffects.cpp	2009-06-10 18:14:27.000000000 -0400
+@@ -180,7 +180,6 @@
+ 	{

+ 		if(!i->update())

+ 			i=lEffects.erase(i);

+-		if(i==NULL)break;

+ 	}

+ 

+     for(p=lParticles.begin();p!=lParticles.end();++p)

+@@ -190,8 +189,6 @@
+ 		if(!p->active())

+ 		{

+ 			p=lParticles.erase(p);

+-			if(p==NULL)

+-				break;

+ 		}

+ 	}

+ 

+diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
+--- work.orig/src/cFont.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cFont.cpp	2009-06-10 18:19:15.000000000 -0400
+@@ -62,7 +62,7 @@
+ }

+ 

+ ///lädt einen TTF-Font ein

+-bool cFont::load(char *path,int size)

++bool cFont::load(const char *path,int size)

+ {

+ 	font = TTF_OpenFont(path,size);

+ 	if(font==NULL)

+diff -ur work.orig/src/cFont.h work/src/cFont.h
+--- work.orig/src/cFont.h	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cFont.h	2009-06-10 18:19:27.000000000 -0400
+@@ -34,7 +34,7 @@
+ 	static void		delInstance();
+ 	static bool		initttf();
+ 
+-	bool			load(char *path,int size);
++	bool			load(const char *path,int size);
+ 	void			setcolor(int r,int g,int b);
+ 	void			setshader(int r,int g,int b);
+ 	void			print(SDL_Surface *screen,int posx,int posy,const char *fmt, ...);
+diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
+--- work.orig/src/cParticleSys.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cParticleSys.cpp	2009-06-10 18:14:27.000000000 -0400
+@@ -81,9 +81,6 @@
+ 		if(time-p->getstarttime()>p->getlifetime())
+ 		{
+ 			p=lParticles.erase(p);
+-			if(p==NULL)
+-				break;
+-			
+ 		}
+ 	}
+ 
+diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
+--- work.orig/src/cSound.cpp	2002-01-12 16:27:34.000000000 -0500
++++ work/src/cSound.cpp	2009-06-10 18:17:44.000000000 -0400
+@@ -92,7 +92,7 @@
+ }

+ 

+ ///spielt eine ogg-datei ab

+-bool cSound::playogg(char *path)

++bool cSound::playogg(const char *path)

+ {

+ 	if(!sound_on)

+ 		return true;

+diff -ur work.orig/src/cSound.h work/src/cSound.h
+--- work.orig/src/cSound.h	2002-01-08 12:30:57.000000000 -0500
++++ work/src/cSound.h	2009-06-10 18:17:50.000000000 -0400
+@@ -35,7 +35,7 @@
+ 
+ 	bool			init();
+ 	void				close();
+-	bool			playogg(char *path);
++	bool			playogg(const char *path);
+ 	void				stopogg();
+ 	bool			loadwav(int index,char *path);
+ 	void				playwav(int index);
+diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
+--- work.orig/src/cSprite.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cSprite.cpp	2009-06-10 18:18:34.000000000 -0400
+@@ -29,7 +29,7 @@
+ 
+ ///lädt ein BMP in das image-Surface
+ ///gibt false zurück falls es schief geht
+-bool cSprite::loadBMP(char *path)
++bool cSprite::loadBMP(const char *path)
+ {
+ 	image=SDL_LoadBMP(path);
+ 	if(!image)
+@@ -73,4 +73,4 @@
+ int cSprite::getheight()
+ {
+ 	return image->h;
+-}
+\ No newline at end of file
++}
+diff -ur work.orig/src/cSprite.h work/src/cSprite.h
+--- work.orig/src/cSprite.h	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cSprite.h	2009-06-10 18:18:44.000000000 -0400
+@@ -26,7 +26,7 @@
+ 	cSprite();
+ 	~cSprite();
+ 
+-	bool 	loadBMP(char *path);
++	bool 	loadBMP(const char *path);
+ 	void 	render(SDL_Surface *screen,int x,int y);
+ 	void 	setColorKey(int r,int g,int b);
+ 
+diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
+--- work.orig/src/cSpriteAnim.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cSpriteAnim.cpp	2009-06-10 18:20:09.000000000 -0400
+@@ -145,7 +145,7 @@
+ }

+ 

+ ///einladen einer Animation aus einer Datei

+-bool cSpriteAnim::load(char *path)

++bool cSpriteAnim::load(const char *path)

+ {

+ 	FILE 	*file;

+ 	char	buffer[512];

+@@ -248,4 +248,4 @@
+ {

+ 	if(anim==NULL)return -1;

+ 	return gfx_sprite[anim->getAct()].getwidth();

+-}
+\ No newline at end of file
++}

+diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
+--- work.orig/src/cSpriteAnim.h	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cSpriteAnim.h	2009-06-10 18:20:16.000000000 -0400
+@@ -53,7 +53,7 @@
+ 	cSpriteAnim();
+ 	~cSpriteAnim();
+ 
+-	bool	load(char *path);
++	bool	load(const char *path);
+ 	void	setColorKey(int r,int g,int b);
+ 	void	render(SDL_Surface *screen,cAnim *anim,int x,int y);
+ 	int		getMaxNum();
+diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
+--- work.orig/src/cUtil.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cUtil.cpp	2009-06-10 18:16:29.000000000 -0400
+@@ -85,7 +85,7 @@
+ }

+ 

+ ///liest einen wert aus einer config-datei

+-char* cUtil::getconfigvalue(char *path,char *value)

++char* cUtil::getconfigvalue(const char *path,const char *value)

+ {

+ 	FILE	*file;

+ 	char	buffer[512];

+diff -ur work.orig/src/cUtil.h work/src/cUtil.h
+--- work.orig/src/cUtil.h	2002-01-02 07:57:46.000000000 -0500
++++ work/src/cUtil.h	2009-06-10 18:16:39.000000000 -0400
+@@ -31,7 +31,7 @@
+ 

+ 	void	updatetime();

+ 	float 	sync(float Faktor);

+-	char*	getconfigvalue(char *path,char *value);

++	char*	getconfigvalue(const char *path,const char *value);

+ 	void	drawpixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G,Uint8 B);

+ 	bool	collision(SDL_Rect objekt1,SDL_Rect objekt2);	

+ 

+diff -ur work.orig/src/mmgr.cpp work/src/mmgr.cpp
+--- work.orig/src/mmgr.cpp	2002-01-02 07:57:46.000000000 -0500
++++ work/src/mmgr.cpp	2009-06-10 18:14:23.000000000 -0400
+@@ -59,6 +59,7 @@
+ #include <time.h>

+ #include <stdarg.h>

+ #include <new>

++using namespace std;
+ 

+ #ifndef	WIN32

+ #include <unistd.h>

diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
index fe67df24a6c0..69baa296c22b 100644
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild,v 1.11 2007/04/24 14:44:07 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild,v 1.12 2009/06/10 23:37:34 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="fast-paced 2D shoot'em'up"
@@ -13,51 +14,45 @@ SLOT="0"
 KEYWORDS="ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="media-libs/libsdl
+DEPEND="media-libs/libsdl[video]
 	media-libs/sdl-ttf
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
+	media-libs/sdl-mixer[vorbis]"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_unpack() {
 	unpack_makeself
-	sed -i "s:-g:${CFLAGS}:" makefile \
-		|| die "sed makefile failed"
 	mkdir binary
-	epatch "${FILESDIR}"/${PV}-gcc3.patch
-	epatch "${FILESDIR}"/${PV}-gcc4.patch
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
 	edos2unix config.cfg
 	sed -i \
 		-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \
 		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:${GAMES_STATEDIR}/${PN}-hscore.dat:" \
+		-e "s:memleaks.log:/dev/null:" \
 		src/*.{h,cpp} \
-			|| die "sed failed"
+		|| die "sed failed"
 	sed -i \
 		-e "s:/usr/local/games:${GAMES_DATADIR}:" \
-		src/*.{h,cpp} `find gfx -name '*.txt'` \
-			|| die "sed failed (2)"
+		src/*.{h,cpp} $(find gfx -name '*.txt') \
+		|| die "sed failed"
 }
 
 src_compile() {
-	local cc=$(tc-getCXX)
-
 	cd src
-	for f in *.cpp ; do
-		echo "${cc} ${CFLAGS} `sdl-config --cflags` ${f}"
-		${cc} ${cflags} `sdl-config --cflags` -c ${f} || \
-			die "couldnt compile ${f}"
-	done
-	${cc} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || \
+	emake CXXFLAGS="$CXXFLAGS $(sdl-config --cflags)" $(echo *.cpp | sed 's/\.cpp/.o/g') \
+		|| die "emake failed"
+	$(tc-getCXX) -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || \
 		die "couldnt produce binary"
 }
 
 src_install() {
 	dogamesbin src/${PN}               || die "dogamesbin failed"
 	dosym ${PN} "${GAMES_BINDIR}/g2ex" || die "dosym failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -R gfx sfx lvl credits arial.ttf "${D}/${GAMES_DATADIR}/${PN}/" \
-		|| die "cp failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r gfx sfx lvl credits arial.ttf || die "doins failed"
 	insinto "${GAMES_SYSCONFDIR}"
 	newins config.cfg ${PN}.cfg        || die "newins failed (cfg)"
 	insinto "${GAMES_STATEDIR}"