Fix parallel install. Bug #341111

Package-Manager: portage-2.1.9.14/cvs/Linux i686

4 files changed, 49 insertions, 18 deletions

diff --git a/games-puzzle/icebreaker/ChangeLog b/games-puzzle/icebreaker/ChangeLog
index d3b9a115b037..65621418abb5 100644
--- a/games-puzzle/icebreaker/ChangeLog
+++ b/games-puzzle/icebreaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/icebreaker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/ChangeLog,v 1.15 2010/10/15 13:24:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/ChangeLog,v 1.16 2010/10/19 08:48:21 tupone Exp $
+
+  19 Oct 2010; Tupone Alfredo <tupone@gentoo.org> icebreaker-1.9.5.ebuild,
+  +files/icebreaker-1.9.5-parallell-install.patch:
+  Fix parallel install. Bug #341111 by flameeyes@gentoo.org
 
   15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   icebreaker-1.9.5.ebuild:
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
index bb3369357a04..7cd84755d5b9 100644
--- a/games-puzzle/icebreaker/Manifest
+++ b/games-puzzle/icebreaker/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icebreaker-1.9.5-gentoo.patch 9254 RMD160 6a4e3162d2459b365f49073154bc546913ed7c8a SHA1 1f2d37330dfb07d126da52fb6ce37240ce9fbdb6 SHA256 47d96e3d08b6adb6cdd45ec24373cb9534b797f71b41bcf8a24bf332058700ee
 AUX icebreaker-1.9.5-ldflags.patch 870 RMD160 461e1a34726bb817492d186f68f76774a9f0f515 SHA1 f796c634f696825b3db457f1974d8cc941cb324c SHA256 4601d7005773a4800d1ee37e3557ea51ec8364f847286b58260b2ace5a574513
+AUX icebreaker-1.9.5-parallell-install.patch 1183 RMD160 a52b88c21d796a7be235dadf3da8677d3c967196 SHA1 c61d6b2a65ab7cdff8ad6b27d630febb9ad0b7e8 SHA256 af211ff2b611b34dcdcb6b9b961b95b0c94fa82cfe98e4b03831c460316709ce
 DIST icebreaker-1.9.5.tgz 116012 RMD160 c498135b286c9d2f85185c7f5343e498ec851cf0 SHA1 430bcc878cfb5c7bb37940c3e07da8a7b6c98174 SHA256 f283bc82df84b5f016efa6b1e6095914379cf2acac9c5692025275ff96102867
-EBUILD icebreaker-1.9.5.ebuild 1133 RMD160 34ec1f81d261a6ffff3903cdb9a1218fd0ec2318 SHA1 ba6f125912c75d4149b160543ab5b7fb688855da SHA256 b1ad6e8072daf6d3318f4611b7c1e45da987b8f9475dc992955476cf5428b615
-MISC ChangeLog 2530 RMD160 729038a0f56aadb283e22efe4202bfe2324e0d39 SHA1 952559e5cf4f1ce990fbdc26e7bdb80788121e2d SHA256 cca39946b1f53a88e43edbf9cc9a8fe2eb0a28716f9b642c0c94dde968ecf24f
+EBUILD icebreaker-1.9.5.ebuild 1177 RMD160 f2ef3195dc4cd6849a02588302a8b7f83b4c2f06 SHA1 a1632fb3693611c30d57d803401578940a893c04 SHA256 7a253ffdd79e71f6f1884d0bbb167545f645a07ebb6456947a71eca17ab7e3df
+MISC ChangeLog 2714 RMD160 2847fe31d75df91c28e718fc4222037edcd14d69 SHA1 d7dff69c650cbb7ce5e000100ef7a4ca61c318a8 SHA256 9d2e44ff52f72ca23abd7778197818fce7e8fc1f2e1466dcc9ec59f0d37d941f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky4VdgACgkQAiZjviIA2XhTkgCg4JRtOwMzXvy1JV51DNYOZXXi
-cVYAniVHQKBEnZ5jqzbGlxLt7XCDleoy
-=g9GK
------END PGP SIGNATURE-----
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.5-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.5-parallell-install.patch
new file mode 100644
index 000000000000..de388d9b5758
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.5-parallell-install.patch
@@ -0,0 +1,34 @@
+--- Makefile.old	2010-10-19 10:26:18.000000000 +0200
++++ Makefile	2010-10-19 10:38:28.000000000 +0200
+@@ -196,26 +196,30 @@
+ themes-install: install-themes
+ 
+ install-themes:
++	mkdir -p $(datadir)/icebreaker
+ 	install -m 644 *.ibt $(datadir)/icebreaker
+ 	install -m 644 *.wav *.bmp $(datadir)/icebreaker
+ 
+ install-bin: icebreaker
++	mkdir -p $(bindir)
+ 	install -g games -m 2755 icebreaker $(bindir) || \
+ 	  install -m 755 icebreaker $(bindir)
+ 	@test -g $(bindir)/icebreaker || \
+ 	  echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
+ 
+ install-man: icebreaker.6
++	mkdir -p $(mandir)/man6
+ 	install -m 644 icebreaker.6 $(mandir)/man6
+ 
+ install-scorefile:
++	mkdir -p $(highscoredir)
+ 	touch $(highscoredir)/icebreaker.scores
+ 	chown -f games:games $(highscoredir)/icebreaker.scores && \
+ 	chmod 664 $(highscoredir)/icebreaker.scores || \
+ 	chmod 644 $(highscoredir)/icebreaker.scores
+ 
+ 
+-install: all install-mkdirs install-themes install-bin install-man install-scorefile
++install: install-themes install-bin install-man install-scorefile
+ 
+ %.d: %.c
+ 	set -e; $(CC) -M $(CFLAGS) $< \
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild
index 6b47f32204ec..73b01d2219c5 100644
--- a/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild
+++ b/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild,v 1.15 2010/10/15 13:24:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild,v 1.16 2010/10/19 08:48:21 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -14,10 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
 	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-parallell-install.patch )
 
 src_compile() {
 	emake \
@@ -30,8 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	# bug #341111
-	emake -j1 \
+	emake \
 		prefix="${D}/usr" \
 		bindir="${D}${GAMES_BINDIR}" \
 		datadir="${D}${GAMES_DATADIR}" \