From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 19 Dec 2020 19:17:53 +0000 (-0500)
Subject: media-fonts/mplus-t-fonts: Update for new python eclasses.
X-Git-Url: https://git.draconx.ca/gitweb/gentoo-draconx.git/commitdiff_plain/c48ae2d39f458e3aa1e48f392f89cd91ebedabff

media-fonts/mplus-t-fonts: Update for new python eclasses.

Seems the fontforge dependency in this package has been busted for
some time and support for python-single-r1 packages was only just
reintroduced to python-any-r1 eclass.  So now, we can adjust the
ebuild to use it so this package is installable again.
---

diff --git a/media-fonts/mplus-t-fonts/Manifest b/media-fonts/mplus-t-fonts/Manifest
index 04dda3f..2d7eeb4 100644
--- a/media-fonts/mplus-t-fonts/Manifest
+++ b/media-fonts/mplus-t-fonts/Manifest
@@ -1,4 +1,2 @@
 DIST scripts-5d3f16e91969123b8960e6806a9eade8a616f064.tar.xz 15832 BLAKE2B f1c225701be79038ff4573fe201ad858a79da4ab96377645cb933231d5844984f7991af6f135463eecfbd84ceae11b293f3d0be995b54055751b426fb9436070 SHA512 5316545e3b7286a693f2ed1f16e70df253c3e8dcf5f10799571a4dc2d75ce7847d1747b7a28eb3f368b0f60c65e4fe06c9b6c4d27fbfd1fe1eba726e38241a8e
-DIST scripts-d180c0bfdd4e3911a18360b3ccacd5271441e240.tar.xz 15276 BLAKE2B 0ee48f1996c2d1ccd45ddd9ac495569c9bec813374ca0cf8a4da2f271f7653179bd8192c0bbfdc0da6e812a663e720df7af1d2f30c1dbd7f3ad71c4a8244e58b SHA512 5260d78f8530e25dbcebb7af5a68fe65891fc9174f02ff17960dd0cc90464386a8b8bbbc04f219a2b4f9cd542df0affeb02e1f6754f09c594f5082cbfbf3bc0a
-EBUILD mplus-t-fonts-20140706-r1.ebuild 995 BLAKE2B 3195f0a7f58753f78b37a55faf551814c0d5aa3593cd765dd5ed7f58eaad65b4714e5e359dd17746940cf91c62b0570795e97f93c4851e379bf65e84f766c5fe SHA512 d2e72af9c9635a68a2fb7ecd693f6c6db1b029b6269560344896afb4c9a3675ac0e941ce9f3167ae83b2a5920cc410dd460364c9671d5ca82d7c7b780311ab97
-EBUILD mplus-t-fonts-20180128-r1.ebuild 1013 BLAKE2B 2a9f8355aca4e184bf78d9f6b838d50a313024048516981c369046fe4d6b36117579dd17ca95608acf8cdb71e2c3cc1dba76e1075ba1010472308d712d0e5736 SHA512 f0dcabbee71e68f17700e6252afc125243669e74136108f296bd44621984096c143e78d9b45afbbd5b50bf50c3f05441a7715e0aca780314da6785519275e1aa
+EBUILD mplus-t-fonts-20180128-r2.ebuild 1030 BLAKE2B 6b8bfd6f0bf2b7fad5a77cb893eabef03c7f37f3ef837342277352e824bc9aa23b8edba3511da1b25de6bff510f3563e61a1523bdb7ed05c095f32c340f5d366 SHA512 c8a1abde3c47bf722bdb75f9f5b62a0cc1a9a792b3cb803574e8d43e83c54eb3cf1f494ce7b3ac4e8b0dccac6158bc9198477f73e31ee67003dcd5a1ce73f34d
diff --git a/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild b/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild
deleted file mode 100644
index 00b9bd4..0000000
--- a/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2014, 2018 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 font
-
-SHA1=d180c0bfdd4e3911a18360b3ccacd5271441e240
-
-DESCRIPTION="Variant of the M+ fonts with enlarged CJK glyphs"
-SRC_URI="https://git.draconx.ca/gitweb/scripts.git/snapshot/$SHA1.tar.xz
-         -> scripts-$SHA1.tar.xz"
-
-LICENSE="WTFPL-2 mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-DEPEND="$(python_gen_any_dep 'media-gfx/fontforge[python,${PYTHON_USEDEP}]')
-	media-fonts/mplus-outline-fonts[ipafont]"
-
-python_check_deps () {
-	has_version "media-gfx/fontforge[${PYTHON_USEDEP}]"
-}
-
-S=$WORKDIR/$SHA1
-MPLUSDIR=$EPREFIX/usr/share/fonts/mplus-outline-fonts
-
-FONT_S=$S/inst
-FONT_SUFFIX=ttf
-
-pkg_setup () {
-	python-any-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_compile () {
-	ln -s "$MPLUSDIR"/*.ttf . || die
-	python mplus-t-gen.py || die
-
-	mkdir inst
-	mv M+?T+IPAG.ttf inst
-}
diff --git a/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r1.ebuild b/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r2.ebuild
similarity index 72%
rename from media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r1.ebuild
rename to media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r2.ebuild
index e05967b..d98f46e 100644
--- a/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r1.ebuild
+++ b/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright © 2014, 2018-2019 Nick Bowler
+# Copyright © 2014, 2018-2020 Nick Bowler
 # License GPLv3+: GNU General Public License version 3 or later.
 # There is NO WARRANTY, to the extent permitted by law.
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5..8} )
 
 inherit python-any-r1 font
 
@@ -17,11 +17,12 @@ LICENSE="WTFPL-2 mplus-fonts IPAfont"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
 
-DEPEND="$(python_gen_any_dep 'media-gfx/fontforge[python,${PYTHON_USEDEP}]')
-	media-fonts/mplus-outline-fonts[ipafont]"
+BDEPEND="media-fonts/mplus-outline-fonts[ipafont]
+	$(python_gen_any_dep \
+		'media-gfx/fontforge[python,${PYTHON_SINGLE_USEDEP}]')"
 
 python_check_deps () {
-	has_version "media-gfx/fontforge[${PYTHON_USEDEP}]"
+	has_version -b "media-gfx/fontforge[${PYTHON_SINGLE_USEDEP}]"
 }
 
 S=$WORKDIR/$SHA1