gcc-4.1 fix, bug #126223

(Portage version: 2.1_pre7-r5)

5 files changed, 51 insertions, 8 deletions

diff --git a/games-arcade/blobwars/ChangeLog b/games-arcade/blobwars/ChangeLog
index 7f3f0dbe6f5e..dc217b688c0a 100644
--- a/games-arcade/blobwars/ChangeLog
+++ b/games-arcade/blobwars/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/blobwars
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.24 2005/10/30 02:11:15 weeve Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/ChangeLog,v 1.25 2006/04/23 11:22:28 tupone Exp $
+
+  23 Apr 2006; <Tupone@gentoo.org> +files/blobwars-1.04-gcc41.patch,
+  blobwars-1.04.ebuild:
+  Fix for gcc-4.1, bug #126223 by Davd Pyke, patch from TGL
 
   30 Oct 2005; Jason Wever <weeve@gentoo.org> blobwars-1.04.ebuild:
   Added ~sparc keyword.
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
index 9ab0666efee5..5eca73138c23 100644
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -1,7 +1,24 @@
-MD5 51c7cf675c1ddf8d11c3044a8812d920 ChangeLog 3183
+MD5 2e8d19ac8ab0d6a211b6b8b434ce87ff ChangeLog 3337
+RMD160 5f9f0326c5a4b2fa7ea3de142a07e51033e00f87 ChangeLog 3337
+SHA256 8f7c1707b6bd1c97a12abe730cf0afac88003743489ab3a78ca04ad4f20c3a22 ChangeLog 3337
 MD5 a1fa28cb3e9c23be6e4cb66b85a80b01 blobwars-1.02.ebuild 1905
-MD5 f9c80a4046d69943a3dd8d40eee321db blobwars-1.04.ebuild 2015
+RMD160 9a61ad43244d1a8d5c8e5b895ec4712f853eb54f blobwars-1.02.ebuild 1905
+SHA256 cdd34032707635cb5955bfc533a548be2d0e477532d89a7e9f477b8a23c21ebd blobwars-1.02.ebuild 1905
+MD5 e16e5b0d32b0c0dda7109680895fa962 blobwars-1.04.ebuild 2050
+RMD160 19a32e74ac8fa6989a772e049c93939d4ee18087 blobwars-1.04.ebuild 2050
+SHA256 6500dc6c0840a104fec70b95b40ffe40f8db06187c9ddc28362a1d2ac7ae7ef1 blobwars-1.04.ebuild 2050
 MD5 d23a2ed12360de25a971070b165b2e0a files/1.04-be_pak.diff 851
+RMD160 5d76c5d6d22957bfb73b997e9e57831a87e74e3f files/1.04-be_pak.diff 851
+SHA256 5c1be7ef2972f201d426f7faee18bdf6b546087db146ac4a5360778acd91951e files/1.04-be_pak.diff 851
+MD5 e57d7d2e6f2272f668ec87abe594d951 files/blobwars-1.04-gcc41.patch 607
+RMD160 0ad237091ed4badada1b6c0ad6cd14be7d6cf893 files/blobwars-1.04-gcc41.patch 607
+SHA256 a2d547c3dfa826daf7d89b3e0f85b3aea818eb047ce107eb062d9a89587057e2 files/blobwars-1.04-gcc41.patch 607
 MD5 f8302f347e2844cfb0b66e3beb5c9fea files/digest-blobwars-1.02 68
-MD5 6ab7a0fe4be4749ea69a082960be996e files/digest-blobwars-1.04 68
+RMD160 add1a629ba357d7734a548c55b131ce51c3cec8e files/digest-blobwars-1.02 68
+SHA256 0dcf5e1433bf71580d35cc9a0f497fe29b370d642552604835b89a6c00c5c47e files/digest-blobwars-1.02 68
+MD5 8104f636d0c55734848de669847d3bdb files/digest-blobwars-1.04 250
+RMD160 fd72b9000f958488a5e1ae64a4faa02028c20196 files/digest-blobwars-1.04 250
+SHA256 bc486eac49d01b5afb29ae159b2e03069bba4e4816db6f4c270e87104df9b284 files/digest-blobwars-1.04 250
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-arcade/blobwars/blobwars-1.04.ebuild b/games-arcade/blobwars/blobwars-1.04.ebuild
index ab25e149d505..78725e4a8180 100644
--- a/games-arcade/blobwars/blobwars-1.04.ebuild
+++ b/games-arcade/blobwars/blobwars-1.04.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/blobwars/blobwars-1.04.ebuild,v 1.6 2005/10/30 02:11:15 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/blobwars/blobwars-1.04.ebuild,v 1.7 2006/04/23 11:22:28 tupone Exp $
 
 inherit eutils games
 
@@ -22,7 +22,8 @@ DEPEND=">=media-libs/libsdl-1.2.5
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-be_pak.diff
+	epatch "${FILESDIR}"/${PV}-be_pak.diff \
+		"${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {
diff --git a/games-arcade/blobwars/files/blobwars-1.04-gcc41.patch b/games-arcade/blobwars/files/blobwars-1.04-gcc41.patch
new file mode 100644
index 000000000000..ea3752834f35
--- /dev/null
+++ b/games-arcade/blobwars/files/blobwars-1.04-gcc41.patch
@@ -0,0 +1,19 @@
+--- src/CFileData.h.old	2006-04-23 12:51:10.000000000 +0200
++++ src/CFileData.h	2006-04-23 12:52:18.000000000 +0200
+@@ -30,5 +30,5 @@
+ 	FileData();
+ 	
+ 	void swapEndians();
+-	void FileData::set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
++	void set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
+ };
+--- src/CKeyboard.h.old	2006-04-23 12:51:20.000000000 +0200
++++ src/CKeyboard.h	2006-04-23 12:52:37.000000000 +0200
+@@ -8,6 +8,6 @@
+ 	
+ 		Keyboard();
+ 		void setDefaultKeys();
+-		static char *Keyboard::translateKey(int value);
++		static char *translateKey(int value);
+ 
+ };
diff --git a/games-arcade/blobwars/files/digest-blobwars-1.04 b/games-arcade/blobwars/files/digest-blobwars-1.04
index 15334c313048..adb69fb95312 100644
--- a/games-arcade/blobwars/files/digest-blobwars-1.04
+++ b/games-arcade/blobwars/files/digest-blobwars-1.04
@@ -1 +1,3 @@
 MD5 fccb31ed097b8db95b58ed9512d98b63 blobwars-1.04-1.tar.gz 7682669
+RMD160 d211649d6946cdf2db3170947f5ef9816ffcb653 blobwars-1.04-1.tar.gz 7682669
+SHA256 84f62f364e5dc5dad138ee73a200827da987a840a092ead0a0e6d9cde551050f blobwars-1.04-1.tar.gz 7682669