Fix for gcc-4.1

Package-Manager: portage-2.1_rc2-r3

5 files changed, 86 insertions, 21 deletions

diff --git a/games-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog
index 2740444e2bbb..af791b741eb0 100644
--- a/games-strategy/freelords/ChangeLog
+++ b/games-strategy/freelords/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freelords
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.21 2006/04/17 13:27:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.22 2006/05/28 00:36:08 tupone Exp $
+
+  28 May 2006; <Tupone@gentoo.org> +files/freelords-0.3.7-gcc41.patch,
+  freelords-0.3.7.ebuild:
+  Fix for gcc-4.1
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   freelords-0.3.7.ebuild:
diff --git a/games-strategy/freelords/Manifest b/games-strategy/freelords/Manifest
index cfe34fd95bed..446f712f9fda 100644
--- a/games-strategy/freelords/Manifest
+++ b/games-strategy/freelords/Manifest
@@ -1,36 +1,50 @@
-AUX freelordsrc 147 RMD160 280bd37b0f3513d369d23a6333f0fb29482f64a6 SHA1 4333410f0f00e25a0a45e25ac381e99354e6741f SHA256 08849f74f79358cbf2ff6fce51c5c7580f8d720694c97ece881ff9d9c1816cda size 147
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX freelords-0.3.7-gcc41.patch 1678 RMD160 793813cf354111262161b4800946eb175b465caa SHA1 341b7f7e5382dc616e22cbffb320a7e2625199e1 SHA256 d6c4273bbef40bf3729ec0e67bd4dc79a9b3263ad63621d9bb81339efa023993
+MD5 203fdb0d6add8a978344968640d44a94 files/freelords-0.3.7-gcc41.patch 1678
+RMD160 793813cf354111262161b4800946eb175b465caa files/freelords-0.3.7-gcc41.patch 1678
+SHA256 d6c4273bbef40bf3729ec0e67bd4dc79a9b3263ad63621d9bb81339efa023993 files/freelords-0.3.7-gcc41.patch 1678
+AUX freelordsrc 147 RMD160 280bd37b0f3513d369d23a6333f0fb29482f64a6 SHA1 4333410f0f00e25a0a45e25ac381e99354e6741f SHA256 08849f74f79358cbf2ff6fce51c5c7580f8d720694c97ece881ff9d9c1816cda
 MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147
 RMD160 280bd37b0f3513d369d23a6333f0fb29482f64a6 files/freelordsrc 147
 SHA256 08849f74f79358cbf2ff6fce51c5c7580f8d720694c97ece881ff9d9c1816cda files/freelordsrc 147
-DIST freelords-0.3.4.tar.bz2 1070123 size 1070123
-DIST freelords-0.3.6.tar.bz2 1498854 size 1498854
-DIST freelords-0.3.7.tar.bz2 2944264 RMD160 1434766f3eab287d15287d963bb49b2912bf802b SHA256 d7ca369cda5e139aa4234e95b573fdef65854b07b65d3ab4e13c0b1eb2f4abac size 2944264
-EBUILD freelords-0.3.4.ebuild 1511 RMD160 6984fff51aea24df44e36eedc53444fe11134086 SHA1 1e2c70191517735387ee023bd271643b236c8202 SHA256 206a639751712e39a5c430f583cb9d821272873a6d959d6dc007c8bd2507a242 size 1511
+DIST freelords-0.3.4.tar.bz2 1070123 RMD160 a062e7e26de50b615da1137f3cb1f55b491542ad SHA1 0f4c562dd0a0c05b459baf6c504e74738edc097d SHA256 882eee5e23d2941663a994466114fb30ba3356f5270661364be12bc66dd96c4a
+DIST freelords-0.3.6.tar.bz2 1498854
+DIST freelords-0.3.7.tar.bz2 2944264 RMD160 1434766f3eab287d15287d963bb49b2912bf802b SHA1 4428f961b0026b899279fafd90efe5aade0debc6 SHA256 d7ca369cda5e139aa4234e95b573fdef65854b07b65d3ab4e13c0b1eb2f4abac
+EBUILD freelords-0.3.4.ebuild 1511 RMD160 6984fff51aea24df44e36eedc53444fe11134086 SHA1 1e2c70191517735387ee023bd271643b236c8202 SHA256 206a639751712e39a5c430f583cb9d821272873a6d959d6dc007c8bd2507a242
 MD5 b40c96132d0344380af85522c934a26e freelords-0.3.4.ebuild 1511
 RMD160 6984fff51aea24df44e36eedc53444fe11134086 freelords-0.3.4.ebuild 1511
 SHA256 206a639751712e39a5c430f583cb9d821272873a6d959d6dc007c8bd2507a242 freelords-0.3.4.ebuild 1511
-EBUILD freelords-0.3.6.ebuild 1493 RMD160 f90c918e840f3e05cf9c1eb4c471d02e5921c759 SHA1 b32be3534c8470db8c8dfb4a9544fa1619c478bb SHA256 ecc5b7e42fdb2c9634e3ad4d745317f0b4bb219d21d29316bb5dc63bd2cf6f40 size 1493
+EBUILD freelords-0.3.6.ebuild 1493 RMD160 f90c918e840f3e05cf9c1eb4c471d02e5921c759 SHA1 b32be3534c8470db8c8dfb4a9544fa1619c478bb SHA256 ecc5b7e42fdb2c9634e3ad4d745317f0b4bb219d21d29316bb5dc63bd2cf6f40
 MD5 d0d7d468935a8f28b20b76ad4cd5df38 freelords-0.3.6.ebuild 1493
 RMD160 f90c918e840f3e05cf9c1eb4c471d02e5921c759 freelords-0.3.6.ebuild 1493
 SHA256 ecc5b7e42fdb2c9634e3ad4d745317f0b4bb219d21d29316bb5dc63bd2cf6f40 freelords-0.3.6.ebuild 1493
-EBUILD freelords-0.3.7.ebuild 1717 RMD160 268555036a6b9358bf7320583cbe76b0dbc05214 SHA1 0b50484f989cbfd1d7c9f5b8eae29e9cec358778 SHA256 d2c99774a81a023a57772e7533f325bc3c111eda6304b9163defc151a0671635 size 1717
-MD5 d43c6363869edec56043594db9890a35 freelords-0.3.7.ebuild 1717
-RMD160 268555036a6b9358bf7320583cbe76b0dbc05214 freelords-0.3.7.ebuild 1717
-SHA256 d2c99774a81a023a57772e7533f325bc3c111eda6304b9163defc151a0671635 freelords-0.3.7.ebuild 1717
-MISC ChangeLog 2873 RMD160 b2280290fd42e49f5be830f0739303d9583dbf3b SHA1 86cdc7cfd64f691cb924484312b3ced95fdcbdc7 SHA256 3d987591f4d80f28e66bba8dcf5630b6935e120dc7d0fac06c4789c596d5ff45 size 2873
-MD5 37441a777af4bdf5f9c0acc8191c8bc8 ChangeLog 2873
-RMD160 b2280290fd42e49f5be830f0739303d9583dbf3b ChangeLog 2873
-SHA256 3d987591f4d80f28e66bba8dcf5630b6935e120dc7d0fac06c4789c596d5ff45 ChangeLog 2873
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+EBUILD freelords-0.3.7.ebuild 1761 RMD160 86fe7bb208c77cac544f36e1be052b5733d9ecec SHA1 66715553981554039010ac8d9a3c48083a409383 SHA256 744eb0d0fd7260e75b0dfeff5dcb5f65bb36061560b716e3688a1f65bf9ea065
+MD5 92e59f8b61f14ff785839df791b5c262 freelords-0.3.7.ebuild 1761
+RMD160 86fe7bb208c77cac544f36e1be052b5733d9ecec freelords-0.3.7.ebuild 1761
+SHA256 744eb0d0fd7260e75b0dfeff5dcb5f65bb36061560b716e3688a1f65bf9ea065 freelords-0.3.7.ebuild 1761
+MISC ChangeLog 2987 RMD160 66b0f09c3343131ed627e2547cb066dc4a1e8e7b SHA1 44a79b6e340f8ee62ef54f584e14352a441bed06 SHA256 45c1b2e4d3404606cb6f4d32d034f8dfab54bf07ec9c848df660ba104b918fee
+MD5 0500acca26321ede6b8a10be3e66d5d5 ChangeLog 2987
+RMD160 66b0f09c3343131ed627e2547cb066dc4a1e8e7b ChangeLog 2987
+SHA256 45c1b2e4d3404606cb6f4d32d034f8dfab54bf07ec9c848df660ba104b918fee ChangeLog 2987
+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 6ef80ef4d03f0404bcfbc6ca368861e8 files/digest-freelords-0.3.4 69
-RMD160 c8ff5853affbb98a1d7c554b6ae7c8996509b678 files/digest-freelords-0.3.4 69
-SHA256 ce776d9c567861f0c3c03cd736eba7c89fffa3144f2e3e6e6a61253352e578b0 files/digest-freelords-0.3.4 69
+MD5 7118dc65fa7f9a0f3d035b167a9481e0 files/digest-freelords-0.3.4 253
+RMD160 e043c4e1d68f94785a3326a13dd1a22616ff8688 files/digest-freelords-0.3.4 253
+SHA256 2506244be9ad7e922a9e4a864dd6013a1a42cba1d27bf9450d4ce452c35c677a files/digest-freelords-0.3.4 253
 MD5 9b067113cc0e53c706f951a9384dc4d4 files/digest-freelords-0.3.6 69
 RMD160 49064cc0c89bdb2f4afd0a76fdd8b826d4dea56e files/digest-freelords-0.3.6 69
 SHA256 33d2e05d40abb52934f030e293f50dd124a3bc214a65a4df2991999dd61d7436 files/digest-freelords-0.3.6 69
 MD5 e8a04c751e3fe7c570b4bb49852d2653 files/digest-freelords-0.3.7 253
 RMD160 a7c12d9469089860ca2f3ec5b4c693ac584aa5d5 files/digest-freelords-0.3.7 253
 SHA256 51350881c70d5bc40f40a19ab533cfcc7c20d3d17a417c865c297002796485f5 files/digest-freelords-0.3.7 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEePCF2CTtIKiFlQIRAomlAJ9+u4Emo8a2msNc7KboRrzp8BSbJwCfZYo1
+L3YNmLvANj8fTbjcgzSfRB8=
+=uOt5
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freelords/files/digest-freelords-0.3.4 b/games-strategy/freelords/files/digest-freelords-0.3.4
index 21a5647f778a..54bf4ea27612 100644
--- a/games-strategy/freelords/files/digest-freelords-0.3.4
+++ b/games-strategy/freelords/files/digest-freelords-0.3.4
@@ -1 +1,3 @@
 MD5 2a42ed5939e57434028ae38a1d8c98c3 freelords-0.3.4.tar.bz2 1070123
+RMD160 a062e7e26de50b615da1137f3cb1f55b491542ad freelords-0.3.4.tar.bz2 1070123
+SHA256 882eee5e23d2941663a994466114fb30ba3356f5270661364be12bc66dd96c4a freelords-0.3.4.tar.bz2 1070123
diff --git a/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch b/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch
new file mode 100644
index 000000000000..bc1f915974a6
--- /dev/null
+++ b/games-strategy/freelords/files/freelords-0.3.7-gcc41.patch
@@ -0,0 +1,44 @@
+--- src/ai_smart.h.old	2006-05-28 01:45:00.000000000 +0200
++++ src/ai_smart.h	2006-05-28 01:45:14.000000000 +0200
+@@ -106,7 +106,7 @@
+         Threat *getBiggestDangerTo(City *city, Threatlist *threats);
+         
+         // examine cities to see if we need to change production
+-        void AI_Smart::examineCities();
++        void examineCities();
+ };
+ 
+ #endif // AI_SMART_H
+--- src/path.h.old	2006-05-28 01:41:44.000000000 +0200
++++ src/path.h	2006-05-28 01:42:02.000000000 +0200
+@@ -60,7 +60,7 @@
+         /* This function is used to verify if the stack can move on the Tile
+          * of the given destination point
+          */
+-        bool Path::canMoveThere(Stack* s, PG_Point* dest);
++        bool canMoveThere(Stack* s, PG_Point* dest);
+ 
+         /** Validates an existing path.
+           * 
+--- src/scroller.h.old	2006-05-28 01:51:44.000000000 +0200
++++ src/scroller.h	2006-05-28 01:51:56.000000000 +0200
+@@ -39,7 +39,7 @@
+         void eventMouseLeave();
+ 
+         //! Begin the scroll
+-        Uint32 Scroller::eventTimer (ID id, Uint32 interval);
++        Uint32 eventTimer (ID id, Uint32 interval);
+ 
+         Uint32 d_timer;
+         SmallMap * d_smap;
+--- src/tooltip.h.old	2006-05-28 01:52:04.000000000 +0200
++++ src/tooltip.h	2006-05-28 01:52:15.000000000 +0200
+@@ -55,7 +55,7 @@
+         bool eventMouseMotion(const SDL_MouseMotionEvent* event);
+         bool eventMouseButtonDown(const SDL_MouseButtonEvent* event);
+         //! Shows the tooltip after TOOLTIP_WAIT milliseconds
+-        Uint32 ToolTip::eventTimer (ID id, Uint32 interval);
++        Uint32 eventTimer (ID id, Uint32 interval);
+ 
+         Uint32 d_timer;
+         int d_movecounter;
diff --git a/games-strategy/freelords/freelords-0.3.7.ebuild b/games-strategy/freelords/freelords-0.3.7.ebuild
index 8f5d165da4b3..6b30053410e9 100644
--- a/games-strategy/freelords/freelords-0.3.7.ebuild
+++ b/games-strategy/freelords/freelords-0.3.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.4 2006/04/28 21:25:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.5 2006/05/28 00:36:08 tupone Exp $
 
 inherit eutils games
 
 DESCRIPTION="Free Warlords clone"
-HOMEPAGE="http://www.freelords.org/"
+HOMEPAGE="http://freelords.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -35,6 +35,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:\"freelordsrc\":\"${GAMES_SYSCONFDIR}/freelordsrc\":" \
 		src/main.cpp \