version bump

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

4 files changed, 128 insertions, 2 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/Manifest b/games-arcade/rocksndiamonds/Manifest
index 8e7bb1d1927e..d98291fc11b0 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,4 +1,5 @@
 AUX rocksndiamonds-3.2.4-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
+AUX rocksndiamonds-3.2.6.1-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
@@ -10,6 +11,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.1.tar.gz 3473786 RMD160 136df20ffbe745b65417d39f406d2bbb4f544f1c SHA1 18ddf5ce93a83a3fb89d65b69a80291a978f5b7e SHA256 bd38ae60ddeadb11c6bab876ad861b373139deca8c6dafdeae3f640051949d6c
 EBUILD rocksndiamonds-3.2.4.ebuild 3107 RMD160 3e3aa4bdd94e03d7491e03e2d78f62f62512584d SHA1 58221bc8e31022dedc4754549bb40771779fe82d SHA256 780634092addae982534979db18bae8f1580a3f9ca831501ffccc252f19f7c91
-MISC ChangeLog 5523 RMD160 87cafba1923a192f28fb97f87814b5f30cbe60aa SHA1 4c9a9e312be4c299f6307845e9b20c59d3e9949b SHA256 ee2317462deb1229a350d1af8d9333e7bd6c83b2a4b8ec86aaa988b8834fdc23
+EBUILD rocksndiamonds-3.2.6.1.ebuild 3201 RMD160 472ff80752e525692f4fb7d6a8536e9b402ab2e3 SHA1 e315a4e1072aa10e49701730325049c7da5d9d43 SHA256 317d70cb1f1e856abed3e9b61388294c5e997adde512d5fb46ee2f172df1fd6b
+MISC ChangeLog 5721 RMD160 bb7975e99d385b061e5add31ca379c5a855b900f SHA1 f6687a3cbf37d3fbd8a35457569b2d2573f3f57c SHA256 8e2865f9590162f482a267ba4c284070011ccffbdbc15240a815e033535fe206
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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
+}