Push out patches and fix datadir path.

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

3 files changed, 10 insertions, 68 deletions

diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index 56a7e086d5a7..99baa7707626 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -19,10 +19,10 @@ RMD160 a22a89c5a0ba8fdd8139953ea91b147249df831c files/fish-fillets-0.7.3-use-lua
 SHA256 27a4760e72fd41b885e2e7dec909eca19738ad7f080fa6f0a9ad954d3c56944f files/fish-fillets-0.7.3-use-lua-pkg-config.patch 2111
 DIST fillets-ng-0.7.3.tar.gz 311799 RMD160 6c8f41feab9df2b6dee3942c18848d61ab2f2c7d SHA1 58937e59c3108e0ed4d2a5e542f3d9b813655287 SHA256 cbcc62fa399f96f636f547cd424c0abbbc7860227e837f191e8eded686b6ffc2
 DIST fillets-ng-data-0.7.1.tar.gz 95672064 RMD160 bee5a815bbcb439bb3bf1fdcf925fb3db304a566 SHA1 37731b58877565165a258ff0df48243f29001d50 SHA256 7f9196e81e279ad088dd64a604bc6a8e9e10eedb75f080b6e845536e3ee13659
-EBUILD fish-fillets-0.7.3.ebuild 1446 RMD160 62a9eb9888b15c0be2e35b7566347e2de99005ac SHA1 7dc97fe70a06a08681e180df4e118fbf82bea5a1 SHA256 32150db63e78af3b0dbda45277a072744c49e828f0be9e4d052edd3db3f560df
-MD5 6c98e43b26dc3cd2efadbb755a2ec853 fish-fillets-0.7.3.ebuild 1446
-RMD160 62a9eb9888b15c0be2e35b7566347e2de99005ac fish-fillets-0.7.3.ebuild 1446
-SHA256 32150db63e78af3b0dbda45277a072744c49e828f0be9e4d052edd3db3f560df fish-fillets-0.7.3.ebuild 1446
+EBUILD fish-fillets-0.7.3-r1.ebuild 1496 RMD160 d09961be8a50bbe688242e58386d6a1b04e5339b SHA1 96b192f4d8b10c8c4269ceef5844e187aa93a12d SHA256 ecb436961c1755a32835a3177ab3ad0b2482d1160a3d1f0e6be67d95f9cb5621
+MD5 993b1d19c28324ea191cced48ebdfe9a fish-fillets-0.7.3-r1.ebuild 1496
+RMD160 d09961be8a50bbe688242e58386d6a1b04e5339b fish-fillets-0.7.3-r1.ebuild 1496
+SHA256 ecb436961c1755a32835a3177ab3ad0b2482d1160a3d1f0e6be67d95f9cb5621 fish-fillets-0.7.3-r1.ebuild 1496
 MISC ChangeLog 3287 RMD160 34a8274b8c298ac416af271570172bd8c31b0830 SHA1 c5c56c836f361197d0863c5a8f0b5df1df131f31 SHA256 0b5f6360e2a354baaaff37d2dabc9a2cdcd9834ea14d2013d01f6f7b919e50d0
 MD5 ea45a348cd09282c6a3be1d16471ff28 ChangeLog 3287
 RMD160 34a8274b8c298ac416af271570172bd8c31b0830 ChangeLog 3287
@@ -31,13 +31,13 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 ce8b18dd1074506883ddf36c928a9553 files/digest-fish-fillets-0.7.3 521
-RMD160 df05f9fe2fe844445142a59f1a868aedd2a76a49 files/digest-fish-fillets-0.7.3 521
-SHA256 d3c6479161b59fecbb3666ad826d3b182975aba65e3afc55ef31929b3607e1d5 files/digest-fish-fillets-0.7.3 521
+MD5 ce8b18dd1074506883ddf36c928a9553 files/digest-fish-fillets-0.7.3-r1 521
+RMD160 df05f9fe2fe844445142a59f1a868aedd2a76a49 files/digest-fish-fillets-0.7.3-r1 521
+SHA256 d3c6479161b59fecbb3666ad826d3b182975aba65e3afc55ef31929b3607e1d5 files/digest-fish-fillets-0.7.3-r1 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEcm/amhnQswr0vIRAnvkAJ9Me7OWxbNXlFQNlb2v3eEvLlvigQCgsAKS
-RLI1yrj2+wvpDKGaJtQirBI=
-=G+1W
+iD8DBQFFEhSmamhnQswr0vIRAon8AKCh3NlPq+VXAxpeTiO7mGyAL8g6DwCggggR
+JcXvBLzJNUxLgH0GG1c1n2c=
+=Mpw7
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/fish-fillets/files/digest-fish-fillets-0.7.3 b/games-puzzle/fish-fillets/files/digest-fish-fillets-0.7.3
deleted file mode 100644
index 81d9393abb25..000000000000
--- a/games-puzzle/fish-fillets/files/digest-fish-fillets-0.7.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3cdb20616c8bf4498f2990f4e0d526a1 fillets-ng-0.7.3.tar.gz 311799
-RMD160 6c8f41feab9df2b6dee3942c18848d61ab2f2c7d fillets-ng-0.7.3.tar.gz 311799
-SHA256 cbcc62fa399f96f636f547cd424c0abbbc7860227e837f191e8eded686b6ffc2 fillets-ng-0.7.3.tar.gz 311799
-MD5 dabb8aa5dcce57e782a2a27343c40cc6 fillets-ng-data-0.7.1.tar.gz 95672064
-RMD160 bee5a815bbcb439bb3bf1fdcf925fb3db304a566 fillets-ng-data-0.7.1.tar.gz 95672064
-SHA256 7f9196e81e279ad088dd64a604bc6a8e9e10eedb75f080b6e845536e3ee13659 fillets-ng-data-0.7.1.tar.gz 95672064
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
deleted file mode 100644
index f88daa7d885d..000000000000
--- a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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.7.3.ebuild,v 1.4 2006/09/20 23:06:58 vapier Exp $
-
-inherit autotools eutils games
-
-DATA_PV="0.7.1"
-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="X"
-
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-mixer-1.2.5
-	>=media-libs/sdl-image-1.2.2
-	X? ( x11-libs/libX11 )
-	media-libs/sdl-ttf
-	>=dev-lang/lua-5"
-
-S=${WORKDIR}/fillets-ng-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-check-for-X.patch
-	epatch "${FILESDIR}"/${P}-custom-datadir.patch
-	epatch "${FILESDIR}"/${P}-no-local-paths.patch
-	epatch "${FILESDIR}"/${P}-use-lua-pkg-config.patch
-	eautoreconf
-}
-
-src_compile() {
-	egamesconf $(use_with X) || die
-	emake || die "emake failed"
-}
-
-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.png
-	prepgamesdirs
-}