[gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/

[Michael Sterrett]

commit:     475b5018039c680f24f88af7ccfbe75105f37b86
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 05:23:34 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 08:26:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475b5018

games-puzzle/fish-fillets: add slot dep for dev-lang/lua

Package-Manager: portage-2.2.26

 games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
index 9130c13..4aa317f 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=media-libs/libsdl-1.2[sound,video]
 	x11-libs/libX11
 	media-libs/sdl-ttf
 	dev-libs/fribidi
-	>=dev-lang/lua-5"
+	>=dev-lang/lua-5:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/

[Conrad Kostecki]

commit:     5a4b43af0426f698b36c0882eb72860dba611099
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 18:48:38 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 19:45:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4b43af

games-puzzle/fish-fillets: drop old version

Dropping old version, which does not support slotted lua.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../fish-fillets/fish-fillets-1.0.1-r1.ebuild      | 59 ----------------------
 1 file changed, 59 deletions(-)

diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
deleted file mode 100644
index 722c291c1dd..00000000000
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DATA_PV="1.0.0"
-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 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[sound,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:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/fillets-ng-${PV}"
-
-src_prepare() {
-	default
-	#.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
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --datadir="/usr/share/${PN}"
-}
-
-src_install() {
-	default
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
-	rm -f COPYING
-	einstalldocs
-	doins -r *
-	newicon images/icon.png ${PN}.png
-	make_desktop_entry fillets "Fish Fillets NG"
-}

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/

[Sam James]

commit:     89640a2f491436778c7caf49b1103e31314c159d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 09:03:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 09:03:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89640a2f

games-puzzle/fish-fillets: respect AR

Closes: https://bugs.gentoo.org/778590
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../fish-fillets/fish-fillets-1.0.1-r100.ebuild    | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
index 196ab712fb4..6dc60e4f3df 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ 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"
+S="${WORKDIR}/fillets-ng-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,42 +20,49 @@ KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/fribidi
 	>=media-libs/libsdl-1.2[sound,video]
 	>=media-libs/sdl-mixer-1.2.5[vorbis]
 	>=media-libs/sdl-image-1.2.2[png]
+	media-libs/sdl-ttf
 	media-libs/smpeg
 	x11-libs/libX11
-	media-libs/sdl-ttf
-	dev-libs/fribidi
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/fillets-ng-${PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-respect-AR.patch"
+)
 
 src_prepare() {
 	default
+
 	#.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
+
+	rm -f missing || die
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	econf --datadir="/usr/share/${PN}"
+	econf --datadir=/usr/share/${PN}
 }
 
 src_install() {
+	rm -f COPYING || die
+
 	default
-	insinto "/usr/share/${PN}"
+
+	insinto /usr/share/${PN}
 	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
-	rm -f COPYING
-	einstalldocs
+
 	doins -r *
 	newicon images/icon.png ${PN}.png
 	make_desktop_entry fillets "Fish Fillets NG"