use all-levels snapshot archive instead of individual level files (should fix bug #44447); use emake

5 files changed, 50 insertions, 73 deletions

diff --git a/games-arcade/lbreakout2/ChangeLog b/games-arcade/lbreakout2/ChangeLog
index fac875a31e5f..7505b763edbe 100644
--- a/games-arcade/lbreakout2/ChangeLog
+++ b/games-arcade/lbreakout2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/lbreakout2
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/ChangeLog,v 1.3 2003/11/04 21:39:33 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/ChangeLog,v 1.4 2004/03/19 09:14:32 mr_bones_ Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> lbreakout2-2.4.ebuild,
+  lbreakout2-2.5_beta3.ebuild:
+  use all-levels snapshot archive instead of individual level files (should fix
+  bug #44447); use emake
 
   04 Nov 2003; Jason Wever <weeve@gentoo.org> lbreakout2-2.4.ebuild:
   Added ~sparc keyword.
diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index 6abf5696df48..4baf34e7987b 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -1,6 +1,6 @@
-MD5 cdd6873f69a4f20d0cdc7962df2725a0 ChangeLog 2291
-MD5 baa640a195ebce693d78430415baf14b lbreakout2-2.4.ebuild 1498
-MD5 8f6380bff867e9224d859e0cd6ae25d3 lbreakout2-2.5_beta3.ebuild 1550
-MD5 b244cf1c41a78cacb62296d573935c07 metadata.xml 245
-MD5 16437a928c8f57d9df74b2ea793a98dc files/digest-lbreakout2-2.4 1387
-MD5 73abb5b043f47722c3da979f66925aaf files/digest-lbreakout2-2.5_beta3 1393
+MD5 06212cca9453ac2ebf22837fae4f9a0c ChangeLog 2506
+MD5 f95d0cd8909ed3a0922eb40d5d4a6e0a lbreakout2-2.4.ebuild 1325
+MD5 0217a219e24f2e90022f42998eb5d225 lbreakout2-2.5_beta3.ebuild 1379
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a63c6d317f064d9ea7f54217557b69d6 files/digest-lbreakout2-2.4 148
+MD5 dc3b105262d533e19172b9832b8ee999 files/digest-lbreakout2-2.5_beta3 154
diff --git a/games-arcade/lbreakout2/files/digest-lbreakout2-2.5_beta3 b/games-arcade/lbreakout2/files/digest-lbreakout2-2.5_beta3
index 2214494192c9..42ea78b28394 100644
--- a/games-arcade/lbreakout2/files/digest-lbreakout2-2.5_beta3
+++ b/games-arcade/lbreakout2/files/digest-lbreakout2-2.5_beta3
@@ -1,27 +1,2 @@
 MD5 eff7e1e961f33e80e2c3a7f04daf69de lbreakout2-2.5beta-3.tar.gz 2789320
-MD5 1ba3edefef4e54eedc80bdda6b1c4f72 Afl 11070
-MD5 f8ef6dc115a1429e1f57cbf5bad26ff4 Arcade 7561
-MD5 9a0b03e9fa3c1bd9c923399acdab5d42 BeOS-4ever 5754
-MD5 1ed3c1cf36109d85fa90597e3ba04fa3 Bombs 14727
-MD5 35b33e9af534668a2782bd621e079c1d Chaos 6762
-MD5 0bf6bf819423ea427528494857748392 Demons 6989
-MD5 993a34352a78b6d8463b96fb6618a9fc HereWeGo 7271
-MD5 32ee65e098ad1e9dbf69eda9c6f24375 HighBall 4086
-MD5 593b070796626ce9ec51534225545d4a Holidays 9208
-MD5 822e2ae72140bd5a8fdea12d78333f5b Hommage 11660
-MD5 040375b98b5f8bf7ed5eed76ca52db0d Kazan-1 8919
-MD5 61beb0d462fff8dff8feec65b7a941dc Kevin 12036
-MD5 8ad4e5f21df458566da7cb9b2ee3a52e Lattsville 23119
-MD5 06dcc5d43053022b76222460ce6cc31f LinuxFun 8881
-MD5 685f43f92ad4525c14f12f4f0c47c876 Megadoomer 23182
-MD5 2667ee9014640d13efcacab718be66d6 OpenSource 8926
-MD5 3dcc6db073c79cc8b2e06cfa8879ad19 Pabelo 5799
-MD5 58db4100ca3803f63a1d73f8e0922382 Ph33r 5740
-MD5 53f1dac8e505e5c0e8d653dd22abc94d R-World 13884
-MD5 1fac3f0b0a76232f8f6142d20d70e776 Runes 13860
-MD5 111a071c36131f150a54d7aed09c77c6 Shimitar 9325
-MD5 d92587777bbc88aa0502096d0468874b TheGauntlet 4099
-MD5 7c1528940c5080a737420e69f3e3d8be Twilight 15202
-MD5 524fce826abde301a61851ffdf8367c6 Wolvie 6008
-MD5 665660d5d6d518edfd7932abbf1f2dde ZijosLand 5798
-MD5 1acca05f3eb31ad57551bb18e9d5c9ea Zufallswelt 12226
+MD5 f6e07da8d5ed369845520f6f035f14ce lbreakout2-levelsets-20040319.tar.gz 134873
diff --git a/games-arcade/lbreakout2/lbreakout2-2.4.ebuild b/games-arcade/lbreakout2/lbreakout2-2.4.ebuild
index 4486b81e1214..2776bc3551b4 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.4.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.4.ebuild
@@ -1,55 +1,53 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/lbreakout2-2.4.ebuild,v 1.4 2004/02/29 09:21:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/lbreakout2-2.4.ebuild,v 1.5 2004/03/19 09:14:32 mr_bones_ Exp $
 
 inherit flag-o-matic games
 
-levels="Afl Arcade BeOS-4ever Bombs Chaos Demons HereWeGo HighBall Holidays Hommage Kazan-1 Kevin Lattsville LinuxFun Megadoomer OpenSource Pabelo Ph33r R-World Runes Shimitar TheGauntlet Twilight Wolvie ZijosLand Zufallswelt"
-
 DESCRIPTION="Breakout clone written with the SDL library"
 HOMEPAGE="http://lgames.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-for x in $levels; do
-	SRC_URI="$SRC_URI
-	http://lgames.sourceforge.net/LBreakout2/levels/${x}"
-done
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz
+	mirror://gentoo/lbreakout2-levelsets-20040319.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
+	media-libs/libpng
+	sys-libs/zlib
 	>=media-libs/libsdl-1.1.5
 	media-libs/sdl-mixer"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	for x in ${levels}; do
-		cp ${DISTDIR}/${x} ${S}
-	done
+	mkdir ${S}/levels
+	cd ${S}/levels
+	unpack lbreakout2-levelsets-20040319.tar.gz
 }
 
 src_compile() {
 	filter-flags -O?
 	egamesconf \
-		--with-doc-path=/usr/share/doc/${PF} \
-		--datadir=${GAMES_DATADIR_BASE} \
+		--with-doc-path="/usr/share/doc/${PF}" \
+		--datadir="${GAMES_DATADIR_BASE}" \
 		|| die
-	make || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	dodir ${GAMES_STATEDIR}
+	dodir "${GAMES_STATEDIR}"
 	egamesinstall \
-		inst_dir=${D}/${GAMES_DATADIR}/${PN} \
-		hi_dir=${D}/${GAMES_STATEDIR}/ \
-		doc_dir=${D}/usr/share/doc/${PF} \
+		inst_dir="${D}/${GAMES_DATADIR}/${PN}" \
+		hi_dir="${D}/${GAMES_STATEDIR}/" \
+		doc_dir="${D}/usr/share/doc/${PF}" \
 			|| die
 
 	insinto ${GAMES_DATADIR}/lbreakout2/levels
-	doins ${levels}
+	doins levels/* || die "doins failed"
 
 	dodoc AUTHORS README TODO ChangeLog
-	mv ${D}/usr/share/doc/${PF}/lbreakout2 ${D}/usr/share/doc/${PF}/html
+	mv "${D}/usr/share/doc/${PF}/lbreakout2" "${D}/usr/share/doc/${PF}/html"
 	prepgamesdirs
 }
diff --git a/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild b/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild
index 92b8d83be8f4..603af10ce4d7 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild,v 1.2 2004/02/20 06:20:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/lbreakout2/lbreakout2-2.5_beta3.ebuild,v 1.3 2004/03/19 09:14:32 mr_bones_ Exp $
 
 inherit flag-o-matic games
 
 MY_P=${PN}-2.5beta-3
 DESCRIPTION="Breakout clone written with the SDL library"
 HOMEPAGE="http://lgames.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lgames/${MY_P}.tar.gz"
-levels="Afl Arcade BeOS-4ever Bombs Chaos Demons HereWeGo HighBall Holidays Hommage Kazan-1 Kevin Lattsville LinuxFun Megadoomer OpenSource Pabelo Ph33r R-World Runes Shimitar TheGauntlet Twilight Wolvie ZijosLand Zufallswelt"
-for x in ${levels} ; do
-	SRC_URI="$SRC_URI
-	http://lgames.sourceforge.net/LBreakout2/levels/${x}"
-done
+SRC_URI="mirror://sourceforge/lgames/${MY_P}.tar.gz
+	mirror://gentoo/lbreakout2-levelsets-20040319.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="virtual/glibc
+	media-libs/libpng
+	sys-libs/zlib
 	>=media-libs/libsdl-1.1.5
 	media-libs/sdl-mixer"
 
@@ -26,32 +25,32 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	for x in ${levels}; do
-		cp ${DISTDIR}/${x} ${S}
-	done
+	mkdir ${S}/levels
+	cd ${S}/levels
+	unpack lbreakout2-levelsets-20040319.tar.gz
 }
 
 src_compile() {
 	filter-flags -O?
 	egamesconf \
-		--with-doc-path=/usr/share/doc/${PF} \
-		--datadir=${GAMES_DATADIR_BASE} \
+		--with-doc-path="/usr/share/doc/${PF}" \
+		--datadir="${GAMES_DATADIR_BASE}" \
 		|| die
-	make || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	dodir ${GAMES_STATEDIR}
+	dodir "${GAMES_STATEDIR}"
 	egamesinstall \
-		inst_dir=${D}/${GAMES_DATADIR}/${PN} \
-		hi_dir=${D}/${GAMES_STATEDIR}/ \
-		doc_dir=${D}/usr/share/doc/${PF} \
+		inst_dir="${D}/${GAMES_DATADIR}/${PN}" \
+		hi_dir="${D}/${GAMES_STATEDIR}/" \
+		doc_dir="${D}/usr/share/doc/${PF}" \
 			|| die
 
 	insinto ${GAMES_DATADIR}/lbreakout2/levels
-	doins ${levels}
+	doins levels/* || die "doins failed"
 
 	dodoc AUTHORS README TODO ChangeLog
-	mv ${D}/usr/share/doc/${PF}/lbreakout2 ${D}/usr/share/doc/${PF}/html
+	mv "${D}/usr/share/doc/${PF}/lbreakout2" "${D}/usr/share/doc/${PF}/html"
 	prepgamesdirs
 }