Fixing gcc-3.4 compiling as from bug 119510

Package-Manager: portage-2.1_pre5-r1

5 files changed, 72 insertions, 8 deletions

diff --git a/games-arcade/ssc/ChangeLog b/games-arcade/ssc/ChangeLog
index 1c0c5d4d79b4..007499fe9f9e 100644
--- a/games-arcade/ssc/ChangeLog
+++ b/games-arcade/ssc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/ssc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.4 2004/09/23 08:48:18 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.5 2006/02/28 22:50:28 tupone Exp $
+
+  28 Feb 2006; <Tupone@gentoo.org> +files/ssc-0.8-gcc34.patch,
+  ssc-0.8.ebuild:
+  Fixing gcc-3.4 compilation (Bug #119510)
 
   23 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -ssc-0.7.ebuild:
   clean older version
diff --git a/games-arcade/ssc/Manifest b/games-arcade/ssc/Manifest
index ed4dcc1132e6..a8cbd514e46b 100644
--- a/games-arcade/ssc/Manifest
+++ b/games-arcade/ssc/Manifest
@@ -1,4 +1,15 @@
+MD5 4a9725c405b87244219048a969c53a5e ChangeLog 670
+RMD160 b2694e7a028772c7ea7c96c7e08fc7d878d2b556 ChangeLog 670
+SHA256 490b3a298166f814a3d762a0ecf9b02891662af24e861d05eb4f91154b1d3879 ChangeLog 670
+MD5 e8824bb154b23c2156f30250c3bfd30e files/digest-ssc-0.8 226
+RMD160 9c1b8968813a013d4691fbb789c513621d98c2e0 files/digest-ssc-0.8 226
+SHA256 e41406e90d01eab80c8d1658856150a22a5544ebaa6d293479c68bb7162c8212 files/digest-ssc-0.8 226
+MD5 70c8a2536f9972301c9e1f5ad83e1220 files/ssc-0.8-gcc34.patch 1514
+RMD160 c2b939b3f7dbbd6bb5c378e3da6103740801597b files/ssc-0.8-gcc34.patch 1514
+SHA256 062c262d5aa8579ca7c83c69fb1a8f4baa0f1bf6431860f544a0b736f2202066 files/ssc-0.8-gcc34.patch 1514
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 467b1e58b834207816d317d070d858d5 ssc-0.8.ebuild 1186
-MD5 fce1c342ad142651226f2380bd3ad3d7 ChangeLog 548
-MD5 f9c44f3ae0f37ad3addec99ab96f7508 files/digest-ssc-0.8 60
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 3529a9688a91a8d4ec13f58b08a79902 ssc-0.8.ebuild 1229
+RMD160 9be5108191a594e241e6b9011eeedd32cef6cc9c ssc-0.8.ebuild 1229
+SHA256 8fa69bf8ac369bf99d8673a3de28f27cba284454794a928a2c2cffb2ad975289 ssc-0.8.ebuild 1229
diff --git a/games-arcade/ssc/files/digest-ssc-0.8 b/games-arcade/ssc/files/digest-ssc-0.8
index 2dc1140d3d89..00b33210e6bc 100644
--- a/games-arcade/ssc/files/digest-ssc-0.8
+++ b/games-arcade/ssc/files/digest-ssc-0.8
@@ -1 +1,3 @@
 MD5 d6a5eb545adf9d93663c719ad89f23bf ssc-0.8.tar.bz2 810870
+RMD160 12b9123b747b352dc595f555cf32dda7e1e67fe1 ssc-0.8.tar.bz2 810870
+SHA256 2bd29ce23fce9fe1530d2a6f756fe541aae27ebccb6585fdd2240e5c54eee4c7 ssc-0.8.tar.bz2 810870
diff --git a/games-arcade/ssc/files/ssc-0.8-gcc34.patch b/games-arcade/ssc/files/ssc-0.8-gcc34.patch
new file mode 100644
index 000000000000..6812888b3e53
--- /dev/null
+++ b/games-arcade/ssc/files/ssc-0.8-gcc34.patch
@@ -0,0 +1,46 @@
+--- src/coord.h	2003-09-29 14:06:14.000000000 +0200
++++ ../../../ssc-0.8/work/ssc-0.8/src/coord.h	2006-01-19 01:03:02.000000000 +0100
+@@ -34,7 +34,7 @@
+ 	}
+ 
+ 	// copy constructor
+-	Coord2(Self &other)
++	Coord2(const Self &other)
+ 		: x(other.x), y(other.y)
+ 	{
+ 	}
+--- src/coord.cc	2003-09-28 19:34:11.000000000 +0200
++++ ../../../ssc-0.8/work/ssc-0.8/src/coord.cc	2006-01-19 07:46:47.000000000 +0100
+@@ -1,7 +1,7 @@
+ #include "coord.h"
+ 
+-const Coord2<double> Coord2<double>::zero(0, 0);
+-const Coord3<double> Coord3<double>::zero(0, 0, 0);
+-const Coord3<double> Coord3<double>::up(0, 1, 0);
+-const Coord3<double> Coord3<double>::forward(0, 0, 1);
+-const Coord3<double> Coord3<double>::side(-1, 0, 0);
++template<> const Coord2<double> Coord2<double>::zero(0,0);
++template<> const Coord3<double> Coord3<double>::zero(0, 0, 0);
++template<> const Coord3<double> Coord3<double>::up(0, 1, 0);
++template<> const Coord3<double> Coord3<double>::forward(0, 0, 1);
++template<> const Coord3<double> Coord3<double>::side(-1, 0, 0);
+--- src/font.cc	2003-09-27 17:15:07.000000000 +0200
++++ ../../../ssc-0.8/work/ssc-0.8/src/font.cc	2006-01-19 07:48:20.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <iostream>
+ #include <iomanip>
++#include <math.h>
+ #include "font.h"
+ 
+ namespace OGLFT {
+--- src/model.cc	2006-01-19 08:09:15.000000000 +0100
++++ src/model.cc.new	2006-01-19 08:09:00.000000000 +0100
+@@ -111,7 +111,6 @@
+ 
+ extern void DrawHeading();
+ 
+-inline
+ void Model::draw(double dt, bool doMove)
+ {
+ 	draw::clearScreen();
diff --git a/games-arcade/ssc/ssc-0.8.ebuild b/games-arcade/ssc/ssc-0.8.ebuild
index 2d6f4536781c..2359e0c4225d 100644
--- a/games-arcade/ssc/ssc-0.8.ebuild
+++ b/games-arcade/ssc/ssc-0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.7 2005/08/09 23:07:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.8 2006/02/28 22:50:28 tupone Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="2D Geometric Space Combat"
 HOMEPAGE="http://sscx.sourceforge.net/"
@@ -27,6 +27,7 @@ src_unpack() {
 		-e "s:/usr/local/share/:${GAMES_DATADIR}/:" \
 		src/{asteroid.cc,audio.cc,config.cc,menu.cc} \
 		|| die "sed failed"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
 }
 
 src_install () {