Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 105 insertions, 7 deletions

diff --git a/games-puzzle/amoebax/ChangeLog b/games-puzzle/amoebax/ChangeLog
index b98808a1ccb0..9b790e3cdd4e 100644
--- a/games-puzzle/amoebax/ChangeLog
+++ b/games-puzzle/amoebax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/amoebax
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.2 2007/08/19 17:13:36 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.3 2008/05/04 20:53:49 nyhm Exp $
+
+  04 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/amoebax-0.2.0-gcc43.patch, amoebax-0.2.0.ebuild:
+  Fix building with gcc-4.3
 
   19 Aug 2007; Christoph Mende <angelos@gentoo.org> amoebax-0.2.0.ebuild:
   Added ~amd64
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index 9cafeb8cd926..e82c547272fe 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX amoebax-0.2.0-gcc43.patch 1765 RMD160 a5521f0e29e2e7781704ca4e3ba4abf20f44f5ba SHA1 178091ea8dc0a6ca4a1150054b10ebb151d8ab04 SHA256 86d0644119cbdad92a28667d945e7da0b7789566077a1a8947e343c8e0c256d5
 DIST amoebax-0.2.0.tar.bz2 10565913 RMD160 f602d4ddef217b9759c4ed16604b19edb04106d1 SHA1 84f45f0363782c4ea7040315cbd0a43f143a5b8a SHA256 77c9da7b424432c55d76a74b62bf01ccba3120200bb89fd5815993c001c7eaae
-EBUILD amoebax-0.2.0.ebuild 1005 RMD160 ddec7728a7439e49929ee06063b6abb9f895b8aa SHA1 3cc877684d0757277f6292e7b10583052548a033 SHA256 993a3cc944c0e24d9771cf267e4a3037085f698f3ce2430f1cad4f7f23be94b1
-MISC ChangeLog 447 RMD160 05154f7534ef083e466a9e5fd9fd2477282d48b4 SHA1 c5a932fdfb64e1a8eb515ded932bd5bbe30b6512 SHA256 32642fe2b381fe774859dadf8c7da507fed1a8baae6dee726ad8c55404b20f83
+EBUILD amoebax-0.2.0.ebuild 1048 RMD160 569dcd061470c0e30b0913bfe4a13ace455a537c SHA1 eee684a3913ac58477f95dc4cacc17d78c829821 SHA256 879aad367630b984ebe75800a87a639e1eabe700f3e9b8997ac0141d7a80201e
+MISC ChangeLog 579 RMD160 45c40094cf68984ecfc2edcc2a70757f9aac0943 SHA1 38287683290581e5932833e5e75d8a6840089cba SHA256 8097500d78ed95c44c871dd00ca992099eebb0a3d7584594715b3a9ebfc1c04c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgeImQACgkQdz7hIScOURFQmQCdF0tFI+s6D5I030HMAO52Dcgb
+3EUAn3jfW+6O5rVR5Gl/TfbXM1qsjeVZ
+=NDMc
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/amoebax/amoebax-0.2.0.ebuild b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
index d240d7a8192b..6a00609315e9 100644
--- a/games-puzzle/amoebax/amoebax-0.2.0.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.2 2007/08/19 17:13:36 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.3 2008/05/04 20:53:49 nyhm Exp $
 
-inherit autotools games
+inherit autotools eutils games
 
 DESCRIPTION="a cute and addictive action-puzzle game, similar to tetris"
 HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
@@ -20,6 +20,7 @@ DEPEND="media-libs/libsdl
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "/^SUBDIRS/s:doc ::" \
 		Makefile.am \
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch
new file mode 100644
index 000000000000..2ee119d5c6c0
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.0-gcc43.patch
@@ -0,0 +1,82 @@
+--- src/ControlSetupState.cxx
++++ src/ControlSetupState.cxx
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #endif // !HAVE_CONFIG_H
+ #include <sstream>
++#include <cstdlib>
+ #include "ControlSetupState.h"
+ #include "File.h"
+ #include "Joystick.h"
+--- src/Font.cxx
++++ src/Font.cxx
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #endif // HAVE_CONFIG_H
+ #include <numeric>
++#include <algorithm>
+ #include <SDL.h>
+ #include "Font.h"
+ 
+--- src/Joystick.cxx
++++ src/Joystick.cxx
+@@ -19,6 +19,7 @@
+ #if defined (HAVE_CONFIG_H)
+ #include <config.h>
+ #endif // !HAVE_CONFIG_H
++#include <cstdlib>
+ #include "Joystick.h"
+ 
+ using namespace Amoebax;
+--- src/MainMenuState.cxx
++++ src/MainMenuState.cxx
+@@ -19,6 +19,7 @@
+ #if defined (HAVE_CONFIG_H)
+ #include <config.h>
+ #endif // HAVE_CONFIG_H
++#include <algorithm>
+ #include <SDL.h>
+ #include "AdvancedAIPlayer.h"
+ #include "AnticipatoryAIPlayer.h"
+--- src/OptionsMenuState.cxx
++++ src/OptionsMenuState.cxx
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #endif // HAVE_CONFIG_H
+ #include <SDL.h>
++#include <algorithm>
+ #include <sstream>
+ #include "ControlSetupState.h"
+ #include "File.h"
+--- src/Sound.h
++++ src/Sound.h
+@@ -19,6 +19,7 @@
+ #if !defined (AMOEBAX_SOUND_H)
+ #define AMOEBAX_SOUND_H
+ 
++#include <string>
+ #include <SDL_mixer.h>
+ 
+ namespace Amoebax
+--- src/System.cxx
++++ src/System.cxx
+@@ -19,7 +19,8 @@
+ #if defined (HAVE_CONFIG_H)
+ #include <config.h>
+ #endif // HAVE_CONFIG_H
+-#include <assert.h>
++#include <algorithm>
++#include <cassert>
+ #include <cstdlib>
+ #include <iostream>
+ #include <limits>
+--- src/TwoPlayersState.cxx
++++ src/TwoPlayersState.cxx
+@@ -19,6 +19,7 @@
+ #if defined (HAVE_CONFIG_H)
+ #include <config.h>
+ #endif // HAVE_CONFIG_H
++#include <algorithm>
+ #include <cassert>
+ #include <SDL.h>
+ #include <sstream>