Fix for gcc-4.1

Package-Manager: portage-2.1_pre10-r2

5 files changed, 90 insertions, 9 deletions

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index 56186f46061a..2496254b996d 100644
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/exult
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.13 2005/10/07 03:49:18 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.14 2006/05/05 06:21:55 tupone Exp $
+
+  05 May 2006; <Tupone@gentoo.org> +files/exult-1.2-gcc41.patch,
+  exult-1.2.ebuild:
+  Fix for gcc-4.1
 
   06 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild:
   expand filename before passing to unpack (bug #107532); tidy
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 20606c9fff57..05f318c7c45b 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,4 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 size 1357
+MD5 a7f6894ec9b22dce8d5420cfbea5c32c files/exult-1.2-gcc41.patch 1357
+RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 files/exult-1.2-gcc41.patch 1357
+SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 files/exult-1.2-gcc41.patch 1357
+DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503 size 12614413
+DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa size 11382878
+DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a size 1722259
+EBUILD exult-1.2.ebuild 2613 RMD160 de178139a8161de1288379c02cd23eddf4703f25 SHA1 6657386ee99cdb241250d14ab999fadfffd11f8b SHA256 caf2642d0c7609295c8e7854f0451783212d0fc0d44aa8c3c3e76b89a972bf67 size 2613
+MD5 c577eee26345aab7ab39da4d2e35d5c8 exult-1.2.ebuild 2613
+RMD160 de178139a8161de1288379c02cd23eddf4703f25 exult-1.2.ebuild 2613
+SHA256 caf2642d0c7609295c8e7854f0451783212d0fc0d44aa8c3c3e76b89a972bf67 exult-1.2.ebuild 2613
+MISC ChangeLog 1853 RMD160 2d4d44066fff36a817b63249a9aef2acf81ae130 SHA1 c83e09b219fccfad76cea61041684f142e309d5d SHA256 73a88fdd9bfb07433a5e0129f42db5b3cd749b371a1d67f230b3e899c1b383c3 size 1853
+MD5 0a85247eae33778a4237d2ed699b6ceb ChangeLog 1853
+RMD160 2d4d44066fff36a817b63249a9aef2acf81ae130 ChangeLog 1853
+SHA256 73a88fdd9bfb07433a5e0129f42db5b3cd749b371a1d67f230b3e899c1b383c3 ChangeLog 1853
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 f57e6d96772375d1636621b8505cfbc8 ChangeLog 1752
-MD5 3272a723ea396097f3a9e0cbb64d1ed7 exult-1.2.ebuild 2570
-MD5 b1ba6382930a1604b072fe00fad87c3a files/digest-exult-1.2 194
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 a1e63bc6fa75e2cc687adf8fed610dd1 files/digest-exult-1.2 720
+RMD160 3d319c0f344c19b27036ac76175c7bde5895ab14 files/digest-exult-1.2 720
+SHA256 dbcafca8691e0a531c3216a814b0843a539a071032e7c5533ec7049e5bfab400 files/digest-exult-1.2 720
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEWu8S2CTtIKiFlQIRAhZgAJ9hByfaYQcoYdPvpJp0LEZjtzrJqQCbBCRT
+pSsMerQQNAHQxiCGH7P4hzU=
+=mI+R
+-----END PGP SIGNATURE-----
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 7c3a83cb651a..4b8b25741970 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.5 2005/10/07 03:49:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.6 2006/05/05 06:21:55 tupone Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems"
 HOMEPAGE="http://exult.sourceforge.net/"
@@ -35,6 +35,7 @@ src_unpack() {
 	cd music/
 	unpack U7MusicOGG_{1,2}of2.zip
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s/u7siinstrics.data/u7siintrinsics.data/" \
 		usecode/ucxt/data/Makefile.in \
diff --git a/games-engines/exult/files/digest-exult-1.2 b/games-engines/exult/files/digest-exult-1.2
index 2a7b44e22def..d1994a018e4c 100644
--- a/games-engines/exult/files/digest-exult-1.2
+++ b/games-engines/exult/files/digest-exult-1.2
@@ -1,3 +1,9 @@
-MD5 0fc88dee74a91724d25373ba0a8670ba exult-1.2.tar.gz 1722259
 MD5 7746d1a9164fd67509107797496553bf U7MusicOGG_1of2.zip 12614413
+RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 U7MusicOGG_1of2.zip 12614413
+SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503 U7MusicOGG_1of2.zip 12614413
 MD5 cdae5956d7c52f35e90317913a660123 U7MusicOGG_2of2.zip 11382878
+RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 U7MusicOGG_2of2.zip 11382878
+SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa U7MusicOGG_2of2.zip 11382878
+MD5 0fc88dee74a91724d25373ba0a8670ba exult-1.2.tar.gz 1722259
+RMD160 339231edf84507f05115ab3189875cb15be9c04f exult-1.2.tar.gz 1722259
+SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a exult-1.2.tar.gz 1722259
diff --git a/games-engines/exult/files/exult-1.2-gcc41.patch b/games-engines/exult/files/exult-1.2-gcc41.patch
new file mode 100644
index 000000000000..045fd83405d5
--- /dev/null
+++ b/games-engines/exult/files/exult-1.2-gcc41.patch
@@ -0,0 +1,42 @@
+--- hash_utils.h.old	2006-05-04 20:47:24.000000000 +0200
++++ hash_utils.h	2006-05-04 20:58:58.000000000 +0200
+@@ -26,7 +26,7 @@
+ #else
+ #if HAVE_EXT_HASH_MAP
+ #  include <ext/hash_map>
+-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
++#  if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4)
+ using __gnu_cxx::hash_map;
+ #  else
+ using std::hash_map;
+@@ -44,7 +44,7 @@
+ #else
+ #if HAVE_EXT_HASH_SET
+ #  include <ext/hash_set>
+-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
++#  if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4)
+ using __gnu_cxx::hash_set;
+ #  else
+ using std::hash_set;
+--- mouse.h.old	2006-05-04 21:02:49.000000000 +0200
++++ mouse.h	2006-05-04 21:03:37.000000000 +0200
+@@ -27,6 +27,8 @@
+ #include "vgafile.h"
+ #include "glshape.h"
+ 
++class Game_window;
++
+ /*
+  *	Handle custom mouse pointers.
+  */
+--- audio/midi_drivers/fmopldrv.h.old	2006-05-04 21:05:16.000000000 +0200
++++ audio/midi_drivers/fmopldrv.h	2006-05-04 21:05:29.000000000 +0200
+@@ -76,7 +76,7 @@
+ 	/* output a packed midi command to the midi stream
+ 	 * valid only if mode is MO_SIMPLE
+ 	 */
+-	void OplDriver::send(uint32 b);
++	void send(uint32 b);
+ 
+ 	/* retrieve a string representation of an error code */
+ 	static const char *get_error_name(int error_code);