version bump (bug #309467)

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

4 files changed, 110 insertions, 2 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 28f0bc0ba261..59d9a31a8983 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/fish-fillets
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.43 2010/01/05 02:21:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.44 2010/03/15 23:18:50 mr_bones_ Exp $
+
+*fish-fillets-0.9.3 (15 Mar 2010)
+
+  15 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +fish-fillets-0.9.3.ebuild, +files/fish-fillets-0.9.3-gcc43.patch:
+  version bump (bug #309467)
 
   05 Jan 2010; Joseph Jezak <josejx@gentoo.org> fish-fillets-0.9.2.ebuild:
   Marked ppc stable for bug #294007.
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index fddd3d8cdf2a..4c9ae6d51c64 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,7 +1,10 @@
 AUX fish-fillets-0.9.2-fribidi.patch 1112 RMD160 cd3b519e801e77c70486711a1ca8887cb1922ac8 SHA1 edd16a8d95c06dbe8c3048c8b899220d62084f4c SHA256 a4e05b2f1b33dcea221f49443b8589adf8952dfe5a5363cc9ea07d98794e1039
 AUX fish-fillets-0.9.2-gcc43.patch 1464 RMD160 a30172fcb6443559d62f2317e80c3580b1245299 SHA1 f28540d18dfd65eb2ae09b4de6e9925c8322239f SHA256 9f984f92d5bcbd57a3847c09e08959739d4eb0a2ed3b64c868ee49ef9af7b71e
+AUX fish-fillets-0.9.3-gcc43.patch 1464 RMD160 a30172fcb6443559d62f2317e80c3580b1245299 SHA1 f28540d18dfd65eb2ae09b4de6e9925c8322239f SHA256 9f984f92d5bcbd57a3847c09e08959739d4eb0a2ed3b64c868ee49ef9af7b71e
 DIST fillets-ng-0.9.2.tar.gz 367136 RMD160 4a11deec482994774189523b6e7bd78c7cbeb085 SHA1 fc535f8f00618db03e7181fd25f5efabad56255e SHA256 8e9c3a5104bd435eb2db4e78fd966f97d301266e0a9bfb79395e8db5804aacd4
+DIST fillets-ng-0.9.3.tar.gz 381008 RMD160 00e536fcb91e46ce49b924ceb28cdc22be34e158 SHA1 3ac6c14b675eabae20050b01c22c9e55d3bfb7b6 SHA256 213fec9f7c223ee76922d1cc4991d55d9f78f2dc2cf3201f37fdccb147db184f
 DIST fillets-ng-data-0.9.2.tar.gz 113066821 RMD160 29c44f63c8c9afc4cb91e95f1a850bac1445e191 SHA1 fc4522de5fe674c658b6fe8dd0d597dc43f9c572 SHA256 d6da53e0fb1dda40276a2c1a92905b9e4028726fc45c2293c2800d37cd082e53
 EBUILD fish-fillets-0.9.2.ebuild 1628 RMD160 ffa55c06d3938d4b6fb3c4a891384d0b06cc0a4a SHA1 360895b9174ae78b6733ac7b52f7e16f7f79245b SHA256 2ea220fc694afbdd2548fe5de6094b97ba439bec435bafb830c9702a2410b8f7
-MISC ChangeLog 6358 RMD160 28e22e5ed6900801ee1b7fa35ffeca37787cf187 SHA1 41924e713bcd594ae965f666e72147d21464c50a SHA256 539d8b5a4d39d9a6e68d873b12fd7f919f65fb514933a5e227e9228e4ec19c37
+EBUILD fish-fillets-0.9.3.ebuild 1593 RMD160 0271cbe7d9ba097b08e2a63934a0c28c883365d7 SHA1 aa5879654278aedb6229d916af0135188b3853fd SHA256 8ac0e46fbb8a31828379af696f5de0749fcc4dc77c642c337d6d50766f430c1d
+MISC ChangeLog 6550 RMD160 6aa1b9bbe5cdf77d513f425944e28e7902cbb134 SHA1 81753d4d47cfb021c0334e0f830aa44119416a0e SHA256 5dc0af99ca4f7c98f0b45b0d65634a85b4191d8bfc46c3edafc2f8277e214934
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.9.3-gcc43.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.9.3-gcc43.patch
new file mode 100644
index 000000000000..19b7ab86c895
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.9.3-gcc43.patch
@@ -0,0 +1,38 @@
+diff -ru fillets-ng-0.8.1.orig/src/gengine/OptionAgent.cpp fillets-ng-0.8.1/src/gengine/OptionAgent.cpp
+--- fillets-ng-0.8.1.orig/src/gengine/OptionAgent.cpp	2008-12-29 05:43:40.000000000 -0500
++++ fillets-ng-0.8.1/src/gengine/OptionAgent.cpp	2009-02-13 13:35:13.000000000 -0500
+@@ -23,8 +23,8 @@
+ #include "UnknownMsgException.h"
+ #include "minmax.h"
+ 
+-#include <stdlib.h> //getenv
+-#include <string.h> //strlen
++#include <cstdlib> //getenv
++#include <cstring> //strlen
+ #include <locale.h> //setlocale
+ 
+ #ifndef LC_MESSAGES
+diff -ru fillets-ng-0.8.1.orig/src/gengine/StringTool.cpp fillets-ng-0.8.1/src/gengine/StringTool.cpp
+--- fillets-ng-0.8.1.orig/src/gengine/StringTool.cpp	2008-08-10 06:00:15.000000000 -0400
++++ fillets-ng-0.8.1/src/gengine/StringTool.cpp	2009-02-13 13:35:29.000000000 -0500
+@@ -8,7 +8,7 @@
+  */
+ #include "StringTool.h"
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <sstream>
+ 
+ //-----------------------------------------------------------------
+diff -ru fillets-ng-0.8.1.orig/src/level/Landslip.cpp fillets-ng-0.8.1/src/level/Landslip.cpp
+--- fillets-ng-0.8.1.orig/src/level/Landslip.cpp	2008-08-10 06:00:29.000000000 -0400
++++ fillets-ng-0.8.1/src/level/Landslip.cpp	2009-02-13 13:36:06.000000000 -0500
+@@ -11,7 +11,7 @@
+ #include "Rules.h"
+ #include "minmax.h"
+ 
+-#include <string.h>
++#include <cstring>
+ 
+ //-----------------------------------------------------------------
+     Landslip::Landslip(const ModelList &models)
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.9.3.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.9.3.ebuild
new file mode 100644
index 000000000000..0bc79e6f53cb
--- /dev/null
+++ b/games-puzzle/fish-fillets/fish-fillets-0.9.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.9.3.ebuild,v 1.1 2010/03/15 23:18:50 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+DATA_PV="0.9.2"
+DESCRIPTION="Underwater puzzle game - find a safe way out"
+HOMEPAGE="http://fillets.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
+	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsdl-1.2[audio,video]
+	>=media-libs/sdl-mixer-1.2.5[vorbis]
+	>=media-libs/sdl-image-1.2.2[png]
+	media-libs/smpeg
+	x11-libs/libX11
+	media-libs/sdl-ttf
+	dev-libs/fribidi
+	>=dev-lang/lua-5"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/fillets-ng-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-gcc43.patch"
+
+	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
+	sed -i \
+		-e 's/\.mod(/.fmod(/' \
+		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
+		|| die "sed failed"
+	rm -f missing
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--datadir="${GAMES_DATADIR}/${PN}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	insinto "${GAMES_DATADIR}/${PN}"
+	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
+	rm -f COPYING
+	doins -r * || die "doins failed"
+	newicon images/icon.png ${PN}.png
+	make_desktop_entry fillets "Fish Fillets NG"
+	prepgamesdirs
+}