gentoo resync : 03.11.2019

1 files changed, 25 insertions, 23 deletions

diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index d6f100c47b5d..e08506b5e6e7 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -9,48 +9,50 @@ MY_P="${P/_/}"
 
 DESCRIPTION="Japanese bitmap and TrueType fonts suitable for browsing 2ch"
 HOMEPAGE="http://monafont.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-		truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="truetype"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-DEPEND="x11-apps/bdftopcf
-		x11-apps/mkfontdir
-		dev-lang/perl
-		>=sys-apps/sed-4
-		app-arch/unzip"
-RDEPEND=""
+BDEPEND="
+	app-arch/unzip
+	dev-lang/perl
+	x11-apps/bdftopcf
+	x11-apps/mkfontscale"
 
 S="${WORKDIR}/${MY_P}"
+
 FONT_S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 FONTDIR="/usr/share/fonts/${PN}"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's:$(X11BINDIR)/mkdirhier:/bin/mkdir -p:' "${S}/Makefile"
+src_prepare() {
+	default
+	sed -i -e 's:$(X11BINDIR)/mkdirhier:/bin/mkdir -p:' Makefile || die
 }
 
 src_compile() {
-	PERL_BADLANG=0 ; LC_CTYPE=C
-	export PERL_BADLANG LC_CTYPE
-	emake X11BINDIR="/usr/bin" || die
+	export PERL_BADLANG=0
+	export LC_CTYPE=C
+	emake X11BINDIR="${EPREFIX}/usr/bin"
 }
 
 src_install() {
-	make install X11BINDIR="/usr/bin" X11FONTDIR="${D}/${FONTDIR}" || die
-	mkfontdir "${D}/${FONTDIR}"
+	emake install X11BINDIR="${EPREFIX}/usr/bin" X11FONTDIR="${ED}${FONTDIR}"
+
+	mkfontdir "${ED}${FONTDIR}"
 	insinto "${FONTDIR}"
 	newins fonts.alias.mona fonts.alias
+
 	dodoc README*
 
-	if use truetype ; then
+	if use truetype; then
 		DOCS="${WORKDIR}/README-ttf.txt"
 		font_src_install
 	fi
@@ -61,6 +63,6 @@ pkg_postinst() {
 	elog "You need to add following line into 'Section \"Files\"' in"
 	elog "XF86Config and reboot X Window System, to use these fonts."
 	elog
-	elog "\tFontPath \"${FONTDIR}\""
+	elog "\tFontPath \"${EROOT}${FONTDIR}\""
 	elog
 }