gcc-4.2 patch from Debian

Package-Manager: portage-2.1.3_rc6

4 files changed, 72 insertions, 23 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/Manifest b/games-arcade/moagg/Manifest
index b9dffaf2b86c..b9c322d1d06c 100644
--- a/games-arcade/moagg/Manifest
+++ b/games-arcade/moagg/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX moagg-0.18-gcc42.patch 1694 RMD160 68a52b05cb6dd06d1d9209373e8c2ef6286c48f1 SHA1 63542f20441d7eef63f9434eb64e02c5eaa8f8e0 SHA256 6a496bfc563d2e84da4b6faa321dd02fe06c6ba5d710fdc35bf6c6e5b1c10cb2
+MD5 841589ce438331a3435271c58eb90bd2 files/moagg-0.18-gcc42.patch 1694
+RMD160 68a52b05cb6dd06d1d9209373e8c2ef6286c48f1 files/moagg-0.18-gcc42.patch 1694
+SHA256 6a496bfc563d2e84da4b6faa321dd02fe06c6ba5d710fdc35bf6c6e5b1c10cb2 files/moagg-0.18-gcc42.patch 1694
 DIST moagg-0.18-data.tar.bz2 409103 RMD160 85735b132442b4a36b8b9be5d05babe7c4d8eace SHA1 7443d88c14ef9c61178672332c969e3260715624 SHA256 5a3cd09d09e8d0628d3d59a0731fe4bef9adde897d2d95c77662b6212690a5b6
 DIST moagg-0.18-src.tar.bz2 194940 RMD160 4ffd313f49614bb7e4731a0f3e52826b675695dd SHA1 395e85e774ad29ad36f930ba0203ec92255138bc SHA256 22c1165820abf9b03606b6a0c8b4794cee412c36544311cd726148acaad20fc6
-EBUILD moagg-0.18.ebuild 1429 RMD160 f696c6050ef8c6ce20278e439430e5f094268f96 SHA1 02dfa635916860fcb601be3bb624916f56ed570d SHA256 f04ef0cd4c54f12a8e8f3d258b8a4242108a2c3965497eab27f3f6667c172af2
-MD5 fb4c884b46198c42bb01019c06c043bd moagg-0.18.ebuild 1429
-RMD160 f696c6050ef8c6ce20278e439430e5f094268f96 moagg-0.18.ebuild 1429
-SHA256 f04ef0cd4c54f12a8e8f3d258b8a4242108a2c3965497eab27f3f6667c172af2 moagg-0.18.ebuild 1429
-MISC ChangeLog 2064 RMD160 c0a0fcfd25d32eeeffdb54d115113f130e0dd5fb SHA1 0f85ece7d0193d4e7fe96f79235b2f2f317206d7 SHA256 f696b8908a157f674d6b17fe860e1f1b3e4cf64565da6a4074298dafcc772456
-MD5 dec4e5fe41b9cf7ec9e0dadb657ddf0b ChangeLog 2064
-RMD160 c0a0fcfd25d32eeeffdb54d115113f130e0dd5fb ChangeLog 2064
-SHA256 f696b8908a157f674d6b17fe860e1f1b3e4cf64565da6a4074298dafcc772456 ChangeLog 2064
+EBUILD moagg-0.18.ebuild 1423 RMD160 0744a6a3a71d4a92a908ae876cd7765b86bf004e SHA1 3172e2874002f812ade7eb10ea407bb7154d3578 SHA256 e521b2e258c3db387b460c4546ab18b4512e64c905528bf42d5147592b13fbe1
+MD5 971b34acd52148b12ac62249d560f857 moagg-0.18.ebuild 1423
+RMD160 0744a6a3a71d4a92a908ae876cd7765b86bf004e moagg-0.18.ebuild 1423
+SHA256 e521b2e258c3db387b460c4546ab18b4512e64c905528bf42d5147592b13fbe1 moagg-0.18.ebuild 1423
+MISC ChangeLog 2189 RMD160 482a49bc1bfb3d8eeb65dd236388f7b48e9c0d5f SHA1 351d9586c662b82b794df2442953dae33dec8f07 SHA256 3b0009bf9895b146d42862bfd54de02bc9e1b34bd3dfc315ea877004342f2e4a
+MD5 a2753050edbee1ef49229277102cdd23 ChangeLog 2189
+RMD160 482a49bc1bfb3d8eeb65dd236388f7b48e9c0d5f ChangeLog 2189
+SHA256 3b0009bf9895b146d42862bfd54de02bc9e1b34bd3dfc315ea877004342f2e4a ChangeLog 2189
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -19,9 +23,9 @@ MD5 fb616bd2be09edc762f88770dcf02b7a files/digest-moagg-0.18 497
 RMD160 657260de4ba8ab3b81b7943562a439224af10a38 files/digest-moagg-0.18 497
 SHA256 7d4d28c00547f638e49ecc4d01ef24ed34e18040b2a57099f337a057e19c7032 files/digest-moagg-0.18 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFy42mkT4lNIS36YERAheZAKCnzymkXe1oM+OiJ2cSXzQeCzaWjgCdGDL7
-xC8Nulx5ulqKG8Kpa3WUd1o=
-=8OZZ
+iD8DBQFGiVC2dz7hIScOURERAoqgAJ9aBvuok/VjW8uX/rTxu3IBqAFc0QCg3DcR
+4XEMt5mA3FkCvwaqA1aWKuY=
+=Qo/U
 -----END PGP SIGNATURE-----
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
 }