Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/fish-fillets/
Date: Sat, 10 Apr 2021 09:03:53
Message-Id: 1618045418.89640a2f491436778c7caf49b1103e31314c159d.sam@gentoo
1 commit: 89640a2f491436778c7caf49b1103e31314c159d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 10 09:03:25 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 10 09:03:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89640a2f
7
8 games-puzzle/fish-fillets: respect AR
9
10 Closes: https://bugs.gentoo.org/778590
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../fish-fillets/fish-fillets-1.0.1-r100.ebuild | 28 ++++++++++++++--------
14 1 file changed, 18 insertions(+), 10 deletions(-)
15
16 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
17 index 196ab712fb4..6dc60e4f3df 100644
18 --- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
19 +++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2020 Gentoo Authors
22 +# Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -12,6 +12,7 @@ DESCRIPTION="Underwater puzzle game - find a safe way out"
27 HOMEPAGE="http://fillets.sourceforge.net/"
28 SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
29 mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
30 +S="${WORKDIR}/fillets-ng-${PV}"
31
32 LICENSE="GPL-2"
33 SLOT="0"
34 @@ -19,42 +20,49 @@ KEYWORDS="~amd64 ~x86"
35
36 REQUIRED_USE="${LUA_REQUIRED_USE}"
37
38 -RDEPEND="${LUA_DEPS}
39 +RDEPEND="
40 + ${LUA_DEPS}
41 + dev-libs/fribidi
42 >=media-libs/libsdl-1.2[sound,video]
43 >=media-libs/sdl-mixer-1.2.5[vorbis]
44 >=media-libs/sdl-image-1.2.2[png]
45 + media-libs/sdl-ttf
46 media-libs/smpeg
47 x11-libs/libX11
48 - media-libs/sdl-ttf
49 - dev-libs/fribidi
50 "
51 DEPEND="${RDEPEND}"
52 BDEPEND="virtual/pkgconfig"
53
54 -S="${WORKDIR}/fillets-ng-${PV}"
55 +PATCHES=(
56 + "${FILESDIR}/${PN}-1.0.1-respect-AR.patch"
57 +)
58
59 src_prepare() {
60 default
61 +
62 #.mod was renamed to .fmod in lua 5.1.3 - bug #223271
63 sed -i \
64 -e 's/\.mod(/.fmod(/' \
65 $(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
66 || die "sed failed"
67 - rm -f missing
68 +
69 + rm -f missing || die
70 mv configure.in configure.ac || die
71 eautoreconf
72 }
73
74 src_configure() {
75 - econf --datadir="/usr/share/${PN}"
76 + econf --datadir=/usr/share/${PN}
77 }
78
79 src_install() {
80 + rm -f COPYING || die
81 +
82 default
83 - insinto "/usr/share/${PN}"
84 +
85 + insinto /usr/share/${PN}
86 cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
87 - rm -f COPYING
88 - einstalldocs
89 +
90 doins -r *
91 newicon images/icon.png ${PN}.png
92 make_desktop_entry fillets "Fish Fillets NG"