From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 media-fonts/monafont/Manifest                |  2 +-
 media-fonts/monafont/monafont-2.90-r2.ebuild | 48 +++++++++++++++-------------
 2 files changed, 26 insertions(+), 24 deletions(-)

(limited to 'media-fonts/monafont')

diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index a5a613204422..bd08c442b506 100644
--- a/media-fonts/monafont/Manifest
+++ b/media-fonts/monafont/Manifest
@@ -1,4 +1,4 @@
 DIST monafont-2.90.tar.bz2 808897 BLAKE2B 844b056c9aed06799bed115fb0ef3280dd5182f97b0207c411b568951ea0fa727e1498a94dfa114d725011c226716fb488831cf2dacb0e320fdf70297ca7b639 SHA512 187cc4d7245c2a730a02d5a60d6db92f2bab5a3a36ba56a9e7a767391587e5cb136a9e0c0143308936d1d214e6ae2e0ffd2dc9374d931ba52c81aaab7740d6c1
 DIST monafont-ttf-2.90.zip 1712768 BLAKE2B 3847a71bd9ec17743dcf25fad3c49dcf597bcc59f20f5fba4704a05d182e69b0e0721d7768bf1d0c7b08ac019e2008640f4110487b47da34e963d5d4689952ed SHA512 0cb0ddf13f398f8504d387e590748c8bf44f01f672eb1f1bffac7c3e027f730ea0e7db41d10727beaf42d26e10e2e518c686669bcdc33a7113343863e49a0a55
-EBUILD monafont-2.90-r2.ebuild 1447 BLAKE2B f48464dacb084f37b2983f2a0277c04d56353c757624a13461cb236175adf3e8f4d40e5126db5f7a316ffb6473550e3113f1834dc16c562d4ad9bc3ee03a35a8 SHA512 91a28e7b103632d8c3be08eeacb91b30858b1816380d2f150d49c006bf7e29473d66f6d20f54095a285e925c4c7aa766d8d45c0626fee3d13faba1bdb7c8ae72
+EBUILD monafont-2.90-r2.ebuild 1413 BLAKE2B 848b4904b4688880cfd256d5b09087b9f4327b0d561da1c664872b4ecfc83f6823d178eaa68370dabbd16a020ee89d4db6e937448e0a45ec255fe2bf645f7afb SHA512 3a5be740f7c9f66b14ca348dd64a006cde505bf54a222960967a0c7a6419d9fcc8d5c22033bc56858f78bdafa7576e65c6ec03ecdff45d19a3ac1a9c1e5286b3
 MISC metadata.xml 411 BLAKE2B 3305144925ef270e00f4d8a037dec8454f0839388f82dc82c9ba7388425ca429574a4ef28b07254b8662323256c9710a92f41dc9928c80ea5335fca07ca7c39a SHA512 a55793b608e9f4298c382335e568cb8ed8c8e113b63b975259e1b0d12cbc0645c2ad2b4bf3602901ca8d1515a0acca580f60b49e00738674c02be15c218256cf
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
 }
-- 
cgit v1.2.3