Fixing bug #121667 : sdl patch not applied to client

(Portage version: 2.1_pre6-r2)

4 files changed, 152 insertions, 18 deletions

diff --git a/games-arcade/frozen-bubble/ChangeLog b/games-arcade/frozen-bubble/ChangeLog
index 719feaefaffd..7417ad30f17e 100644
--- a/games-arcade/frozen-bubble/ChangeLog
+++ b/games-arcade/frozen-bubble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/frozen-bubble
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.16 2005/09/16 22:06:39 ciaranm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.17 2006/03/18 00:39:09 tupone Exp $
+
+*frozen-bubble-1.0.0-r6 (18 Mar 2006)
+
+  18 Mar 2006; <Tupone@gentoo.org> +frozen-bubble-1.0.0-r6.ebuild:
+  Fixing bug #121667 : client has no sdl patch applied. Thanks Rene' Nussbaumer
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-arcade/frozen-bubble/Manifest b/games-arcade/frozen-bubble/Manifest
index 6a18fd104fb3..8f4f48598313 100644
--- a/games-arcade/frozen-bubble/Manifest
+++ b/games-arcade/frozen-bubble/Manifest
@@ -1,18 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9270c771d017773c05f10c650e98dd46 frozen-bubble-1.0.0-r5.ebuild 2807
-MD5 ed81470e0a1698d713b04ecb69d5a9e0 metadata.xml 449
-MD5 1e24a2baa78a3eb50c6416a88003dcdf ChangeLog 5587
-MD5 2c95df6273ce7e60321c8f004aa0af1e files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch 2111
-MD5 5c883c8dd838b13190b3115a7649333d files/frozen-bubble-1.0.0-sdl-perl-2.patch 3919
-MD5 411c7217cb8bf93cdedbb0ef0640ed2f files/frozen-bubble-1.0.0-makefile.patch 1053
+MD5 e6e339eae8cc36473c62976bd68afbfb ChangeLog 5774
+RMD160 eb43c73d25c319ead9c086a87a3aaed81050c118 ChangeLog 5774
+SHA256 570e0d226d0d7d06229e49162897b918bbf19ec7a2a02dc69ae9cdd87fdfb405 ChangeLog 5774
 MD5 c30d59b06b6112e4d3ca9ba2117c3202 files/1.0.0-no-chainreaction.patch 357
+RMD160 49e017082d91488cd9d069d8566cba869013c700 files/1.0.0-no-chainreaction.patch 357
+SHA256 610811d88be84319f6e61ec73ffbb93c261b5b5be3d8c12aa7c26da1bd8f24c6 files/1.0.0-no-chainreaction.patch 357
 MD5 9a77f057ee51c039f467c20fa822159d files/digest-frozen-bubble-1.0.0-r5 228
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK0IgLLFUmVNQ7rkRAt7+AJ9J/J3xfXP2Wi1Zjw+Q18PQVb4SYACfbXoM
-93w01yYkAqOMaDrcs8rhEQ4=
-=1pad
------END PGP SIGNATURE-----
+RMD160 c0365fe959bef5063efce5c1fb2e439039891a04 files/digest-frozen-bubble-1.0.0-r5 228
+SHA256 e21e46ad54acd34c1af59c6a1f839e2c8ab3ea1aa45978a9dac3b6d010ad44b1 files/digest-frozen-bubble-1.0.0-r5 228
+MD5 cbc6956c1b99904d1ef3d4ce79abc214 files/digest-frozen-bubble-1.0.0-r6 822
+RMD160 149cd7dc37e708a597885b6eb51ae5acb27391cc files/digest-frozen-bubble-1.0.0-r6 822
+SHA256 d5bc4171f6949e4cf0884c5dbca3813eb49fcce410ccfc4b8636a2a1197e6825 files/digest-frozen-bubble-1.0.0-r6 822
+MD5 2c95df6273ce7e60321c8f004aa0af1e files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch 2111
+RMD160 709b8a2fd17c85b794c97ee687f43bf87b75a208 files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch 2111
+SHA256 1bcc3a7d5592fdc5e79296dee480e0ff50640a69d9ce6e114ddef2b7676daabd files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch 2111
+MD5 411c7217cb8bf93cdedbb0ef0640ed2f files/frozen-bubble-1.0.0-makefile.patch 1053
+RMD160 db041ac0e5af02c8e329aa70960c5c85f2bb0c91 files/frozen-bubble-1.0.0-makefile.patch 1053
+SHA256 ecc90bd456d2f0c11b5ec7ddaaabe59448e442fa3c3d6fd0ba5745c103aa5437 files/frozen-bubble-1.0.0-makefile.patch 1053
+MD5 5c883c8dd838b13190b3115a7649333d files/frozen-bubble-1.0.0-sdl-perl-2.patch 3919
+RMD160 24fc0d83d901fefcfe642773cdcb148a3fc611ea files/frozen-bubble-1.0.0-sdl-perl-2.patch 3919
+SHA256 2c7199a227aedd59d056ca849d97a426c9ff364c76ee20a85510c9138bd2d272 files/frozen-bubble-1.0.0-sdl-perl-2.patch 3919
+MD5 9270c771d017773c05f10c650e98dd46 frozen-bubble-1.0.0-r5.ebuild 2807
+RMD160 f66bdd66a3fc77263a6f999de5ac510fa36a2859 frozen-bubble-1.0.0-r5.ebuild 2807
+SHA256 8e9ca4e2a4e15cd62849409f67057d3214bf4c36724abaa10a39d6266374d432 frozen-bubble-1.0.0-r5.ebuild 2807
+MD5 8377a6361af80db55d6fdc740025e9b8 frozen-bubble-1.0.0-r6.ebuild 2831
+RMD160 1c6d1651b0e73412191c972ef1da3625ad5d9f09 frozen-bubble-1.0.0-r6.ebuild 2831
+SHA256 2f267266f4d2d42a707d83aebd75ed62a399a6310fa3dfa0159f6b0ef8542055 frozen-bubble-1.0.0-r6.ebuild 2831
+MD5 ed81470e0a1698d713b04ecb69d5a9e0 metadata.xml 449
+RMD160 b8f34def5d742659506da917a43d62bc670167af metadata.xml 449
+SHA256 63337ec457363a86ff999264ec10ee614f5156160a57371d278122c167470602 metadata.xml 449
diff --git a/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r6 b/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r6
new file mode 100644
index 000000000000..501c4138811e
--- /dev/null
+++ b/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r6
@@ -0,0 +1,9 @@
+MD5 2be5ead2aee72adc3fb643630a774b59 frozen-bubble-1.0.0.tar.bz2 7321135
+RMD160 eeea4dceef9f205a94688913099a25bba7b50faa frozen-bubble-1.0.0.tar.bz2 7321135
+SHA256 fe7e46e529c7c3c969946c41efb519462f98dd5c280e247bd98ff629dcca1433 frozen-bubble-1.0.0.tar.bz2 7321135
+MD5 08e6f290c41e135c88235b15566020cf frozen-bubble-client-0.0.3.tar.bz2 59680
+RMD160 bbaa980fa890b93da5efe57f1b9678a6b16b2660 frozen-bubble-client-0.0.3.tar.bz2 59680
+SHA256 4c649196f5ef7fe4f5cc0fa96a44d3bf729e58de97cb74b9af6e797760fa69f0 frozen-bubble-client-0.0.3.tar.bz2 59680
+MD5 3b843f2ce1b6424e144b645ccc985997 frozen-bubble-server-0.0.3.tar.bz2 5772
+RMD160 9aa0501c04d895942520ff2b94225a909cb5370a frozen-bubble-server-0.0.3.tar.bz2 5772
+SHA256 5619a828bc6fab06df6a7aa62ddc4eb71c259a5448370f2794fdbec2f6418f07 frozen-bubble-server-0.0.3.tar.bz2 5772
diff --git a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r6.ebuild b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r6.ebuild
new file mode 100644
index 000000000000..59a03238db22
--- /dev/null
+++ b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r6.ebuild,v 1.1 2006/03/18 00:39:09 tupone Exp $
+
+inherit eutils perl-module games
+
+NET_CLIENT_P=frozen-bubble-client-0.0.3
+NET_SERVER_P=frozen-bubble-server-0.0.3
+DESCRIPTION="A Puzzle Bubble clone written in perl (now with network support)"
+HOMEPAGE="http://www.frozen-bubble.org/ http://chl.tuxfamily.org/frozen-bubble/"
+SRC_URI="http://guillaume.cottenceau.free.fr/fb/${P}.tar.bz2
+	http://chl.tuxfamily.org/frozen-bubble/${NET_CLIENT_P}.tar.bz2
+	http://chl.tuxfamily.org/frozen-bubble/${NET_SERVER_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/sdl-mixer-1.2.3
+	dev-perl/sdl-perl"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# main package
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PV}-no-chainreaction.patch
+	epatch "${FILESDIR}"/${P}-{editor-,}sdl-perl-2.patch
+	sed -i \
+		-e 's:INSTALLDIRS=.*:PREFIX=${D}/usr:' \
+		c_stuff/Makefile \
+		|| die 'sed c_stuff/Makefile failed'
+
+	# server addon
+	cd "${WORKDIR}"/${NET_SERVER_P}
+	sed -i \
+		-e '/^dnl AM_CONFIG_HEADER/s:dnl ::' configure.in \
+		|| die "sed configure.in failed"
+	libtoolize -c -f || die "libtoolize failed"
+	env \
+		WANT_AUTOMAKE=1.4 \
+		WANT_AUTOCONF=2.5 \
+		./bootstrap.sh || die "bootstrap failed"
+	echo '#include "config.h"' >> fb_serv.h
+
+	# client addon
+	cd "${WORKDIR}"/${NET_CLIENT_P}
+	mv frozen-bubble-client frozen-bubble
+	epatch "${FILESDIR}"/${P}-sdl-perl-2.patch
+	mv frozen-bubble frozen-bubble-client
+}
+
+src_compile() {
+	emake \
+		OPTIMIZE="${CFLAGS}" \
+		PREFIX=/usr \
+		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="${GAMES_DATADIR}" \
+		MANDIR=/usr/share/man \
+		|| die "emake game failed"
+
+	# server addon
+	cd "${WORKDIR}"/${NET_SERVER_P}
+	egamesconf || die
+	emake || die "emake server failed"
+}
+
+src_install() {
+	make \
+		PREFIX="${D}/usr" \
+		BINDIR="${D}/${GAMES_BINDIR}" \
+		DATADIR="${D}/${GAMES_DATADIR}" \
+		MANDIR="${D}/usr/share/man" \
+		install \
+		|| die "make install failed"
+	dosed /usr/games/bin/frozen-bubble
+	dodoc AUTHORS CHANGES README
+	newicon icons/frozen-bubble-icon-48x48.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}.png
+
+	# client addon
+	cd "${WORKDIR}/${NET_CLIENT_P}"
+	make \
+		PREFIX="${D}/usr" \
+		BINDIR="${D}/${GAMES_BINDIR}" \
+		DATADIR="${D}/${GAMES_DATADIR}" \
+		MANDIR="${D}/usr/share/man" \
+		install \
+		|| die "make install client failed"
+
+	# server addon
+	cd "${WORKDIR}/${NET_SERVER_P}"
+	make \
+		DESTDIR="${D}" \
+		sbindir="${GAMES_BINDIR}" \
+		install \
+		|| die "make install server failed"
+	dodoc TODO
+	newdoc README README.server
+
+	fixlocalpod
+	prepgamesdirs
+}