Add menu support (bug #89378) with patch from Aleksandar Radovic

(Portage version: 2.0.51.19)

4 files changed, 14 insertions, 58 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 4a79ccbe3585..1c9a581453a2 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/fish-fillets
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.13 2004/12/28 15:43:47 josejx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.14 2005/04/18 15:33:37 mr_bones_ Exp $
+
+  18 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  fish-fillets-0.6.0.ebuild:
+  Add menu support (bug #89378) with patch from Aleksandar Radovic
+  Tidy old ebuild
 
   29 Dec 2004; Joseph Jezak <josejx@gentoo.org> fish-fillets-0.6.0.ebuild:
   Marked ppc stable.
diff --git a/games-puzzle/fish-fillets/files/digest-fish-fillets-0.5.0-r1 b/games-puzzle/fish-fillets/files/digest-fish-fillets-0.5.0-r1
deleted file mode 100644
index 11468cd747fa..000000000000
--- a/games-puzzle/fish-fillets/files/digest-fish-fillets-0.5.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d267da9787858125abe2e21a0a346c28 fillets-ng-0.5.0.tar.gz 287662
-MD5 b9253d425c5382744ce57f6a136b730a fillets-ng-data-0.5.1.tar.gz 43643862
-MD5 1e271ae4c474d12f289724a24bc8dee7 fillets-ng-data-cs-0.5.0.tar.gz 20328046
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.5.0-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.5.0-r1.ebuild
deleted file mode 100644
index f58eb2580ce3..000000000000
--- a/games-puzzle/fish-fillets/fish-fillets-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 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.5.0-r1.ebuild,v 1.2 2004/11/05 05:45:08 josejx Exp $
-
-inherit games
-
-CS_PV="0.5.0"
-DATA_PV="0.5.1"
-DESCRIPTION="Underwater puzzle game - find a safe way out"
-HOMEPAGE="http://fillets.sf.net"
-SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
-	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz
-	nls? ( mirror://sourceforge/fillets/fillets-ng-data-cs-${CS_PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE="nls"
-
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-mixer-1.2.5
-	>=media-libs/sdl-image-1.2.2
-	media-libs/sdl-ttf
-	>=dev-lang/lua-5"
-
-S="${WORKDIR}/fillets-ng-${PV}"
-
-src_compile() {
-	CPPFLAGS="-DSYSTEM_DATA_DIR=\"\\\"${GAMES_DATADIR}/${PN}\\\"\"" \
-	egamesconf \
-		--with-lua="/usr" || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dodir "${GAMES_DATADIR}/${PN}"
-	cd ../fillets-ng-data-${DATA_PV}
-	cp -r font music sound doc images script "${D}${GAMES_DATADIR}/${PN}" \
-		|| die "cp failed"
-	if use nls ; then
-		cd ../fillets-ng-data-cs-${CS_PV}
-		cp -r sound "${D}${GAMES_DATADIR}/${PN}" \
-			|| die "cp failed"
-	fi
-	prepgamesdirs
-}
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.6.0.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.6.0.ebuild
index b61b66bf3960..1ff69a114af1 100644
--- a/games-puzzle/fish-fillets/fish-fillets-0.6.0.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.6.0.ebuild,v 1.2 2004/12/28 15:43:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.6.0.ebuild,v 1.3 2005/04/18 15:33:37 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 CS_PV="0.6.0"
 DATA_PV="0.6.1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 IUSE="nls"
 
 DEPEND=">=media-libs/libsdl-1.2
@@ -23,7 +23,7 @@ DEPEND=">=media-libs/libsdl-1.2
 	media-libs/sdl-ttf
 	>=dev-lang/lua-5"
 
-S="${WORKDIR}/fillets-ng-${PV}"
+S=${WORKDIR}/fillets-ng-${PV}
 
 src_compile() {
 	CPPFLAGS="-DSYSTEM_DATA_DIR=\"\\\"${GAMES_DATADIR}/${PN}\\\"\"" \
@@ -39,6 +39,8 @@ src_install() {
 	cd ../fillets-ng-data-${DATA_PV}
 	cp -r font music sound doc images script "${D}${GAMES_DATADIR}/${PN}" \
 		|| die "cp failed"
+	newicon images/icon.png fillets.png
+	make_desktop_entry fillets FishFillets fillets.png
 	if use nls ; then
 		cd ../fillets-ng-data-cs-${CS_PV}
 		cp -r sound "${D}${GAMES_DATADIR}/${PN}" \