Fix for gcc-4, bug #128476

Package-Manager: portage-2.1_rc2-r3

7 files changed, 100 insertions, 14 deletions

diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index a48e5c822f00..25a94dec76ff 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecnc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.6 2005/09/16 02:25:06 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.7 2006/05/27 00:18:10 tupone Exp $
+
+  27 May 2006; <Tupone@gentoo.org> +files/freecnc-0.2.1.31072003-gcc4.patch,
+  freecnc-0.2.1.31072003.ebuild:
+  Fix for gcc-4, bug #128476 by Robert Marmorstein
 
   16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> freecnc-0.2.0.ebuild,
   freecnc-0.2.1.31072003.ebuild:
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index 0915e256cef8..2321b5510500 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -1,14 +1,72 @@
-MD5 c1367cb0182bffdf9207a7fad503c5fb ChangeLog 858
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.2.0-gentoo-paths.patch 980 RMD160 ae4e9d0e8e44f757137a257ca538d1b46269a3f5 SHA1 a3db2f7eb90b596a4af6028e1f39b77686d27c5c SHA256 8dec1678067f808fdc3ac8ab1a0c1df5f8e148240f1253a512197801bc241ee2
 MD5 deb5d60f8269a27307f92372b65f2600 files/0.2.0-gentoo-paths.patch 980
+RMD160 ae4e9d0e8e44f757137a257ca538d1b46269a3f5 files/0.2.0-gentoo-paths.patch 980
+SHA256 8dec1678067f808fdc3ac8ab1a0c1df5f8e148240f1253a512197801bc241ee2 files/0.2.0-gentoo-paths.patch 980
+AUX 0.2.0-makefile-cflags.patch 4220 RMD160 e63665273dbea8d96b2692a1043135748f1afc1b SHA1 ebd9713435c99f656b8cedcd3adfbbe4facc1b91 SHA256 258a05074f2fce00aa5fe62a68b6c59e5da7aacfe8d6bb6ba3122ea15666a7c1
 MD5 97801c0bb7df9499db0b530110aaa510 files/0.2.0-makefile-cflags.patch 4220
+RMD160 e63665273dbea8d96b2692a1043135748f1afc1b files/0.2.0-makefile-cflags.patch 4220
+SHA256 258a05074f2fce00aa5fe62a68b6c59e5da7aacfe8d6bb6ba3122ea15666a7c1 files/0.2.0-makefile-cflags.patch 4220
+AUX 0.2.0-remove-root.patch 636 RMD160 4c2cc7caf3ec2ed077d06c38bfe0d5725a98561d SHA1 b2981e9b4b16864eb9861355ecca9b6dcf194b62 SHA256 5bf71e0e607cfb2191cdd55c45e9856cfbc1146980929419679ac5f7f72735fb
 MD5 929803ba179a8f6e0996f29dfc33dcdc files/0.2.0-remove-root.patch 636
+RMD160 4c2cc7caf3ec2ed077d06c38bfe0d5725a98561d files/0.2.0-remove-root.patch 636
+SHA256 5bf71e0e607cfb2191cdd55c45e9856cfbc1146980929419679ac5f7f72735fb files/0.2.0-remove-root.patch 636
+AUX 0.2.1.31072003-gentoo-paths.patch 1583 RMD160 86f64dfb501eeced4602f2c6893bd77c24785a05 SHA1 b9b98145a30107af647bca2f0ff233f6145a4a35 SHA256 bb0d6527d3a87583eefa30b5e3fef99c5fd23dd6e9e040be5208ace045bdb664
 MD5 bb8ca96dac9e2f1f139629d437ff6e7a files/0.2.1.31072003-gentoo-paths.patch 1583
+RMD160 86f64dfb501eeced4602f2c6893bd77c24785a05 files/0.2.1.31072003-gentoo-paths.patch 1583
+SHA256 bb0d6527d3a87583eefa30b5e3fef99c5fd23dd6e9e040be5208ace045bdb664 files/0.2.1.31072003-gentoo-paths.patch 1583
+AUX 0.2.1.31072003-makefile-cflags.patch 478 RMD160 5f6fb661fae69a542d9875e24485405fd29faeb1 SHA1 3d79fbfd8b47ab5186c24422e878424d18276bdb SHA256 21ab855aded23a19c353ad5e13f42ec76150bf020ba4311c717a43bf99682e97
 MD5 368b1fb21ec956e33e0cea243ba89448 files/0.2.1.31072003-makefile-cflags.patch 478
+RMD160 5f6fb661fae69a542d9875e24485405fd29faeb1 files/0.2.1.31072003-makefile-cflags.patch 478
+SHA256 21ab855aded23a19c353ad5e13f42ec76150bf020ba4311c717a43bf99682e97 files/0.2.1.31072003-makefile-cflags.patch 478
+AUX 0.2.1.31072003-remove-root.patch 555 RMD160 7bd7afe0241e83308b8531ae09af974c04db2822 SHA1 458d98509dc767ceef7cce13bfc53e24955faf9e SHA256 b9450649620c70a2c4c11fcc4a16c2782d611f11c3e6eab802e4e057383ce207
 MD5 a95fe9ff48a57f7d2afaf10e0932faab files/0.2.1.31072003-remove-root.patch 555
-MD5 7705eafc118ebb753d4b8a80fe7e333c files/digest-freecnc-0.2.0 189
-MD5 caea2862781d0a98c4c8eb0b932aa47d files/digest-freecnc-0.2.1.31072003 198
+RMD160 7bd7afe0241e83308b8531ae09af974c04db2822 files/0.2.1.31072003-remove-root.patch 555
+SHA256 b9450649620c70a2c4c11fcc4a16c2782d611f11c3e6eab802e4e057383ce207 files/0.2.1.31072003-remove-root.patch 555
+AUX freecnc 44 RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 SHA1 2a86ec97c739e2c0a8d124cc24186a4c7f49c096 SHA256 94b017b779b59a349a752d3663864058c4036ffbfa453216f3212fe5eda9aeae
 MD5 190952f0b1cd7f8ebd7385c01e0b70db files/freecnc 44
+RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 files/freecnc 44
+SHA256 94b017b779b59a349a752d3663864058c4036ffbfa453216f3212fe5eda9aeae files/freecnc 44
+AUX freecnc-0.2.0-endian.patch 3042 RMD160 3aebfdd38cd7f1e447b9cdc07e3456fec072fda6 SHA1 cbc061b52573c52955be92646b9f06383628d913 SHA256 4565fd4ed3f3dec9f9b686839bbaba32adafda4a7003a6a298c0b36431939996
 MD5 da57fef460c5cba4a6aaf3490242a0e4 files/freecnc-0.2.0-endian.patch 3042
-MD5 fd3e1edf5dc83342294b13c363f63078 freecnc-0.2.0.ebuild 2223
-MD5 7fdb3a5e200186fdfa8be42ca743e4de freecnc-0.2.1.31072003.ebuild 2259
+RMD160 3aebfdd38cd7f1e447b9cdc07e3456fec072fda6 files/freecnc-0.2.0-endian.patch 3042
+SHA256 4565fd4ed3f3dec9f9b686839bbaba32adafda4a7003a6a298c0b36431939996 files/freecnc-0.2.0-endian.patch 3042
+AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 SHA1 3f884ae37f843ea8320f0e5e1f12695db661731c SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1
+MD5 b7a2487d3f2a0c36ab831cc34f300c15 files/freecnc-0.2.1.31072003-gcc4.patch 403
+RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 files/freecnc-0.2.1.31072003-gcc4.patch 403
+SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1 files/freecnc-0.2.1.31072003-gcc4.patch 403
+DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87
+DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48
+DIST freecnc++-0.2.0-src.tar.bz2 264419 RMD160 8fa51bd98dce7a57b388ea668528295e2b421bc2 SHA1 9a1fc62af96c24359e82a4fdf4da3de5c4590207 SHA256 19b2aa3ef040a631a4cc0c8e773252380437c2f961d9a8bf8a6722fdfc08dc49
+DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5
+EBUILD freecnc-0.2.0.ebuild 2220 RMD160 c3a33caddece3c4fb0c0c1a88a07ad35b7d0e4e1 SHA1 c8663862b63b27591dbed715f184a30afd3ce71e SHA256 52d73e35b621050db326cfc5c5573e936cb73d25067dac32952854dac9442f21
+MD5 24ef15f2031361b1492ee0e60bb1edb4 freecnc-0.2.0.ebuild 2220
+RMD160 c3a33caddece3c4fb0c0c1a88a07ad35b7d0e4e1 freecnc-0.2.0.ebuild 2220
+SHA256 52d73e35b621050db326cfc5c5573e936cb73d25067dac32952854dac9442f21 freecnc-0.2.0.ebuild 2220
+EBUILD freecnc-0.2.1.31072003.ebuild 2290 RMD160 87b9b1593b3cbb07abdeecd9d474a40bcc7fb653 SHA1 d4bc7478629b104a5835d033fbc69d8435e65e5c SHA256 c9fb673a8faf6f3ca5b403a5dc8b88ef0612b0c29f6a2f96676a7c4b7ab017f3
+MD5 e4174320527e56dca8beba4631bc9b90 freecnc-0.2.1.31072003.ebuild 2290
+RMD160 87b9b1593b3cbb07abdeecd9d474a40bcc7fb653 freecnc-0.2.1.31072003.ebuild 2290
+SHA256 c9fb673a8faf6f3ca5b403a5dc8b88ef0612b0c29f6a2f96676a7c4b7ab017f3 freecnc-0.2.1.31072003.ebuild 2290
+MISC ChangeLog 1017 RMD160 80ee94329c748b039ee875fb7f3578f2951cc75b SHA1 4d710f70758ccdf6eb3ce8079eb26034a0d0b9ab SHA256 6f4a764cd7a318b73750f6d40cb1a0a4536fdf4734c3e4569b0028edecb75c75
+MD5 b331004a1a6e8f30c54cc82993f6f380 ChangeLog 1017
+RMD160 80ee94329c748b039ee875fb7f3578f2951cc75b ChangeLog 1017
+SHA256 6f4a764cd7a318b73750f6d40cb1a0a4536fdf4734c3e4569b0028edecb75c75 ChangeLog 1017
+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 7e8e77b1c53ca06cfeeaaf2faefe190d files/digest-freecnc-0.2.0 705
+RMD160 aa9cc33d6babd489de738a9982e3ee92d4373e5c files/digest-freecnc-0.2.0 705
+SHA256 6b984aa823e042fe05effcf449ef71be564fbd28f59885d2400a6766eeb71d31 files/digest-freecnc-0.2.0 705
+MD5 0c0285caf26128f1b2fb8d3adf5812a7 files/digest-freecnc-0.2.1.31072003 732
+RMD160 d52931537e7d6a1eedbb1021a60993c3b415b2ad files/digest-freecnc-0.2.1.31072003 732
+SHA256 4b3c8208e11a10196c1a16c81f493db49aa8739cb9cc10b83227c28b234bf342 files/digest-freecnc-0.2.1.31072003 732
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEd5re2CTtIKiFlQIRAj4LAKCkCiH56NreeuoV/QgWNQeakz/NTwCfbRBI
+7UGagJIq7ZjvGWrMJohcG9k=
+=JQVV
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecnc/files/digest-freecnc-0.2.0 b/games-strategy/freecnc/files/digest-freecnc-0.2.0
index b96e2cca1aa2..536986d688c0 100644
--- a/games-strategy/freecnc/files/digest-freecnc-0.2.0
+++ b/games-strategy/freecnc/files/digest-freecnc-0.2.0
@@ -1,3 +1,9 @@
-MD5 9d43ea387f370b8108e7a870a82017d5 freecnc++-0.2.0-src.tar.bz2 264419
 MD5 7d770d38618e20796fbe642037f08de5 cc1demo1.zip 9367945
+RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 cc1demo1.zip 9367945
+SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87 cc1demo1.zip 9367945
 MD5 bbe489d259c4e6d6cadb4a2544b764aa cc1demo2.zip 17797920
+RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 cc1demo2.zip 17797920
+SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48 cc1demo2.zip 17797920
+MD5 9d43ea387f370b8108e7a870a82017d5 freecnc++-0.2.0-src.tar.bz2 264419
+RMD160 8fa51bd98dce7a57b388ea668528295e2b421bc2 freecnc++-0.2.0-src.tar.bz2 264419
+SHA256 19b2aa3ef040a631a4cc0c8e773252380437c2f961d9a8bf8a6722fdfc08dc49 freecnc++-0.2.0-src.tar.bz2 264419
diff --git a/games-strategy/freecnc/files/digest-freecnc-0.2.1.31072003 b/games-strategy/freecnc/files/digest-freecnc-0.2.1.31072003
index f3b071e5d57b..4e0247680c7d 100644
--- a/games-strategy/freecnc/files/digest-freecnc-0.2.1.31072003
+++ b/games-strategy/freecnc/files/digest-freecnc-0.2.1.31072003
@@ -1,3 +1,9 @@
-MD5 3179192e8e6efc5672b940d1bcda424d freecnc++-0.2.1.31072003-src.tar.bz2 271980
 MD5 7d770d38618e20796fbe642037f08de5 cc1demo1.zip 9367945
+RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 cc1demo1.zip 9367945
+SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87 cc1demo1.zip 9367945
 MD5 bbe489d259c4e6d6cadb4a2544b764aa cc1demo2.zip 17797920
+RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 cc1demo2.zip 17797920
+SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48 cc1demo2.zip 17797920
+MD5 3179192e8e6efc5672b940d1bcda424d freecnc++-0.2.1.31072003-src.tar.bz2 271980
+RMD160 e249a600a54a5a0aa791219360011724b8e273f2 freecnc++-0.2.1.31072003-src.tar.bz2 271980
+SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5 freecnc++-0.2.1.31072003-src.tar.bz2 271980
diff --git a/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc4.patch b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc4.patch
new file mode 100644
index 000000000000..2a37ce0ff0c6
--- /dev/null
+++ b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-gcc4.patch
@@ -0,0 +1,11 @@
+diff -Naur freecnc++.old/src/include/structure.h freecnc++/src/include/structure.h
+--- freecnc++.old/src/include/structure.h	2006-04-02 00:15:35.000000000 -0500
++++ freecnc++/src/include/structure.h	2006-04-02 00:17:01.000000000 -0500
+@@ -160,6 +160,7 @@
+     std::vector<UnitType*> specificTypeAllow;
+ };
+ 
++class BuildingAnimEvent;
+ class BAttackAnimEvent;
+ 
+ class Structure : public UnitOrStructure
diff --git a/games-strategy/freecnc/freecnc-0.2.0.ebuild b/games-strategy/freecnc/freecnc-0.2.0.ebuild
index 761d2a168bdd..4332818a22ee 100644
--- a/games-strategy/freecnc/freecnc-0.2.0.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.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-strategy/freecnc/freecnc-0.2.0.ebuild,v 1.7 2006/01/11 21:34:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.0.ebuild,v 1.8 2006/05/27 00:18:10 tupone Exp $
 
 inherit games flag-o-matic eutils
 
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index a54bd0ca237b..a1e986150263 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.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/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.7 2006/01/11 21:34:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.8 2006/05/27 00:18:10 tupone Exp $
 
 inherit flag-o-matic eutils games
 
@@ -36,7 +36,8 @@ src_unpack() {
 	cd "${S}"
 	epatch ${FILESDIR}/${PV}-makefile-cflags.patch \
 		${FILESDIR}/${PV}-remove-root.patch \
-		${FILESDIR}/${PV}-gentoo-paths.patch
+		${FILESDIR}/${PV}-gentoo-paths.patch \
+		"${FILESDIR}/${P}"-gcc4.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \