version bump

Package-Manager: portage-2.1.4.5

4 files changed, 124 insertions, 2 deletions

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index 85951eb1a546..1ff355291f39 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/rocksndiamonds
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.30 2008/06/25 18:55:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.31 2008/11/26 02:12:40 mr_bones_ Exp $
+
+*rocksndiamonds-3.2.6.0 (26 Nov 2008)
+
+  26 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/rocksndiamonds-3.2.6.0-parallel-build.patch,
+  +rocksndiamonds-3.2.6.0.ebuild:
+  version bump
 
   25 Jun 2008; nixnut <nixnut@gentoo.org> rocksndiamonds-3.2.4.ebuild:
   Stable on ppc wrt bug 229119
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 48913840343f..4da0d72a1291 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,5 +1,6 @@
 AUX rocksndiamonds-3.2.3-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
 AUX rocksndiamonds-3.2.4-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
+AUX rocksndiamonds-3.2.6.0-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
 DIST BD2K3-1.0.0.zip 4715324 RMD160 50b0ffdecb609711f9bfd5819b50ac1816e18588 SHA1 822f8c2767b68360f73dd5ae4bc56c3e39c2d9ba SHA256 5fc5130c859e69d6907bff87e01ff2296d59f7376202a8aacc03e55f359fb351
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 RMD160 ecf209811ed15767d1114c82c800ca801d0387a4 SHA1 d6900835dee0b551ac3aeac275657817c4a26786 SHA256 6f9dc48023830fbdc318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969
 DIST Contributions-1.2.0.zip 9499312 RMD160 d6f2f83bbfeb224a09175ef0c39b5a1530f092be SHA1 5f67026debbc672fdf8effcc2dc7efd087a5ae3a SHA256 d533dc69cd136d2bb7d76d674ab087285799191e0a516320aba8ac2368ce6dd2
@@ -11,6 +12,8 @@ DIST rockslevels-dx-1.0.tar.gz 211151 RMD160 1fb969e4205aa16318a8a8ae4d33de21b50
 DIST rockslevels-emc-1.0.tar.gz 3824268 RMD160 d9baa3e625f8857b40dc247f39ae16a53d27f77c SHA1 1b4de87eef54f3f8b5bb3dd6eda47588dc2182d4 SHA256 a04e554fb8b6d010c73e21de090f116dad6054e43e00edc80c59c71a8a1eaa0c
 DIST rockslevels-sp-1.0.tar.gz 373564 RMD160 ddfc4b5af5bdbbabd1fd884f14f76257d75e52d3 SHA1 049edb601654bdf31046ffd60c8234a13cf19540 SHA256 770d75a5926bb924c6787a6f95ee9f7af743b629ea14005ab0375b57eb488f25
 DIST rocksndiamonds-3.2.4.tar.gz 3427302 RMD160 a64116a6a17c4969bab1e79c5457b67ce0890a6b SHA1 93abd489a3e027d2553886322cd93dee8b541f35 SHA256 8973e9c8cea4395c0ba05e98329a573fbf691c00e866c8d53f573fa2d37410ac
+DIST rocksndiamonds-3.2.6.0.tar.gz 3471530 RMD160 337ef991bfc9ab66f3b2622918c6c2589a274dac SHA1 cebf6b856d20f7bacc7f20d2ce97c63bf3c9aec7 SHA256 ef3a91a7a0f5dd42b407cd4c503174cd214a07634225dcca5fa05f7cc683c888
 EBUILD rocksndiamonds-3.2.4.ebuild 3107 RMD160 3e3aa4bdd94e03d7491e03e2d78f62f62512584d SHA1 58221bc8e31022dedc4754549bb40771779fe82d SHA256 780634092addae982534979db18bae8f1580a3f9ca831501ffccc252f19f7c91
-MISC ChangeLog 4783 RMD160 20924e352dcc1f258ff094a64bf58ebb2484a879 SHA1 00962b9152dc6550ab01b55cf2ebbbbabbe4e24a SHA256 68909f332ca7705ba1d206cc45e3efc4f8c3a8f0a5cbd6eae99960cddd01830a
+EBUILD rocksndiamonds-3.2.6.0.ebuild 3115 RMD160 edbd9241e19a51e1d63f672e368ad94a5987a4ac SHA1 ce550bda2fb58e38879f5f6e1308acfa5e5ffe12 SHA256 4e3b0ad3422c80291d0af461f156e40cac7ffa5bca9d4b496af0e110d1afc7d6
+MISC ChangeLog 4984 RMD160 e2eaacb4e7d6a66c2b927e453acbc6c13893333d SHA1 73633894e48960a4790f26b9a11dc34160d8bed9 SHA256 f018c555b85ec5658f04b7501b3b5b8fbd531f78eb136423584178b6b2a00d66
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.0-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.0-parallel-build.patch
new file mode 100644
index 000000000000..8e3a565c7d36
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.0-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.0.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.0.ebuild
new file mode 100644
index 000000000000..526b7ab49848
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 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.0.ebuild,v 1.1 2008/11/26 02:12:40 mr_bones_ Exp $
+
+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/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.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.jb-line.de/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
+		>=media-libs/sdl-mixer-1.2.4
+		media-libs/sdl-net
+		>=media-libs/sdl-image-1.2.2
+		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
+
+	# make it parallel-friendly.
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
+		-e '/^MAKE/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
+}