From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Dec 2021 02:47:11 +0000
Subject: gentoo resync : 05.12.2021

---
 media-fonts/mplus-fonts/Manifest                   |  4 ++--
 media-fonts/mplus-fonts/metadata.xml               |  1 +
 .../mplus-fonts/mplus-fonts-2.2.4-r1.ebuild        | 25 ++++++++++------------
 3 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'media-fonts/mplus-fonts')

diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index d106e5021f66..fd1b827f670b 100644
--- a/media-fonts/mplus-fonts/Manifest
+++ b/media-fonts/mplus-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST mplus_bitmap_fonts-2.2.4.tar.gz 382574 BLAKE2B 76f1da0dcf9ac25425ace63efb751c5c193f717e76a51750e359216057469cc74cf84572c8162302ac4fb9682ddcd5396325b5ee570a5639f06f338c1ce4d86f SHA512 77aa46d651dbfbbfd6e254619ec917fd861fc44bc7847c2f9e7c4d5ebe0f90bafd8a543eceac394bd3482f868dc6a54440dda384b8be0c24e0c4093735f017e8
-EBUILD mplus-fonts-2.2.4-r1.ebuild 671 BLAKE2B 485b8325c276a95f2fa49d3f2205823abf86b4503137547f1374349050b654c78f97e452bcf809308e115bf6501f5752a05ae342ba6847799afccc4725626f2d SHA512 724cde7fc4db35480e129ba486b0c15f3edbfe4803af4237eb984a02b41e92a2c9a31aa7a0f2ab3b34e5444c17dee36f7225359e51bf9ecbfa8331ec57fa075d
-MISC metadata.xml 418 BLAKE2B 6575bdbd943ae45a55fb3e67ed72c27982cc998af32aa5f51b8e1e5179c1c89db4e767bb6530cec648662789db46c0f76456e48b88fb4adc23561a54e0ab6775 SHA512 7f7aa1b11002955354fb02327a5c2538de59776fc1f1d217c81e228ad11fc3b3b77575434ae9ad7565f01f15161ae8f6ad4bd912953e8b457079ff73291638ed
+EBUILD mplus-fonts-2.2.4-r1.ebuild 622 BLAKE2B 8d20f89ee397966af0d16e7d6a0f9ecc363f8297d244c88a0eb1fb28c1fa94556158d192ac2bead549b8fa8ef1f6d5babc5df464189133b492d71a6493a209f7 SHA512 6b16ef69ee9043e09732c1939b0007d0d1195f0632ac4b0d4b178dd19f8c57ea6c470929cc35019d79e775569de879ed441bb1ee228c8ba704ea6c2dbeadb3fa
+MISC metadata.xml 442 BLAKE2B 104629b881eaa62583781af7c10c96ef47c23265d7069038a1cb6dc680661012f66c03329eac32d75a1e33e489d5f6d3305b528e591dc61df3bba15e7cf6a812 SHA512 c62198a329efdb5088a7a306148d5283e4ef8d1df762db91c123590ca35f7d9809b43a35f9334aa2da250d50fe3d9130c2485c8d42d9878a42f8a1874ac5980a
diff --git a/media-fonts/mplus-fonts/metadata.xml b/media-fonts/mplus-fonts/metadata.xml
index 3c6de810ec12..a4bb0bb41170 100644
--- a/media-fonts/mplus-fonts/metadata.xml
+++ b/media-fonts/mplus-fonts/metadata.xml
@@ -9,6 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge-jp">mplus-fonts</remote-id>
 	</upstream>
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
 }
-- 
cgit v1.2.3