summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/icebreaker/ChangeLog6
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.5-parallell-install.patch34
-rw-r--r--games-puzzle/icebreaker/icebreaker-1.9.5.ebuild12
3 files changed, 46 insertions, 6 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/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}" \