Added gcc4 patch from Mark Loeser <mark@halcy0n.com> and closing bug #131028.

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 79 insertions, 11 deletions

diff --git a/games-arcade/gunocide2ex/ChangeLog b/games-arcade/gunocide2ex/ChangeLog
index c6d0529b7fda..b23130b323e2 100644
--- a/games-arcade/gunocide2ex/ChangeLog
+++ b/games-arcade/gunocide2ex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/gunocide2ex
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.7 2005/05/17 17:38:28 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/ChangeLog,v 1.8 2006/08/23 23:49:21 wolf31o2 Exp $
+
+  23 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> +files/1.0-gcc4.patch,
+  gunocide2ex-1.0.ebuild:
+  Added gcc4 patch from Mark Loeser <mark@halcy0n.com> and closing bug #131028.
 
   17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   gunocide2ex-1.0.ebuild:
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
index 8f3e5b455f9e..d1ab9fd9985f 100644
--- a/games-arcade/gunocide2ex/Manifest
+++ b/games-arcade/gunocide2ex/Manifest
@@ -1,5 +1,34 @@
-MD5 ddff1c811cc48fa80d374d73e73bfbdd gunocide2ex-1.0.ebuild 2023
-MD5 eb5295a7afd9892c8448afdfc881444f ChangeLog 899
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0-gcc3.patch 251 RMD160 96107add9ce521f132c75a9c50e4618f49f68c5e SHA1 b808c0bb788c137540d5140f489847251ecd580a SHA256 6362efe929f04c62ede615b632257e49917dc86dc182817997954eaf9868a953
 MD5 1a6d5cdeab6dce56efb9db9e034d7461 files/1.0-gcc3.patch 251
-MD5 a08a5846c9829d55905e529b86c26302 files/digest-gunocide2ex-1.0 61
+RMD160 96107add9ce521f132c75a9c50e4618f49f68c5e files/1.0-gcc3.patch 251
+SHA256 6362efe929f04c62ede615b632257e49917dc86dc182817997954eaf9868a953 files/1.0-gcc3.patch 251
+AUX 1.0-gcc4.patch 808 RMD160 54c29ec565498e82c55fd177dccece2543914737 SHA1 a6458c7672e5f6f517908aad162a994bc0bdd228 SHA256 7206ce9d70e5d44664dd4044455c36874b690c5329583216d01d81fcbfa3ec87
+MD5 e4f498c0b7df8441dc462c8cdb24892a files/1.0-gcc4.patch 808
+RMD160 54c29ec565498e82c55fd177dccece2543914737 files/1.0-gcc4.patch 808
+SHA256 7206ce9d70e5d44664dd4044455c36874b690c5329583216d01d81fcbfa3ec87 files/1.0-gcc4.patch 808
+DIST g2ex-setup.run 30844481 RMD160 a3d1bfddefd3cdd882a1fb9ab576fd205349de61 SHA1 910e198859ce22e792c508cbdb5abfc081ec98b8 SHA256 85cf7ff402b73271e24867c7b0c162b258d61a69065d6a848ea0b74c301a4fbe
+EBUILD gunocide2ex-1.0.ebuild 2047 RMD160 a85e3b5cc4e54b6ffe41fb80597e8fdd7610ab7a SHA1 ad54b96be45940b983a07054c3a3b7fb49424367 SHA256 538cf705388f24b0d136a079ff9dfa0048c1650758da3781c420fd08be39103e
+MD5 010a97fd7222c377f33aad5a89a71679 gunocide2ex-1.0.ebuild 2047
+RMD160 a85e3b5cc4e54b6ffe41fb80597e8fdd7610ab7a gunocide2ex-1.0.ebuild 2047
+SHA256 538cf705388f24b0d136a079ff9dfa0048c1650758da3781c420fd08be39103e gunocide2ex-1.0.ebuild 2047
+MISC ChangeLog 1083 RMD160 83b41eadef4e8f4206439445c982c6059ca71756 SHA1 d5c3091addfbcc3c55f4d589cc6bf815a6b57309 SHA256 c6a8cac07ab815bb8aa35f601b4c5c2f004aae1e80f0aba275b27d96de74cac4
+MD5 dc065df6c9b1cafb9bfc47ede05e1d05 ChangeLog 1083
+RMD160 83b41eadef4e8f4206439445c982c6059ca71756 ChangeLog 1083
+SHA256 c6a8cac07ab815bb8aa35f601b4c5c2f004aae1e80f0aba275b27d96de74cac4 ChangeLog 1083
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 2d99293675edf4d413d9a0b6e83ed950 files/digest-gunocide2ex-1.0 229
+RMD160 70c707a5d60849aa0d11a9b43d5132a2e56ccdf7 files/digest-gunocide2ex-1.0 229
+SHA256 c8c12cc9de62fbe7948faf310359d8a1fea1bef436060f20aa836dfd12740adf files/digest-gunocide2ex-1.0 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE7OmlkT4lNIS36YERAh07AJ95oEBGxbBaN7rY5P13I+ynUV6sUgCglcvJ
+Y51f5UNU37WmnC65aD5mlLs=
+=tPg+
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/gunocide2ex/files/1.0-gcc4.patch b/games-arcade/gunocide2ex/files/1.0-gcc4.patch
new file mode 100644
index 000000000000..04bb3fd1fcd8
--- /dev/null
+++ b/games-arcade/gunocide2ex/files/1.0-gcc4.patch
@@ -0,0 +1,33 @@
+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/digest-gunocide2ex-1.0 b/games-arcade/gunocide2ex/files/digest-gunocide2ex-1.0
index 152f53335f8a..a46415ae7b83 100644
--- a/games-arcade/gunocide2ex/files/digest-gunocide2ex-1.0
+++ b/games-arcade/gunocide2ex/files/digest-gunocide2ex-1.0
@@ -1 +1,3 @@
 MD5 f247b651937b090b90e6e6dd748e0e36 g2ex-setup.run 30844481
+RMD160 a3d1bfddefd3cdd882a1fb9ab576fd205349de61 g2ex-setup.run 30844481
+SHA256 85cf7ff402b73271e24867c7b0c162b258d61a69065d6a848ea0b74c301a4fbe g2ex-setup.run 30844481
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
index a2351c59bfd8..982872847082 100644
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.9 2005/05/17 17:38:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild,v 1.10 2006/08/23 23:49:21 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -16,8 +16,7 @@ IUSE=""
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
 
@@ -26,7 +25,8 @@ src_unpack() {
 	sed -i "s:-g:${CFLAGS}:" makefile \
 		|| die "sed makefile failed"
 	mkdir binary
-	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch "${FILESDIR}"/${PV}-gcc3.patch
+	epatch "${FILESDIR}"/${PV}-gcc4.patch
 	edos2unix config.cfg
 	sed -i \
 		-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \