version bump

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 124 insertions, 1 deletions

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index c262a256e5d4..553289c41ad8 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/rocksndiamonds
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.35 2009/02/23 17:08:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.36 2009/11/27 22:39:08 mr_bones_ Exp $
+
+*rocksndiamonds-3.2.6.1 (27 Nov 2009)
+
+  27 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +rocksndiamonds-3.2.6.1.ebuild,
+  +files/rocksndiamonds-3.2.6.1-parallel-build.patch:
+  version bump
 
   23 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   -files/rocksndiamonds-3.2.6.0-parallel-build.patch,
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch
new file mode 100644
index 000000000000..8e3a565c7d36
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/126080
+
+--- src/Makefile
++++ src/Makefile
+@@ -220,7 +220,7 @@
+ # build targets
+ # -----------------------------------------------------------------------------
+ 
+-all: libgame_dir game_em_dir $(PROGNAME)
++all: $(PROGNAME)
+ 
+ $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
+ 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild
new file mode 100644
index 000000000000..bde301cc8844
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild,v 1.1 2009/11/27 22:39:08 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic eutils games
+
+DESCRIPTION="A Boulderdash clone"
+HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
+SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
+	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
+	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
+	http://www.jb-line.de/hp/rnd_jue-v7.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X sdl"
+
+DEPEND="app-arch/unzip
+	X? ( x11-libs/libX11 )
+	!sdl? ( x11-libs/libX11 )
+	sdl? (
+		>=media-libs/libsdl-1.2.3[joystick,video]
+		>=media-libs/sdl-mixer-1.2.4[mikmod,mp3,timidity]
+		media-libs/sdl-net
+		>=media-libs/sdl-image-1.2.2[gif]
+		media-libs/smpeg
+	)"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	unpack \
+		rockslevels-emc-1.0.tar.gz \
+		rockslevels-sp-1.0.tar.gz \
+		rockslevels-dx-1.0.tar.gz
+}
+
+src_prepare() {
+	# make it parallel-friendly.
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
+		-e '/^MAKE/d' \
+		-e '/^CC/d' \
+		Makefile \
+		|| die "sed failed"
+
+	cd levels
+	unpack \
+		rnd_jue-v7.zip \
+		BD2K3-1.0.0.zip \
+		rnd-contrib-1.0.0.tar.gz \
+		Snake_Bite-1.0.0.zip \
+		Contributions-1.2.0.zip \
+		Boulder_Dash_Dream-1.0.0.zip \
+		Sokoban-1.0.0.zip
+}
+
+src_compile() {
+	replace-cpu-flags k6 k6-1 k6-2 i586
+
+	local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
+	if use X || { ! use X && ! use sdl; } ; then
+		make clean || die
+		emake ${makeopts} OPTIONS="${CFLAGS}" x11 || die
+		mv rocksndiamonds{,.x11}
+	fi
+	if use sdl ; then
+		make clean || die
+		emake ${makeopts} OPTIONS="${CFLAGS}" sdl || die
+		mv rocksndiamonds{,.sdl}
+	fi
+}
+
+src_install() {
+	if use X || { ! use X && ! use sdl; } ; then
+		dogamesbin rocksndiamonds.x11 || die "dogamesbin failed"
+	fi
+	if use sdl ; then
+		dogamesbin rocksndiamonds.sdl || die "dogamesbin failed"
+		dosym rocksndiamonds.sdl "${GAMES_BINDIR}/rocksndiamonds"
+	else
+		dosym rocksndiamonds.x11 "${GAMES_BINDIR}/rocksndiamonds"
+	fi
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r graphics levels music sounds || die "doins failed"
+
+	newman rocksndiamonds.{1,6}
+	dodoc CHANGES CREDITS HARDWARE README TODO docs/elements/*.txt
+	newicon graphics/gfx_classic/rocks_icon_32x32.pcx ${PN}.pcx
+	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.pcx
+
+	prepgamesdirs
+}