Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/, profiles/
Date: Mon, 30 Nov 2020 18:32:22
Message-Id: 1606761127.f3fdffac9209a6a66dd37d666109d1be57da8c9b.marecki@gentoo
1 commit: f3fdffac9209a6a66dd37d666109d1be57da8c9b
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 18:27:50 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 18:32:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3fdffac
7
8 games-puzzle/fish-fillets: migrate to lua-single.eclass
9
10 Uses pkgconfig to find unversioned Lua so works perfectly with the wrapper
11 provided by the eclass. As for LUA_COMPAT, let's stick with 5.1 - the code
12 itself appears to have been written for 5.0 and there are so many runtime
13 scripts that evaluating their compatibility with newer Lua versions would
14 be too much work.
15
16 Closes: https://bugs.gentoo.org/752690
17 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
18
19 .../fish-fillets/fish-fillets-1.0.1-r100.ebuild | 61 ++++++++++++++++++++++
20 profiles/package.mask | 1 +
21 2 files changed, 62 insertions(+)
22
23 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
24 new file mode 100644
25 index 00000000000..196ab712fb4
26 --- /dev/null
27 +++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
28 @@ -0,0 +1,61 @@
29 +# Copyright 1999-2020 Gentoo Authors
30 +# Distributed under the terms of the GNU General Public License v2
31 +
32 +EAPI=7
33 +
34 +LUA_COMPAT=( lua5-1 )
35 +
36 +inherit autotools desktop lua-single
37 +
38 +DATA_PV="1.0.0"
39 +DESCRIPTION="Underwater puzzle game - find a safe way out"
40 +HOMEPAGE="http://fillets.sourceforge.net/"
41 +SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
42 + mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~x86"
47 +
48 +REQUIRED_USE="${LUA_REQUIRED_USE}"
49 +
50 +RDEPEND="${LUA_DEPS}
51 + >=media-libs/libsdl-1.2[sound,video]
52 + >=media-libs/sdl-mixer-1.2.5[vorbis]
53 + >=media-libs/sdl-image-1.2.2[png]
54 + media-libs/smpeg
55 + x11-libs/libX11
56 + media-libs/sdl-ttf
57 + dev-libs/fribidi
58 +"
59 +DEPEND="${RDEPEND}"
60 +BDEPEND="virtual/pkgconfig"
61 +
62 +S="${WORKDIR}/fillets-ng-${PV}"
63 +
64 +src_prepare() {
65 + default
66 + #.mod was renamed to .fmod in lua 5.1.3 - bug #223271
67 + sed -i \
68 + -e 's/\.mod(/.fmod(/' \
69 + $(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
70 + || die "sed failed"
71 + rm -f missing
72 + mv configure.in configure.ac || die
73 + eautoreconf
74 +}
75 +
76 +src_configure() {
77 + econf --datadir="/usr/share/${PN}"
78 +}
79 +
80 +src_install() {
81 + default
82 + insinto "/usr/share/${PN}"
83 + cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
84 + rm -f COPYING
85 + einstalldocs
86 + doins -r *
87 + newicon images/icon.png ${PN}.png
88 + make_desktop_entry fillets "Fish Fillets NG"
89 +}
90
91 diff --git a/profiles/package.mask b/profiles/package.mask
92 index 8aa2d3de29b..4117f527e87 100644
93 --- a/profiles/package.mask
94 +++ b/profiles/package.mask
95 @@ -562,6 +562,7 @@ dev-lua/luacrypto
96 >=games-engines/love-0.8.0-r100:0.8
97 >=games-engines/love-11.3-r100:0
98 >=games-engines/solarus-1.3.1-r100
99 +>=games-puzzle/fish-fillets-1.0.1-r100
100 >=games-roguelike/stone-soup-0.25.1-r100
101 >=mail-filter/imapfilter-2.6.16-r100
102 >=media-gfx/geeqie-1.5.1-r1