media-fonts/x11fonts-jmk: Port to EAPI 7

Bug: https://bugs.gentoo.org/696312
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index 925a0919dd8ebcbeae609031b3119da296507a7a..5b4c856ce68c7c641d02a3886fd63709f61f0923 100644 (file)
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -1,38 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-FONT_PN=jmk
+EAPI=7
 
-inherit font
+MY_P="jmk-x11-fonts-${PV}"
 
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="This package contains character-cell fonts for use with X"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
+SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 ~sh sparc x86"
-IUSE=""
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
-DEPEND="x11-misc/imake
+BDEPEND="
+       x11-misc/imake
        >=x11-apps/mkfontscale-1.2.0
        x11-apps/bdftopcf"
-RDEPEND=""
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       eapply "${FILESDIR}"/gzip.patch
-}
+PATCHES=( "${FILESDIR}"/gzip.patch )
+
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
        xmkmf || die
-       emake || die
+       default
 }
 
 src_install() {
-       make install INSTALL_DIR="${D}${FONTDIR}" || die
-       dodoc README NEWS
+       emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
+       einstalldocs
 }