Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 233 insertions, 5 deletions

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index d7a7f74dcd81..4c93bd967f38 100644
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/exult
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.19 2008/01/29 10:08:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.20 2008/05/01 10:15:43 nyhm Exp $
+
+  01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/exult-1.2-gcc43.patch, exult-1.2.ebuild:
+  Fix building with gcc-4.3
 
   29 Jan 2008; Tristan Heaven <nyhm@gentoo.org> exult-1.2.ebuild:
   Don't specify compression type in doc elog, bug #169772
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 4d7e7c79c22c..d80ea1357011 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exult-1.2-64bits.patch 591 RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 SHA1 1a5d1db8212be32ed20cf0e41edbb137d6ed19ea SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675
 AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04
+AUX exult-1.2-gcc43.patch 3741 RMD160 b513b8e88f476b06aa2ecbbdd40d082996d8eb54 SHA1 e0542298b8136edf1666882804f3eee8bf3f27ff SHA256 4a4f224cd44c3250ac43ffaae1d0fae0a8a8a2d291ddcd9e4a053bceda36bf6a
 AUX exult-1.2-x11link.patch 286 RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b SHA1 bc76419d4a86d88fa3f3f26da29ae0c03ef4757b SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308
 DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503
 DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA1 91250accd89bf931ce5fee6433ae988d55266a2f SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa
 DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a
-EBUILD exult-1.2.ebuild 2460 RMD160 43f9ba961cc9cea28cab301bacb8b17e852de763 SHA1 6fcfa196f486f7989009f9956d4b2843a88b78ee SHA256 7ad854a6c07d70b37c96b9e00bef03b44a71b1639d0d6b618e861e6c8d3d4b71
-MISC ChangeLog 2474 RMD160 4d521c36830eb79b596f7a658f87abc50bb3cdf6 SHA1 c9fea65d0f9076bfcad0e2b1ae7810ede884e57e SHA256 84da8141c6089246e141195fbac1661f78862dc5689ac072a933954e8b14700a
+EBUILD exult-1.2.ebuild 2495 RMD160 1109c46b4ab48dc9dde2e298e57e9a495e08d20e SHA1 02560684e2338fa45e02efbb24b066af2d19952d SHA256 4871263c18e42c7f395f137b0253a663a8008e3c5f3b57694d9fa0174e45b7b5
+MISC ChangeLog 2601 RMD160 36cb541f46ed0e2cfa42e08bcedbef02236501fe SHA1 3e188d1582f8d374b9970632d18aa6021657b3f1 SHA256 79e5bb25269d23bb33f39eb5c2a8a1d8533826fe7719d476b0f88292176c9a8f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZmFYACgkQdz7hIScOURFsLQCfae3e/Kis8DK24XBbjG0M8s/0
+8WwAmwWH0TcPzCofohgUzHIteTeH9qRw
+=iQZt
+-----END PGP SIGNATURE-----
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 4ec632a316cd..3d8c37336e9b 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.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-engines/exult/exult-1.2.ebuild,v 1.12 2008/01/29 10:08:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.13 2008/05/01 10:15:43 nyhm Exp $
 
 inherit eutils autotools games
 
@@ -38,7 +38,8 @@ src_unpack() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-64bits.patch \
-		"${FILESDIR}"/${P}-x11link.patch
+		"${FILESDIR}"/${P}-x11link.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "s/u7siinstrics.data/u7siintrinsics.data/" \
 		usecode/ucxt/data/Makefile.am \
diff --git a/games-engines/exult/files/exult-1.2-gcc43.patch b/games-engines/exult/files/exult-1.2-gcc43.patch
new file mode 100644
index 000000000000..7900b6c50575
--- /dev/null
+++ b/games-engines/exult/files/exult-1.2-gcc43.patch
@@ -0,0 +1,212 @@
+--- actions.cc
++++ actions.cc
+@@ -22,6 +22,8 @@
+ #  include <config.h>
+ #endif
+ 
++#include <cstdlib>
++#include <cstring>
+ #include "gamewin.h"
+ #include "actions.h"
+ #include "actors.h"
+--- args.cc
++++ args.cc
+@@ -24,6 +24,7 @@
+ #  include <iostream>
+ #endif
+ 
++#include <cstdlib>
+ #include "args.h"
+ 
+ #ifndef UNDER_CE
+--- audio/xmidi.cc
++++ audio/xmidi.cc
+@@ -31,6 +31,7 @@
+ #  include <cmath>
+ #endif
+ #include <unistd.h>
++#include <cstdlib>
+ #include "../files/utils.h"
+ #include "xmidi.h"
+ #include "../conf/Configuration.h"
+--- conf/Configuration.cc
++++ conf/Configuration.cc
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <iostream>
+ #include <fstream>
++#include <cstdlib>
+ #ifdef HAVE_SSTREAM
+ #include <sstream>
+ #endif
+--- files/Flex.h
++++ files/Flex.h
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <string>
+ #include <iosfwd>
++#include <cstring>
+ #include "common_types.h"
+ #include "U7file.h"
+ 
+--- files/IFF.h
++++ files/IFF.h
+@@ -21,6 +21,7 @@
+ 
+ #include <vector>
+ #include <string>
++#include <cstring>
+ #include "common_types.h"
+ #include "U7file.h"
+ 
+--- files/listfiles.cc
++++ files/listfiles.cc
+@@ -29,6 +29,7 @@
+ #include <vector>
+ #include <string>
+ #include <iostream>
++#include <cstring>
+ 
+ #ifndef UNDER_CE
+ using std::vector;
+--- files/msgfile.cc
++++ files/msgfile.cc
+@@ -24,6 +24,7 @@
+ 
+ #include <iostream>
+ #include <vector>
++#include <cstdlib>
+ #include "utils.h"
+ 
+ using std::istream;
+--- files/Table.cc
++++ files/Table.cc
+@@ -26,6 +26,7 @@
+ #  include <cstdio>
+ #endif
+ #include <iostream>
++#include <cstdlib>
+ #include "exceptions.h"
+ #include "utils.h"
+ 
+--- files/U7file.cc
++++ files/U7file.cc
+@@ -24,6 +24,7 @@
+ #  include <cstdio>
+ #endif
+ #include <iostream>
++#include <cstdlib>
+ 
+ #include "U7file.h"
+ #include "Flex.h"
+--- hash_utils.h
++++ hash_utils.h
+@@ -19,6 +19,7 @@
+ #ifndef _HASH_UTILS_H_
+ #define _HASH_UTILS_H_
+ 
++#include <cstring>
+ #include "exult_types.h"
+ 
+ #ifdef DONT_HAVE_HASH_MAP
+--- imagewin/ibuf8.cc
++++ imagewin/ibuf8.cc
+@@ -29,6 +29,8 @@
+ #  include <iostream>
+ #endif
+ 
++#include <cstdlib>
++#include <cstring>
+ #include "exult_types.h"
+ #include "utils.h"
+ 
+--- objs/chunkter.cc
++++ objs/chunkter.cc
+@@ -25,6 +25,7 @@
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+ #endif
++#include <cstring>
+ #include "chunkter.h"
+ #include "gamewin.h"
+ #ifdef INCL_OPENGL
+--- party.cc
++++ party.cc
+@@ -26,6 +26,7 @@
+ 
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ #include "party.h"
+ #include "actors.h"
+ #include "gamewin.h"
+--- server/objserial.cc
++++ server/objserial.cc
+@@ -30,6 +30,7 @@
+ #include "objserial.h"
+ #include "servemsg.h"
+ #include <iostream>
++#include <cstring>
+ 
+ using std::cout;
+ using std::endl;
+--- server/server.cc
++++ server/server.cc
+@@ -45,6 +45,7 @@
+ #endif
+ 
+ #include <cstdio>
++#include <cstdlib>
+ 
+ #ifdef _AIX
+ #include <strings.h>
+--- shapes/shapeinf.cc
++++ shapes/shapeinf.cc
+@@ -32,6 +32,7 @@
+ 
+ #include "utils.h"
+ #include <iomanip>	/* Debugging */
++#include <cstring>
+ using std::cout;
+ using std::endl;
+ 
+--- shapes/shapewrite.cc
++++ shapes/shapewrite.cc
+@@ -24,6 +24,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include "shapevga.h"
+ #include "shapeinf.h"
+ #include "monstinf.h"
+--- usecode/ucmachine.cc
++++ usecode/ucmachine.cc
+@@ -23,6 +23,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include "ucmachine.h"
+ #include "keyring.h"
+ #include "conversation.h"
+--- usecode/useval.cc
++++ usecode/useval.cc
+@@ -32,6 +32,7 @@
+   #include <cstdio>
+ #endif
+ 
++#include <cstdlib>
+ #include "useval.h"
+ #include "utils.h"
+ 
+--- usecode/useval.h
++++ usecode/useval.h
+@@ -24,6 +24,7 @@
+ 
+ #include <cassert>
+ #include <iostream>
++#include <cstdlib>
+ 
+ #include <vector>	// STL container
+ #include <deque>	// STL container