Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 47 insertions, 6 deletions

diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog
index d0fe33be3353..0d0f67ccbed6 100644
--- a/games-strategy/boswars/ChangeLog
+++ b/games-strategy/boswars/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/boswars
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.7 2008/03/02 07:58:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.8 2008/05/01 00:21:34 nyhm Exp $
+
+  01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/boswars-2.5-gcc43.patch, boswars-2.5.ebuild:
+  Fix building with gcc-4.3
 
 *boswars-2.5 (02 Mar 2008)
 
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
index bce348b11e12..0e31af744ac4 100644
--- a/games-strategy/boswars/Manifest
+++ b/games-strategy/boswars/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX boswars-2.4.1-gentoo.patch 1025 RMD160 e1308e93f80eeac323f5dda5c9586abe2db1d088 SHA1 3b9ef3962d2cc37e64bb9f575e99971a2ef036da SHA256 cdd3bc4beaa5060343c7cb7ac5219b5eb6fb9384cf251590d8f2df3cdb840546
+AUX boswars-2.5-gcc43.patch 465 RMD160 01bd439ab17f7402b3cfd62f27a4973d1bf60175 SHA1 69f2bbd7948b4f5630874af75bbaaff060b66d7e SHA256 ad117646bb8ae25ee317948da0e3ba750dcca10f6905e66e8e8c0f6632a955c4
 AUX boswars-2.5-gentoo.patch 1025 RMD160 e1308e93f80eeac323f5dda5c9586abe2db1d088 SHA1 3b9ef3962d2cc37e64bb9f575e99971a2ef036da SHA256 cdd3bc4beaa5060343c7cb7ac5219b5eb6fb9384cf251590d8f2df3cdb840546
 DIST bos.png 620 RMD160 19822ea636b7a7995a348332dffb40e302c61a6e SHA1 e0088d4e3d9b7376563e4bb31dba30e1820dcf66 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a
 DIST boswars-2.4.1-src.tar.gz 48870528 RMD160 198271714b4d899e0f2292c7c34de0054727c2e3 SHA1 12d3658f651c5bd57856ea890b7ee944bae797e6 SHA256 8acd6e1e7553bc61a1685e0e5ea3955130b93f4ed1671027911a953095a87aa0
 DIST boswars-2.5-src.tar.gz 63851225 RMD160 dc42410f3d89c588b579ee7c0d47627c5d455362 SHA1 7305eaea67a0df8dd689df821573dab17e8de01a SHA256 ac5d9c8227fec012087ff617ea62666c7517b7bf2ac4c52be9030bd5ccef7f13
 EBUILD boswars-2.4.1.ebuild 1340 RMD160 79960bba4ca249de2a639c29df899084bc0805be SHA1 5817f20d8c5b177ec451a7926121fc6d02f5a854 SHA256 054eac069f1672a673be647643c1a8e359ebdced5ef078320337b385f9726480
-EBUILD boswars-2.5.ebuild 1342 RMD160 a003f37353cacea730415c3451ff6de54151f5d8 SHA1 5945221460d920dc5abf22c0e96e8c8ba9abca2c SHA256 6216fe65c0f1189caa5219e1c23d2575eceb58a0b39c6aea8921bb735bd94eec
-MISC ChangeLog 1343 RMD160 a34e9986eb87ccae0ded4926e299a53f276ec2e7 SHA1 5d933cf708fc45012389edb1404c3a87ce3325e7 SHA256 ca6811e0becc225d62f8f050f111b20c4f0fa08a1a998521b2a7d1792d8dc6ca
+EBUILD boswars-2.5.ebuild 1491 RMD160 793cc21177e0f1cdbfed6460cc3f13432c47f9bf SHA1 338644e63f801041880b439c61b84f08f9819d6a SHA256 bf414e7e02febba1806ae2b821bfdc5b247e9dc82ca1844f874b409414af972b
+MISC ChangeLog 1469 RMD160 df6c65c470dcfc509380df0b0bbc10f1b00cc300 SHA1 6b32d0ec9bd8ad8ff0f43aacbe6abdc904e3426d SHA256 e0bf63fc6849f9043d28417551a72d65eb932b0e3d1369bbb441829e5647dadd
 MISC metadata.xml 423 RMD160 9d009a8f49f9779eb0e508af34e0cc9e8d08c5f6 SHA1 c45842ff445b38e3085cc00ca266c097ebb1df14 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZDRUACgkQdz7hIScOURHibgCgmViXKgm0a2AvmxWgL6Xp5t/n
+coUAoK/w3sGhvAQ7eMGnyY5ZN/r98/2O
+=HvQS
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/boswars/boswars-2.5.ebuild b/games-strategy/boswars/boswars-2.5.ebuild
index 7c89d58d4c9c..35625404f464 100644
--- a/games-strategy/boswars/boswars-2.5.ebuild
+++ b/games-strategy/boswars/boswars-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v 1.1 2008/03/02 07:58:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v 1.2 2008/05/01 00:21:34 nyhm Exp $
 
 inherit eutils games
 
@@ -31,11 +31,17 @@ src_unpack() {
 	unpack ${A/bos.png}
 	cd "${S}"
 	rm -f doc/{README-SDL.txt,guichan-copyright.txt}
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
 		engine/include/stratagus.h \
-		|| die "sed failed"
+		|| die "sed stratagus.h failed"
+	sed -i \
+		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
+		SConstruct \
+		|| die "sed SConstruct failed"
 }
 
 src_compile() {
diff --git a/games-strategy/boswars/files/boswars-2.5-gcc43.patch b/games-strategy/boswars/files/boswars-2.5-gcc43.patch
new file mode 100644
index 000000000000..783934bba215
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.5-gcc43.patch
@@ -0,0 +1,20 @@
+--- engine/pathfinder/astar.cpp
++++ engine/pathfinder/astar.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include "stratagus.h"
+ #include "pathfinder.h"
++#include <cstdlib>
+ 
+ /*----------------------------------------------------------------------------
+ --  Declarations
+--- engine/stratagus/stratagus.cpp
++++ engine/stratagus/stratagus.cpp
+@@ -160,6 +160,7 @@
+ #include <time.h>
+ #include <ctype.h>
+ #include <sstream>
++#include <algorithm>
+ 
+ #ifndef _MSC_VER
+ #include <unistd.h>