add patch from Marien Zwart for current gcc __FUNCTION__ handling (bug #106258)

Package-Manager: portage-2.0.51.22-r3

4 files changed, 36 insertions, 4 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index d569032310a3..a5066298116c 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.13 2005/10/06 15:28:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.14 2005/10/11 06:55:47 mr_bones_ Exp $
+
+  11 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.2_beta5-gcc4.patch, lgeneral-1.2_beta5.ebuild:
+  add patch from Marien Zwart for current gcc __FUNCTION__ handling (bug
+  #106258)
 
 *lgeneral-1.2_beta5 (06 Oct 2005)
 
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 39aafd413477..1b81c6d2e855 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,8 +1,9 @@
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
-MD5 3cd43be66c2e33e554fe9e78f4342e65 lgeneral-1.2_beta5.ebuild 1601
+MD5 55332d6f35da9d70285b06eab8ef512d lgeneral-1.2_beta5.ebuild 1651
 MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113
-MD5 987d8ca8fbb8e5548823638c4204bdfb ChangeLog 2878
+MD5 3c00b7bf7d280e0857bd222b0c06bad3 ChangeLog 3076
+MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta5-gcc4.patch 841
 MD5 77fda12a372abfd55040151b84dd2d7b files/1.1.1-netbsd-audio.patch 813
 MD5 75e452fcd09e7f2a437b74ab63f8b175 files/digest-lgeneral-1.2_beta5 130
 MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
diff --git a/games-strategy/lgeneral/files/1.2_beta5-gcc4.patch b/games-strategy/lgeneral/files/1.2_beta5-gcc4.patch
new file mode 100644
index 000000000000..226cfa34d8de
--- /dev/null
+++ b/games-strategy/lgeneral/files/1.2_beta5-gcc4.patch
@@ -0,0 +1,24 @@
+diff -ur lgeneral-orig/src/ai.c lgeneral-1.2beta-5/src/ai.c
+--- lgeneral-orig/src/ai.c	2005-10-07 16:58:21.000000000 +0200
++++ lgeneral-1.2beta-5/src/ai.c	2005-10-07 16:58:48.000000000 +0200
+@@ -508,7 +508,7 @@
+ */
+ void ai_finalize( void )
+ {
+-printf(__FUNCTION__ "\n");
++printf("%s\n", __FUNCTION__);
+     if ( finalized )
+         return;
+ printf("Really finalized\n");
+diff -ur lgeneral-orig/src/ai_group.c lgeneral-1.2beta-5/src/ai_group.c
+--- lgeneral-orig/src/ai_group.c	2005-10-07 16:58:21.000000000 +0200
++++ lgeneral-1.2beta-5/src/ai_group.c	2005-10-07 16:59:18.000000000 +0200
+@@ -560,7 +560,7 @@
+         }
+     }
+     if ( unit == 0 ) {
+-        printf("ERROR: " __FUNCTION__ ": null unit detected\n");
++        printf("ERROR: %s: null unit detected\n", __FUNCTION__);
+ 	return 0;
+     }
+     if ( group->state == GS_ART_FIRE )
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild
index d8902181ac09..34766cff0e55 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild,v 1.1 2005/10/06 15:28:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta5.ebuild,v 1.2 2005/10/11 06:55:48 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -24,6 +24,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-gcc4.patch
 	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
 	cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
 }