Fix for gcc-4.1

Package-Manager: portage-2.1_rc2-r3

5 files changed, 81 insertions, 9 deletions

diff --git a/games-strategy/ufo2000/ChangeLog b/games-strategy/ufo2000/ChangeLog
index 1f61b41dda83..520b5f40fbb3 100644
--- a/games-strategy/ufo2000/ChangeLog
+++ b/games-strategy/ufo2000/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/ufo2000
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.12 2005/09/06 13:01:15 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.13 2006/05/28 10:51:30 tupone Exp $
+
+  28 May 2006; <Tupone@gentoo.org> +files/ufo2000-0.6.627-gcc41.patch,
+  ufo2000-0.6.627.ebuild:
+  Fix for gcc-4.1
 
   06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   ufo2000-0.6.627.ebuild:
diff --git a/games-strategy/ufo2000/Manifest b/games-strategy/ufo2000/Manifest
index 0210c80d6693..28f845a2e3b8 100644
--- a/games-strategy/ufo2000/Manifest
+++ b/games-strategy/ufo2000/Manifest
@@ -1,4 +1,33 @@
-MD5 13e2ada127d5ffa0af475b757c0b9847 ufo2000-0.6.627.ebuild 2455
-MD5 fada660ae3da582985c39c1efed860b6 ChangeLog 1861
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ufo2000-0.6.627-gcc41.patch 775 RMD160 8535fd899d30bd84528ca36a18f0027f9124c55c SHA1 bf4d89face1f187d2769ba8194601202eff8d052 SHA256 7e5e47d715072e1ac6f0c8fe2bfe6649a68e339e11e43a685f4943b692dc13d3
+MD5 28d808507493899f932f191e7400caa5 files/ufo2000-0.6.627-gcc41.patch 775
+RMD160 8535fd899d30bd84528ca36a18f0027f9124c55c files/ufo2000-0.6.627-gcc41.patch 775
+SHA256 7e5e47d715072e1ac6f0c8fe2bfe6649a68e339e11e43a685f4943b692dc13d3 files/ufo2000-0.6.627-gcc41.patch 775
+DIST terror.zip 1096279 RMD160 eeed8764d8cc26ddf4c57179f17d7eabaf85ec72 SHA1 2b5ee654fac40769ff452d8166cd33231bef733c SHA256 9af0930f6aade6cc02355c3d0354e9ccca4989f22636a013b3c34b2e55336cc8
+DIST ufo2000-0.6.627-src.tar.bz2 795646 RMD160 fbe561bcfeb85f63869f030d46bc40ebb274ae6f SHA1 8887d16c0aeef8ccaab86e7d91d892ebdb416266 SHA256 c34ae7525d222e506f77ec8de4ea34704a5b4a1f785433e245ec6b5683f00eaa
+DIST ufo2000-music-20041222.zip 1661196 RMD160 4baa339c746da218e794743b608bc0fe15387442 SHA1 3e6deac66bc84754f651a8fe983426df20c0a563 SHA256 45fe31944de38c160e145cf2b2eedf42f9d0cef66edfdb3d06132617e15104c6
+DIST xcomdemo.zip 1148768 RMD160 b160b2ad4314e787b471b38ea58abcf7846c4a0b SHA1 4d312038506e732735d34e52fbe173157186a1dd SHA256 11c0166cbb9e58a1f7bab0891626368c7ba86e2c1cbb8f596391602c9e9b893c
+EBUILD ufo2000-0.6.627.ebuild 2503 RMD160 987fb0abd96e10f659cf259e7c394ae5d5b9988e SHA1 2c9cf181849c973bea006656d6eef8329ab96f42 SHA256 b5e4a96c4974b1904bbc96d132721408a3ded7763a7f935e6458bfebeeb61a76
+MD5 7908283950ae8567ef948458ae5db99d ufo2000-0.6.627.ebuild 2503
+RMD160 987fb0abd96e10f659cf259e7c394ae5d5b9988e ufo2000-0.6.627.ebuild 2503
+SHA256 b5e4a96c4974b1904bbc96d132721408a3ded7763a7f935e6458bfebeeb61a76 ufo2000-0.6.627.ebuild 2503
+MISC ChangeLog 1975 RMD160 ca373592841e53e56a176466c26697afd8ca39ed SHA1 49244564bab31fc19642f89923b806027b313ab0 SHA256 ea1b7a52923f67ffb4399dbc01373397dae79431f1043032288a0bc8c959c6c3
+MD5 2aed9fa30d7ae425e1e18fda36bceba7 ChangeLog 1975
+RMD160 ca373592841e53e56a176466c26697afd8ca39ed ChangeLog 1975
+SHA256 ea1b7a52923f67ffb4399dbc01373397dae79431f1043032288a0bc8c959c6c3 ChangeLog 1975
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 e283cd0a1d6f97ef8ed3e3380936accb files/digest-ufo2000-0.6.627 258
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 37b8b8bf481fa1c70b7735ef2a0e0f61 files/digest-ufo2000-0.6.627 958
+RMD160 704bea66c2520794eb9290ce4c364f9318341a88 files/digest-ufo2000-0.6.627 958
+SHA256 b7af2f1bf2a0a61dbc9d9dde6bf7a05a718b3c0accfa54a4aadd0e410fe2c7c9 files/digest-ufo2000-0.6.627 958
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEeYC+2CTtIKiFlQIRAociAKCbfTu61mdTJrhEOEUHhwNkvSWfwQCeMJPu
+k0xLFaPHWq0948GRdsLJkKw=
+=kXos
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 b/games-strategy/ufo2000/files/digest-ufo2000-0.6.627
index 93bb53a2c88e..59ebe3ed229a 100644
--- a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627
+++ b/games-strategy/ufo2000/files/digest-ufo2000-0.6.627
@@ -1,4 +1,12 @@
-MD5 ee14e98c8e751cfaa734aeeb52fef4cf ufo2000-0.6.627-src.tar.bz2 795646
-MD5 0cabff3ae8ad047fde1753e9075358b4 xcomdemo.zip 1148768
 MD5 0267a027ec437bf1b93e0cb1394a2c46 terror.zip 1096279
+RMD160 eeed8764d8cc26ddf4c57179f17d7eabaf85ec72 terror.zip 1096279
+SHA256 9af0930f6aade6cc02355c3d0354e9ccca4989f22636a013b3c34b2e55336cc8 terror.zip 1096279
+MD5 ee14e98c8e751cfaa734aeeb52fef4cf ufo2000-0.6.627-src.tar.bz2 795646
+RMD160 fbe561bcfeb85f63869f030d46bc40ebb274ae6f ufo2000-0.6.627-src.tar.bz2 795646
+SHA256 c34ae7525d222e506f77ec8de4ea34704a5b4a1f785433e245ec6b5683f00eaa ufo2000-0.6.627-src.tar.bz2 795646
 MD5 92df4c6e94ec7b2f0d720aecb1e4e68e ufo2000-music-20041222.zip 1661196
+RMD160 4baa339c746da218e794743b608bc0fe15387442 ufo2000-music-20041222.zip 1661196
+SHA256 45fe31944de38c160e145cf2b2eedf42f9d0cef66edfdb3d06132617e15104c6 ufo2000-music-20041222.zip 1661196
+MD5 0cabff3ae8ad047fde1753e9075358b4 xcomdemo.zip 1148768
+RMD160 b160b2ad4314e787b471b38ea58abcf7846c4a0b xcomdemo.zip 1148768
+SHA256 11c0166cbb9e58a1f7bab0891626368c7ba86e2c1cbb8f596391602c9e9b893c xcomdemo.zip 1148768
diff --git a/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch b/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch
new file mode 100644
index 000000000000..8b8c249e6196
--- /dev/null
+++ b/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch
@@ -0,0 +1,29 @@
+--- src/global.h.old	2006-05-28 12:30:33.000000000 +0200
++++ src/global.h	2006-05-28 12:31:10.000000000 +0200
+@@ -412,6 +412,7 @@
+ extern DATAFILE *datafile;
+ extern int NOTICEremote;
+ extern Wind *info_win;
++class Icon;
+ extern Icon *icon;
+ extern int g_time_limit;
+ extern int g_p2_start_sit;
+--- src/server.h.old	2006-05-28 12:31:30.000000000 +0200
++++ src/server.h	2006-05-28 12:32:09.000000000 +0200
+@@ -40,7 +40,7 @@
+     NLsocket    m_socket;
+ public:
+     virtual ~ClientServer();
+-    bool ClientServer::connect(
++    bool connect(
+         const std::string &host,
+         const std::string &proxy,
+         std::string &error_message);
+@@ -54,6 +54,7 @@
+ /**
+  * Server side client-server connection
+  */
++class ServerDispatch;
+ class ServerClient
+ {
+ protected:
diff --git a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
index 71023a8722b3..7ac0c38da112 100644
--- a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
+++ b/games-strategy/ufo2000/ufo2000-0.6.627.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-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.5 2005/09/06 13:01:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.6 2006/05/28 10:51:30 tupone Exp $
 
 inherit games
 
@@ -44,6 +44,8 @@ src_unpack() {
 		cd "${S}/newmusic"
 		unpack ufo2000-music-20041222.zip
 	fi
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {