x11-wm/musca: Port to EAPI 7

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 129899ded8d093da0df55174dbea44d09b6f10db..adef927a76b5bce8d855af195f6f91cde8033b27 100644 (file)
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
+EAPI=7
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
 HOMEPAGE="https://launchpad.net/musca"
@@ -13,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="apis xlisten"
 
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
-       sys-apps/sed"
+DEPEND="x11-libs/libX11"
 RDEPEND="
-       ${COMMON}
+       ${DEPEND}
        >=x11-misc/dmenu-4.4
-       apis? ( x11-misc/xbindkeys )
-"
+       apis? ( x11-misc/xbindkeys )"
 
 src_prepare() {
        restore_config config.h
@@ -30,12 +28,13 @@ src_prepare() {
                -e 's:sed.*exec.*-i::g' \
                || die
 
-       epatch \
+       eapply \
                "${FILESDIR}"/${PN}-0.9.24-make.patch \
                "${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
                "${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
                "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
                "${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+       eapply_user
 
        local i
        for i in apis xlisten; do
@@ -49,13 +48,9 @@ src_prepare() {
 
 src_install() {
        dobin musca
+       use xlisten && dobin xlisten
+       use apis && dobin apis
 
-       local i
-       for i in xlisten apis; do
-               if use ${i}; then
-                       dobin ${i}
-               fi
-       done
        doman musca.1
 
        exeinto /etc/X11/Sessions