mplus-t-fonts: Update for newer fontforge.

diff --git a/media-fonts/mplus-t-fonts/Manifest b/media-fonts/mplus-t-fonts/Manifest
index a7e57218f98052d635129d979dc17a724dae3cc9..eaf92e174002771f20d2520e709f5610948e0722 100644 (file)
--- a/media-fonts/mplus-t-fonts/Manifest
+++ b/media-fonts/mplus-t-fonts/Manifest
@@ -1,2 +1,4 @@
-DIST d180c0bfdd4e3911a18360b3ccacd5271441e240.tar.xz 15276 SHA256 05805d63b5c11e295cdc1b309e17140110444754fce69e296ae52afd65167f43 SHA512 5260d78f8530e25dbcebb7af5a68fe65891fc9174f02ff17960dd0cc90464386a8b8bbbc04f219a2b4f9cd542df0affeb02e1f6754f09c594f5082cbfbf3bc0a WHIRLPOOL 349204dd9e5c9258683e69ee9fc65d1448d4f4b5e52c8c236f10ca8935d3cdc35f7571e5fc2d073ca18d0ad05b0ae2dfcfa24684a33830d031849ba1755c337c
-EBUILD mplus-t-fonts-20140706.ebuild 842 SHA256 33b9978df4dc4a21fae009662c04ec5bf58f34ca964835314669ccefa8e5039a SHA512 13019097cab4b192c43e036e364dc755dfbe724592da55bc5b5269ebfec974edbf527978af84494fb0e080f112a2ee769612f7319c8dc957ec9cb81ba534844a WHIRLPOOL 16958acb597f15ea63b5045162f5f2683753a06e402105ca834ac2c6bae9bcaf9975e709fe5ba44f66c7470ead008193c7dfeb131e3e901ce06a987a9685fbb9
+DIST scripts-5d3f16e91969123b8960e6806a9eade8a616f064.tar.xz 15832 SHA256 4c855c164546e7eed0d8c4e8a15c1f628f37605e0b6222d991b259c345894444 SHA512 5316545e3b7286a693f2ed1f16e70df253c3e8dcf5f10799571a4dc2d75ce7847d1747b7a28eb3f368b0f60c65e4fe06c9b6c4d27fbfd1fe1eba726e38241a8e WHIRLPOOL 28bf4695efab438e712360a7a23fd6383e07bab815c0e641ae12a7a470beebacc61bf3a759e0526d4f1dd1529552c419624735863b65b40598e7df1f46e5e3c9
+DIST scripts-d180c0bfdd4e3911a18360b3ccacd5271441e240.tar.xz 15276 SHA256 05805d63b5c11e295cdc1b309e17140110444754fce69e296ae52afd65167f43 SHA512 5260d78f8530e25dbcebb7af5a68fe65891fc9174f02ff17960dd0cc90464386a8b8bbbc04f219a2b4f9cd542df0affeb02e1f6754f09c594f5082cbfbf3bc0a WHIRLPOOL 349204dd9e5c9258683e69ee9fc65d1448d4f4b5e52c8c236f10ca8935d3cdc35f7571e5fc2d073ca18d0ad05b0ae2dfcfa24684a33830d031849ba1755c337c
+EBUILD mplus-t-fonts-20140706-r1.ebuild 990 SHA256 e2c9c1bce6c6d30df3ec4ec57b5fc557a3cf17d1d9010ec73c7fa106abaaa8ce SHA512 d6f86a13c4f482139af40282dce3d80310abb85a21744effcf192412f60cce911e4b87596ea41019544ea3ec005d0df77699f8b68c2433779eb28526ea6ece30 WHIRLPOOL 26ffd882aba7dfe1253817e9e0c181bdd03849ab684604bbe7042efb02d27c98c1ac8fbad7b2fd198bc9b6992018545a8df2716f866650cd4b1c2170512d3717
+EBUILD mplus-t-fonts-20180128.ebuild 1000 SHA256 1d4ae17729781f65171ccdc569e60b537e719f983dbf9c42c9fec02dade1ed27 SHA512 880f140bd4747982bfde3821bae39ceef905744e3fc93fde0303154dad7cd09747c9842a55ddef4ed58444dd920aed165d8e16461b0fa66fa2810b21ad80d346 WHIRLPOOL e12c3cc7f94ccf8d8b6a1fec42bf17327869a3e719644d7c5770457316a68b44b3485f11428f1dcef96ba5b8991a0d3f0664499e3c992b71dca00cdb970e79b7

diff --git a/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706.ebuild b/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild
similarity index 61%
rename from media-fonts/mplus-t-fonts/mplus-t-fonts-20140706.ebuild
rename to media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild
index f97972d6ff4d7b097042ffc07f2f0874b10ec3ea..b820862c95c98705f12360c90007bfbccf0442ee 100644 (file)
--- a/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706.ebuild
+++ b/media-fonts/mplus-t-fonts/mplus-t-fonts-20140706-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright © 2014 Nick Bowler
+# 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=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1 font
@@ -10,15 +10,19 @@ inherit python-any-r1 font
 SHA1=d180c0bfdd4e3911a18360b3ccacd5271441e240
 
 DESCRIPTION="Variant of the M+ fonts with enlarged CJK glyphs"
-SRC_URI="http://git.draconx.ca/gitweb/scripts.git/snapshot/$SHA1.tar.xz"
+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"
 
-DEPEND="$PYTHON_DEPS
-       media-fonts/mplus-outline-fonts[ipafont]
-       media-gfx/fontforge[python]"
+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
@@ -26,12 +30,12 @@ MPLUSDIR=$EPREFIX/usr/share/fonts/mplus-outline-fonts
 FONT_S=$S/inst
 FONT_SUFFIX=ttf
 
-pkg_setup() {
+pkg_setup () {
        python-any-r1_pkg_setup
        font_pkg_setup
 }
 
-src_compile() {
+src_compile () {
        ln -s "$MPLUSDIR"/*.ttf . || die
        python mplus-t-gen.py || die
 

diff --git a/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128.ebuild b/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128.ebuild
new file mode 100644 (file)
index 0000000..409e216
--- /dev/null
+++ b/media-fonts/mplus-t-fonts/mplus-t-fonts-20180128.ebuild
@@ -0,0 +1,44 @@
+# 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 python3_5 )
+
+inherit python-any-r1 font
+
+SHA1=5d3f16e91969123b8960e6806a9eade8a616f064
+
+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"
+
+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
+}