media-fonts/arphicfonts: EAPI-7 bump, drop eutils

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 45 insertions, 46 deletions

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">