Fix chainreaction bug and some other stuff #67774 by René Nussbaumer.

6 files changed, 43 insertions, 6 deletions

diff --git a/games-arcade/frozen-bubble/ChangeLog b/games-arcade/frozen-bubble/ChangeLog
index 7d450fe3f011..c622d6746351 100644
--- a/games-arcade/frozen-bubble/ChangeLog
+++ b/games-arcade/frozen-bubble/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-arcade/frozen-bubble
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.12 2004/07/21 02:12:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.13 2004/12/16 18:12:22 vapier Exp $
+
+*frozen-bubble-1.0.0-r4 (16 Dec 2004)
+
+  16 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.0.0-fb-sdlperl-deb.patch, +files/1.0.0-no-chainreaction.patch,
+  +files/1.0.0-sdl-perl-check.patch, -files/fb-sdlperl-deb.patch,
+  -frozen-bubble-1.0.0-r3.ebuild, +frozen-bubble-1.0.0-r4.ebuild:
+  Fix chainreaction bug and some other stuff #67774 by René Nussbaumer.
 
   20 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
   +files/fb-sdlperl-deb.patch, frozen-bubble-1.0.0-r3.ebuild:
diff --git a/games-arcade/frozen-bubble/files/fb-sdlperl-deb.patch b/games-arcade/frozen-bubble/files/1.0.0-fb-sdlperl-deb.patch
index f58a51d5b0af..17afc8822ebc 100644
--- a/games-arcade/frozen-bubble/files/fb-sdlperl-deb.patch
+++ b/games-arcade/frozen-bubble/files/1.0.0-fb-sdlperl-deb.patch
@@ -1,4 +1,4 @@
---- /usr/games/frozen-bubble	2003-06-13 09:46:09.000000000 -0300
+--- frozen-bubble	2003-06-13 09:46:09.000000000 -0300
 +++ frozen-bubble	2004-05-31 00:46:31.000000000 -0300
 @@ -308,7 +308,11 @@
  sub add_image($) {
diff --git a/games-arcade/frozen-bubble/files/1.0.0-no-chainreaction.patch b/games-arcade/frozen-bubble/files/1.0.0-no-chainreaction.patch
new file mode 100644
index 000000000000..bacd64983979
--- /dev/null
+++ b/games-arcade/frozen-bubble/files/1.0.0-no-chainreaction.patch
@@ -0,0 +1,12 @@
+--- frozen-bubble.orig	2004-10-13 19:30:51.817394448 +0200
++++ frozen-bubble	2004-10-13 19:17:38.680079840 +0200
+@@ -1590,6 +1590,9 @@
+ 	$TIME_HURRY_WARN = 250;
+ 	$TIME_HURRY_MAX = 375;
+     } elsif (is_1p_game()) {
++    if ($chainreaction) {
++        $chainreaction = 0;
++    }
+ 	$backgr = $imgbin{back_1p};
+ 	%POS = %POS_1P;
+ 	$TIME_APPEARS_NEW_ROOT = 8;
diff --git a/games-arcade/frozen-bubble/files/1.0.0-sdl-perl-check.patch b/games-arcade/frozen-bubble/files/1.0.0-sdl-perl-check.patch
new file mode 100644
index 000000000000..3422956ccf21
--- /dev/null
+++ b/games-arcade/frozen-bubble/files/1.0.0-sdl-perl-check.patch
@@ -0,0 +1,11 @@
+--- frozen-bubble-1.0.0/Makefile.orig	2004-12-16 12:54:41.860432848 -0500
++++ frozen-bubble-1.0.0/Makefile	2004-12-16 12:55:24.317978320 -0500
+@@ -9,7 +9,7 @@
+ 
+ dirs:
+ 	@if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
+-	@if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || $$mn<19'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
++	@if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 1 if $$mj<1 || ($$mj==1 && $$mn<19)'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
+ 	@for n in . $(DIRS); do \
+ 		[ "$$n" = "." ] || $(MAKE) -C $$n ;\
+ 	done
diff --git a/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r3 b/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r4
index 1abf1f03e569..1abf1f03e569 100644
--- a/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r3
+++ b/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r4
diff --git a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r4.ebuild
index 2f90b6e952b7..643614e3d18c 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r3.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.18 2004/07/21 02:12:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r4.ebuild,v 1.1 2004/12/16 18:12:22 vapier Exp $
 
 inherit eutils perl-module games
 
@@ -14,7 +14,7 @@ SRC_URI="http://guillaume.cottenceau.free.fr/fb/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
@@ -28,12 +28,14 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}/fb-sdlperl-deb.patch"
+	epatch "${FILESDIR}"/${PV}-fb-sdlperl-deb.patch
+	epatch "${FILESDIR}"/${PV}-sdl-perl-check.patch
+	epatch "${FILESDIR}"/${PV}-no-chainreaction.patch
 	sed -i \
 		-e 's:INSTALLDIRS=.*:PREFIX=${D}/usr:' \
 		c_stuff/Makefile \
 		|| die 'sed c_stuff/Makefile failed'
-	cd "${WORKDIR}/${NET_SERVER_P}"
+	cd "${WORKDIR}"/${NET_SERVER_P}
 	sed -i \
 		-e '/^dnl AM_CONFIG_HEADER/s:dnl ::' configure.in \
 		|| die "sed configure.in failed"
@@ -43,6 +45,10 @@ src_unpack() {
 		WANT_AUTOCONF=2.5 \
 		./bootstrap.sh || die "bootstrap failed"
 	echo '#include "config.h"' >> fb_serv.h
+	cd "${WORKDIR}"/${NET_CLIENT_P}
+	ln -s frozen-bubble-client frozen-bubble
+	epatch "${FILESDIR}"/${PV}-fb-sdlperl-deb.patch
+	rm frozen-bubble
 }
 
 src_compile() {