Fix for gcc-4, bug #128476

(Portage version: 2.1_rc2-r3)

6 files changed, 37 insertions, 9 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/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}/:" \