[gentoo-commits] repo/gentoo:master commit in: media-fonts/mplus-fonts/

[Akinori Hattori]

commit:     361e0e69e74ccaf89ad0f1462e9aac5fa783d2ad
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 14:23:34 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 14:25:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361e0e69

media-fonts/mplus-fonts: tidy

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../mplus-fonts/mplus-fonts-2.2.4-r1.ebuild        | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index 7df74fe1160e..09a9326afaa8 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
+FONT_PN=${PN%-*}
 
-FONT_PN=mplus
-MY_P="mplus_bitmap_fonts-${PV}"
 inherit font
 
+MY_P="${P/-/_bitmap_}"
+
 DESCRIPTION="M+ Japanese bitmap fonts"
 HOMEPAGE="https://mplus-fonts.osdn.jp/about-en.html"
 SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="mplus-fonts"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="X"
+IUSE=""
+RESTRICT="binchecks strip"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-BDEPEND="
-	x11-apps/bdftopcf
-	>=x11-apps/mkfontscale-1.2.0
-"
+BDEPEND="x11-apps/bdftopcf
+	x11-apps/mkfontscale"
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	DESTDIR="${D}${FONTDIR}" ./install_mplus_fonts || die
-	dodoc README* INSTALL*
+	DESTDIR="${ED}"${FONTDIR} ./install_${PN/-/_} || die
+	einstalldocs
 }