Build with gcc-4.6 Bug #364805

Fix parallel make

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 69 insertions, 8 deletions

diff --git a/games-arcade/emilia-pinball/ChangeLog b/games-arcade/emilia-pinball/ChangeLog
index 3b89c69d8c21..b299b98492cc 100644
--- a/games-arcade/emilia-pinball/ChangeLog
+++ b/games-arcade/emilia-pinball/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/emilia-pinball
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.22 2010/09/25 12:03:06 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.23 2011/04/26 08:57:17 tupone Exp $
+
+  26 Apr 2011; Tupone Alfredo <tupone@gentoo.org>
+  emilia-pinball-0.3.1-r1.ebuild, +files/emilia-pinball-0.3.1-gcc46.patch,
+  +files/emilia-pinball-0.3.1-parallel.patch:
+  Build with gcc-4.6 Bug #364805 by Diego Elio Pettenò
+  Fix parallel make
 
   25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   emilia-pinball-0.3.1-r1.ebuild:
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index 9408e0c3b967..61fd86287ebd 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX emilia-pinball-0.3.1-gcc46.patch 887 RMD160 50d9d1884aed9fcc068f83e65574c242da23f2b2 SHA1 2ca134f0031899bb91a9c91b729dcbe651ed2e99 SHA256 c2dd6f7ded0b113e2e6df9ab6ca7b2d0795e8b0f8228c03998b500430e8afdc9
 AUX emilia-pinball-0.3.1-glibc210.patch 379 RMD160 af16d019329c553a9d22cc5dbfdbf7907d5f03b2 SHA1 70e79bb369138d132ce93edd839c373301621e1e SHA256 7947e7c4327b339185da9d87c83fdf9c03d43d6dcb678b93d67b36de116f94da
 AUX emilia-pinball-0.3.1-libtool.patch 2371 RMD160 0ff67e10b1c120106452e8c2323cd8ebf243de86 SHA1 2641f91e8df2fd8cad0775535c37a198ad49edaf SHA256 05a344ecb84435c60286628dcf447e893138e63723f839160eb980bfe8d1ae34
+AUX emilia-pinball-0.3.1-parallel.patch 428 RMD160 8b0f8c6a1e13368181504a99116522e95ccc28c8 SHA1 442538bc5faa036fc8c9f0451f630284e1432cc2 SHA256 34a7214241c6a52ebdd9ea343887f6d46d0693b0ef9ec559e0dbe1c093eb2be0
 DIST pinball-0.3.1.tar.gz 6082982 RMD160 ba85469c9f53f7a0a46ab26aa4e45666b2dca806 SHA1 7daf63a7b7e586ede2a6ffae3e53abd0e23fff22 SHA256 ba47989f7fb6e294faa95285563220c8b01c3dbb9aa1bc29828eb7e832855cb8
-EBUILD emilia-pinball-0.3.1-r1.ebuild 1639 RMD160 c13943ec336ab0ec03522f5b79daa7458673d576 SHA1 119ee28d4457e4fa1f588c4fe16b84b0a4e40359 SHA256 29261cd602e1c5352045af6d25f612ede16ca5d4a7cdabff95fa3bb97e16e0da
-MISC ChangeLog 3450 RMD160 4d5aa90b8f94e7c3915688166efb259456543dff SHA1 5983c79e9dd5f4862986d3dbb92db29fe1108e66 SHA256 300013175ce0c4e179b05299bdda4298572a7f6e47bb9517903081bd67f724f7
+EBUILD emilia-pinball-0.3.1-r1.ebuild 1705 RMD160 431f66c28947862d90cd9a0f39f6b8c02c1b7c6d SHA1 6e028f20bf9c528d4dac99f4f174f667a93ec8c4 SHA256 2e4ddbf93ca37f2be5333a62c3caf102332de54e3c8db3ac44401d88f1694dad
+MISC ChangeLog 3695 RMD160 008bd4d54279a7ff8d00a92b06f08bd6cd6d601b SHA1 8e36fa5c6b87acf2863816b6df28fd49c2038177 SHA256 f7555daa5d59e27f06ed3a476a20722cac79ddddd087d95da92f6d5378876b9f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk22iPgACgkQIY77eQFFFC0/LgCdFSNcNHQtzj1YW+JNaxOhLGLm
+OkMAmwYL7voWkFCNeFXLA1z7cQ2PZbur
+=gSp0
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
index 23fe2c9e4a86..8eae9ac8eda6 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild,v 1.6 2010/09/25 12:03:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild,v 1.7 2011/04/26 08:57:17 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -30,7 +30,9 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	sed -i -e '/dnl/d' {src,test}/Makefile.am || die #334899
 	epatch "${FILESDIR}"/${P}-glibc210.patch \
-		"${FILESDIR}"/${P}-libtool.patch
+		"${FILESDIR}"/${P}-libtool.patch \
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-parallel.patch
 	rm -rf libltdl
 	eautoreconf
 }
@@ -40,7 +42,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+	emake CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install() {
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
new file mode 100644
index 000000000000..d78779197fce
--- /dev/null
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
@@ -0,0 +1,30 @@
+--- base/SignalSender.cpp.old	2011-04-26 09:39:24.303339444 +0200
++++ base/SignalSender.cpp	2011-04-26 09:39:51.261063162 +0200
+@@ -11,6 +11,7 @@
+ #include "SignalSender.h"
+ #include "Group.h"
+ #include "Behavior.h"
++#include <cstddef>
+ 
+ SignalSender * SignalSender::p_SignalSender = NULL;
+ 
+--- base/Behavior.cpp.old	2011-04-26 09:36:27.129006665 +0200
++++ base/Behavior.cpp	2011-04-26 09:36:48.855396752 +0200
+@@ -9,6 +9,7 @@
+ #include "Private.h"
+ #include "Behavior.h"
+ #include "Group.h"
++#include <cstddef>
+ 
+ Behavior::Behavior() {
+ 	//EM_COUT("Behavior::Behavior", 1);
+--- base/BehaviorVisitor.cpp.old	2011-04-26 09:37:39.759653248 +0200
++++ base/BehaviorVisitor.cpp	2011-04-26 09:37:54.481594952 +0200
+@@ -9,6 +9,7 @@
+ #include "BehaviorVisitor.h"
+ #include "Behavior.h"
+ #include "Group.h"
++#include <cstddef>
+ 
+ BehaviorVisitor * BehaviorVisitor::p_BehaviorVisitor = NULL;
+ 
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
new file mode 100644
index 000000000000..3dfef56090c9
--- /dev/null
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.old	2011-04-26 10:46:05.102070461 +0200
++++ src/Makefile.am	2011-04-26 10:46:16.872813136 +0200
+@@ -9,7 +9,7 @@
+ 
+ INCLUDES = -I../base -I../addon
+ 
+-pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
++pinball_LDADD = libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ pinball_LDFLAGS = -export-dynamic
+ 
+ pinball_SOURCES = Pinball.cpp