Fix by ph for build error with gcc-3.x #109476 by Mike Bonar.

Package-Manager: portage-2.0.53_rc5

4 files changed, 44 insertions, 14 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 46aadd9e41e5..7432c982e7da 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2005/10/15 04:04:19 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.16 2005/10/16 21:54:47 vapier Exp $
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/lgeneral-1.2_beta6-gcc3.patch, lgeneral-1.2_beta6.ebuild:
+  Fix by ph for build error with gcc-3.x #109476 by Mike Bonar.
 
 *lgeneral-1.2_beta6 (15 Oct 2005)
 
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 86203009cc0e..f3b7f769e7cf 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,13 +1,24 @@
-MD5 ff6bfa6397434f0f15450b0bec5a338b lgeneral-1.2_beta6.ebuild 1652
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
-MD5 55332d6f35da9d70285b06eab8ef512d lgeneral-1.2_beta5.ebuild 1651
-MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113
-MD5 d7f706cc8b01765e821b06ac117fa09c ChangeLog 3241
-MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta5-gcc4.patch 841
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8c08847e9125f8ab8af6d57c3596a3e4 ChangeLog 3420
 MD5 77fda12a372abfd55040151b84dd2d7b files/1.1.1-netbsd-audio.patch 813
+MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta5-gcc4.patch 841
+MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta6-gcc4.patch 841
+MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138
+MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
 MD5 75e452fcd09e7f2a437b74ab63f8b175 files/digest-lgeneral-1.2_beta5 130
 MD5 80df20a9e5cbef4c8d3d6cf6b5adc9a8 files/digest-lgeneral-1.2_beta6 130
-MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
-MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138
-MD5 2ed49392adca7517991f0115bf18bc5f files/1.2_beta6-gcc4.patch 841
+MD5 5646809f30092dbfd35378661d2c0554 files/lgeneral-1.2_beta6-gcc3.patch 421
+MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113
+MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
+MD5 55332d6f35da9d70285b06eab8ef512d lgeneral-1.2_beta5.ebuild 1651
+MD5 644dc305c000f4c42337ac9dba8a43f4 lgeneral-1.2_beta6.ebuild 1694
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUsywgIKl8Uu19MoRAipoAJ0UzQyeG11wPVEMPl2ZabseQ9v8KACfWFKl
+07bnLYHKfigxYygSQuSTFNY=
+=DUH6
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta6-gcc3.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta6-gcc3.patch
new file mode 100644
index 000000000000..8106249dce51
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta6-gcc3.patch
@@ -0,0 +1,14 @@
+Patch by Mike Bonar to fix building with newer gcc versions
+
+http://bugs.gentoo.org/109476
+
+--- src/main.c
++++ src/main.c
+@@ -136,7 +136,6 @@
+         case 'h':
+             if (ctlspec[1] == 0 || strcasecmp(ctlspec, "human") == 0) ctl = PLAYER_CTRL_HUMAN;
+             break;
+-        default:
+     }
+     if (ctl != PLAYER_CTRL_CPU && ctl != PLAYER_CTRL_HUMAN)
+         abortf("Invalid player control: %s\n", ctlspec);
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild
index 6aac19fc1095..4c8600c6be7f 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta6.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_beta6.ebuild,v 1.1 2005/10/15 04:04:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta6.ebuild,v 1.2 2005/10/16 21:54:47 vapier Exp $
 
 inherit eutils games
 
@@ -25,7 +25,8 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#epatch "${FILESDIR}"/${PV}-gcc4.patch
+	epatch "${FILESDIR}"/${PV}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-gcc3.patch #109476
 	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
 	cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
 }