Fix for gcc-4.1, bug #131222

Package-Manager: portage-2.1_rc2-r3

4 files changed, 94 insertions, 23 deletions

diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index a14511e15848..8129620c30f4 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/glob2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.29 2006/04/27 20:08:34 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.30 2006/05/28 10:13:20 tupone Exp $
+
+  28 May 2006; <Tupone@gentoo.org> +files/glob2-0.8.19-gcc41.patch,
+  glob2-0.8.19.ebuild:
+  Fix for gcc-4.1, bug #131222 by nyhm
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-glob2-0.8.15,
   files/digest-glob2-0.8.16, files/digest-glob2-0.8.17,
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 36b5b51efb89..3bcf7f30a077 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,36 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST glob2-0.8.15.tar.gz 8990844 RMD160 b3ab552f60a10ef2757a2af852693685c25f971f SHA256 ee874326ace15535447f378f02ac5b0e93c1c1fdba815e3f0232cdb0de3fcd29 size 8990844
-DIST glob2-0.8.16.tar.gz 8868021 RMD160 95ef7cfee25eff6703531032ea233c8b99b2a13e SHA256 128cf09b96a6245a59b8dd32ba32e1da0bec938e89a5d1acd89a4425851efa6e size 8868021
-DIST glob2-0.8.17.tar.gz 8887975 RMD160 ab6f76b1589973e8ca550de1a4023c8034be66d0 SHA256 f72b7ab66e5fd9dedd78a71df32942a0293027db01e00e2395d0b4381d17566e size 8887975
-DIST glob2-0.8.18.tar.gz 9125977 RMD160 420c3769f4b79618bc84f5d34ba5a6112a7668c3 SHA256 62baf6ae48cfd82bad82027c607218a11067debb2a639e165917df490e1f46cf size 9125977
-DIST glob2-0.8.19.tar.gz 9405824 RMD160 5126e8f5bf68f07a8882af6082b7a706f2d811df SHA256 267a3e4d05ec434514ae834d9ee163ce5aaebfb8c1c217728cc4db7ae9db18bc size 9405824
-EBUILD glob2-0.8.15.ebuild 1073 RMD160 7a2e53bdbfdebd8a7a341c4c09754ad22ef4e303 SHA1 5a232cd04e9d2dfeb645f811b0868e163b9eaeb2 SHA256 33f92355a98937728759c2214fbea21fd7a7de1c56ab492c5b6d53f8131bb0f4 size 1073
+AUX glob2-0.8.19-gcc41.patch 2100 RMD160 bd26a02a67ea72d2dc3291f6f2764a7963eef085 SHA1 7b89c11834555322f2fd2d4cda064915ddaaec46 SHA256 39ddb99b39ff2b1458a2bce6b294e28707e619cd7fdcc556c96f9473b34c0d1f
+MD5 05cb87a4e14a92a5f3bcfaf38d9a8207 files/glob2-0.8.19-gcc41.patch 2100
+RMD160 bd26a02a67ea72d2dc3291f6f2764a7963eef085 files/glob2-0.8.19-gcc41.patch 2100
+SHA256 39ddb99b39ff2b1458a2bce6b294e28707e619cd7fdcc556c96f9473b34c0d1f files/glob2-0.8.19-gcc41.patch 2100
+DIST glob2-0.8.15.tar.gz 8990844 RMD160 b3ab552f60a10ef2757a2af852693685c25f971f SHA256 ee874326ace15535447f378f02ac5b0e93c1c1fdba815e3f0232cdb0de3fcd29
+DIST glob2-0.8.16.tar.gz 8868021 RMD160 95ef7cfee25eff6703531032ea233c8b99b2a13e SHA1 e1a5954a80f3b8b004746947feb41018a1741b9f SHA256 128cf09b96a6245a59b8dd32ba32e1da0bec938e89a5d1acd89a4425851efa6e
+DIST glob2-0.8.17.tar.gz 8887975 RMD160 ab6f76b1589973e8ca550de1a4023c8034be66d0 SHA1 0b1865b2eef60cfdbfea6e0ef8362a9f84aeb1b1 SHA256 f72b7ab66e5fd9dedd78a71df32942a0293027db01e00e2395d0b4381d17566e
+DIST glob2-0.8.18.tar.gz 9125977 RMD160 420c3769f4b79618bc84f5d34ba5a6112a7668c3 SHA256 62baf6ae48cfd82bad82027c607218a11067debb2a639e165917df490e1f46cf
+DIST glob2-0.8.19.tar.gz 9405824 RMD160 5126e8f5bf68f07a8882af6082b7a706f2d811df SHA1 4f3637179cd5576c316a4de38383dee8f2c42f2e SHA256 267a3e4d05ec434514ae834d9ee163ce5aaebfb8c1c217728cc4db7ae9db18bc
+EBUILD glob2-0.8.15.ebuild 1073 RMD160 7a2e53bdbfdebd8a7a341c4c09754ad22ef4e303 SHA1 5a232cd04e9d2dfeb645f811b0868e163b9eaeb2 SHA256 33f92355a98937728759c2214fbea21fd7a7de1c56ab492c5b6d53f8131bb0f4
 MD5 bad48144211e306ea91a7571e7982fc9 glob2-0.8.15.ebuild 1073
 RMD160 7a2e53bdbfdebd8a7a341c4c09754ad22ef4e303 glob2-0.8.15.ebuild 1073
 SHA256 33f92355a98937728759c2214fbea21fd7a7de1c56ab492c5b6d53f8131bb0f4 glob2-0.8.15.ebuild 1073
-EBUILD glob2-0.8.16.ebuild 1285 RMD160 ef32a8eba365ce084adab6bd081c05aa50579284 SHA1 d9b9a04cf5520550aeb89b3e85b75caa96f2e69a SHA256 24522e8dbc9b319155748a2b1bab9570ed5dcb69ae2d8f35649da8a510919ce8 size 1285
+EBUILD glob2-0.8.16.ebuild 1285 RMD160 ef32a8eba365ce084adab6bd081c05aa50579284 SHA1 d9b9a04cf5520550aeb89b3e85b75caa96f2e69a SHA256 24522e8dbc9b319155748a2b1bab9570ed5dcb69ae2d8f35649da8a510919ce8
 MD5 cbc9d911c20649e5f4200a52bd1dfb98 glob2-0.8.16.ebuild 1285
 RMD160 ef32a8eba365ce084adab6bd081c05aa50579284 glob2-0.8.16.ebuild 1285
 SHA256 24522e8dbc9b319155748a2b1bab9570ed5dcb69ae2d8f35649da8a510919ce8 glob2-0.8.16.ebuild 1285
-EBUILD glob2-0.8.17.ebuild 1285 RMD160 661704177a9ffcfac75ed5d94372d5b6cbee9339 SHA1 df9c7250602d7262441398c03f01701c15ca10db SHA256 aaf21d8053ebd902dc0f1c7af2d5734fc16b3e5ddf6e597e241868be841094dc size 1285
+EBUILD glob2-0.8.17.ebuild 1285 RMD160 661704177a9ffcfac75ed5d94372d5b6cbee9339 SHA1 df9c7250602d7262441398c03f01701c15ca10db SHA256 aaf21d8053ebd902dc0f1c7af2d5734fc16b3e5ddf6e597e241868be841094dc
 MD5 c3049f9db1be841bc6aeea3dc81620ce glob2-0.8.17.ebuild 1285
 RMD160 661704177a9ffcfac75ed5d94372d5b6cbee9339 glob2-0.8.17.ebuild 1285
 SHA256 aaf21d8053ebd902dc0f1c7af2d5734fc16b3e5ddf6e597e241868be841094dc glob2-0.8.17.ebuild 1285
-EBUILD glob2-0.8.18.ebuild 1301 RMD160 d67a609277553d95ecf5d7382e59fb25621ef5ab SHA1 c8fc9091ffbca9483f94b176a9a5d65367ac35af SHA256 2700c50ae700a66a5f0b14024cf4b37430354e89a7e0d4071c25d2845279e813 size 1301
+EBUILD glob2-0.8.18.ebuild 1301 RMD160 d67a609277553d95ecf5d7382e59fb25621ef5ab SHA1 c8fc9091ffbca9483f94b176a9a5d65367ac35af SHA256 2700c50ae700a66a5f0b14024cf4b37430354e89a7e0d4071c25d2845279e813
 MD5 79407270a77a99c1477efeeacc9963a0 glob2-0.8.18.ebuild 1301
 RMD160 d67a609277553d95ecf5d7382e59fb25621ef5ab glob2-0.8.18.ebuild 1301
 SHA256 2700c50ae700a66a5f0b14024cf4b37430354e89a7e0d4071c25d2845279e813 glob2-0.8.18.ebuild 1301
-EBUILD glob2-0.8.19.ebuild 1299 RMD160 477a1159f97ff512b58109d31017116905651e95 SHA1 2621509452079e3c10ce45374c336f64660f2491 SHA256 d093376b63a5ab3afb9c3c51ceed4d1bef1415c1ae7073122359e76d59020573 size 1299
-MD5 b7feebe106e7e47fe69c43211467c527 glob2-0.8.19.ebuild 1299
-RMD160 477a1159f97ff512b58109d31017116905651e95 glob2-0.8.19.ebuild 1299
-SHA256 d093376b63a5ab3afb9c3c51ceed4d1bef1415c1ae7073122359e76d59020573 glob2-0.8.19.ebuild 1299
-MISC ChangeLog 3587 RMD160 e51007a629c4d44756f47c0672e63ab23c42a810 SHA1 f4fe132c9e6a8cb0df735d71a588f9ca62b30ad3 SHA256 4de090f6a03d423ef54ad07ce3cf86b9bc3b9e6e6a3a57d126d2e77115426aef size 3587
-MD5 1116596cfea8bc6263e3ca40617ef5bf ChangeLog 3587
-RMD160 e51007a629c4d44756f47c0672e63ab23c42a810 ChangeLog 3587
-SHA256 4de090f6a03d423ef54ad07ce3cf86b9bc3b9e6e6a3a57d126d2e77115426aef ChangeLog 3587
-MISC metadata.xml 546 RMD160 702338ae8936b3f81e43ded8c08aa74ce919a1c8 SHA1 0cddda4674a8c9a8ac51f68fa211131220c814a5 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd size 546
+EBUILD glob2-0.8.19.ebuild 1335 RMD160 514a78a682fcdf411ff82951fff99383ae67cc77 SHA1 6780fa755c7ef511f6edabc0c9eae4c5005dd416 SHA256 0e35eb29c3b640d1f77ec5e9a30fc059585d566195eace94609335329587968c
+MD5 a07751408b5d51f31d40479bfdcc1fdd glob2-0.8.19.ebuild 1335
+RMD160 514a78a682fcdf411ff82951fff99383ae67cc77 glob2-0.8.19.ebuild 1335
+SHA256 0e35eb29c3b640d1f77ec5e9a30fc059585d566195eace94609335329587968c glob2-0.8.19.ebuild 1335
+MISC ChangeLog 3717 RMD160 7fa81264378c6a5aed7d7d76e74e8a3a8a3e5505 SHA1 ef4a4eda6ee5505e68d9553205c00023d5fefc10 SHA256 fcd11004d3d77bb4dfd5c56e7997a67be8441e94e02b370543c39c96e346fed4
+MD5 c0d05b3dbd84a4bd1acb1fbb64110761 ChangeLog 3717
+RMD160 7fa81264378c6a5aed7d7d76e74e8a3a8a3e5505 ChangeLog 3717
+SHA256 fcd11004d3d77bb4dfd5c56e7997a67be8441e94e02b370543c39c96e346fed4 ChangeLog 3717
+MISC metadata.xml 546 RMD160 702338ae8936b3f81e43ded8c08aa74ce919a1c8 SHA1 0cddda4674a8c9a8ac51f68fa211131220c814a5 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd
 MD5 be3faa436a456146cab34d1a7ba5e534 metadata.xml 546
 RMD160 702338ae8936b3f81e43ded8c08aa74ce919a1c8 metadata.xml 546
 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd metadata.xml 546
@@ -52,7 +56,7 @@ SHA256 3cf1250cd15e2d09c515356b24318a7d4a1f3f68c473bcc7dac9ecefc83fdcf9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUSTLW78445TWHXcRAmjEAKCaNYKyAumzBApKHpwejzIeltNwQQCcCAUv
-doxPZnPU75DLyCLhIeHrRZA=
-=0A1R
+iD8DBQFEeXfO2CTtIKiFlQIRAiiRAKC1qZ7eKzUeo+58xqpvYnzhAa7uZwCeMS7/
+Hgw1wMsOHIAkFBkhRnKhk60=
+=pcMQ
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch b/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch
new file mode 100644
index 000000000000..b1b7e37bdea5
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch
@@ -0,0 +1,62 @@
+--- src/EndGameScreen.h.old	2006-05-28 11:35:22.000000000 +0200
++++ src/EndGameScreen.h	2006-05-28 11:35:45.000000000 +0200
+@@ -64,7 +64,7 @@
+ 
+ protected:
+ 	//! resort players
+-	void EndGameScreen::sortAndSet(EndOfGameStat::Type type);
++	void sortAndSet(EndOfGameStat::Type type);
+ 	
+ public:
+ 	EndGameScreen(GameGUI *gui);
+--- src/GameGUILoadSave.cpp.old	2006-05-28 11:37:45.000000000 +0200
++++ src/GameGUILoadSave.cpp	2006-05-28 11:38:40.000000000 +0200
+@@ -31,7 +31,7 @@
+ {
+ 
+ public:
+-	FuncFileList::FuncFileList(int x, int y, int w, int h, Uint32 hAlign, Uint32 vAlign, const char *font, 
++	FuncFileList(int x, int y, int w, int h, Uint32 hAlign, Uint32 vAlign, const char *font, 
+ 		const char *dir, const char *extension, const bool recurse, 
+ 		std::string (*filenameToNameFunc)(const char *filename),
+ 		std::string (*nameToFilenameFunc)(const char *dir, const char *name, const char *extension))
+@@ -41,16 +41,16 @@
+ 		this->generateList();
+ 	}
+ 	
+-	FuncFileList::~FuncFileList()
++	~FuncFileList()
+ 	{}
+ 
+ private:
+-	std::string FuncFileList::fileToList(const char* fileName) const
++	std::string fileToList(const char* fileName) const
+ 	{
+ 		return filenameToNameFunc(fullName(fileName).c_str());
+ 	}
+ 	
+-	std::string FuncFileList::listToFile(const char* listName) const
++	std::string listToFile(const char* listName) const
+ 	{
+ 		return nameToFilenameFunc(fullDir().c_str(), listName, extension.c_str());
+ 	}
+--- src/IRC.h.old	2006-05-28 11:35:30.000000000 +0200
++++ src/IRC.h	2006-05-28 11:36:07.000000000 +0200
+@@ -69,7 +69,7 @@
+ 		char diffusion[IRC_CHANNEL_SIZE+1];
+ 		char message[IRC_MESSAGE_SIZE+1];
+ 		
+-		ChatMessage::ChatMessage() { source[0]=0; diffusion[0]=0; message[0]=0; }
++		ChatMessage() { source[0]=0; diffusion[0]=0; message[0]=0; }
+ 	};
+ 
+ 	struct InfoMessage
+@@ -79,7 +79,7 @@
+ 		char diffusion[IRC_CHANNEL_SIZE+1];
+ 		char message[IRC_MESSAGE_SIZE+1];
+ 		
+-		InfoMessage::InfoMessage(InfoMessageType t) { type=t; source[0]=0; diffusion[0]=0; message[0]=0; }
++		InfoMessage(InfoMessageType t) { type=t; source[0]=0; diffusion[0]=0; message[0]=0; }
+ 	};
+ 
+ protected:
diff --git a/games-strategy/glob2/glob2-0.8.19.ebuild b/games-strategy/glob2/glob2-0.8.19.ebuild
index 1962b26bb249..0955d2a5f823 100644
--- a/games-strategy/glob2/glob2-0.8.19.ebuild
+++ b/games-strategy/glob2/glob2-0.8.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.19.ebuild,v 1.1 2006/03/13 08:35:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.19.ebuild,v 1.2 2006/05/28 10:13:20 tupone Exp $
 
 inherit games
 
@@ -27,6 +27,7 @@ DEPEND="virtual/opengl
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "/^glob2linkdir/s:\$(datadir):/usr/share:" \
 		data/Makefile.in \