[gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/

[James Le Cuirot]

commit:     fbcf13fcb97f376f89025460808d52270cfaad6e
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Aug  3 01:49:28 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:16:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbcf13fc

games-emulation/higan: eutils->desktop

Only ahs eutils for the implicit desktop inheritance for doicon and
make_desktop_entry.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 games-emulation/higan/higan-106_p1-r1.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild 
b/games-emulation/higan/higan-106_p1-r1.ebuild
index a39e0db7e72..afaa222f924 100644
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ b/games-emulation/higan/higan-106_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils gnome2-utils toolchain-funcs qmake-utils
+inherit desktop gnome2-utils toolchain-funcs qmake-utils
 
 MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
 
@@ -47,6 +47,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
 
+PATCHES=(
+       "${FILESDIR}"/${P}-header-locations.patch
+       "${FILESDIR}"/${P}-QA.patch
+)
+
 disable_module() {
        sed -i \
                -e "s|$1\b||" \
@@ -54,15 +59,11 @@ disable_module() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-header-locations.patch
-       epatch "${FILESDIR}"/${P}-QA.patch
-
+       default
        sed -i \
                -e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
                nall/dl.hpp || die "fixing libdir failed!"
 
-       eapply_user
-
        # audio modules
        use ao || disable_module audio.ao
        use openal || disable_module audio.openal