remove old 1.0 version

(Portage version: 2.1.2-r9)

7 files changed, 8 insertions, 358 deletions

diff --git a/games-arcade/frozen-bubble/ChangeLog b/games-arcade/frozen-bubble/ChangeLog
index bc13a8cab7e5..2f846ad6ec8c 100644
--- a/games-arcade/frozen-bubble/ChangeLog
+++ b/games-arcade/frozen-bubble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/frozen-bubble
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.26 2007/01/13 21:33:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/frozen-bubble/ChangeLog,v 1.27 2007/02/26 18:10:54 mr_bones_ Exp $
+
+  26 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch,
+  -files/frozen-bubble-1.0.0-sdl-perl-2.patch,
+  -files/1.0.0-no-chainreaction.patch,
+  -files/frozen-bubble-1.0.0-makefile.patch, -frozen-bubble-1.0.0-r6.ebuild:
+  remove old 1.0 version
 
   07 Jan 2007; Mike Frysinger <vapier@gentoo.org>
   frozen-bubble-2.1.0.ebuild:
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
deleted file mode 100644
index bacd64983979..000000000000
--- a/games-arcade/frozen-bubble/files/1.0.0-no-chainreaction.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/digest-frozen-bubble-1.0.0-r6 b/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r6
deleted file mode 100644
index 501c4138811e..000000000000
--- a/games-arcade/frozen-bubble/files/digest-frozen-bubble-1.0.0-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-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/files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch b/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch
deleted file mode 100644
index e67043cf3f8a..000000000000
--- a/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-editor-sdl-perl-2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Based on upstream patch:
-http://www.frozen-bubble.org/perl-SDL.patch
-
-To fix:
-http://bugs.gentoo.org/show_bug.cgi?id=74844
-http://bugs.gentoo.org/show_bug.cgi?id=87502
-
-This version of the patch works with both sdl-perl-1.x and sdl-perl-2.x
-
---- c_stuff/lib/FBLE.pm
-+++ c_stuff/lib/FBLE.pm
-@@ -86,6 +86,25 @@
- 
- #- ----------- bubbles processing/drawing -----------------------------------------
- 
-+sub surf {
-+    my ($surface) = @_;
-+    if (ref($surface) eq 'HASH') {
-+        return $surface->{-surface};
-+    } else {
-+        return $$surface;
-+    }
-+}
-+
-+sub rect {
-+    my ($rect) = @_;
-+    if (ref($rect) eq 'HASH') {
-+        return $rect->{-rect};
-+    } else {
-+        return $$rect;
-+    }
-+}
-+
-+
- # subroutine to calculate the left corner x of the given bubble option column (based on 0 start)
- sub bubble_optionx {
-     my ($col) = @_;
-@@ -1094,11 +1113,11 @@
-     $rect{screenshot} = SDL::Rect->new(-x => $POS_1P{p1}{left_limit} - 40, '-y' => 0, 
- 				       -width => $POS_1P{p1}{right_limit} - $POS_1P{p1}{left_limit} + 80,
- 				       -height => $POS_1P{bottom_limit} - $POS_1P{init_top_limit} + 190);
--    fb_c_stuff::shrink($app->{-surface},
--		       $file_browser_screenshots[$list_browser_highlight_offset]->display_format()->{-surface},
-+    fb_c_stuff::shrink(surf($app),
-+		       surf($file_browser_screenshots[$list_browser_highlight_offset]->display_format()),
- 		       $rect{middle}->x + $rect{middle}->width - $rect{screenshot}->width/4 - 12,
- 		       $rect{middle}->y + $rect{middle}->height/2 - $rect{screenshot}->height/8 - 3,
--		       $rect{screenshot}{-rect}, 4);
-+		       rect($rect{screenshot}), 4);
- }
- 
- 
-@@ -1366,6 +1366,14 @@
-     print_dialog_list_arrow($do_highlight, 'up');
- }
- 
-+sub SDL_TEXTWIDTH {
-+	if (defined(&SDL::App::SDL_TEXTWIDTH)) {
-+		SDL::App::SDL_TEXTWIDTH(@_);   # perl-sdl-1.x
-+	} else {
-+		SDL::SFont::SDL_TEXTWIDTH(@_); # perl-sdl-2.x
-+	}
-+}
-+
- # subroutine to print out the levelset name at the top of the screen
- sub print_levelset_name {
-     $rect{ls_name_erase} = SDL::Rect->new(-x => 195, '-y' => 0, -width => 445-195, -height => 35);
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-makefile.patch b/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-makefile.patch
deleted file mode 100644
index 29cf7fc97418..000000000000
--- a/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Update the perl-SDL check to accept 2.x versions.
-
-Make sure we update the DATADIR stuff before building in 
-subdirs otherwise the lib file gets copied to blib first 
-and the final binary isn't fixed up properly.
-
---- Makefile
-+++ Makefile
-@@ -11,6 +11,3 @@
- 	@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
- 	@if [ ! -d save_virgin ]; then mkdir save_virgin; cp c_stuff/lib/fb_stuff.pm save_virgin; fi
-@@ -18,2 +15,5 @@
- 	perl -pi -e 's|\@DATADIR\@|$(DATADIR)|' c_stuff/lib/fb_stuff.pm
-+	@for n in . $(DIRS); do \
-+		[ "$$n" = "." ] || $(MAKE) -C $$n ;\
-+	done
- 
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-sdl-perl-2.patch b/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-sdl-perl-2.patch
deleted file mode 100644
index be8dfb058f85..000000000000
--- a/games-arcade/frozen-bubble/files/frozen-bubble-1.0.0-sdl-perl-2.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Based on upstream patch:
-http://www.frozen-bubble.org/perl-SDL.patch
-
-To fix:
-http://bugs.gentoo.org/show_bug.cgi?id=74844
-
-This version of the patch works with both sdl-perl-1.x and sdl-perl-2.x
-
---- frozen-bubble
-+++ frozen-bubble
-@@ -90,3 +90,4 @@
- 
- $version = '1.0.0';
-+$SDL_VER = substr($SDL::VERSION, 0, 1); # Extract sdl-perl's major num
- 
-@@ -161,6 +161,19 @@
- 
- #- ----------- sound related stuff ----------------------------------------
- 
-+sub get_sound {
-+	my ($sound) = @_;
-+	if ($SDL_VER eq 1) {
-+		if (ref($sound) eq 'SDL::Sound') {
-+			return $sound{$_}{-data};
-+		} else {
-+			return $sound->{-data};
-+		}
-+	} else {
-+		return $$sound;
-+	}
-+}
-+
- sub play_sound($) {
-     $mixer_enabled && $mixer && !$sfx_disabled && $sound{$_[0]} and $mixer->play_channel(-1, $sound{$_[0]}, 0);
- }
-@@ -179,7 +188,7 @@
- 	    $elem or return -1;
- 	    -f $elem or return 0;
- 	    $mus = SDL::Music->new($elem);
--	    if ($mus->{-data}) {
-+	    if (get_sound($mus)) {
- 		print STDERR "[Playlist] playing `$elem'\n";
- 		$mixer->play_music($mus, 0);
- 		return 1;
-@@ -191,9 +200,9 @@
- 	while ($tryanother->() == 0) {};
-     } else {
- 	$mus = SDL::Music->new("$FPATH$musics{$name}");
--	$mus->{-data} or print STDERR "Warning, could not create new music from `$FPATH$musics{$name}' (reason: ", $app->error, ").\n";
-+	get_sound($mus) or print STDERR "Warning, could not create new music from `$FPATH$musics{$name}' (reason: ", $app->error, ").\n";
- 	if ($pos) {
--	    fb_c_stuff::fade_in_music_position($mus->{-data}, -1, 500, $pos);
-+	    fb_c_stuff::fade_in_music_position(get_sound($mus), -1, 500, $pos);
- 	} else {
- 	    $mixer->play_music($mus, -1);
- 	}
-@@ -212,7 +221,7 @@
-     foreach (@sounds) {
- 	my $sound_path = "$FPATH/snd/$_.wav";
- 	$sound{$_} = SDL::Sound->new($sound_path);
--	if ($sound{$_}{-data}) {
-+	if (get_sound($sound{$_})) {
- 	    $sound{$_}->volume(80);
- 	} else {
- 	    print STDERR "Warning, could not create new sound from `$sound_path'.\n";
-@@ -233,6 +233,14 @@
- 
- #- ----------- graphics related stuff --------------------------------------
- 
-+sub SDL_TEXTWIDTH {
-+	if (defined(&SDL::App::SDL_TEXTWIDTH)) {
-+		SDL::App::SDL_TEXTWIDTH(@_);   # perl-sdl-1.x
-+	} else {
-+		SDL::SFont::SDL_TEXTWIDTH(@_); # perl-sdl-2.x
-+	}
-+}
-+
- sub add_default_rect($) {
-     my ($surface) = @_;
-     $rects{$surface} = SDL::Rect->new(-width => $surface->width, -height => $surface->height);
-@@ -304,10 +304,28 @@
-     return $save;
- }
- 
-+sub surf {
-+    my ($surface) = @_;
-+    if (ref($surface) eq 'HASH') {
-+        return $surface->{-surface};
-+    } else {
-+        return $$surface;
-+    }
-+}
-+
-+sub rect {
-+    my ($rect) = @_;
-+    if (ref($rect) eq 'HASH') {
-+        return $rect->{-rect};
-+    } else {
-+        return $$rect;
-+    }
-+}
-+
- sub add_image($) {
-     my $file = "$FPATH/gfx/$_[0]";
-     my $img = SDL::Surface->new(-name => $file);
--    $img->{-surface} or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
-+    surf($img) or die "FATAL: Couldn't load `$file' into a SDL::Surface.\n";
-     add_default_rect($img);
-     return $img;
- }
-@@ -1473,7 +1491,7 @@
- 	}
- 
- 	put_image($imgbin{hiscore_frame}, $high_posx - 7, $high_posy - 6);
--	fb_c_stuff::shrink($app->{-surface}, $background->display_format->{-surface}, $high_posx, $high_posy, $high_rect->{-rect}, 4);
-+	fb_c_stuff::shrink(surf($app), surf($background->display_format), $high_posx, $high_posy, rect($high_rect), 4);
- 	$centered_print->($high_posx, $high_posy,    $high->{name});
- 	$centered_print->($high_posx, $high_posy+20, $high->{level} eq 'WON' ? "WON!" : "LVL-".$high->{level});
- 	my $min = int($high->{time}/60);
-@@ -1642,7 +1660,7 @@
- 	$background->blit($apprects{main}, $app, $apprects{main});
- 	$app->flip;
-     } else {
--	fb_c_stuff::effect($app->{-surface}, $background->display_format->{-surface});
-+	fb_c_stuff::effect(surf($app), surf($background->display_format));
-     }
- 
-     $display_on_app_disabled = 0;
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
deleted file mode 100644
index 8ab5de0b62c9..000000000000
--- a/games-arcade/frozen-bubble/frozen-bubble-1.0.0-r6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.6 2006/09/27 03:26:01 vapier Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-inherit autotools 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"
-
-pkg_setup() {
-	if ! built_with_use -a media-libs/sdl-image gif png ; then
-		ewarn "Frozen-bubble uses GIF and PNG image files."
-		ewarn "You must emerge media-libs/sdl-image with GIF and PNG support."
-		ewarn "Please USE=\"gif png\" emerge media-libs/sdl-image"
-		die "Cannot emerge without gif and png USE flags on sdl-image"
-	fi
-	if ! built_with_use media-libs/sdl-mixer mikmod ; then
-		ewarn "You must emerge media-libs/sdl-mixer with mikmod support."
-		ewarn "    USE=mikmod emerge media-libs/sdl-mixer"
-		die "missing mikmod USE flag for sdl-mixer"
-	fi
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	find . -type d -name .xvpics -print0 | xargs -0 rm -rf #bug #132227
-	# main package
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${PV}-no-chainreaction.patch \
-		"${FILESDIR}"/${P}-{editor-,}sdl-perl-2.patch
-	sed -i \
-		-e 's:INSTALLDIRS=.*:PREFIX=${D}/usr:' \
-		c_stuff/Makefile \
-		|| die 'sed failed'
-
-	# server addon
-	cd "${WORKDIR}"/${NET_SERVER_P}
-	eautoreconf
-
-	# 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
-}