gcc-4.2 patch from Debian

(Portage version: 2.1.3_rc6)

3 files changed, 56 insertions, 11 deletions

diff --git a/games-arcade/moagg/ChangeLog b/games-arcade/moagg/ChangeLog
index 5f26a4ed3dc7..f75f61565374 100644
--- a/games-arcade/moagg/ChangeLog
+++ b/games-arcade/moagg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/moagg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/ChangeLog,v 1.15 2007/02/08 20:52:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/ChangeLog,v 1.16 2007/07/02 19:23:28 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/moagg-0.18-gcc42.patch, moagg-0.18.ebuild:
+  gcc-4.2 patch from Debian
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/games-arcade/moagg/files/moagg-0.18-gcc42.patch b/games-arcade/moagg/files/moagg-0.18-gcc42.patch
new file mode 100644
index 000000000000..11b03ace9b20
--- /dev/null
+++ b/games-arcade/moagg/files/moagg-0.18-gcc42.patch
@@ -0,0 +1,41 @@
+diff -ur moagg.old/libMoaggCore/include/Exception.h moagg-0.18/libMoaggCore/include/Exception.h
+--- moagg.old/libMoaggCore/include/Exception.h	2005-04-17 09:40:18.000000000 +0000
++++ moagg-0.18/libMoaggCore/include/Exception.h	2007-05-07 18:14:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef EXCEPTION_H
+ #define EXCEPTION_H
+ 
+-#include <iosfwd>
++#include <iostream>
+ #include <string>
+ 
+ //----------------------------------------------------------------------------
+diff -ur moagg.old/libMoaggCore/include/MathTools.h moagg-0.18/libMoaggCore/include/MathTools.h
+--- moagg.old/libMoaggCore/include/MathTools.h	2005-04-17 09:40:18.000000000 +0000
++++ moagg-0.18/libMoaggCore/include/MathTools.h	2007-05-07 18:24:52.000000000 +0000
+@@ -62,6 +62,8 @@
+         double m_x;
+         double m_y;
+     };
++    Vector operator+(const Vector &v1, const Vector &v2);
++    Vector operator-(const Vector &v1, const Vector &v2);
+ 
+ 
+     //------------------------------------------------------------------------
+diff -ur moagg.old/libMoaggCore/include/Tools.h moagg-0.18/libMoaggCore/include/Tools.h
+--- moagg.old/libMoaggCore/include/Tools.h	2005-04-17 09:40:18.000000000 +0000
++++ moagg-0.18/libMoaggCore/include/Tools.h	2007-05-16 19:08:35.000000000 +0000
+@@ -34,13 +34,8 @@
+ 
+ 
+ //----------------------------------------------------------------------------
+-#if defined __GNUC__ && ! defined __LINT__
+-#define MIN(X, Y) ((X) <? (Y))
+-#define MAX(X, Y) ((X) >? (Y))
+-#else
+ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
+ #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+-#endif //!__GNUC__
+ 
+ //----------------------------------------------------------------------------
+ #define ZAP_POINTER(p) delete p; p = NULL;
diff --git a/games-arcade/moagg/moagg-0.18.ebuild b/games-arcade/moagg/moagg-0.18.ebuild
index b53fe3d5638c..a61bca5e5286 100644
--- a/games-arcade/moagg/moagg-0.18.ebuild
+++ b/games-arcade/moagg/moagg-0.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/moagg-0.18.ebuild,v 1.2 2005/05/06 10:04:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/moagg-0.18.ebuild,v 1.3 2007/07/02 19:23:28 nyhm Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="MOAGG (Mother Of All Gravity Games) combines several different gravity-type games"
 HOMEPAGE="http://moagg.sourceforge.net"
@@ -14,18 +14,18 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2.6
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-gfx-2.0.8
-	>=media-libs/freetype-2.1.4
-	sys-libs/zlib
-	>=dev-libs/expat-1.95.6
+DEPEND="media-libs/libsdl
+	media-libs/sdl-mixer
+	media-libs/sdl-gfx
+	>=media-libs/freetype-2.3
+	dev-libs/expat
 	=media-libs/paragui-1.0*
 	!>=media-libs/paragui-1.1"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc42.patch
 	# We don't want the docs inside ${GAMES_DATADIR}/doc, so we don't
 	# let "make install" do the doc install.
 	sed -i \
@@ -46,7 +46,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO doc/*.tex
 	prepgamesdirs
 }