Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
Date: Tue, 26 Nov 2019 21:24:45
Message-Id: 1574802567.5f4ca15feab1287e17fe8f6c2432388d9a679264.chewi@gentoo
1 commit: 5f4ca15feab1287e17fe8f6c2432388d9a679264
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 26 21:09:27 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 26 21:09:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4ca15f
7
8 games-kids/tuxtype: EAPI 7, fix EPREFIX, xdg.eclass
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.17
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 21 ++++++++++++---------
14 1 file changed, 12 insertions(+), 9 deletions(-)
15
16 diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
17 index 5ca2f0d987c..db74faed70e 100644
18 --- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
19 +++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
20 @@ -1,8 +1,9 @@
21 # Copyright 1999-2019 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=6
25 -inherit eutils
26 +EAPI=7
27 +
28 +inherit desktop xdg
29
30 DESCRIPTION="Typing tutorial with lots of eye-candy"
31 HOMEPAGE="https://github.com/tux4kids/tuxtype"
32 @@ -19,24 +20,26 @@ DEPEND="acct-group/gamestat
33 media-libs/sdl-mixer
34 media-libs/sdl-pango
35 media-libs/sdl-ttf
36 - svg? ( gnome-base/librsvg )"
37 -RDEPEND=${DEPEND}
38 + svg? ( gnome-base/librsvg:2 )"
39 +
40 +RDEPEND="${DEPEND}"
41
42 -S=${WORKDIR}/${PN}-upstream-${PV}
43 +S="${WORKDIR}/${PN}-upstream-${PV}"
44
45 src_configure() {
46 econf \
47 - --localedir=/usr/share/locale \
48 + --localedir="${EPREFIX}"/usr/share/locale \
49 $(use_with svg rsvg)
50 }
51
52 src_install() {
53 default
54 - rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
55 - doicon ${PN}.ico
56 - make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
57 + rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
58 keepdir /etc/${PN} /var/games/${PN}/words
59
60 + newicon -s 64 icon.png ${PN}.png
61 + make_desktop_entry ${PN} TuxTyping
62 +
63 fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
64 fperms 660 /var/games/${PN}
65 fperms 2755 /usr/bin/${PN}