version bump

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

4 files changed, 134 insertions, 2 deletions

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index 9b83700485b3..902e11e36100 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/rocksndiamonds
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.38 2010/02/10 03:26:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.39 2010/07/14 21:15:15 mr_bones_ Exp $
+
+*rocksndiamonds-3.3.0.1 (14 Jul 2010)
+
+  14 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +rocksndiamonds-3.3.0.1.ebuild,
+  +files/rocksndiamonds-3.3.0.1-parallel-build.patch:
+  version bump
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org>
   rocksndiamonds-3.2.6.1.ebuild:
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 8e6a0912eef3..9ae875ac2985 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,4 +1,5 @@
 AUX rocksndiamonds-3.2.6.1-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
+AUX rocksndiamonds-3.3.0.1-parallel-build.patch 392 RMD160 26ffff09baa3ab2a00fa911ceec90434e670f245 SHA1 f40ba68b698e5d66d2f89687ca9f7fd69daa1d67 SHA256 ba1bc3e33d6173d4bd245730d9691a1618afe5061949259c9f76c510f380bad4
 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
@@ -6,10 +7,13 @@ DIST Snake_Bite-1.0.0.zip 6506066 RMD160 b8a5d7dc61086c8b3ef08275dd597ecae63ee80
 DIST Sokoban-1.0.0.zip 295339 RMD160 b0c07aa209dad3f615a6dd0a0aeced4a527059a2 SHA1 0ae1cf65db9f8b6a76e55d7236f77a19684b6027 SHA256 63f9d36789edca22c0f9454202f9fd21fcee89111642459b5882314f13ebdc0e
 DIST rnd-contrib-1.0.0.tar.gz 3389242 RMD160 54c9b860b7d027eb6e24af72e8b731df85776195 SHA1 9b55ae5865575ba76a90353b1b3883ef3950d792 SHA256 c24b56399ba202ebf60bb60316e81d7996ccd02ae281a7e54f2f555e088a1ce1
 DIST rnd_jue-v7.zip 10216825 RMD160 3c8a4b86289267d30772b0a1cd3889d3a476eb49 SHA1 0396db88600db82cbdda5cc090b05974c3026509 SHA256 8b7910ce8e9170eabad917bdbe0ca2db840ed4489414022e706025fb40125906
+DIST rnd_jue-v8.tar.bz2 17244645 RMD160 ce044462880707bcffe517ebf3aca1f4469fcff1 SHA1 2071230bf7c3237927174bc9bc7b13b9c163aaae SHA256 442a21a24b7c004f0c8f8c4fc844cac7f3ff4692574a0a7df2835a1da4dab7fa
 DIST rockslevels-dx-1.0.tar.gz 211151 RMD160 1fb969e4205aa16318a8a8ae4d33de21b5050c78 SHA1 5f2d119c978c4f91bb1ff53594a8765b5237caae SHA256 23f1710710eef1dcd1c490670de16d2d58dc98f3fdd9a2df186bdca590e57579
 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.6.1.tar.gz 3473786 RMD160 136df20ffbe745b65417d39f406d2bbb4f544f1c SHA1 18ddf5ce93a83a3fb89d65b69a80291a978f5b7e SHA256 bd38ae60ddeadb11c6bab876ad861b373139deca8c6dafdeae3f640051949d6c
+DIST rocksndiamonds-3.3.0.1.tar.gz 2494558 RMD160 44f8bec6be74ce0346ec6826844d923cc69069a6 SHA1 529612c95355292fb76d0b954ce51f7cb54dc22a SHA256 974897f14136ecec91c7bdded8d904d74f2064a6c8a6c6c83f2f7111108747d3
 EBUILD rocksndiamonds-3.2.6.1.ebuild 3196 RMD160 0e31cde6a9f79c23da3f6ad189b102e269d6cd76 SHA1 4420aaca4097401bc7b279f3a77690cb4dad7609 SHA256 299ae3a2d8ce6d8f0c03ca9af777b08091bebf308105568e6141dbb94013cfd2
-MISC ChangeLog 5951 RMD160 8ae6d27d4a1592eea62ab7e5a3213eec63ecc0ff SHA1 45e2cca631ff2f07332b8face1d44d35c81855f1 SHA256 1db66c2bf75003747b72b92906c3f20a798eddc00d9bbbca8debf21e5c5e16ad
+EBUILD rocksndiamonds-3.3.0.1.ebuild 3250 RMD160 76f8a2812dc145e5c971bf5890650e5128c9d98a SHA1 1101a725da1d95f2dae036d4e8826f3456d4f31d SHA256 918133e87a33afd1f13f03345ef89b7a41d43b7e2e790275c42210f2cc1232e3
+MISC ChangeLog 6152 RMD160 4ed54fa96ab8ec55066d092e13ec104072aafbfd SHA1 5f4c6bb75d38bea12e75a5927230cffbe0e80d20 SHA256 9a032142f6bfed27448712ec0722f17e6786d3ad9c070a5e087c77657814e0b0
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.1-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.1-parallel-build.patch
new file mode 100644
index 000000000000..d36376eb0b35
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.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 game_sp_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.3.0.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild
new file mode 100644
index 000000000000..4849f824346d
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild,v 1.1 2010/07/14 21:15:15 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
+	mirror://gentoo/rnd_jue-v8.tar.bz2"
+
+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"
+
+	sed -i \
+		-e '/^LDFLAGS/s/=/+=/' \
+		src/Makefile \
+		|| die "sed failed"
+
+	cd levels
+	unpack \
+		rnd_jue-v8.tar.bz2 \
+		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 docs graphics levels music sounds || die "doins failed"
+
+	newman rocksndiamonds.{1,6}
+	dodoc CREDITS ChangeLog README
+	newicon graphics/gfx_classic/rocks_icon_32x32.pcx ${PN}.pcx
+	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.pcx
+
+	prepgamesdirs
+}