Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.

Package-Manager: portage-2.2_pre5

4 files changed, 92 insertions, 6 deletions

diff --git a/games-arcade/moagg/ChangeLog b/games-arcade/moagg/ChangeLog
index f75f61565374..4670d801edad 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.16 2007/07/02 19:23:28 nyhm Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/ChangeLog,v 1.17 2008/05/10 10:57:08 vapier Exp $
+
+  10 May 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/moagg-0.18-gcc43.patch, moagg-0.18.ebuild:
+  Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.
 
   02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/moagg-0.18-gcc42.patch, moagg-0.18.ebuild:
diff --git a/games-arcade/moagg/Manifest b/games-arcade/moagg/Manifest
index d6baf154379a..f70d69cb76e0 100644
--- a/games-arcade/moagg/Manifest
+++ b/games-arcade/moagg/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX moagg-0.18-gcc42.patch 1694 RMD160 68a52b05cb6dd06d1d9209373e8c2ef6286c48f1 SHA1 63542f20441d7eef63f9434eb64e02c5eaa8f8e0 SHA256 6a496bfc563d2e84da4b6faa321dd02fe06c6ba5d710fdc35bf6c6e5b1c10cb2
+AUX moagg-0.18-gcc43.patch 1371 RMD160 c254b5c35b0662bbe67b8996c156b1eda908e045 SHA1 f59a0bea2b7e4af09507fa05e0b9361d8f147b28 SHA256 8415d17eeb2f5e3c5ecc42633d5ca5f4be687dfb165363aae774578183ab7005
 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 1423 RMD160 0744a6a3a71d4a92a908ae876cd7765b86bf004e SHA1 3172e2874002f812ade7eb10ea407bb7154d3578 SHA256 e521b2e258c3db387b460c4546ab18b4512e64c905528bf42d5147592b13fbe1
-MISC ChangeLog 2189 RMD160 482a49bc1bfb3d8eeb65dd236388f7b48e9c0d5f SHA1 351d9586c662b82b794df2442953dae33dec8f07 SHA256 3b0009bf9895b146d42862bfd54de02bc9e1b34bd3dfc315ea877004342f2e4a
+EBUILD moagg-0.18.ebuild 1464 RMD160 c31919cb9da10bd524755d334b2790a4276fa59a SHA1 dde7c9c4fb1d73521cc9633732c294f54587db80 SHA256 d66c53f0252ccc4eddd138fe97e3d29d5075b6977f886ccf06dfacca60bed4f1
+MISC ChangeLog 2370 RMD160 8aaf8dc3cbcd135c9975fdc6964c2efb4d94cd28 SHA1 6c35b29aeb90c2e3fa4c9bbd442d365802caa712 SHA256 428c193e3750d7dc834ed4873dd4b4aa57b537207caf82efa8ee21e0745ac0e1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIJX+Kj9hvisErhMIRArnSAJ9eCPWU28u0taFw0PZ5pvcf5c6R6QCgv/DT
+HeRBVhZD7OAyfpKlMtlbeUc=
+=wpFU
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/moagg/files/moagg-0.18-gcc43.patch b/games-arcade/moagg/files/moagg-0.18-gcc43.patch
new file mode 100644
index 000000000000..3ac983fa3ef2
--- /dev/null
+++ b/games-arcade/moagg/files/moagg-0.18-gcc43.patch
@@ -0,0 +1,70 @@
+http://bugs.gentoo.org/220193
+
+--- libMoaggCore/src/LevelReader.cpp
++++ libMoaggCore/src/LevelReader.cpp
+@@ -1,4 +1,5 @@
+ #include <sstream>
++#include <cstring>
+ 
+ #include "Exception.h"
+ #include "Configuration.h"
+--- libMoaggCore/src/System.cpp
++++ libMoaggCore/src/System.cpp
+@@ -4,6 +4,7 @@
+ #include <cerrno>
+ #include <sstream>
+ #include <list>
++#include <cstring>
+ 
+ #include "Tools.h"
+ #include "SyscallException.h"
+--- libMoaggCore/src/Tools.cpp
++++ libMoaggCore/src/Tools.cpp
+@@ -2,6 +2,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <set>
++#include <cstdlib>
+ 
+ #include "Exception.h"
+ #include "Tools.h"
+--- libMoaggGame/src/Tiles.cpp
++++ libMoaggGame/src/Tiles.cpp
+@@ -2,6 +2,7 @@
+ #include <cassert>
+ #include <sstream>
+ #include <iomanip>
++#include <memory>
+ 
+ 
+ #include "Configuration.h"
+--- testsuite/MyAssertionTraits.h
++++ testsuite/MyAssertionTraits.h
+@@ -2,6 +2,7 @@
+ #define MYASSERTIONTRAITS_H
+ 
+ #include <cppunit/TestAssert.h>
++#include <cstring>
+ 
+ CPPUNIT_NS_BEGIN
+ 
+--- tools/convertmap.cpp
++++ tools/convertmap.cpp
+@@ -3,6 +3,7 @@
+ #include <memory>
+ #include <list>
+ #include <cassert>
++#include <cstdlib>
+ 
+ #include "Matrix.h"
+ #include "File.h"
+--- tools/modifymap.cpp
++++ tools/modifymap.cpp
+@@ -2,6 +2,7 @@
+ #include <iostream>
+ #include <memory>
+ #include <list>
++#include <cstdlib>
+ 
+ #include "Matrix.h"
+ #include "File.h"
diff --git a/games-arcade/moagg/moagg-0.18.ebuild b/games-arcade/moagg/moagg-0.18.ebuild
index a61bca5e5286..1efa9d528471 100644
--- a/games-arcade/moagg/moagg-0.18.ebuild
+++ b/games-arcade/moagg/moagg-0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3 2007/07/02 19:23:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moagg/moagg-0.18.ebuild,v 1.4 2008/05/10 10:57:08 vapier Exp $
 
 inherit eutils games
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc42.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	# We don't want the docs inside ${GAMES_DATADIR}/doc, so we don't
 	# let "make install" do the doc install.
 	sed -i \