Fix compiling with gcc-4.1 Not able to play it, thought

Package-Manager: portage-2.1_rc1-r2

5 files changed, 49 insertions, 12 deletions

diff --git a/games-puzzle/shaaft/ChangeLog b/games-puzzle/shaaft/ChangeLog
index 35265620330c..0fe2afb985b2 100644
--- a/games-puzzle/shaaft/ChangeLog
+++ b/games-puzzle/shaaft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/shaaft
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.5 2006/03/14 22:19:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.6 2006/05/21 12:00:22 tupone Exp $
+
+  21 May 2006; <Tupone@gentoo.org> +files/shaaft-0.5.0-gcc41.patch,
+  shaaft-0.5.0.ebuild:
+  Fix compiling with gcc-4.1
 
   14 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> shaaft-0.5.0.ebuild:
   X is implicit
diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest
index b44d30acf5f2..bffb0987c0a4 100644
--- a/games-puzzle/shaaft/Manifest
+++ b/games-puzzle/shaaft/Manifest
@@ -1,15 +1,34 @@
-MD5 41b17003173fe20cd134612ada006af1 ChangeLog 762
-RMD160 e3a9bc3ae566bb802324321e1f8968282257d8e6 ChangeLog 762
-SHA256 200a43470109c323106a10294f60f24a1a525e07aebc7b8e4c5c532c568fa13f ChangeLog 762
-MD5 3b94f9a4427c26cf66ebcff72c849efc files/digest-shaaft-0.5.0 65
-RMD160 b5544e06e9b36f828e57bbcccc438fcae17d765c files/digest-shaaft-0.5.0 65
-SHA256 aef08ce4f29d07587c4068e2bf4047395fe6a0423f61f8779f11419f29a4b69f files/digest-shaaft-0.5.0 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX shaaft-0.5.0-gcc34.patch 544 RMD160 d54ef48c0557ce2dc0774f2897b7796989e97b53 SHA1 ec7ee84e40543bb7f65cc22b6cebdcf93bf91e2a SHA256 0eecaba26e1d7e8d43a4a7c556e9624e910d8e1c292228755cf4f4670cb3a052 size 544
 MD5 ee787c086ea75ca819d582f8be04f0bf files/shaaft-0.5.0-gcc34.patch 544
 RMD160 d54ef48c0557ce2dc0774f2897b7796989e97b53 files/shaaft-0.5.0-gcc34.patch 544
 SHA256 0eecaba26e1d7e8d43a4a7c556e9624e910d8e1c292228755cf4f4670cb3a052 files/shaaft-0.5.0-gcc34.patch 544
+AUX shaaft-0.5.0-gcc41.patch 277 RMD160 666f376a8313f0df536f326f94552e3c6a15d307 SHA1 ac240b39a9f718cfe0038404782eea7fec62c373 SHA256 15c5a0b6a48e44c2b42dbb7a37ea348f12fc4ebcb4b9866594f39283ccbf9dd1 size 277
+MD5 f1e39de5c89bf0b96f0330f6bb1e5ced files/shaaft-0.5.0-gcc41.patch 277
+RMD160 666f376a8313f0df536f326f94552e3c6a15d307 files/shaaft-0.5.0-gcc41.patch 277
+SHA256 15c5a0b6a48e44c2b42dbb7a37ea348f12fc4ebcb4b9866594f39283ccbf9dd1 files/shaaft-0.5.0-gcc41.patch 277
+DIST Shaaft-0.5.0.tar.bz2 512996 RMD160 88441778220be57923aa6ca50de0d08a365ee9fc SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 size 512996
+EBUILD shaaft-0.5.0.ebuild 973 RMD160 dc2998a189517d2a4074464495c081c7590c171d SHA1 7e4d7fe7dd93bf18ba0a36bb3a276704bf5bf445 SHA256 f2228a18bcdf738bb6662fd24363fedb52c574e005dc6cfadf6578079daa61bc size 973
+MD5 25d2360a43cd9f6609c60e47a39deccd shaaft-0.5.0.ebuild 973
+RMD160 dc2998a189517d2a4074464495c081c7590c171d shaaft-0.5.0.ebuild 973
+SHA256 f2228a18bcdf738bb6662fd24363fedb52c574e005dc6cfadf6578079daa61bc shaaft-0.5.0.ebuild 973
+MISC ChangeLog 880 RMD160 4a671236208fe91aa1b3c1b1dfa48eddbc2b3182 SHA1 911e8173b00f135e5ba0be682ca4231a26444763 SHA256 5f2f45e1d1c825969d7fd5795197d637b82aa668a0b7713e5407281b8283678d size 880
+MD5 966dfff0e4aad7b9e80881be42797989 ChangeLog 880
+RMD160 4a671236208fe91aa1b3c1b1dfa48eddbc2b3182 ChangeLog 880
+SHA256 5f2f45e1d1c825969d7fd5795197d637b82aa668a0b7713e5407281b8283678d ChangeLog 880
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 44d89c4b4cfe1e033dd90445f03956e7 shaaft-0.5.0.ebuild 941
-RMD160 a7bcb926cf2bd5e211d89d0d2fe4def9712adffb shaaft-0.5.0.ebuild 941
-SHA256 046da3644cfc80a16fadbc3029548a6eb2ce4c708036ceca7369bf26eba7a8b5 shaaft-0.5.0.ebuild 941
+MD5 9127bf1c1fad5d81ba1f90b2a2075520 files/digest-shaaft-0.5.0 241
+RMD160 a9e303c9ee1314fc6e7a53b34ec16c1e3f42ad81 files/digest-shaaft-0.5.0 241
+SHA256 c7f35cc029506493bee5d500616f556bde2dad2a969c81b1d06f2bcfcde778e1 files/digest-shaaft-0.5.0 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEcFZo2CTtIKiFlQIRAjocAKCe+tIbOZSX9sVvb3k6GN3yE8hfMwCdFgM1
+ekBpeRvRYYjg1IpoILaZ/QE=
+=QjA0
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/shaaft/files/digest-shaaft-0.5.0 b/games-puzzle/shaaft/files/digest-shaaft-0.5.0
index 6644c2b306bb..db0d17ce682d 100644
--- a/games-puzzle/shaaft/files/digest-shaaft-0.5.0
+++ b/games-puzzle/shaaft/files/digest-shaaft-0.5.0
@@ -1 +1,3 @@
 MD5 c86524f286c60e3fd45b10d023a92db2 Shaaft-0.5.0.tar.bz2 512996
+RMD160 88441778220be57923aa6ca50de0d08a365ee9fc Shaaft-0.5.0.tar.bz2 512996
+SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 Shaaft-0.5.0.tar.bz2 512996
diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
new file mode 100644
index 000000000000..73310a138273
--- /dev/null
+++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- utils/hashMap.hpp.old	2006-05-21 13:46:38.000000000 +0200
++++ utils/hashMap.hpp	2006-05-21 13:47:22.000000000 +0200
+@@ -14,7 +14,7 @@
+ //
+ #if defined( __GNUC__ )
+ 
+-#  if (__GNUC__ == 3)
++#  if (__GNUC__ >= 3)
+ #    include <ext/hash_map>
+ 
+ #    if (__GNUC_MINOR__ == 0)
diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
index 6d61090f5354..6709195fb577 100644
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.8 2006/03/14 22:19:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.9 2006/05/21 12:00:22 tupone Exp $
 
 inherit eutils games
 
@@ -31,7 +31,8 @@ src_unpack() {
 		game/main.cpp \
 		|| die "sed main.cpp failed"
 
-	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-gcc34.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_install() {