gentoo resync : 27.03.2021

3 files changed, 47 insertions, 48 deletions

diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 3038df09bc4e..4cab80ec4c56 100644
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@@ -1,4 +1,4 @@
-AUX arphicfonts-0.2.20080216.1-fontconfig.patch 5739 BLAKE2B c2c649277caf5223c17c788c2d97951ffffc7fd73ba206f0fea6c62c5143bdf4bd9886e14536a281caa26a9dbc355c4f37aea44ec88d5803d67739f993f57a80 SHA512 0c7fa9086f5ae33b9150a83a0d5620c4ea4f67d2f11fc5646640ca77f79c4fdea107e15d8a3a3cf314e399b0bcaa6baf14d4261407f2ac7217b384312f7f8516
+AUX arphicfonts-0.2.20080216.1-fontconfig.patch 5773 BLAKE2B f56e3ef7ce1115f927c154e03ddaac55fabed91a14023a2008093b1470b55c38cb0e3b29a82216386d2868c2abddeac1890cd4d3bb9d92c9df4249ec7fc89e8e SHA512 6f28a3dc17181567be888d0637ac10fa6d7621666a9b16af68cb537ab45df4275689462e8d6b2cfb525973308b1a690d4634cf610ceaf5619ec6cccbb4182d4f
 AUX arphicfonts-0.2.20080216.1.pe 119 BLAKE2B b10a4b920581fc7a940f6699c6f5d739174fe50968e5c8bc78cbbdfc6d6ac0972cbab91279f7ce4121b6d14cdf392bcb5f89f056ae08267e06314d22234ddeef SHA512 28ac49dbf8ca80f91e1dda4d5a065716c2012c89ca173520a58689ec88f89222186036e1a029f195f3c3dbca011ec5e20d8f94cb5323eba7e32630597a41f1d6
 DIST bkai00mp.ttf.gz 6013768 BLAKE2B f10bd74dab431f28088b443b83caf2fe3a54beda47df24d31c0109e18b28aa11c890b3c2ee7e03b02eeb4a98a9f6c3e62ac2a8a63855e15f57da407c053ac3eb SHA512 cec2dae60d2cea060c560587338e64e92b95e8fb7c6a4ee41946b9c578cd0dc7e457bcfa927011ca731210cad6906864bfbd5eb07acd2de317911f4ccf0646c6
 DIST bsmi00lp.ttf.gz 5653466 BLAKE2B 2cc8b32ec1d6c939654c251f7f5853e8fa770dbd8539d9401594e5ce0813842c12f8b69ce8c5a513ab55b9aa595c1f4858284a72eff401e8302e2890d80b74ff SHA512 9aa360213b25780def342043f5c0d4d6c1236778488119125a9b702cf26312f9759c9bb7eb1ac93e0169cbbd26e5a8cc38970d8df538903868dec95c3692efeb
@@ -6,5 +6,5 @@ DIST gbsn00lp.ttf.gz 2345803 BLAKE2B 6b4bcca2a6947b532d0471cb91e3e7d5265af5f56ea
 DIST gkai00mp.ttf.gz 2698942 BLAKE2B c8ca0e99239904bb80834878c9d77e228d8460e2f308ba7bee1f9606e4c423fe4e3fcadd91bcb521b2856ab778a570db5838d4976e7f17eaa9e235f60237c3ff SHA512 5797d1a4e49c4ba219381fe4e90225584513f47c29af77f8004bb318c5cddf2097be56ea6cc09ed31573e8ceeec5870129cbacafe81df3d68d8bd556594b2c89
 DIST ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz 10336387 BLAKE2B 89ea5d1ccabc30ae77c245c4ce2a8f9b058dbe5d1da5812158639a2270d20610633389cf1335f68e290525875f2e6ba50f1197c23993102571e3f14fbcc3414e SHA512 8c96d36f5e36eb73ec3e415cba7ee5f02a0b85c334af7362facb2dd9a7650ed3329cfadb21fe0fe7273f52c87f1bd1aeb039c40499ca32925db4cd96ebd03c21
 DIST ttf-arphic-uming_0.2.20080216.1.orig.tar.gz 10684442 BLAKE2B 0d5c73e36169cd91faaa9b61186a83f2d07baf5794a534bfcf330750aed643b4931918f7bfaaabe1b655f04faec36f5064c711cb2f68c605d63c4022cad78370 SHA512 ef96969d1c5f1bda14aadfbe112a1ba30ae1bc477a89838753287ceaf07804e59c2f3f306399e9d54074be99d0c963abdb33d789f3933fdd98453a1ef7731407
-EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2244 BLAKE2B 0f3d0ddd7957bb89249913064aef1e0549f796685a1269d1c36263af6f021ab2fc2948744205e415b18da33c15d86bbc2b53eebe66d64c2ca340cd6a1b5b2540 SHA512 e6fa0061a55a13aa140b5fea2a7c54d9266bf088a84b0f491e41ad52067b7aa6bf41a9b4aa65455d1c715e904e61de684c3057967d309c335c5de26c865574f5
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2095 BLAKE2B 91f42b854d3e6bb0af144b0748c747e30cefb52153ae189b9cbbc2c6d2a2f899539bb5a53dfe2a89429f70c261063405d0438a28c06f4c2f44d84dfb7250d82f SHA512 dfee12d564ba2576153cd92f7e84f6a35838f37bdfd56c32d3ec5274883385dbf27b3d327fbdd39d0dba294049458f9d485ececc9feccb2ef0ac92f62e0ce63b
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index e2f80f9e5cdc..bd3155d8c0f8 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils font xdg-utils
+EAPI=7
+
+inherit font xdg-utils
 
 DESCRIPTION="Chinese TrueType Arphic Fonts"
 HOMEPAGE="http://www.arphic.com.tw/
@@ -13,67 +14,65 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
 	mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz
 	mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_${PV}.orig.tar.gz
 	mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_${PV}.orig.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="Arphic"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="media-gfx/fontforge"
+# No binaries, only fonts
+RESTRICT="strip binchecks"
 
-S="${WORKDIR}"
+BDEPEND="media-gfx/fontforge"
 
-#No binaries, only fonts
-RESTRICT="strip binchecks"
+PATCHES=( "${FILESDIR}"/${P}-fontconfig.patch )
 
-FONT_S="${S}"
+FONT_CONF=(
+	ukai/25-ttf-arphic-ukai-render.conf
+	ukai/35-ttf-arphic-ukai-aliases.conf
+	ukai/41-ttf-arphic-ukai.conf
+	ukai/75-ttf-arphic-ukai-select.conf
+	ukai/90-ttf-arphic-ukai-embolden.conf
+	uming/25-ttf-arphic-uming-bitmaps.conf
+	uming/25-ttf-arphic-uming-render.conf
+	uming/35-ttf-arphic-uming-aliases.conf
+	uming/41-ttf-arphic-uming.conf
+	uming/64-ttf-arphic-uming.conf
+	uming/90-ttf-arphic-uming-embolden.conf
+)
 FONT_SUFFIX="ttc ttf"
-FONT_CONF=(	"25-ttf-arphic-ukai-render.conf"
-		"35-ttf-arphic-ukai-aliases.conf"
-		"41-ttf-arphic-ukai.conf"
-		"75-ttf-arphic-ukai-select.conf"
-		"90-ttf-arphic-ukai-embolden.conf"
-		"25-ttf-arphic-uming-bitmaps.conf"
-		"25-ttf-arphic-uming-render.conf"
-		"35-ttf-arphic-uming-aliases.conf"
-		"41-ttf-arphic-uming.conf"
-		"64-ttf-arphic-uming.conf"
-		"90-ttf-arphic-uming-embolden.conf" )
 
+# ensure that we don't overwrite one font's docs with another's
 src_unpack() {
-	#All of this is to ensure that we don't overwrite one font's docs
-	#with another's.
-
 	unpack {gk,bk}ai00mp.ttf.gz {bsmi,gbsn}00lp.ttf.gz
-	mkdir "${WORKDIR}"/{uming,ukai}
-
-	cd "${WORKDIR}"/uming
-	unpack ttf-arphic-uming_${PV}.orig.tar.gz
 
-	cd "${WORKDIR}"/ukai
-	unpack ttf-arphic-ukai_${PV}.orig.tar.gz
+	do_unpack() {
+		mkdir ${1} || die
+		pushd ${1} > /dev/null || die
+			unpack ttf-arphic-${1}_${PV}.orig.tar.gz
+		popd > /dev/null || die
+		mv ${1}/${1}.ttc . || die
+	}
+	do_unpack ukai
+	do_unpack uming
 }
 
 src_prepare() {
-	cd "${WORKDIR}"
-	find "${WORKDIR}" -mindepth 2 -maxdepth 2 -name '*.ttc' -exec mv {} . \;
-	find "${WORKDIR}" -name '*.conf' -exec mv "{}" . \;
-	epatch "${FILESDIR}"/${P}-fontconfig.patch
+	default
 	xdg_environment_reset
 	fontforge -script "${FILESDIR}"/${P}.pe b*.ttf || die
 }
 
 src_install() {
-	local myfont doc
-	for myfont in ukai uming
-	do
-		cd "${WORKDIR}"/${myfont}
-		docinto ${myfont}
+	font_src_install
+
+	do_doc() {
 		for doc in FONTLOG KNOWN_ISSUES TODO README README.Bitmap NEWS CONTRIBUTERS
 		do
-			[ -f ${doc} ] && dodoc ${doc}
+			[[ -f ${1}/${doc} ]] && newdoc ${1}/${doc} ${1}.${doc}
 		done
-	done
-	cd "${S}"
-	font_src_install
+	}
+	do_doc ukai
+	do_doc uming
 }
diff --git a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
index 5c5738a3bdf5..1f984f28e2cb 100644
--- a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
+++ b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
@@ -1,5 +1,5 @@
---- a/41-ttf-arphic-ukai.conf
-+++ b/41-ttf-arphic-ukai.conf
+--- a/ukai/41-ttf-arphic-ukai.conf
++++ b/ukai/41-ttf-arphic-ukai.conf
 @@ -5,13 +5,28 @@
  <!--
    Sans-serif faces
@@ -38,8 +38,8 @@
 +        <default><family>sans-serif</family></default>
 +    </alias>
  </fontconfig>
---- a/41-ttf-arphic-uming.conf
-+++ b/41-ttf-arphic-uming.conf
+--- a/uming/41-ttf-arphic-uming.conf
++++ b/uming/41-ttf-arphic-uming.conf
 @@ -7,10 +7,25 @@
   -->
  	<alias>
@@ -120,8 +120,8 @@
  		<family>AR PL UMing TW MBE</family>
  		<default><family>monospace</family></default>
  	</alias>
---- a/25-ttf-arphic-uming-bitmaps.conf
-+++ b/25-ttf-arphic-uming-bitmaps.conf
+--- a/uming/25-ttf-arphic-uming-bitmaps.conf
++++ b/uming/25-ttf-arphic-uming-bitmaps.conf
 @@ -5,25 +5,65 @@
  	<match target="font">
  	  <test name="family">