Fixes for GCC 3.4 and marked ~ppc.

4 files changed, 48 insertions, 6 deletions

diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog
index cfc3506ad2f3..8f268015c4e2 100644
--- a/games-arcade/criticalmass/ChangeLog
+++ b/games-arcade/criticalmass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/criticalmass
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.5 2004/06/24 22:03:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.6 2004/11/01 11:29:12 josejx Exp $
+
+  01 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  +files/criticalmass-0.99-gcc-3.4.patch, criticalmass-0.99.ebuild:
+  Fixes for GCC 3.4 and marked ~ppc.
 
   11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   criticalmass-0.99.ebuild:
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index 55009e2ffafa..08e335306765 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,6 +1,7 @@
-MD5 5348a50336b7f7f20c39325c4487fb12 criticalmass-0.98.ebuild 822
 MD5 0c6d7b6eb2213e3497f2ae161adb2b59 ChangeLog 1706
+MD5 5348a50336b7f7f20c39325c4487fb12 criticalmass-0.98.ebuild 822
+MD5 085aa391e5edf91808ae655193506530 criticalmass-0.99.ebuild 959
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 dc11531ee6a1cb2dcd50f5dd96fc1acc criticalmass-0.99.ebuild 868
 MD5 a9498b82d4646691dcd2ae5ba9d3b641 files/digest-criticalmass-0.98 71
 MD5 7b673c7461c2779b5765b31f5b59b95a files/digest-criticalmass-0.99 71
+MD5 1cb0ec57529ae482f1634cbf00f7e40c files/criticalmass-0.99-gcc-3.4.patch 821
diff --git a/games-arcade/criticalmass/criticalmass-0.99.ebuild b/games-arcade/criticalmass/criticalmass-0.99.ebuild
index 2c8e50d8f2f1..3496642a386f 100644
--- a/games-arcade/criticalmass/criticalmass-0.99.ebuild
+++ b/games-arcade/criticalmass/criticalmass-0.99.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-0.99.ebuild,v 1.4 2004/06/24 22:03:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-0.99.ebuild,v 1.5 2004/11/01 11:29:12 josejx Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="SDL/OpenGL space shoot'em up game"
 HOMEPAGE="http://criticalmass.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer
@@ -19,6 +19,12 @@ DEPEND="media-libs/sdl-mixer
 
 S=${WORKDIR}/CriticalMass-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc-3.4.patch
+}
+
 src_compile() {
 	egamesconf || die
 	sed -i \
diff --git a/games-arcade/criticalmass/files/criticalmass-0.99-gcc-3.4.patch b/games-arcade/criticalmass/files/criticalmass-0.99-gcc-3.4.patch
new file mode 100644
index 000000000000..196e9dcf818b
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-0.99-gcc-3.4.patch
@@ -0,0 +1,31 @@
+--- game/Input.hpp.old	2004-11-01 11:13:11.232726960 +0000
++++ game/Input.hpp	2004-11-01 11:13:24.057777256 +0000
+@@ -28,7 +28,7 @@
+ 
+ namespace HASH_NAMESPACE
+ {
+-    struct hash<Trigger>
++    template <> struct hash<Trigger>
+     {
+ 	//a simple hash function for Trigger
+ 	int operator()(const Trigger &t) const
+--- utils/HashString.hpp.old	2004-11-01 11:06:50.815559160 +0000
++++ utils/HashString.hpp	2004-11-01 11:07:13.640089304 +0000
+@@ -21,7 +21,7 @@
+ 
+ namespace HASH_NAMESPACE
+ {
+-    struct hash<const string>
++    template <> struct hash<const string>
+     {
+ 	//a simple hash function for string
+ 	int operator()(const string & s) const
+@@ -32,7 +32,7 @@
+ 	}
+     };
+ 
+-    struct hash<string>
++    template <> struct hash<string>
+     {
+ 	//a simple hash function for string
+ 	int operator()(string s) const