version bump

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

5 files changed, 134 insertions, 2 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 28f00165714a..8930d6e7bdb9 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/fish-fillets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.40 2009/07/07 03:28:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.41 2009/10/19 01:45:05 mr_bones_ Exp $
+
+*fish-fillets-0.9.2 (19 Oct 2009)
+
+  19 Oct 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +fish-fillets-0.9.2.ebuild, +files/fish-fillets-0.9.2-fribidi.patch,
+  +files/fish-fillets-0.9.2-gcc43.patch:
+  version bump
 
 *fish-fillets-0.9.1 (07 Jul 2009)
 
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index f29e6ce8b130..caa69b638a34 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -2,11 +2,16 @@ AUX fish-fillets-0.8.1-fribidi.patch 1112 RMD160 cd3b519e801e77c70486711a1ca8887
 AUX fish-fillets-0.8.1-gcc43.patch 1464 RMD160 a30172fcb6443559d62f2317e80c3580b1245299 SHA1 f28540d18dfd65eb2ae09b4de6e9925c8322239f SHA256 9f984f92d5bcbd57a3847c09e08959739d4eb0a2ed3b64c868ee49ef9af7b71e
 AUX fish-fillets-0.9.1-fribidi.patch 1112 RMD160 cd3b519e801e77c70486711a1ca8887cb1922ac8 SHA1 edd16a8d95c06dbe8c3048c8b899220d62084f4c SHA256 a4e05b2f1b33dcea221f49443b8589adf8952dfe5a5363cc9ea07d98794e1039
 AUX fish-fillets-0.9.1-gcc43.patch 1464 RMD160 a30172fcb6443559d62f2317e80c3580b1245299 SHA1 f28540d18dfd65eb2ae09b4de6e9925c8322239f SHA256 9f984f92d5bcbd57a3847c09e08959739d4eb0a2ed3b64c868ee49ef9af7b71e
+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
 DIST fillets-ng-0.8.1.tar.gz 359212 RMD160 67152cc8b135c7742df65207ec58d26d78eb79f7 SHA1 79e6bf7ddb6f2a4f1cda12705c2415fecccbe4a0 SHA256 de07d9388fcde9eaaef16f92181b9c79793b2bfacbd62a7e4755a0b5e5cd664c
 DIST fillets-ng-0.9.1.tar.gz 365697 RMD160 c7c611c97573c53afec1b9fb8cb3cf8d64f3aeab SHA1 bdabb6d92f5eb0592921e1c586056b122abb272e SHA256 d4d7d3950117392bea413abaf2f4344e1e1badbddd3871b7064c78972c0764e3
+DIST fillets-ng-0.9.2.tar.gz 367136 RMD160 4a11deec482994774189523b6e7bd78c7cbeb085 SHA1 fc535f8f00618db03e7181fd25f5efabad56255e SHA256 8e9c3a5104bd435eb2db4e78fd966f97d301266e0a9bfb79395e8db5804aacd4
 DIST fillets-ng-data-0.8.1.tar.gz 95953619 RMD160 da980117d5a41d9f6daf0215d37c9bf6a931d124 SHA1 6bbe438097cbd4ecfbcffcbad47e1791b4865a54 SHA256 b19d2f1aff628ceb79456a37c760dff992adedab8f3f1bd8ae5d441bc0e18309
 DIST fillets-ng-data-0.9.0.tar.gz 113063946 RMD160 cf782ad624d374f19748946ee32f4fe0b48aab16 SHA1 317d4c7cea98adefca9f640ac469f9e2c35fbe64 SHA256 c40a907e1ac1db09fc120f8373adbfe363f6e5c7c91bc9d669f218c70ae4a42b
+DIST fillets-ng-data-0.9.2.tar.gz 113066821 RMD160 29c44f63c8c9afc4cb91e95f1a850bac1445e191 SHA1 fc4522de5fe674c658b6fe8dd0d597dc43f9c572 SHA256 d6da53e0fb1dda40276a2c1a92905b9e4028726fc45c2293c2800d37cd082e53
 EBUILD fish-fillets-0.8.1.ebuild 1597 RMD160 df571082c76f169d0b2294dd5cec3800c17dac57 SHA1 f119ed66fc42ce906b6d453482c626ca97c40dca SHA256 df65604a62f4a5cd7174c262e2a1cafc7c43528b7f4c3958a29782cead766464
 EBUILD fish-fillets-0.9.1.ebuild 1610 RMD160 151f346d98b1328ddd397075397ba448abedf773 SHA1 912de4df66c860d6987303930c66efa45fe62b20 SHA256 6b6847bfed103812816bc1170a9684e2bbe20a61112386c327497af63a6cab27
-MISC ChangeLog 5922 RMD160 a67e9eef41087d7e675c152c7feee318e51c2e68 SHA1 677343fc795d7b7334cbd6a110d7b4f8433c2973 SHA256 9361323d41d2fed946ef475abd6a17a03fd11d94daea8a62e213745844d07f00
+EBUILD fish-fillets-0.9.2.ebuild 1610 RMD160 ebb700f0aaeec9f56217acac28963c96883d8da4 SHA1 2e13e7a7500d8ca8372f7759bd7699bb523162f7 SHA256 603bcb44e7e0d53c9cab6dbaf20dc7b4a3b468019a783f2d26ce9a1deb56a72c
+MISC ChangeLog 6140 RMD160 64e7eb45de363440903976855dab1e2045359777 SHA1 7327294d6c064a5b6bc06be7ee0ac1f5d67114f9 SHA256 c4aef2d64e192d26be139eb7432a2e9a7d888af881f8565324a785b41800b5c7
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-fribidi.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-fribidi.patch
new file mode 100644
index 000000000000..2e490ebe0014
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-fribidi.patch
@@ -0,0 +1,21 @@
+diff -ru fillets-ng-0.8.1.orig/src/effect/Font.cpp fillets-ng-0.8.1/src/effect/Font.cpp
+--- fillets-ng-0.8.1.orig/src/effect/Font.cpp	2006-01-05 23:31:18.000000000 +0100
++++ fillets-ng-0.8.1/src/effect/Font.cpp	2009-03-02 21:20:23.000000000 +0100
+@@ -26,7 +26,7 @@
+     FriBidiChar *logicalString = new FriBidiChar[text.length() + 1];
+     FriBidiChar *visualString = new FriBidiChar[text.length() + 1];
+ 
+-    int ucsLength = fribidi_utf8_to_unicode(const_cast<char*>(text.c_str()),
++    int ucsLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, const_cast<char*>(text.c_str()),
+             text.length(), logicalString);
+     fribidi_boolean ok = fribidi_log2vis(logicalString, ucsLength, &base,
+             visualString, NULL, NULL, NULL);
+@@ -37,7 +37,7 @@
+     }
+ 
+     char *buffer = new char[text.length() + 1];
+-    int length = fribidi_unicode_to_utf8(visualString, ucsLength, buffer);
++    int length = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, visualString, ucsLength, buffer);
+     std::string result = std::string(buffer, length);
+     delete[] buffer;
+     delete[] visualString;
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-gcc43.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-gcc43.patch
new file mode 100644
index 000000000000..19b7ab86c895
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.9.2-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.2.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.9.2.ebuild
new file mode 100644
index 000000000000..0a3124973415
--- /dev/null
+++ b/games-puzzle/fish-fillets/fish-fillets-0.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 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.2.ebuild,v 1.1 2009/10/19 01:45:05 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[video]
+	>=media-libs/sdl-mixer-1.2.5[vorbis]
+	>=media-libs/sdl-image-1.2.2[png]
+	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" \
+		"${FILESDIR}/${P}-fribidi.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 fillets.png
+	make_desktop_entry fillets FishFillets fillets
+	prepgamesdirs
+}