Remove broken version as recommended by upstream.

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

4 files changed, 7 insertions, 121 deletions

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index 59e35b892bcd..c262a256e5d4 100644
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2009/02/22 15:50:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.35 2009/02/23 17:08:16 mr_bones_ Exp $
+
+  23 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/rocksndiamonds-3.2.6.0-parallel-build.patch,
+  -rocksndiamonds-3.2.6.0.ebuild:
+  Remove broken version as recommended by upstream.
 
   22 Feb 2009; Raúl Porcel <armin76@gentoo.org>
   rocksndiamonds-3.2.6.0.ebuild:
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 62608f308d50..5feca41a0e32 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,6 +1,5 @@
 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
@@ -12,8 +11,6 @@ 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
-EBUILD rocksndiamonds-3.2.6.0.ebuild 3178 RMD160 ecc4a0d75013d9962480734d4ea31fa99f9e15ab SHA1 fbe80eac7acad3b86351e0ab14c4f1c234279155 SHA256 70965fc76d495d0d8fd48a3c53b12311e80c6ceacccd40043a2f765a0ac66e73
-MISC ChangeLog 5325 RMD160 86a8d6da26f3d8234d8b84a49f5e9cc9002d5c0b SHA1 261ac2550042f52939b4fd08bb5386d034535738 SHA256 70ffdf338d7151df3d1ff1ead07511740669df7a67be84353361c646ec1f5bc3
+MISC ChangeLog 5523 RMD160 87cafba1923a192f28fb97f87814b5f30cbe60aa SHA1 4c9a9e312be4c299f6307845e9b20c59d3e9949b SHA256 ee2317462deb1229a350d1af8d9333e7bd6c83b2a4b8ec86aaa988b8834fdc23
 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
deleted file mode 100644
index 8e3a565c7d36..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.0-parallel-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index b612ef2445e3..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.0.ebuild,v 1.6 2009/02/22 15:50:01 armin76 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/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[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
-}