games-kids/tuxtype: EAPI 7, fix EPREFIX, xdg.eclass

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index 5ca2f0d987ced89c26021f3790746edc79a9a68a..db74faed70ebad6cb8aa0f9447c6d19b39acd2c8 100644 (file)
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop xdg
 
 DESCRIPTION="Typing tutorial with lots of eye-candy"
 HOMEPAGE="https://github.com/tux4kids/tuxtype"
@@ -19,24 +20,26 @@ DEPEND="acct-group/gamestat
        media-libs/sdl-mixer
        media-libs/sdl-pango
        media-libs/sdl-ttf
-       svg? ( gnome-base/librsvg )"
-RDEPEND=${DEPEND}
+       svg? ( gnome-base/librsvg:2 )"
+
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}-upstream-${PV}
+S="${WORKDIR}/${PN}-upstream-${PV}"
 
 src_configure() {
        econf \
-               --localedir=/usr/share/locale \
+               --localedir="${EPREFIX}"/usr/share/locale \
                $(use_with svg rsvg)
 }
 
 src_install() {
        default
-       rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
-       doicon ${PN}.ico
-       make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
+       rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
        keepdir /etc/${PN} /var/games/${PN}/words
 
+       newicon -s 64 icon.png ${PN}.png
+       make_desktop_entry ${PN} TuxTyping
+
        fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
        fperms 660 /var/games/${PN}
        fperms 2755 /usr/bin/${PN}