Fix parallel make

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 73 insertions, 10 deletions

diff --git a/games-arcade/tuxpuck/ChangeLog b/games-arcade/tuxpuck/ChangeLog
index 3d09ea5d6097..75039f6cf134 100644
--- a/games-arcade/tuxpuck/ChangeLog
+++ b/games-arcade/tuxpuck/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/tuxpuck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxpuck/ChangeLog,v 1.16 2015/01/05 20:18:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxpuck/ChangeLog,v 1.17 2015/01/07 14:01:27 tupone Exp $
+
+  07 Jan 2015; Tupone Alfredo <tupone@gentoo.org> tuxpuck-0.8.2-r1.ebuild,
+  +files/tuxpuck-0.8.2-parallel.patch:
+  Fix parallel make
 
   05 Jan 2015; Tupone Alfredo <tupone@gentoo.org> tuxpuck-0.8.2-r1.ebuild:
   EAPI 5
diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
index 3b41e710becd..96cc85f4a355 100644
--- a/games-arcade/tuxpuck/Manifest
+++ b/games-arcade/tuxpuck/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 AUX tuxpuck-0.8.2-ldflags.patch 407 SHA256 0a5f8610ef0001b5c98834f850ec9a3ade5437703ea04cb363f7cc6f5b39fec5 SHA512 b586dcf8c14dfc591a746023075eb3fb64981f92aaf79c582884950195e25b5b5bada9b5e313c97cbd5efce200c06dee3718e782f94b6a28cbd0796a8b749c05 WHIRLPOOL dfb9569d5ca7f8d5532a6ceb34090bf0ad6f81118429a944e96b6645d86831df9774afa89f1bcd623f72cee7641c9982867deafcdbfbd0a644321c10e47df5a8
+AUX tuxpuck-0.8.2-parallel.patch 1701 SHA256 d243f068d12662342cbcfcca33a2a4610e07d2c0b079ec348b3bbf5c8721f3dd SHA512 960e999273a847a103892103a13c07445442371e4a727d39ae65047ff1b19124db8f63102c8e06f4417499c4ace27cf43bd887376921e4e097406d141784a075 WHIRLPOOL 1ac7d9a3cb330ce2e7922b9c588b53d15f73d3f68ba473b9e891e37f1354a6c36943ec17985e7dd6cf55519e14d3124fbc0dd83712987444feb1bbbb6b8bf522
 AUX tuxpuck-0.8.2-png15.patch 2124 SHA256 cf9a3a51876fd00e1b4fd34afe1ca79763facd6b0326628186b342da0fd9b68f SHA512 b95ad05eaf5790fed9de66b7f6952fe6039b38e5204dda617b9c8bbf69ea613720bdc8111ed58881ddcc2438cb292bc4ddb34b47d2bd25801223ee66fb32ebcf WHIRLPOOL 376fe034331382af62e9e62c6082f5911ba56e127cd92499e4a55645c9d5b3f27c1f90e73e2ec2678a4afd0d42c95d29eb625fe992a46b638b59505a3530351b
 DIST tuxpuck-0.8.2.tar.gz 384009 SHA256 62d9604ed69c27b9ca2be1312bc705b36de8ed509c539c6d81193e7846272f18 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46 WHIRLPOOL 04bcb512a7b83cea122e982ce5c9b0c73585305878a959a03e8821109e8786258f4eb1dbb9abc66cf2e08a228ad9663077059b5ef4eafed8df575cec4ff498bd
-EBUILD tuxpuck-0.8.2-r1.ebuild 1268 SHA256 feec7a976d0f6f07ed35e4e060944c4304754ff014f569165f5cdf5e6a79e35e SHA512 a05c63482016b2e1f6eadd0c40909c7b3fbc018be1273295d88f437e236e631be47542d8559b44adf1db21f4f6e4e7a39b5d969a5f59a039690e3fef0b286112 WHIRLPOOL bd6e0fa4d7f08b65ef8eda41382ca8286c8ee6e5bcac0f0bb4db37b8cff831adfea529d8724880e13bc30177aa7f78df674cda1f993a6d73962077b42c79121d
-MISC ChangeLog 3626 SHA256 ab7f4a92304c08b7ca916b356eede3dce4ebff1bacf869a389d368dd57b39e45 SHA512 1bc4717c319fc9d12ae715dc29d975aed3575d270fa0e8dce98163fdb089033527d76cd68f56b02d630836158421b58908c236bc2ed06c6b297ea90b889df8b8 WHIRLPOOL 9a80888bdb176f7fd096d1ca91372633310eaac9543a5d58d775d682fe8745780e8caae5d481f90c0066d2c15a0db3c18490a1efa544dfc40dede07d3cd99343
+EBUILD tuxpuck-0.8.2-r1.ebuild 1238 SHA256 4c6cc817283fa702d39f720116f66791731e22026a941643380d8e97604504f7 SHA512 64cfd4da710b41c6da93a95fcf0ca9aa674402f7fbb7b19974a5e368cc0752374e7f09602eedf67255fdd3d61ca40c68c052811c430480a6303883a1b0a7069c WHIRLPOOL 6601ad15430e2e7ab7aceb7035e85c33b177990822ff76593d2e23e6d3ba3ee73829b959d014015905e93f7ce599eadb9f17f36291618812c2b221abe902437c
+MISC ChangeLog 3761 SHA256 2b9614bfe137812a390ec21f9c4ffab75fc9f14d0f6db53e555f7a16a163bfc4 SHA512 2050929807dcd1624786814c7fb603057a9803feb08bba561fec2dafdd2210f4e5723a3234a6475c04ed40dfde2dee82aac6b3ea6bdea233359ac9ad86722292 WHIRLPOOL 3fecce0a086ea41b4c69ef2434250159a3c3a909386edee8ede93ed6789b355b3f192c3f4e5f995c8c1776ab8c6c1811fa76a945131f287abe49cf2e4f49208b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSq8YkACgkQIY77eQFFFC0apgCgjQAhVUzRzlGfsS+VNr6Nfe4d
-N3EAoIKJBnKCz2h8sJzTY6iudSWSkzpY
-=qgX1
+iEYEAREIAAYFAlStPD0ACgkQIY77eQFFFC24XgCgve9O8iolWViDQmckCs/BmYsF
+iNMAnAm8Va+ZviQ6OaAvL1On5viP+Q8P
+=7KSc
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
new file mode 100644
index 000000000000..cdcdecc42c32
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
@@ -0,0 +1,58 @@
+--- data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
++++ data/Makefile	2015-01-07 14:57:44.079822614 +0100
+@@ -15,20 +15,29 @@
+ 	ar r libdata.a $(OBJS)
+ 	ranlib libdata.a
+ 
+-$(SOURCES):
+-	cd ../utils/; $(MAKE)
++monos_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
+ 	../utils/data2c monos.fnt monos_fnt
++	rm monos.fnt
++monob_fnt.c:
+ 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
+ 	../utils/data2c monob.fnt monob_fnt
+-	rm *.fnt
++	rm monob.fnt
++title_jpg.c:
+ 	../utils/data2c jpgs/title.jpg title_jpg
++board_jpg.c:
+ 	../utils/data2c jpgs/board.jpg board_jpg
++logo_jpg.c:
+ 	../utils/data2c jpgs/logo.jpg logo_jpg
++pad_png.c: pngs/pad.png
+ 	../utils/data2c pngs/pad.png pad_png
++puck_png.c: pngs/puck.png
+ 	../utils/data2c pngs/puck.png puck_png
++scoreboard_png.c:
+ 	../utils/data2c pngs/scoreboard.png scoreboard_png
++mousebar_png.c:
+ 	../utils/data2c pngs/mousebar.png mousebar_png
++glass_png.c:
+ 	../utils/data2c pngs/glass.png glass_png
+ 	../utils/data2c pngs/piece1.png piece1_png
+ 	../utils/data2c pngs/piece2.png piece2_png
+@@ -37,15 +46,22 @@
+ 	../utils/data2c pngs/piece5.png piece5_png
+ 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
+ 	rm piece?_png.c temp
++crash_ogg.c:
+ 	../utils/data2c sounds/crash.ogg crash_ogg
++nock_ogg.c:
+ 	../utils/data2c sounds/nock.ogg nock_ogg
++tux_eyes_spr.c:
+ 	# Tux
+ 	../utils/anim tux/eyes.ac tux_eyes.spr
+ 	../utils/data2c tux_eyes.spr tux_eyes_spr
+ 	rm tux_eyes.spr
++tux_png.c: tux/tux.png
+ 	../utils/data2c tux/tux.png tux_png
++tux_apps_ogg.c:
+ 	../utils/data2c tux/apps.ogg tux_apps_ogg
++tux_boos_ogg.c:
+ 	../utils/data2c tux/boos.ogg tux_boos_ogg
++arcana_png.c:
+ 	# Arcana
+ 	../utils/data2c arcana/arcana.png arcana_png
+ clean :
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
index ba599e90bf50..32f15f2f8f64 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild,v 1.9 2015/01/05 20:18:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild,v 1.10 2015/01/07 14:01:27 tupone Exp $
 
 EAPI=5
 inherit eutils games
@@ -35,13 +35,13 @@ src_prepare() {
 		data/Makefile \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-png15.patch
+		"${FILESDIR}"/${P}-png15.patch \
+		"${FILESDIR}"/${P}-parallel.patch
 }
 
 src_compile() {
 	emake -C utils
-	# Note that the Makefiles for tuxpuck are buggy so -j1 is used.
-	emake -j1 -C data
+	emake -C data
 	emake
 }