gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-fonts
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
184 files changed, 645 insertions, 1066 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 1a9ab20f7365..bd32479881a7 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/aquafont/Manifest b/media-fonts/aquafont/Manifest
index cd0ad341c287..fc45e0211f81 100644
--- a/media-fonts/aquafont/Manifest
+++ b/media-fonts/aquafont/Manifest
@@ -1,4 +1,4 @@
 AUX 60-aquafont.conf 208 BLAKE2B dc83a5958894e5b6db17e8f669cd9d3fde1dccc7c3eb105ec71410eb12e324f01615b30ef858ac5b5095ae989246846b24617f41c430196e65f705b7d409713d SHA512 4384cd9abcd684725336c4d2e867069d4b6602920493e6fc56fcdc13f00201a92338a8a558daf797c639b3a157c448e54fbc21f805ee0ad9ee1cb5cab5c2799f
 DIST aqua2_7.zip 2935520 BLAKE2B 019f2be39c7e2817bde0e2f14c8eb9d313a215548d4b1ff535131956d42332c963bddd7c31f79e600bc34c40d41559e897b43dde677a2489add7b65ff347546f SHA512 e49a96164584ba30681e0cd234a4164a4ee4fc10e430993a46786796cc8c123782a7126285cc6adc7e15b48c4a85b88fbf2de7b67540005c0dc012e1601b5323
-EBUILD aquafont-2.7-r4.ebuild 879 BLAKE2B 799fe0c06d703b7bb7e00e0ccebb0d12a8a17f181f8b73f75f2e7360bf39cbd68d10f20e9513965344f89eaf48e4112679eb40992a905d6f509e7bb7b435f5fe SHA512 976b9f4887f10dd71cbcafefae48fa71e244627fb1ba8de69a6615a31658f58cea67740a5c62f2fab7c714b0ad502dd90d7d944f8ac3bd0a705b8fc10ec7b504
+EBUILD aquafont-2.7-r4.ebuild 864 BLAKE2B b513fdb4bc24408578077b43d148f6477ea2274f41346b073e2f6a17988f5d578c89eabddf688fc5905b43932e52f6782a8f8e66f7dc98dd599c3579000995a0 SHA512 cc638471a2be202de931eda09dcdfe8789bf047a4b922ff58067a9865216ac920c85fd05b5eaac378166c15378f18c89b22ccdf01b45f13b282b7172e7325c38
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index d1d9f44b0fd0..28d94686f455 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -15,20 +15,17 @@ LICENSE="aquafont"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
+BDEPEND="app-arch/unzip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+S="${WORKDIR}/${MY_P}"
 
 DOCS="readme.txt"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-FONT_CONF=( "${FILESDIR}/60-aquafont.conf" )
+FONT_CONF=( "${FILESDIR}"/60-aquafont.conf )
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
 
 pkg_postinst() {
 	font_pkg_postinst
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest
index a0557c56373c..1df2627ab6f9 100644
--- a/media-fonts/aquapfont/Manifest
+++ b/media-fonts/aquapfont/Manifest
@@ -1,5 +1,4 @@
-AUX 60-aquapfont-r1.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2
-AUX 60-aquapfont.conf 451 BLAKE2B 435a16b9dc29a642ff006bea4cf0bf274c0544e51bbbc0a201f8f3a33643ddcb516b57b253b5eba8e8c87ad3caacc15f8e038f0178fb95d31cd8448385388e1f SHA512 9bf5dc2944a8e34bc5e6343e75b76a424e586cea27f64ca3a1ba0b155b423b83e33990547df72a0bcea0b38271a28d32e710a345dae16b49b2da6e333d8b44f1
+AUX 60-aquapfont.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2
 DIST aquap2_6.zip 2896324 BLAKE2B 4bd7e699c71758117b42538360901b252006af2619ece3294662a49724810c2f0e900ab4529bdf6bff774c9421de1dbe57fc82e91cbfad35615a3b3b271ac086 SHA512 5a46fe428eb81739cd9eda0570350a1a892fb7dd6f4e136f4f1d585837a668ac63d816bfa0f956ac24d945b20e16e7b72274cbf1d21e9f93ca057eee72b6af88
-EBUILD aquapfont-2.6-r2.ebuild 940 BLAKE2B bc385aa55f5201e231f5fda7029a5e774db8d0f78bdb1b75997a0ac561af7081ede8310abae27be9a4edb2f34b433a0cce98844d4e35435b473c3d00ccdefc45 SHA512 ee86cefafe441038606268d2ef3a763052b9c746135be84a607e82a8693c4510d8afc6b1a8cf1ca04472587d6d12c26eb8c8324c06053d89f988808a977ca3f2
+EBUILD aquapfont-2.6-r2.ebuild 823 BLAKE2B 0b65c4214dc17b4db56176915b8d6484b5d95fa2464b7b69268db3548c76d1c0a649715c7d73d0d0aaf600d3201388442429a189353a0e4e80f56d1f12fd06f7 SHA512 c8afdafe551a174fd638648cef765ac0746d1bb7da6e77199ab359c9c0a63c4c36712ae3513d4bfa79e07941c96e809f89f1cb77f46857b091e5e51be7827786
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index 657d83c7c412..dfa5495e12f6 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -14,30 +14,21 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
 LICENSE="aquafont"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-DOCS="readme.txt"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF=( "${T}/60-aquapfont.conf" )
+BDEPEND="app-arch/unzip"
 
-src_compile() {
-	cp "${FILESDIR}"/60-aquapfont-r1.conf "${T}"/60-aquapfont.conf || die
-}
+S="${WORKDIR}/${MY_P}"
+
+DOCS="readme.txt"
+FONT_CONF=( "${FILESDIR}"/60-aquapfont.conf )
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
 
 pkg_postinst() {
 	font_pkg_postinst
 
-	echo
 	elog "To use aquapfont instead of the default font for sans and serif use:"
 	elog "   eselect fontconfig enable 60-aquapfont.conf"
-	echo
 }
diff --git a/media-fonts/aquapfont/files/60-aquapfont-r1.conf b/media-fonts/aquapfont/files/60-aquapfont-r1.conf
deleted file mode 100644
index 3610820e10db..000000000000
--- a/media-fonts/aquapfont/files/60-aquapfont-r1.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>aqua_pfont</family> <!-- han (ja) -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>aqua_pfont</family> <!-- han (ja) -->
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/media-fonts/aquapfont/files/60-aquapfont.conf b/media-fonts/aquapfont/files/60-aquapfont.conf
index 07c60a6afe56..3610820e10db 100644
--- a/media-fonts/aquapfont/files/60-aquapfont.conf
+++ b/media-fonts/aquapfont/files/60-aquapfont.conf
@@ -4,19 +4,13 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>mikachan_o-P</family> <!-- han (ja) -->
+			<family>aqua_pfont</family> <!-- han (ja) -->
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>mikachan_o-P</family> <!-- han (ja) -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>mikachan_o</family> <!-- han (ja) -->
+			<family>aqua_pfont</family> <!-- han (ja) -->
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/media-fonts/artwiz-aleczapka-en/Manifest b/media-fonts/artwiz-aleczapka-en/Manifest
index 49cee24b240d..932c6113558a 100644
--- a/media-fonts/artwiz-aleczapka-en/Manifest
+++ b/media-fonts/artwiz-aleczapka-en/Manifest
@@ -1,3 +1,3 @@
 DIST artwiz-aleczapka-en-1.3.tar.bz2 36849 BLAKE2B e40d7761d2f47cddd364926619722859f1bb2e494b737f9f4853655f08ad6ae20c7c2719772088d977b5a33b8abd6308e57838cda9def7b789c0bfe77135059d SHA512 18f315314f6a03bc94920d7e83958d15ea4d80ab84911317bcec75486f46d07edafda2c58c82fd98b5350e939680d73b9c323843f7eebffdb4d2bbebc311400b
-EBUILD artwiz-aleczapka-en-1.3.ebuild 504 BLAKE2B 318fb70165e6961fd651921c616b00bb8b695e15f9ede765a0b9e1847752c5b73eef6abac50960eacdfaa6149255f6a293cf133f41716b7cb52d66b338ccd8cc SHA512 4f6995340d6defbc6ef87c035a78da3f9e02f51b132238b90c81ea30fc42df01c673a61174a6fafd4866fd197f7fb7b4ab7fe968e04772aa975eb6e315c20e5f
+EBUILD artwiz-aleczapka-en-1.3.ebuild 481 BLAKE2B f8b013e6078aed4cb6ea3cbe1d39a241e8b5ff27181a8252e8de13a2376952a101e126215fa363db358da51805caba73d35375729d7a2c2c077fb3b248e8a547 SHA512 bfee030ce475716004e42321416dce6398ec5f7745fb67afbc403d4db154c8a631266c4fc97bf21d14f23b9aa12a44f47ec796673427e9fccc112ffb8aad5c14
 MISC metadata.xml 323 BLAKE2B fceebb758ba933febb56c9a486b5f8867f2cc62831f8d36085d93d48244dbc6f24c294bc178b3482bf1048ccb8ed7f2bb630f62f7e91c9f2d428eadddc4f1afe SHA512 7a1221c23022627670c5d4a68782e94bed6db7634f9728593e6570513e2517e7c1a005993117c4109dfe5f6773e8ba27bcf03aaa51cfda4f4ad8e8a2fd83be99
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index 54c62739dd24..2522f713c3cf 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,10 +12,6 @@ SRC_URI="mirror://sourceforge/artwizaleczapka/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-
-FONT_SUFFIX="pcf"
 
 DOCS="AUTHORS BUGS ChangeLog NEWS README VERSION"
+FONT_SUFFIX="pcf"
diff --git a/media-fonts/artwiz-latin1/Manifest b/media-fonts/artwiz-latin1/Manifest
index 81168a156f97..3d7124c55410 100644
--- a/media-fonts/artwiz-latin1/Manifest
+++ b/media-fonts/artwiz-latin1/Manifest
@@ -1,3 +1,3 @@
 DIST artwiz-latin1-1.1.tgz 113305 BLAKE2B 42d800a3c37018d7cde8ecb2324f44932556c5ecdcbd6a9c72597605b2eb1f81bf10960107b2c43b61e444ad3bcd6b9fb0db9fca099c1c98080d95b2ff99578a SHA512 d22b808c22b0bcd029bc58577833092dc6b9f6d7b8459da2b0128bcc293c64a4466a146879034e0e4ac7ca756e6c4808c04b0224d328186c54604df15ac37854
-EBUILD artwiz-latin1-1.1.ebuild 514 BLAKE2B d16e5c9b791be9d563668d2305c7d7418d61f87ae231e5f0ad12447205cfe1c6ff23d0d0ae83e6334586bc38290766587e74ac2e9866d32d53ab2ebff60413b7 SHA512 0d6d18e4b509c26ddad62c996b4de97b51fcfd392cfe917d6bbb58556c9a38542cbfed0d9797ff8951544d0a52626dbbfb06467526b46a66a1f7bcbc6266500b
+EBUILD artwiz-latin1-1.1.ebuild 500 BLAKE2B 489e8a3ccbd234046d6b1602079bb15c4a8d6c5ac14e5352eefd6ae837a3ab0f34994cf4f23eeefa93532e94816a703f479eccc6d36656b9bb4d751283c4d79c SHA512 e55fdbe5fa3a9fb38dfab73aa070a23ddaa4a7e70475ba274e024acb432b929360c81d191e2fe3752c4d59057b921185dacf3766af06cf448857660db9750186
 MISC metadata.xml 321 BLAKE2B c39514558163939dd4adb8ba211ddccdf166ab0875045d6b0d19293cffaaa6810f09507a31c80486d817cff00742100d347557a4f5e57b64d824b6c736ee2a4c SHA512 df55e6389e5c7fe621c1d0706ca612b257e8283306133054187b4daefb63290fc25c321db080f3b3587110ab5ffd45bb2ad5606d9ee935e554efa440e6b1ffb4
diff --git a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
index 4600923234fe..7eb2d63e8399 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,9 +12,9 @@ SRC_URI="mirror://sourceforge/artwiz-latin1/${P}.tgz"
 LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
 
-S=${WORKDIR}/artwiz-latin1
-FONT_S=${S}
-FONT_SUFFIX="pcf.gz"
+S="${WORKDIR}/${PN}"
+
 DOCS="README AUTHORS VERSION CHANGELOG"
+FONT_S="${S}"
+FONT_SUFFIX="pcf.gz"
diff --git a/media-fonts/cardo/Manifest b/media-fonts/cardo/Manifest
index c160acb297fa..1954644f1224 100644
--- a/media-fonts/cardo/Manifest
+++ b/media-fonts/cardo/Manifest
@@ -1,3 +1,3 @@
 DIST cardo104.zip 2884040 BLAKE2B b99415deb43a7d589d979572d40f39c9053e5662b47bb9ec9fc9dcaec72053f7bb9f198710abe38d88a1597988d18c3245651ff5af387c6dd7dd6ff87c0891ee SHA512 559d91528dfebba1c0668ab0116e7cc8d481c88727cf01848978d920d625ee32c893d6abff3170e5365e136fa6f603c4f34390e17383409bc3db01611c42eefb
-EBUILD cardo-1.04.ebuild 468 BLAKE2B 95219bcdffc780480ba1d15d7fdb62ad80a68d4f5dee974e0d03f8335f45c2f716283e59c7d364a5f8fae0ce94da866732fe3155bcb755348fd5c1ab6517c762 SHA512 9838566c2f01327a4236fadbf6b6e27b69f1cbc635579801df286fb9613438934e12b2e2089017e52d35cf978b634528b8574312e8d51142c434cad6d600cd9f
+EBUILD cardo-1.04.ebuild 448 BLAKE2B 01dd0c9b5dc1915ef7f0a854e06078673e0d490412b0409f829bdb2b13ea2512b64b2bc25acee39c94fa98c0cead7ae32afae50c2d1ed263c30f7d4f2efadd3a SHA512 42befca72e127f9d2488b16e6e6debe1d277c83518459d80af10af802a1e40d748665173ddb54c5af8ab2f8fdc78ec8e5eea32152c872ffe607f84fd51665af2
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/cardo/cardo-1.04.ebuild b/media-fonts/cardo/cardo-1.04.ebuild
index a637562d9a48..441d3409163a 100644
--- a/media-fonts/cardo/cardo-1.04.ebuild
+++ b/media-fonts/cardo/cardo-1.04.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,12 +12,11 @@ SRC_URI="http://scholarsfonts.net/${PN}${PV//./}.zip"
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
+
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 DOCS="Manual104s.pdf"
diff --git a/media-fonts/cheapskatefonts/Manifest b/media-fonts/cheapskatefonts/Manifest
index 35145e8a10f3..34ff16b4989b 100644
--- a/media-fonts/cheapskatefonts/Manifest
+++ b/media-fonts/cheapskatefonts/Manifest
@@ -10,5 +10,5 @@ DIST Wargames.zip 32386 BLAKE2B 81019bfe0b1a9b04d1b87bcffb70efc12a3157ab43c3a656
 DIST Winks.zip 19003 BLAKE2B fa913fa32a4942b0af0624b071c9b06d00b4dd8b4c7142e40e0553931799d4dff0bd8a6ffa7eb24e2f9d852002498dd46c436d40cad70b7da8ce385d212029be SHA512 c2e4eac1f7c6bd8f94be5f925b6ccd31c352b3a83b63bb4a7730545eab4eb198b7b9d5f3c84653a0e9cec5cc847d10b905f009d002988f0d58ede46d21affe8d
 DIST balker.zip 20872 BLAKE2B 167b7bce0af3d72909e9cd18e442faaa92faed38e51014417c076c77a112537fa470dc2f582cf25586334911dd70af94883f893b7f882f64389d07c95fc4e37a SHA512 8368e3e57f94fc8b15a8b5460b638cb3c8aa8622fabe0d1e31bc85b166784c7118e7a580f6e3a5f1daf7cf7ef9b3999d16f955c40a96c876de4f822203b22953
 DIST flatline.zip 31411 BLAKE2B da6031cad411157a9e7762fd41cf82b4ae78ef5cdd41a23dce92f1f6ef174b865e9af2ef9768fd6a1bb663e0baf982aeda515d93797eae6abb6485d4d3c51ebc SHA512 460360f3d6d5fb4c19d246842d97ff220a353ba63b1e773ab949e0b2753b199f5e34522f7e98b2715b72a0b2fba7811299940cccad5d8e39fb0d2d16345d71fa
-EBUILD cheapskatefonts-1.0.ebuild 1130 BLAKE2B 7146c412f44f5f843a6034ed3827405e29448db347bf55b0bcc7d424eb97cf6573e0bdc8cd3783ca41a153329a3afd03355ac5cf8f7a5f3ca7a012d77f2c86a2 SHA512 fbbdb80e65eb4d904e4e0bf91d581c8d5f58746bbb2ce06fa1ce074046358e69e6ec9df62c6f8afd7104a2b90a7f753c82e2f40aa7e874eb5450658a1e21fa8f
+EBUILD cheapskatefonts-1.0.ebuild 947 BLAKE2B e6d6fdf95f43155596965091437a3971f83899750379cef30f618c85beb93017e592c0b74d5c1af6227d767c209689c4b4fbd595af427adea930b142af43fe1e SHA512 8b73068286515165f2367b9b849150b913986b17a1847fecd201854a0cb7f25eb3ee9612a9cf32e82eaf0e3b64238f08c59a06c90bd37725dfc6c4c1f4d26612
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index 28ce35dbaa9a..c90ad093205b 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Dustismo's decorative font collection"
 HOMEPAGE="http://www.dustismo.com/site/fonts.html"
-SRC_URI="http://www.dustismo.com/fonts/Domestic_Manners.zip
+SRC_URI="
+	http://www.dustismo.com/fonts/Domestic_Manners.zip
 	http://www.dustismo.com/fonts/PenguinAttack.zip
 	http://www.dustismo.com/fonts/Dustismo.zip
 	http://www.dustismo.com/fonts/El_Abogado_Loco.zip
@@ -23,19 +24,10 @@ SRC_URI="http://www.dustismo.com/fonts/Domestic_Manners.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${S}
-FONT_SUFFIX="ttf"
+S="${WORKDIR}"
 
-src_unpack() {
-	for zip in ${A} ; do
-		echo ">>> Unpacking ${zip} to ${WORKDIR}"
-		unzip -n ${DISTDIR}/${zip} > /dev/null \
-			|| die "failed to unpack ${zip}"
-	done
-}
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index bd80ef07ad99..8cd65a40e630 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,6 +1,4 @@
-DIST x6rus-2.3.1-bin.tgz 602902 BLAKE2B a42ea9ce78e16533bdd7c0336825d3361b1a655cf2dd39a6928b1a606d0fd68eaed5b1f815519d1bb9ec6d2f4109c9ffe4ac3d6ee632404cd8cf700bebefdc6c SHA512 0bc585724fa13edb27f8f0d275620fa01f35f885835a017428f12ca5cd30111942d7422efbc2a7e6b055325e1e8fb54bf58caadf2e981c56fc7f6deb96a75717
 DIST xfonts-cronyx_2.3.8-6.diff.gz 14285 BLAKE2B 91021cb3033fb6acd96b2f8fd12f4c621f066aabe7226b90d8a6a8da98fbfbfcb765a8a4cc7397b764b7b4c1f196c6e8a8df8cae1b7ae8c8f8981920f9b8ce42 SHA512 15703eda0e612b2cc29b16a4668fbe3efbfc3ffcea9bfa25ee47c4b3a7e1f0f8f5637b0f3c9b1239ab192f7229d56a433b8ff1b4366131d8d4c722f4451a1288
 DIST xfonts-cronyx_2.3.8.orig.tar.gz 269169 BLAKE2B e867a78511b744ca1b4fd95581c820b8932f8c17b336cc467f894324817b223b94179fe9cd5de46fd85445044e20c78ff067b650495eb0ba6e4781b05484f0bc SHA512 ac6e0d18977fb36ee255c57114f333dc5962c5a3f30dea8a6dccadd3831baa0d1b940c9a2fc40c56c043c8cb276c7a1bc039b555a68dab05e00139884b6b4696
-EBUILD cronyx-fonts-2.3.1-r2.ebuild 1695 BLAKE2B 94df9906a6ef86eddef1483adb1ec20651eabdad8822bc7190f2e15686fa5b4f12942ba871d853853d27da1798ac7dfaa1ca0c0abc514b809519c9c631ba3be4 SHA512 695ebf9acb6c062cc60cf04b23b23bc98fd6b061247c623edfb0fda2d6007dad0ba60de338fa3218b80a89310173215c5ab5931afcd08cf1287e8eaf6b0c9dbc
-EBUILD cronyx-fonts-2.3.8.ebuild 717 BLAKE2B ceab53f0038b2f5968251f8335d5d21731ff5bf8164ba1c1a46b9b2e073f18c2650d770b58d93f565924a450c46a274d0461d64889962460912753c3021eed6f SHA512 a1c1c33f6c36e1cac582a941d3464049cf84b3ced5f1725e84f970c463275bdd58f0ee9eac12507f473b820c900b0fbc5d373e21fb93f1247bb72b210dda733e
+EBUILD cronyx-fonts-2.3.8.ebuild 716 BLAKE2B af89e51e06b0a1442692d4ac4a0255e220c6b8567699beac078fb57cd6ecec5c3e799671d1d1e3e247f54f73190a50004f5aba9e19afe1d2a79f014d7f519daa SHA512 22270cb0be207c29bda4956b3ca73def9678834a7f844debe4ba892d7365125141ad2b9c43a97dd2236eb17ad09e1b404c52495dd9ce2bc833b2728548fb0f9e
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
deleted file mode 100644
index 8bf97ee3051b..000000000000
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
-HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
-S="${WORKDIR}/cyrillic"
-SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-SLOT="0"
-LICENSE="freedist"
-DEPEND="x11-apps/mkfontdir"
-RDEPEND=""
-IUSE=""
-
-FONT_ROOT=/usr/share/fonts/cronyx
-FONT_TARGETS="75dpi 100dpi misc"
-
-src_install() {
-	for dir in ${FONT_TARGETS}; do
-		insinto ${FONT_ROOT}/$dir
-		doins ${dir}/*.pcf.gz
-	done
-	# our install dir is still ${FONT_ROOT}/misc, so
-	doins misc/fonts.alias
-	dodoc xrus.info
-}
-
-rebuild_fontfiles() {
-	einfo "Refreshing fonts.scale and fonts.dir..."
-	cd ${FONT_ROOT}
-	mkfontdir -- ${FONT_TARGETS}
-	if [ "${ROOT}" = "/" ] &&  [ -x /usr/bin/fc-cache ]
-	then
-		einfo "Updating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f ${FONT_TARGETS}
-	fi
-}
-
-pkg_postinst() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-		elog "In order to make X see the fonts, you need to add the"
-		elog "following lines to the files section of your "
-		elog "/etc/X11/XF86Config (or the XOrg equivalent):"
-		elog "  FontPath \"${FONT_ROOT}/100dpi/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/misc/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/75dpi/:unscaled\""
-		elog ""
-		elog "In order to make them accessible to your current X"
-		elog "session, run:"
-		elog "  xset fp+ ${FONT_ROOT}/100dpi/:unscaled,\\"
-		elog "${FONT_ROOT}/misc/:unscaled,\\"
-		elog "${FONT_ROOT}/75dpi/:unscaled"
-		elog "  xset fp rehash"
-	fi
-}
-
-pkg_postrm() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-	fi
-}
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index c420a8ca405a..c07950ee68d1 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-FONT_PN="cronyx"
-inherit eutils font font-ebdftopcf
+EAPI=7
+
+inherit font font-ebdftopcf
 
 MY_P="xfonts-cronyx_${PV}"
+
 DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
-HOMEPAGE="http://packages.debian.org/source/sid/xfonts-cronyx"
-SRC_URI="mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
+HOMEPAGE="https://packages.debian.org/source/sid/xfonts-cronyx"
+SRC_URI="
+	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}-6.diff.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
-FONT_S="${S}/75dpi ${S}/100dpi ${S}/misc"
-DOCS="Changelog.en xcyr.README.* xrus.README"
 
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-6.diff
-}
+PATCHES=( "${WORKDIR}"/${MY_P}-6.diff )
+
+DOCS="Changelog.en xcyr.README.* xrus.README"
+FONT_PN="cronyx"
+FONT_S="${S}/75dpi ${S}/100dpi ${S}/misc"
+FONTDIR="/usr/share/fonts/cronyx"
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 63072d43a4a4..acf8c9c27e86 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -2,6 +2,6 @@ DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
 DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.35.ebuild 2105 BLAKE2B 18063325a3cec07ca26ef21bff8e12ed08d7e3dc7c63abd62eea7ed3c61c6591046ed4f521b7e6bf652300208834dfc9174895e47db10ce5016d464e578a36d9 SHA512 371e7ad0f3bdca4d03b5b46f259ddf4f7d4e059979167679128d074a4571b50451dd23bb1e1f826bc1fd636644bc4b001dfd2fc1a353ded74e6501fe40ef5dde
-EBUILD dejavu-2.37.ebuild 2167 BLAKE2B 93560cca556c45223144122b71732331d8b0641fdfb98c749b470c36c48b2a230db47b4f43aecc2bef678256812c854d997f633f513d78489492d46184728712 SHA512 913e300f1e569bd3177002aa5f8e2edf6a9d60d9a00ed17c5744a1a6b9c71099dbad5f08798c210f1381dc1a04236c8556b572419bca000037ad5a6ee23971cf
+EBUILD dejavu-2.35.ebuild 2089 BLAKE2B a64f81357244f947b91594b992ca9c3a1fcbdc32bbef7d5635ac532bc198c0b4333e6c5a700804c08de91e99ad534f35039bd65b4689af3dc7b6a30bbb476dc4 SHA512 b899511d32c9ee50f016e523f6281c20226c5e691f0521ee6a123ea494767ef1b51995a316225e0dc9ce90ea5f18bc88055dae536150b45daa78ae68aa99f171
+EBUILD dejavu-2.37.ebuild 2154 BLAKE2B 18efce7416eedbcda391f395fd77d8e0157bfaa5b965a10f65472024ec62d980b12aa6d51521c26cb2819834aa50aab0dfdb49900dd08888a91640439ac21224 SHA512 d8ec32019dc19e53ce56258dde8bb1f79053a2bd4f46d6b3f350aac5393360629ed44ffc59836082284e3686ab4688562d633aeecb438e34dc7639d7cef4e1fb
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 231aff9c53c4..0a0e131e0794 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,9 +28,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
-DEPEND="fontforge? ( x11-apps/mkfontscale
+DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
 		>=media-gfx/fontforge-20080429
-		x11-apps/mkfontdir
 		dev-perl/Font-TTF
 		app-i18n/unicode-data
 		>media-libs/fontconfig-2.6.0 )"
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 2fbef3de226c..f46826227e59 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -29,9 +29,8 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 IUSE="fontforge"
 
 DEPEND="fontforge? (
-		x11-apps/mkfontscale
+		>=x11-apps/mkfontscale-1.2.0
 		>=media-gfx/fontforge-20080429
-		x11-apps/mkfontdir
 		dev-perl/Font-TTF
 		app-i18n/unicode-data
 		>media-libs/fontconfig-2.6.0:1.0 )
diff --git a/media-fonts/dina/Manifest b/media-fonts/dina/Manifest
index 10f93e33093b..934a94bc7455 100644
--- a/media-fonts/dina/Manifest
+++ b/media-fonts/dina/Manifest
@@ -1,5 +1,3 @@
 DIST dina-2.93.zip 78625 BLAKE2B b2376faf3b94177d657a029bd0d31243e7751b4784b07de08f22977daadbf1e4fec4f93c024d1e1f7110353fd9831a6cc9d0a207cb324fbedd3dbd47923e700f SHA512 cccf05b32d401ba77861e39471d9f6489a85b839dd8d49ec008eabd107189bb0a95bdd36805bc7907ab96fa65792910408192a136340f62c34a61b1d5c6f6307
-DIST dina-pcf-2.89.tar.gz 36442 BLAKE2B 84d343c1fa7b84e436f4a5712bc58b0db2a30b603a4f4cb2eec7bdceb844a1948d3fbc6b2c9c14316519ca0ec907a547ad150e2961493c0c31fe7f11fb9d2684 SHA512 e315f3afde86fa957d18d6903a97f1b2f018d12452d0186464dcb61de6ec9ec1e99f20519730567934fe8fc8555e2c1f4c531d19fd329c36eb5b1a840b2d7971
-EBUILD dina-2.89.ebuild 460 BLAKE2B daef515f2a3ba9661430147222384da8cabbf942a3e245c92743be74fd684b5758fb630f68a8e64d471274bd85e5f579d84253c775f3bfd95735056978c984f7 SHA512 835fccf54d50c19fac6492a10e728f57614cf785968bdc2097dcf04dc54b03e99511eb34af9adf7e0c49e39414f5862972c30a2590d43f6b85c27c5aea2a1af4
-EBUILD dina-2.93.ebuild 601 BLAKE2B fc6c5082fc935a74d6136d82936896752ce18e29be8927f0469342cdf49a62fa50823f485fb3d461cbbcb473d5d3bf3c36b6df1bd7811c00a9a6c7e5ae261699 SHA512 a5c4b538f62133902c351f5d8471d89a5b76177cb09331b903d891f350b38e202a56f3a2753870636afe77576d795a6d1c8377b70201f1ca3dbea09ded39147a
+EBUILD dina-2.93.ebuild 596 BLAKE2B ea502eadb6726402ceaf36b70ea45b035cd7b2ed510e323499981ddc2f5373815cf3d856cac29220e0afea723bd7c75f103df2ff55abea05ee0791061fdbf4f2 SHA512 fc87a0ab3d942f0c30b1d1cb013a75cbbf8b09f379cd1f87650dd6b899a55c11aa70f257c6b1715010a0d2a1701e3f301bdccb68970514499fd30bfb00834a9b
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/dina/dina-2.89.ebuild b/media-fonts/dina/dina-2.89.ebuild
deleted file mode 100644
index 465b72218e18..000000000000
--- a/media-fonts/dina/dina-2.89.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-DESCRIPTION="A monospace bitmap font, primarily aimed at programmers"
-HOMEPAGE="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/dina-pcf-${PV}.tar.gz"
-
-LICENSE="Dina"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/Dina-PCF
-FONT_S=${WORKDIR}/Dina-PCF
-FONT_SUFFIX="pcf"
diff --git a/media-fonts/dina/dina-2.93.ebuild b/media-fonts/dina/dina-2.93.ebuild
index 5e32d170d725..46aefaabe4ca 100644
--- a/media-fonts/dina/dina-2.93.ebuild
+++ b/media-fonts/dina/dina-2.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.donationcoder.com/forum/index.php?action=dlattach;topic=3604
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/efont-unicode/Manifest b/media-fonts/efont-unicode/Manifest
index 6cadfb3a4ef3..449e726a919d 100644
--- a/media-fonts/efont-unicode/Manifest
+++ b/media-fonts/efont-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST efont-unicode-bdf-0.4.2.tar.bz2 23999335 BLAKE2B 3a8b90d0343f5f90bda08003446922f4c994001ecb769b1ec58efbf23cbec93e2d327704d0f04fe01a7456ec0286d1fe318c388f660a7ca2b6fdef3e9ca9f687 SHA512 d19b4827bb473f8e7b0102b3c563e4ce559861220de158486e602aabe71f0abde127e83a46a622fafce797395f6977ad1c61e73e8c4997a4a088158a3b51e41e
-EBUILD efont-unicode-0.4.2-r1.ebuild 637 BLAKE2B 603ffce8fd03cd574f3f34c49ed3f32cbe1d47317cb0a7fe9141881ddba05e327879b3683bcbed94d686526618e8e13e5fbff85f72ddbd325cfe70fc9b1b0f3f SHA512 ff874e9641b54a2081a585a3b8714231836416a0d0b6367ae1e577ee482854ba99717c9702fb2bc939ec473083c7690909e2d03b9d49f4a4913ce73a24377993
+EBUILD efont-unicode-0.4.2-r1.ebuild 636 BLAKE2B c6d6f15500eba467edcfcb7f3cfe26422900e8e312769713011ed31611352b500e9627417574308ff454ef738e05b11c0ce0e773b0dc843774b503ca71359801 SHA512 2c5e4c8eb7032d1008396e47a9d3f42617fe26c146d31972cda8bb20d699aa03a2202bc412994fb64276e599184646b4c9e7b72a665de9b942ff06de379a66b9
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
index 2508edbe1170..ea2905909221 100644
--- a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
+++ b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font font-ebdftopcf
 
@@ -16,10 +16,10 @@ LICENSE="public-domain BAEKMUK BSD MIT HPND free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}/${MY_P}"
-FONT_S=${S}
-DOCS="README* COPYRIGHT ChangeLog INSTALL"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
+FONT_S="${S}"
+DOCS="README* COPYRIGHT ChangeLog INSTALL"
diff --git a/media-fonts/ekushey-bangla-fonts/Manifest b/media-fonts/ekushey-bangla-fonts/Manifest
index 190cbd898258..f84466c7f5ba 100644
--- a/media-fonts/ekushey-bangla-fonts/Manifest
+++ b/media-fonts/ekushey-bangla-fonts/Manifest
@@ -9,5 +9,5 @@ DIST Saraswatii_03-09-2005.ttf 285756 BLAKE2B 26eb1cfcd1ae27e67a4afe67523111d563
 DIST Sharifa_03-09-2005.ttf 354356 BLAKE2B bf9314cce39b5146bf0caa85d718c3f96fc6d51531805ed739ecd6673127c87150de0f5d23838725581a43977ce110b819fa6af8ee3c6c7806b43c1fcc4ee39f SHA512 97af7402d794d675c61268bcceb09ca6f21418083a33992cabe66d81cc476e6476f86b5103571692e894fa7190d66f6851609f8f251094ad0878dcd0767c5516
 DIST SolaimanLipi_20-04-07.ttf 249656 BLAKE2B 8af862d020e8faa269d7db5a647d0b3003647c1f80ccb75713aedad811f25a1dbe602841c82ae9ef6f75b90c18a6cce62a38de0cee1db2f73c517b76cf2fba44 SHA512 f4c23e4a405039ad80f48e588ae5ef8adc02272aeb133758de8b2470a0ea0edd13bd92c394c59f0d043cb5040ed41134ef2cd31382f3ffbcd11ad98f6bb93c8a
 DIST Sumit_03-09-2005.ttf 326112 BLAKE2B 3d9918c6217dc4bdcb03969c8e862ce73ca5cea2cf7126b3c18f1d0f51d18f1a7042c27623342869afad04eb3aa37577373043cf75a0dab11a0d8a38c78630c2 SHA512 46caec852f0a4ce447dfe383e534995d919dea9e778077617953d66a5b2d8300a562ef1848b8a1c5554c2179410066c12f6be7fd9f2ece94adb5100ff616a230
-EBUILD ekushey-bangla-fonts-20070420.ebuild 1459 BLAKE2B 7c60fca18596a6eeea1d8bef2a4bda056e033c6afdbef9ae59ab62a7e3e738797c5206db055f578642a0ae5efa975232206b06602d0c93355126276b1515e73c SHA512 f6288eb3292287cd63d45347418eb1030376fe14b519658228319be6f9e3cc2ff493412ac207bc3c9ea3cf1a9b1079e7767149345845d2ce042554c03e126a59
+EBUILD ekushey-bangla-fonts-20070420.ebuild 1315 BLAKE2B bfc83af61750bee5015401728b92b68c8ab4bc69f998ebb2279472750852ba5981672b2142b847ded312b5c9aba3564466a5b6ac02cc6a99de104019401a1716 SHA512 d2cfc94527a2efebc5878fab5b60fe35d3cae6743af3911394fe983f7cc9d6ba611ff41bb911aa8c141d327784affd0f31cc6c859ef18261cf1b5035964ce3c0
 MISC metadata.xml 315 BLAKE2B 9afc3a500af9d55301f52a840a562bfb56bfe0e29b61398c234f304d28bd757848916074f0e69dc10443e7161f84677453b19586420784fd56e3cef7aed100a9 SHA512 e2fca9e30be5b62eb8fd689ff0fac189a76d32434b0362282f7295a82a5dd7efc00091c87a5d11216fcfc974efb19548a0cd1a735d899584199d079d90c3644e
diff --git a/media-fonts/ekushey-bangla-fonts/ekushey-bangla-fonts-20070420.ebuild b/media-fonts/ekushey-bangla-fonts/ekushey-bangla-fonts-20070420.ebuild
index 0b2d2ee5408d..67591655647a 100644
--- a/media-fonts/ekushey-bangla-fonts/ekushey-bangla-fonts-20070420.ebuild
+++ b/media-fonts/ekushey-bangla-fonts/ekushey-bangla-fonts-20070420.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -31,26 +31,17 @@ SRC_URI="mirror://sourceforge/ekushey/${P_LOHIT}.ttf
 	mirror://sourceforge/ekushey/${P_SOLAIMANLIPI}.ttf
 	mirror://sourceforge/ekushey/${P_RUPALI}.ttf"
 
-LICENSE="GPL-2 OFL-1.1"
+LICENSE="GPL-2+ OFL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-FONT_S="${WORKDIR}"
-S="${FONT_S}"
 FONT_SUFFIX="ttf"
 
 src_unpack() {
-	cd "${S}"
-	for DISTFILE in ${A}
-	do
-		[[ "${DISTFILE}" =~ ([A-Za-z]+) ]]
-		local FONTNAME="${BASH_REMATCH[1]}"
-		cp -a "${DISTDIR}/${DISTFILE}" "${S}/${FONTNAME}.ttf"
+	local f
+	mkdir "${S}" || die
+	for f in ${A}; do
+		cp "${DISTDIR}/${f}" "${S}/${f%%[_-]*}.ttf"
 	done
 }
-
-DOCS=""
diff --git a/media-fonts/exljbris-free/Manifest b/media-fonts/exljbris-free/Manifest
index c9fac88bca14..d5b4f5121a5d 100644
--- a/media-fonts/exljbris-free/Manifest
+++ b/media-fonts/exljbris-free/Manifest
@@ -3,5 +3,5 @@ DIST FontinSans_49.zip 89449 BLAKE2B c5fa4391291c8b9a6444fb065ed15a73f52c9f22759
 DIST delicious-123.zip 90823 BLAKE2B aa340054f06dd6af5ed1aaf4f7e0a567abe6df389248ee69c75ffb367883c2b0778d30dc381b2da44f845e8cdcc48aea136e654c9a244537c1fe7331f0a1742f SHA512 e01e75d4aa175789dde6b4685dc582374096b69a81b45b77035b2a813bbec2f79ea4fff38ec80746ef859826ffdec23f67925b93aa6614b559d1cf09604a18cf
 DIST fontin2_pc.zip 74922 BLAKE2B 574a57be04646c23f78ad8ab5915bc4e570aaa2cb58177b94bb60d6549d82ba521d3533a217d885e09723e5e9dcbfb01b5a0f71a2b133d6dd85bb5d530f5e263 SHA512 c617440f96609909b2ee7291bcf3b26c38eb7841cba6fbf278e2acfde119b01a250b69f2bb804c4000f622080ba0c623a73b48951603129304e01f67c7f1567b
 DIST tallys_15b2.zip 16564 BLAKE2B a377da4605b38196c8d5088b996171a91c39493f06b2051aa8040d4dc4afbd66c2fe0d648a29f6575332006ebc6e826c655d85c7e463987647b8d784e0a60e5d SHA512 0b25146eae4669941706d8feb7de3da37031daa602fe11b8f914b2a2224b0e4cb496852014c3f5d85b9b853af61ba5013619abd8efa786b5fd01efe474552a31
-EBUILD exljbris-free-20100320.ebuild 723 BLAKE2B 4aee645a324721733f129035862c9e0ad2c1860157c04bf2646c22fe2d21e31713b9ef7b756bb47312c3f58eb8aca39761f6c33cd915b19197488c305e2b6655 SHA512 57f06ce6219049e90cdaa9b17e5f6e1a1b09183634c67a95d541e72f8fbf218cb6207b008b2305e797ef1fb23790dde4dc6cd58091915582eff11e293862cecf
+EBUILD exljbris-free-20100320.ebuild 684 BLAKE2B 27bd807998434129e655fe6c525349132fe091b3993b523211af281b154d1d2f4a2615126e4ba7ab35073460f39352e34899f84e0c909b17939ebc17eef577b8 SHA512 fea8dc7faa6fb70bffd9cbf811a45999c808b34528ba538a3509e995390e2fbd5779e59ec54275c9a8e58cfc9f87eac89640b79cac10e03b9abea2d8dda0271e
 MISC metadata.xml 388 BLAKE2B 3c830abb16cc0a24e9b602a56935bc01adf14d35569c18c691f34e87b11c6517495e4bb1f976f8776e467dd5d518088ce17b5df8a5525291a574b524438e96d0 SHA512 3ee66b2b47cac695ca8e34cae27aa841a7780ed863f83157ed2ca420a6c8c999cb153252f1fb06419bfb20620d9640e3d3e79bf94b7c9d5d09a63905a17fb1c8
diff --git a/media-fonts/exljbris-free/exljbris-free-20100320.ebuild b/media-fonts/exljbris-free/exljbris-free-20100320.ebuild
index bb67c66505a0..520bbcad0634 100644
--- a/media-fonts/exljbris-free/exljbris-free-20100320.ebuild
+++ b/media-fonts/exljbris-free/exljbris-free-20100320.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Beautiful free fonts from exljbris Font Foundry"
 HOMEPAGE="http://www.josbuivenga.demon.nl/"
-SRC_URI="http://www.exljbris.com/dl/delicious-123.zip
+SRC_URI="
+	http://www.exljbris.com/dl/delicious-123.zip
 	http://www.exljbris.com/dl/Diavlo_II_37b2.zip
 	http://www.exljbris.com/dl/fontin2_pc.zip
 	http://www.exljbris.com/dl/FontinSans_49.zip
@@ -16,20 +17,16 @@ SRC_URI="http://www.exljbris.com/dl/delicious-123.zip
 LICENSE="exljbris-free"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
 RESTRICT="mirror"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
+
 FONT_S="${S}"
 FONT_SUFFIX="otf ttf"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	mv "${S}"/Diavlo_II_37/*.otf "${S}"
+src_prepare() {
+	default
+	mv Diavlo_II_37/*.otf . || die
 }
diff --git a/media-fonts/farsi-fonts/Manifest b/media-fonts/farsi-fonts/Manifest
index 85ffad605be6..13cd9ae123b6 100644
--- a/media-fonts/farsi-fonts/Manifest
+++ b/media-fonts/farsi-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST farsifonts-0.4.zip 332472 BLAKE2B b987298d3a531655a36a88402c96769cf6604f74e899cfe75d8f70e25629d79e941a8a92cbe64b611519430029efb2312bfc7facbbeb6b72c61d2b8d4192acb0 SHA512 fbb7c769a7d3c42f42a5f62a323dc983c6d0d0094e97af521356d858697fbdfad6b431808185514de3bf200121c9cda712949fb7221333f1a6dc250a906daccb
-EBUILD farsi-fonts-0.4.ebuild 501 BLAKE2B 7815b1a451055600d9dbbabec9fa05b138ebadbcc15f015f84c951759c915ddc6a0580428904c053d5648edd3af522f190d71fe0cec480c6b5080053f3e8c529 SHA512 7f336b31225768bd7bfd0550a37a8f5515fa00e5ef6a3ff5526a9907685c3f503cd04d467e9e3c02ff21d5f461d1b3c1e96fa680f5232e01c429bfba23da8a40
+EBUILD farsi-fonts-0.4.ebuild 482 BLAKE2B c52fdb1f8f70ca0f586a7ef75372349d3808829df996e826e5186151a57292fdf5e3ca66be25376fd1faf4c935e5a6e9b640e232867d8d84857562197d24dc4c SHA512 203d455eb6ff87522e09a8b3d62a1de2e77d13bc2c7b93dc5a90ed8169eae476109a161bb7950385378b2674b2e2513e41893a58dc4a64f3dce2908582c787da
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index e7dc251557a9..3d1701bfb479 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
-S=${WORKDIR}/${P/-/}
-
 DESCRIPTION="Farsi (Persian) Unicode fonts"
 HOMEPAGE="http://www.farsiweb.ir/wiki/Products/PersianFonts"
 SRC_URI="http://www.farsiweb.ir/font/farsifonts-${PV}.zip"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~ppc-macos ~x86-macos"
-IUSE=""
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${P/-/}"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/fgdc-emergency/Manifest b/media-fonts/fgdc-emergency/Manifest
index 8a85be97361c..0f9e68e685f9 100644
--- a/media-fonts/fgdc-emergency/Manifest
+++ b/media-fonts/fgdc-emergency/Manifest
@@ -1,3 +1,3 @@
 DIST ers_v220.zip 684659 BLAKE2B 09add211c9e1377c43b974830744d1caed355c92b23d99d0777ed19789b9dec1ff5c568f2895798dc761737e05010d83c35f96107c56cf86f6264fa484f1a755 SHA512 f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717
-EBUILD fgdc-emergency-2.20.ebuild 582 BLAKE2B 677e9161b7d474504f12720ca6fa8535c3aa629fba61a37b895fe4dbb201071394df002759c42995d38b086d38f39927ec10abdf6b5d26074568ee4041117473 SHA512 125023a7b1f6622a034fb6b0b9ef5aab8d93050d572435b758bc2cd76d5f9ccd96aa62878b1651e5396a42b2bd5bc85a6aed4c22a2fc04ea6212a89086bcfc14
+EBUILD fgdc-emergency-2.20.ebuild 553 BLAKE2B 559e7c05fce3755258425783f195b92ed12878831512ac8944589dee89e77540c649681d7330ad74d66514ed77081ea894e5f119cd35d07319f01e0a82cb4194 SHA512 8dc81eea92982b3dbbc704ed712f937869f6c2253dcf590039226278c392a35cee0959c78452aff6385e0f8609059ce0416cd1441862a38e4491d6f6ea5a57f1
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
index 966167049362..72a402226094 100644
--- a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
+++ b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="FGDC Emergency Response Symbology Prototype"
 HOMEPAGE="http://www.fgdc.gov/HSWG/"
 SRC_URI="http://www.fgdc.gov/HSWG/symbol_downloads/ers_v${PV//./}.zip"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
@@ -18,18 +18,12 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 
 S="${WORKDIR}/ersSymbolsVersion0202"
-
+FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
-DOCS="readme.txt"
-
-FONT_S="${S}"
+DOCS=( readme.txt )
 
 src_install(){
-
-	cd "${FONT_S}"
-	cp ersV2sym/*.ttf .
-	cp ersV2txt/*.ttf .
-
+	cp ersV2{sym,txt}/*.ttf . || die
 	font_src_install
 }
diff --git a/media-fonts/free-bangla-font/Manifest b/media-fonts/free-bangla-font/Manifest
index 3b9f7f18efda..a0e90941447f 100644
--- a/media-fonts/free-bangla-font/Manifest
+++ b/media-fonts/free-bangla-font/Manifest
@@ -2,5 +2,5 @@ DIST Akaash-0.8.5.tar.gz 260206 BLAKE2B 29db12bcdecd18dc64a33cf6ba396226bdc45c3b
 DIST Ani.tar.gz 129089 BLAKE2B 40f54798406374ffe39c98c2b19bd0c465a41e97fdb20ddea694fe357c63eef74534c1ff413a7234d6879b378369781d1b4f96befcb3546ab47a106f73cb21b3 SHA512 147ad2cb7122a0c64a0cebf15821b2269b9f639615293bd27623b55a1c58b17a848968f9023921a06e5171172587af2eb2c01aa539731416d26ebd00fc77a9ee
 DIST Likhan-0.5.tar.gz 158889 BLAKE2B 4a0889c74227854a8f5ab89bb55adfe063b31c09b3046b7ce056eebd35179c3c8aead0e27a74564b621c6e9c8c3f4e3895d5103d78791b1173e94e7723e3c07e SHA512 c20f4bb17498fcb67afb4e709b7edfbaee20346cd0552ef850fcb8af928c355f4ce7f8c1c92936094e1d23b0d5040340eaf8fe6d2bb6b405c8695dce39fc29eb
 DIST MuktiNarrow-0.94.tar.bz2 116736 BLAKE2B 3b302f7356b22053c11581dff434a5d236861177f40c6fd2c5bcf0e03c4b3ed887e5043e960adc7f01b8a26c93b1e4ff58c7bf430abb00146f0a5db265835a22 SHA512 f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
-EBUILD free-bangla-font-0.2.ebuild 997 BLAKE2B aef780cf4f0c04be37428983cb92228766e051ece787db1e301aff0894c12b9d49ec26a7bf30b34136b2e7ab651ee7ff87f0b447c948cb11cf3846d60d4f786a SHA512 dbd0d534db0e14b6ad2d4bee086fbd67d6f57d5cdffd0b2bcb4e5ad24c46af884496b12dded329c474d837f019de86af780f02e289d893fd46e5f319ecb550b9
+EBUILD free-bangla-font-0.2.ebuild 1058 BLAKE2B 57fc7956a625fab48e0b42794e0842bb7507651539ab7757aa31cc24c8422497d6b4440d009a73816e7722c8c965baa08efe15755c57b26c92a57f9e3f425cb8 SHA512 7eec0aa9caa5e5cee318dc5ffd8260b78ee3ae1d9fd7f9cb3ad1dc5c55e3fb3735ba90ee5d97f9e19d5585219872b04ab052b52a4354b9eec5cca4f06037e00b
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
index 5353896850eb..0d4d3baf9f7d 100644
--- a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
+++ b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -13,7 +13,8 @@ MUKTINARROW_P="MuktiNarrow-0.94"
 DESCRIPTION="Unicode compliant Open Type Bangla fonts"
 HOMEPAGE="http://www.nongnu.org/freebangfont/index.html"
 SRC_BASE="https://savannah.nongnu.org/download/freebangfont"
-SRC_URI="${SRC_BASE}/${AKAASH_P}.tar.gz
+SRC_URI="
+	${SRC_BASE}/${AKAASH_P}.tar.gz
 	${SRC_BASE}/${ANI_P}.tar.gz
 	${SRC_BASE}/${LIKHAN_P}.tar.gz
 	${SRC_BASE}/${MUKTINARROW_P}.tar.bz2"
@@ -21,25 +22,27 @@ SRC_URI="${SRC_BASE}/${AKAASH_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh x86"
-IUSE=""
-
-FONT_SUFFIX="ttf TTF"
 
 S="${WORKDIR}"
-FONT_S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf TTF"
 
 src_install() {
-
-	find . -name '*.[tT][tT][fF]' -exec cp {} . \;
-
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		cp "${f}" . || die
+	done < <(find . -name '*.[tT][tT][fF]' -type f -print0)
 	font_src_install
 
 	docinto ${AKAASH_P%-*}
 	dodoc ${AKAASH_P%-*}/[A-Z][A-Z]*
+
 	docinto ${ANI_P}
 	dodoc ${ANI_P}/[A-Z][A-Z]*
+
 	docinto ${LIKHAN_P%-*}
 	dodoc ${LIKHAN_P}/README
+
 	docinto ${MUKTINARROW_P%-*}
 	dodoc ${MUKTINARROW_P/-/}/{Changelog,readme.txt}
 }
diff --git a/media-fonts/freefonts/Manifest b/media-fonts/freefonts/Manifest
index 1fdaf038ff5e..eb027bc78173 100644
--- a/media-fonts/freefonts/Manifest
+++ b/media-fonts/freefonts/Manifest
@@ -1,3 +1,3 @@
 DIST freefonts-0.10.tar.gz 2422824 BLAKE2B 9ceec3e86786957a2949660528de128a40e5d02dc15d28068d8ac2d8b61633dd8d3060085e2c7b20ff029a0076f789137a28830bf90ca00e15f95ebce01d8015 SHA512 21b911cb574015b6474b125fe20be6670fe32fe40e6534e738f8d0b527d3b7a8000843206343187deb565970e04fa900eeb5eae43e14b19a7acbeacad6b057b5
-EBUILD freefonts-0.10-r3.ebuild 469 BLAKE2B b80a3ae1f21ea47cb3e38aad73aa73caf1906e6aa6571c816c2c60ea8ebcaa4bbe61673f12c71296031dd4b04468f3b538d02f03d75cbbabdfd265b7c6c00224 SHA512 c51cef847209a1d998f1d4d63d59ae02337b4e2b8ac91f9c286e1c194429adfee51f9fb0adc665d88d2465cf820f89121dfec2f508a11a3de11ae6720e6dca37
+EBUILD freefonts-0.10-r3.ebuild 466 BLAKE2B 33e3077a5af7f1c4e1c1bd077555f072d2bb24b84b31575b1ebf5f4b32d5d6352af7fd5c66005684766667aaf0349db75cc844d2eb64f4d41b09c58bf7f6e8d0 SHA512 25200c13c0cc0dcdd60328f02ab63b0dc3490e8d842fec13c56055a41e1870c40805418d5a5cff30e9632d4c9471b0e741d9308bdb1df7a85428c94324a72439
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/freefonts/freefonts-0.10-r3.ebuild b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
index 7427d02579ef..85a881a03574 100644
--- a/media-fonts/freefonts/freefonts-0.10-r3.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="A Collection of Free Type1 Fonts"
-SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 HOMEPAGE="http://www.gimp.org"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-SLOT="0"
+SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
+
 LICENSE="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="X"
 
-FONT_S=${WORKDIR}/freefont
-S=${FONT_S}
+S="${WORKDIR}/freefont"
 
-FONT_SUFFIX="pfb"
 DOCS="README *.license"
+FONT_S="${S}"
+FONT_SUFFIX="pfb"
diff --git a/media-fonts/fs-fonts/Manifest b/media-fonts/fs-fonts/Manifest
index bcbeb527dcc9..9963da8f89eb 100644
--- a/media-fonts/fs-fonts/Manifest
+++ b/media-fonts/fs-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST fs-fonts-0.1test3.tar.gz 7470476 BLAKE2B af3afb48594333b4162f1da70660af443173b2a3274bd238de1fba537f1e788a8e0f36425a038c5272f5e6d421bddc8d2734bbeb2f42170c8e9960604e3d2862 SHA512 d513771f0c9e8a7132b7de806edb52a094201980de324a076c434ec4e609dadbd48aea727c83e4843378fd3d126e11d971557a427dd4c23af4871dddf6369eae
-EBUILD fs-fonts-0.1_alpha3.ebuild 786 BLAKE2B ed3516292cda4d54948cb2ac3bc3351959dbf80f451d5adf47195923aefa1f27ad7e5464a605c606073a6e6bc0ba9a04bdecbbf8a20fda512b6f7546e6f2ad74 SHA512 06fdce69f84c2086082930dde1a88ae552a0de1c5924b2136bdb714c8977b766e605cacbfd4f6c2a03a994f711540c6b6518195e2537c40a24c2d37256f08e32
+EBUILD fs-fonts-0.1_alpha3.ebuild 738 BLAKE2B c8b7d0ea3ddb3b47388f5d84f163fc665d68b2646cea8d36fab8930f140e9dfbf378285e8a2bbd0fb54eb261ba635f31374d4bd27b53b046e0f23750f9e27116 SHA512 8c93de8e9aad1b512c030f8c50d20492c486cc3aba5e42e76f21631b071a782a0c3eb5a7306f4a5f67505c74bdb1ec5f0b8635ce6fc66f2d904cca89327c31e6
 MISC metadata.xml 410 BLAKE2B a1412a8a5cb998f90a31a6c9ab7e69bf02d6b5d258cca02b6c3024e140fbdc6a808adfdd89a02d6a671a649b3c35b858f88fecd09271db057e5ece1d6a92d2e5 SHA512 2aee09db3d528008dbd456fa8b570128ecc0caa6a52089aae5e37821b8c8634941fd3ab26c769c4c6a833790e4443f3cb3929a36d3a4adef4cd4f1833f399359
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index afe49f5f2acc..b4847b5a6171 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -1,35 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
-IUSE=""
 MY_P="${P/_alpha/test}"
 
 DESCRIPTION="Japanese TrueType fonts designed for screen and print"
 HOMEPAGE="http://x-tt.sourceforge.jp/fs_fonts/"
 SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="public-domain"
-SLOT=0
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}"
+
+DOCS="AUTHORS *.txt THANKS Changes docs/README"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="AUTHORS *.txt THANKS Changes docs/README"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
 
 src_install() {
 	font_src_install
-
-	cd docs
-	for d in kappa20 k14goth mplus_bitmap_fonts shinonome* Oradano kochi-substitute; do
-		docinto $d
-		dodoc $d/*
-	done
+	dodoc -r docs/{kappa20,k14goth,mplus_bitmap_fonts,shinonome*,Oradano,kochi-substitute}
 }
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index 5db17c0d0db6..3941d3aa3189 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,3 +1,5 @@
 DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
+DIST glass-tty-vt220-001.3.tar.gz 23707 BLAKE2B 3fe67a3e34d405aff20addaacd4a7acdd9fb4632cbc7f277a715469fab3ba68ef6985e17e8bcd630264641ecc56cc0f9a2e08876ac94ed26b40175cac1709738 SHA512 9ed77e9cff5c1c59a9a93cb2caaebdc19d8057827165630882cbacb5cc79e15c6b90044d3a5e85bfc55c344a16128d499f15d6bdff8ef3091093b2b7790fbedc
+EBUILD glass-tty-vt220-001.3-r2.ebuild 761 BLAKE2B b08470cba6e8ad65b2574431c8a2382448228bf0a5ef4bbaac3724737bc1da58261c3a9894eaf5f3ec3c2ecb68811ecac14902301c1843d53f668cdaedeeaade SHA512 527eae6385096ed8c36c9b267a90bb52a04baf939b641d0ec350e263b02830652f9c713d172d29b4d0fbe83a6520fc96eb090c31db1ded5850a1024a92bbbcc1
 EBUILD glass-tty-vt220-001.3.ebuild 567 BLAKE2B d3e5077a3705dffb21df135c38ab6aaf7fa0146b820ced341e6db9d45584f5346f7572a69da27a0137a99f8842a7aef55dc41c8cad220605fe596df50a18f1fa SHA512 e5aee8aad4b8149511f94bc2342bfa0141e4b360aae256164d940b687b433af86bf96b83e097dfdb4d3716c8d0c6f32c0dd1c87aa67706954d369038677b98e0
-MISC metadata.xml 857 BLAKE2B 2c79eff84b11bae387c6d591fb90551c6e6f5b31d72f14925a135c23b62c95e9e4ba81513a3ccfa44eda0da20fc2b0e432268b122dae09197e89cc7ffa97f671 SHA512 c5bc22dc0a7bb56da981b7eb9b1403f937a51f9d6e646dd6693db24aa7bb8064d206f0b51ab07f8f1358b4039c87957c6f33bca608d74880375081456e70f5cd
+MISC metadata.xml 1002 BLAKE2B 832819c66315b14cb9ee3d91bd96bc11ac17604ae51e3b95f5c7201bc1f32be2e7a25208a71b4228004cfeaea4d35a6da509df62f4046180a7a79fef11417063 SHA512 b2567aab7e2cd239b55446a516599a076d89fea9134b661a1533e60f0113c81eab67b1890e70d2971166f1eea4bf35a57406bb6f35cf564d53cd74d08600677f
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
new file mode 100644
index 000000000000..7a257a419b64
--- /dev/null
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="8d5bcafe971ee94df4aa20317f197d407df672e9"
+MY_PN="glasstty"
+
+inherit font
+
+DESCRIPTION="Hacking with Style: TrueType VT220 Font"
+HOMEPAGE="
+	http://sensi.org/~svo/glasstty/
+	https://github.com/svofski/glasstty
+"
+SRC_URI="https://github.com/svofski/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="Unlicense"
+SLOT="0"
+
+S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
+
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+
+	einfo "Since the GlassTTY VT220 font is fixed,"
+	einfo "you must use a font size of 15 for best quality."
+}
diff --git a/media-fonts/glass-tty-vt220/metadata.xml b/media-fonts/glass-tty-vt220/metadata.xml
index 91f4fc444d21..029a9e3f3352 100644
--- a/media-fonts/glass-tty-vt220/metadata.xml
+++ b/media-fonts/glass-tty-vt220/metadata.xml
@@ -18,4 +18,8 @@
 		is lacking and nostalgic value is absent. What I wanted was a font that
 		fills my virtual terminal window with the magic hacking glow.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/svofski/glasstty/issues</bugs-to>
+		<remote-id type="github">svofski/glasstty</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/hkscs-ming/Manifest b/media-fonts/hkscs-ming/Manifest
deleted file mode 100644
index b8e60069998e..000000000000
--- a/media-fonts/hkscs-ming/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mandrake_setup.bin 17157184 BLAKE2B e4d237af15a7a21f05d086b1ce6e60ed0c3a8a9113abea539028a7cd742825000db17e32eee76107c5dd67434392336bb7344bc61f7ffc5991c78a14b13144e1 SHA512 230466146642f3348483bbfb6a63a27dc3e76e248abb34fc5872edfa6b5b9a2a93cf8446c23f64b80bcac6c0c8a16059a8dc3945925a30815d222a6621daccb2
-EBUILD hkscs-ming-1.0_pre20030919-r2.ebuild 1352 BLAKE2B 2a6dcc589aefe54d0622ff6523c0999dc69144decb0b8bf45252e4a163ffb3bbde8d4d0e77eda7a2594d4d66f3be87d9ee8cebc65b9e4e681e1202896836617b SHA512 a16ef08ba4f105a7099943e8e806ad2acc396f39e00189da5ee09e85c1b9ea140e8c3ef2a0f696b30725dd412cd6ae36c9b363c896cb2b8e9707c9a19d0dae07
-MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild b/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
deleted file mode 100644
index 91452223537d..000000000000
--- a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit rpm font
-
-RESTRICT="mirror strip binchecks"
-
-RPM_V=1.0
-
-DESCRIPTION="Hong Kong Official Reference Chinese Font that implements ISO10646 & HKSCS-2001"
-HOMEPAGE="http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/hkscs/"
-SRC_URI="http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/mandrake_setup.bin"
-
-LICENSE="HKSCS-2001"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-FONT_S="${S}/usr/share/inputmethod"
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	# complicated and convoluted unpack procedure
-	local linenumber=237
-	cd "${S}"; tail -n +${linenumber} "${DISTDIR}/${A}" | tar zxvf - || die "unpack failed"
-
-	# then we rpm_unpack the fonts package
-	rpm_unpack "${S}/package_mdk/imfont-${RPM_V}-0.i386.rpm"
-}
-
-src_compile() { :; }
-
-pkg_postinst() {
-	elog "The font name installed is 'Ming(for ISO10646)'. To add make it"
-	elog "the default Chinese font, you should add entries to your"
-	elog "/etc/fonts/local.conf similar to:"
-	elog
-	elog "<alias>"
-	elog "	   <family>Luxi Sans</family>"
-	elog "	   <family>Bitstream Vera Sans</family>"
-	elog "	   <family>Ming(for ISO10646)</family>"
-	elog "	   <default><family>sans-serif</family></default>"
-	elog "</alias>"
-	elog
-}
diff --git a/media-fonts/hkscs-ming/metadata.xml b/media-fonts/hkscs-ming/metadata.xml
deleted file mode 100644
index 6f2ca22da233..000000000000
--- a/media-fonts/hkscs-ming/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-fonts/hunkyfonts/Manifest b/media-fonts/hunkyfonts/Manifest
index 02b2d4956ede..580280203f5b 100644
--- a/media-fonts/hunkyfonts/Manifest
+++ b/media-fonts/hunkyfonts/Manifest
@@ -1,3 +1,3 @@
 DIST hunkyfonts-0.3.1.tar.bz2 452207 BLAKE2B b78ba6839adcb696ace3702588d026618c5d8092b7623174a22062af566e7e0586244314005df36c4881478ce46c7af9aee87e39647e66c8dec1277e603efa64 SHA512 0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375
-EBUILD hunkyfonts-0.3.1.ebuild 514 BLAKE2B a1bc50fc8d3ac1edabc344485ffaa70b9ddaca2db920f695941a75a44752e99220ce0d22623a669e0fae655ad7535851110bc4111ceac222d0ed6b6e917aeb67 SHA512 9085c331ba324c4730a0ac909d263f2d7ec8f4124330235e0debd1dccd57a12bef438f8ce44fd55e0ceda9e9eb76636f6045405177463da4c2012b64841f55b9
+EBUILD hunkyfonts-0.3.1.ebuild 491 BLAKE2B 51a6f0a126660c3721ad6e0d6c396002f8c99f4e91207cbd46c8139a973a71b39beccd9bb76d75b2a4c0501454fca609ceabb9f74f586e0a5f48228cd1c8b6b2 SHA512 c9d918c309ad6a744006aae070bc414132f2e2b026eda652fdaddc1a3e24874a92b2494bc79c28fd47c89129f40c9df5745e783e365d71cf4a763862ef7a54c8
 MISC metadata.xml 550 BLAKE2B d909fe6569dac324c05382ee8121c5860e2f4ba18d21b1fc3ea6aad3694d91a34498c0c267bbcf352e4549c0b5844abb57e5cd19916ff8ca787953e9bcdf16ca SHA512 45a95222e1cd82f8ac387078e89ee1fabb548acb45d4dac8b3f2a0c165dc0531efd73581d56a51c346af984d98b4e58576cc6fb98a263e0f7742592a8cc06463
diff --git a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
index b1a013836c95..6cf68f800ec8 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,9 +12,7 @@ SRC_URI="mirror://sourceforge/hunkyfonts/${P}.tar.bz2"
 LICENSE="BitstreamVera public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-FONT_S="${WORKDIR}/${P}/TTF"
-FONT_SUFFIX="ttf"
 
 DOCS="ChangeLog README"
+FONT_S="${S}/TTF"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/inconsolata-lgc/Manifest b/media-fonts/inconsolata-lgc/Manifest
index cbca70ca8878..d8188eccad9d 100644
--- a/media-fonts/inconsolata-lgc/Manifest
+++ b/media-fonts/inconsolata-lgc/Manifest
@@ -1,3 +1,3 @@
-DIST inconsolata-lgc-1.1.0_p20140917-gh.tar.gz 388972 BLAKE2B 16156225ca11733a3b3db8ac95fb405b61ac6e884634e1e324a4a8d59114f31897d55bd508bb970f3b8a8d05f4c9bfdd1b645a96f0bde3706fa3d9c6bd33df85 SHA512 5dc9792cb267cf6cc81a66e8e8bdbb76c8bdbe1be8e1ee91efdea4a7914ee59687a4bf5d55980b48ecbd9e87dc4e30494a308a012f453bfebd7b2216eea195e9
-EBUILD inconsolata-lgc-1.1.0_p20140917.ebuild 587 BLAKE2B 4b647b5818b905f77ec6c543501093313d3445903acaf134f349f4910dcc5f6956990c2918e297d9410c56307e4fdeee2e1ef4cf84ef8a881ab88b0be9fbdd0e SHA512 0d7dcecb9e31742495e72928104e3350c7cb5a27d55eee29242e0d811c9a03d742bf9572f70cd799196ec2f1ff1240b15cf0705c5b7fce91e4a88818102755c3
+DIST inconsolata-lgc-1.3.0.tar.gz 274350 BLAKE2B d8864cb189a0c3019850a123bdd15b6fb9275059b3fef48edf0a6f53ae4a7304b1d1f2c10d1ecbac2c9e65913065dc9b68acd8530df38df6ed72575dec317cf7 SHA512 1958246e38f12b6f6675eb26ccdfa35d870e44a2e50e1263a7f0268e1e4af9fd2870a11dc8dd0da452f7c436b4a998782b5c80233803448684602e36c658163d
+EBUILD inconsolata-lgc-1.3.0.ebuild 511 BLAKE2B 01a12077f8edcbd69ad1652df57380965e304369617ba481ad07998923e3864c2eda039eab19ec5edc9866eb81a8bcc0b81149cf9eb750cae438787d492d9acf SHA512 c8f195e8870de64e6db7d0540bc4f4fca439cdf132af616f80ca4a85752a267901fbfeaba6ebec42d4e9d4a4e28ebe7282cf384ef0011fc678452cc8c618f0a6
 MISC metadata.xml 472 BLAKE2B dd3215a7a9a93a0497480773191dae3399407515a54e0bd58692fdc0db2d2b1c63d52afe677b53f399c5918552e25de96ef8d413598cef534d721fc94eff2b97 SHA512 0d72c22820f6fad11ce1841ffd3f511be9e8ade45392e15f97168ecdd073c9c6e56488d322472ba79f452cc7687ec089a320aadbb4cc487376d91116f3169985
diff --git a/media-fonts/inconsolata-lgc/inconsolata-lgc-1.1.0_p20140917.ebuild b/media-fonts/inconsolata-lgc/inconsolata-lgc-1.1.0_p20140917.ebuild
deleted file mode 100644
index 01742a70ea42..000000000000
--- a/media-fonts/inconsolata-lgc/inconsolata-lgc-1.1.0_p20140917.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-EGIT_COMMIT="d086a618248121d61e3f3de64b4301230d1c860c"
-DESCRIPTION="Modified version of Inconsolata Hellenic adding the Cyrillic alphabet"
-HOMEPAGE="https://github.com/DeLaGuardo/Inconsolata-LGC"
-SRC_URI="https://github.com/DeLaGuardo/Inconsolata-LGC/archive/${EGIT_COMMIT}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/DeLaGuardo-Inconsolata-LGC-${EGIT_COMMIT::7}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/inconsolata-lgc/inconsolata-lgc-1.3.0.ebuild b/media-fonts/inconsolata-lgc/inconsolata-lgc-1.3.0.ebuild
new file mode 100644
index 000000000000..d12ceaff035a
--- /dev/null
+++ b/media-fonts/inconsolata-lgc/inconsolata-lgc-1.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Modified version of Inconsolata Hellenic adding the Cyrillic alphabet"
+HOMEPAGE="https://github.com/MihailJP/Inconsolata-LGC"
+SRC_URI="https://github.com/MihailJP/Inconsolata-LGC/archive/LGC-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="media-gfx/fontforge"
+
+S="${WORKDIR}/Inconsolata-LGC-LGC-${PV}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 6d2691981472..189a4efc4762 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,3 +1,3 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
-EBUILD intlfonts-1.2.1.ebuild 758 BLAKE2B b6b31251a65ce3217e7ee7a6007eaabad0d2ad8028138a5e09d58bb5c3c639e883649ca9b5bc97aeb4f554345b0e756e59cfcbfe3c20b15dac30133003c41a47 SHA512 0c2625631cf19ea00cd3b6399547bef4b1f246696e432ba976354c25373c059dea8b23ffa740fcefd64e458ad3314d2049ed606d6462215f8b3485084dbdc230
+EBUILD intlfonts-1.2.1.ebuild 727 BLAKE2B 17abdd5311937482c9012336a386f5d5a67ee949f0c3af3811dc69077b8af25604ace6b7190536062d7707030c1f22238baab0e2653f95ad212beae358a55189 SHA512 816f7ede0acf38661cb13af55b57052103f042cfffae7da6cbeac97ea30324c13ae476e66ca35a46e30c2070aa9067c5593af3273d17881bce2b5a876f89c053
 MISC metadata.xml 310 BLAKE2B fa2fd301aaecf5199872cc505f1f3e1617fcdc9d5b2339a09fbf17a5c211a86aa36679c02f329b8a2ad6303d4273e637e053e45cc49cc5cf2d749e625065482c SHA512 d28b30457a33057122995d04f513281a3513ca0b30c5afa4d5bfcb222912d0eb870c5afcd12dc2426b2d10cb82a9254888d6b307a9defab5112c4bbb6e60f22d
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
index 7d5465ee4446..2f64bafdef9d 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
-IUSE="bdf"
-
 DESCRIPTION="International X11 fixed fonts"
 HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
-
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="bdf"
 
 DEPEND="x11-apps/bdftopcf
-		x11-apps/mkfontdir"
-RDEPEND=""
+	>=x11-apps/mkfontscale-1.2.0"
+
+DOCS=( ChangeLog NEWS README Emacs.ap )
 
-src_compile() {
-	econf --with-fontdir=/usr/share/fonts/${PN}
+src_configure() {
+	local myconf=(
+		--with-fontdir=/usr/share/fonts/${PN}
+		--enable-compress='gzip -9'
+		$(use_with bdf)
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake install fontdir="${D}/usr/share/fonts/${PN}" || die
-	find "${D}/usr/share/fonts/${PN}" -name '*.pcf' | xargs gzip -9
-	use bdf || rm -rf "${D}/usr/share/fonts/${PN}/bdf"
-	dodoc ChangeLog NEWS README
-	dodoc Emacs.ap
+	emake install fontdir="${ED}/usr/share/fonts/${PN}"
+	einstalldocs
 	font_xfont_config
 }
diff --git a/media-fonts/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index d867352bc82a..95c8859dce0c 100644
--- a/media-fonts/ipamonafont/Manifest
+++ b/media-fonts/ipamonafont/Manifest
@@ -1,3 +1,3 @@
 DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 BLAKE2B 74d9501a47730ea651d05b6de973926c9c78b3fb61640eeac023a68b99a71684d934a17a54eebb8cb4b19d1c16f8fccb794dbb6f582f9e0853bf6328d3de9ddd SHA512 b46b09bb44497275d8949bcd6d0c472c7bc8a26f20113e97f6379a10e8f4d5d072e4c517aa1c69e24efd980644d8298d220abbcccb6e9af3c65794dc31f7ec7b
-EBUILD ipamonafont-1.0.8.ebuild 671 BLAKE2B aa1a41653febe7947b5987305ce1004458e41dd67cd968f3e60d353a4d1c20d518906478de4f33b9a5ad8bf129a62dde47f6adfb15161e339e3fac954de67e6c SHA512 6d235d4c2e8eda1e16470e6ef52599575bccf5dd0eb6ff0ac50ceb9a77db1576aa94558ab7b6034d7281bbc202f10f9b8f4a1512c1c9d04b8297491cfe31b803
+EBUILD ipamonafont-1.0.8.ebuild 668 BLAKE2B d65696689240ab9abe5494ddbacd46df876bcbf3ab09de1fcc5228fa87117fe3790533964b1b4fb2b73f1ad752d92817e10352b0dd0ecb8c56d8126f3f41f8cd SHA512 c7c913439e877d8dfe5a93df6baa691b35453f783e03af57c1ddb7e5301947704dfd6b90d245c6f958dd9b6e74dec302264b7ab7c5ff84930ed73f59fe8ac043
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index c1a4754ed835..f2bf8209afb9 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
+MY_PN="opfc-ModuleHP-1.1.1_withIPAMonaFonts"
+
 DESCRIPTION="Hacked version of IPA fonts, which is suitable for browsing 2ch"
 HOMEPAGE="https://web.archive.org/web/20190326123924/http://www.geocities.jp/ipa_mona/"
-MY_PN="opfc-ModuleHP-1.1.1_withIPAMonaFonts"
 SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="grass-ipafonts mplus-fonts public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
+RESTRICT="mirror"
 
 S="${WORKDIR}"
 
-RESTRICT="mirror"
-
 FONT_SUFFIX="ttf"
 FONT_S="${S}/${MY_PN}-${PV}/fonts"
diff --git a/media-fonts/jsmath-extra-dark/Manifest b/media-fonts/jsmath-extra-dark/Manifest
index ce676147603f..c44319d5d531 100644
--- a/media-fonts/jsmath-extra-dark/Manifest
+++ b/media-fonts/jsmath-extra-dark/Manifest
@@ -1,3 +1,3 @@
 DIST jsmath-extra-dark-1.0.tar.bz2 242603 BLAKE2B 499460875bb37c1839a9f7af088137e10ab8e56487d0f36409cab373a63cb3d0c9d9b7880c33e6143969b7463f481120c34cfd9ae9e25c81357ce407c85cd6f1 SHA512 8be1486e27192107f4b7659a6d39c49f536e73ff40115fa03eb8a9b4692417a2e8c886ff18b034c132ebeafbf2233932f2ac0b6eb63e6c7ba7ec2e83550c2ca8
-EBUILD jsmath-extra-dark-1.0.ebuild 458 BLAKE2B a443a71d8e225d06af30ba2ac655427f4c2380e0317f473023768b578ab2da38f202ba383d5925d15dd6c6b3e5d627363e2d1a6e86a3ea2a5ed0a0b53beaae33 SHA512 3c99488c48209e42c577565aa5f6f0fb7511e24b80dc73725067dd0ba65ee7d4b29a4cd91c2129d81d529ffeb9d0187358e4367a4e1f8eeefb1c9e6a40fbd364
+EBUILD jsmath-extra-dark-1.0.ebuild 439 BLAKE2B 5752557f8ad1bc509852aebfa49a4b0e272d2d76deff47d4da5ee0a1dba117c08b6f10045569b6445dbac2a9280c21e8177cc59a6a8de308fbfe8547c5818951 SHA512 7461b4335e9420a2167856127e7ef97d3852ade0ed62e402ac953e453bb034a93bb8d7100cf35062f61cf6aed0e7d9b26c198fe1db5b39b9d99bb24274cd3ba0
 MISC metadata.xml 378 BLAKE2B 8cb7b478ea081a24d37a623e859047964199ae9af439acbfc3656d8be4d1d9add5d1b5c3d2fdf2a0720bdb34200c8ccb114cd7b5ba4ae4c1fffbb8da7f54970a SHA512 df25de97720738d9ec9745010ed92f4dd30f27881eff5e28a3388b780927b4754a8449e3af2eeaeac9cae7e478886b4e5c3c2873adc2a4ada46da3b7ca5a9245
diff --git a/media-fonts/jsmath-extra-dark/jsmath-extra-dark-1.0.ebuild b/media-fonts/jsmath-extra-dark/jsmath-extra-dark-1.0.ebuild
index 67c7cc47edf1..fe6e6481654c 100644
--- a/media-fonts/jsmath-extra-dark/jsmath-extra-dark-1.0.ebuild
+++ b/media-fonts/jsmath-extra-dark/jsmath-extra-dark-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,10 +12,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="media-fonts/jsmath
+RDEPEND="
+	media-fonts/jsmath
 	!media-fonts/jsmath-extra-light"
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/jsmath-extra-light/Manifest b/media-fonts/jsmath-extra-light/Manifest
index f3b952cdc27b..1b402a98e8c7 100644
--- a/media-fonts/jsmath-extra-light/Manifest
+++ b/media-fonts/jsmath-extra-light/Manifest
@@ -1,3 +1,3 @@
 DIST jsmath-extra-light-1.0.tar.bz2 445 BLAKE2B e58ffd47391083f579ba57122fc34e597efdd017691a1b3b9b210f9f4c07f58d578020058cd0afe8523511419adfb8b09cd039e8897677ba1aa13dc9567fe7d2 SHA512 8168378ceef45543efd61e4f9802766104cba288fae68b370e78bc8ec22b379dde91f3193d8d1b5e5570961dda14a0aa299f375df13201dfbcb8a48372f933a2
-EBUILD jsmath-extra-light-1.0.ebuild 458 BLAKE2B 2c6a85abea9180f99984316d01f040288f90d0b67585bcfaeda33456e35486e3414016ee85cdc1680cc12735bd5d58942b7fbc3a2048d2a4b28572138e4cbd10 SHA512 5a06ad6e487d5ed52a4ea4a2d0166657c0ff3fd4b632467c5c661ce66af9c888eddb081dbb64cc583b2a739bf1718ddc49e339e4bc0a9635d61e51e6a2870eff
+EBUILD jsmath-extra-light-1.0.ebuild 455 BLAKE2B 81902fc288ec008eccb934f3a9cf0e046be15ef534eed21cce528e31990e9400aa546f672c9767acb7d8bbef22af474557cc011475783b273da03735983e2747 SHA512 8bfc6545d2fb0269bff819538cd4ac7cf3767ed1ba31c640314119f0d927be38156e14595b2a3faf2e4a80e2aaa40191825cc057b72dc548c5675025e6723263
 MISC metadata.xml 379 BLAKE2B fd13f7643d77c979e02c16ebc61049e4de7ebdf9cf1900decbc0bd88b35236bd1f3642fa89fcc76185924a3727107d37456e2b449102d55456f3d986b9aa62ca SHA512 dd923940ba28ca2a00bbe25394b65d03125b414466dc44b4dc5ec18339ce4b62e018f4dd62f1032fe76c02a8b21dbab0a468b41e07b280ab2545b134a225f3c7
diff --git a/media-fonts/jsmath-extra-light/jsmath-extra-light-1.0.ebuild b/media-fonts/jsmath-extra-light/jsmath-extra-light-1.0.ebuild
index d7b02e9903ba..2894ae265c7c 100644
--- a/media-fonts/jsmath-extra-light/jsmath-extra-light-1.0.ebuild
+++ b/media-fonts/jsmath-extra-light/jsmath-extra-light-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit font
 
diff --git a/media-fonts/jsmath/Manifest b/media-fonts/jsmath/Manifest
index 7c58cbc10578..498f6ba15357 100644
--- a/media-fonts/jsmath/Manifest
+++ b/media-fonts/jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST TeX-fonts-linux.tgz 127294 BLAKE2B 8238b8b4d371708e14efce2352703e5f1e3aceb3569ec99ab16914d7fc79983e76b9fb1879177a3263a7acfe7afbf4076d30605229a6be0b180cf6fc9765c2b1 SHA512 ccbcd2f8b2a7ddfc7f72c03525741d3cbb7edd98836916126a634376fbaa0454d4f08cee5408f5368e04423719f4408e9f00a656917b58bab0cb5300ea5445da
-EBUILD jsmath-1.0.ebuild 470 BLAKE2B 1db32e2767fbfdbe6e3b6a47fc627a16facdea6d7605d99acba0f6f417b60de3c0f18e0e2de0a237ed02114f04c24d2d1f03be516766c9c3b9ab31d5f1074f91 SHA512 bead119f2e8f16b30eb30a82b7065f3465c57a2044ebec2e99c5078db5165e542243a53b4527cc42700d9da8673355baec80d5dc433cb8d03096edbc3f9cc0b0
+EBUILD jsmath-1.0.ebuild 449 BLAKE2B 7f0d3ae836ed3dff8da2c633e6431966bdf2e39f0d4f5557a2bf90bff009c1b038f075befb0122ec92ccca221fa10cd494ff0e0c617fdb838fa611e61d3cea7e SHA512 d4dd7b40e55d70d867d74ebec259f7a78d46a9da572c4a615608e8bec35ae7727320fe851840599aa5b2b6fb50d1cbe0049507c2e422cfea6a7f6916966d93ab
 MISC metadata.xml 449 BLAKE2B 61fbbde1b3535ad7502df4ec01ec2e767c96032c7511a6126ead874e4316c136ba81bbeb2fa4a526c478d0f309cbb8f33aacdecdb92ad5a8a2fce1cff6283f1a SHA512 a2582f69114c5bac5dfa1f66fa16e6eb6247056d3a94a886da989e265005864d3c5d1fc1055d81657396c1e83a4f96c0aa0319db290221a80567eb0de65a631e
diff --git a/media-fonts/jsmath/jsmath-1.0.ebuild b/media-fonts/jsmath/jsmath-1.0.ebuild
index 0670ac0faf82..fa2a6dbeaa2b 100644
--- a/media-fonts/jsmath/jsmath-1.0.ebuild
+++ b/media-fonts/jsmath/jsmath-1.0.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
-MYPN=TeX-fonts-linux
+MY_PN=TeX-fonts-linux
 
 DESCRIPTION="Raster fonts for jsmath"
 HOMEPAGE="http://www.math.union.edu/~dpvc/jsMath/"
-SRC_URI="http://www.math.union.edu/~dpvc/jsMath/download/${MYPN}.tgz"
+SRC_URI="http://www.math.union.edu/~dpvc/jsMath/download/${MY_PN}.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+S="${WORKDIR}/${MY_PN}"
 
-S="${WORKDIR}/${MYPN}"
 FONT_S="${S}"
 FONT_PN="jsMath"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/khmer/Manifest b/media-fonts/khmer/Manifest
index 8167a1a95b6d..f2cbacc736d9 100644
--- a/media-fonts/khmer/Manifest
+++ b/media-fonts/khmer/Manifest
@@ -1,3 +1,3 @@
 DIST All_KhmerOS_5.0.zip 944849 BLAKE2B e95f90d6773ff3d5d38b408e83131e43b381f63261d0bfa273e56103a907fe5b2d6a9d69fea4f8f67fefc52098c56598d75fe13cc0aa4410288b0d814313beac SHA512 5fded88a9149d0fd59a377f08d9e1ea63ecffede58cde42e28504a48b12b35dec699b1ea0e0bbb95465c281d5b19ddfbe808a3c4ef40cd46295aaa069bd9127f
-EBUILD khmer-5.0-r1.ebuild 729 BLAKE2B d2fa6bcd437795edc83abe55264a56803a2c02a2c892d785a40d125c1d6e17e4a2881921694c1b43196c5ba67637e7d42fdfef104fcec65d5670ad5921ec7a48 SHA512 a2f95b8b3e65b85fa3b72f6339cbc4bf22caead6b1bdd42f6591c604097c6a7aa0680d0d3512c414215cda6d7c006db82c1b341c81506e68cbc0538e39defd9d
+EBUILD khmer-5.0-r1.ebuild 658 BLAKE2B de96eb2435839640f14cc97ef0728ec4d058c24e7d953b88281107e64e8bfab81ced8ffacdbd03045cf3c0302713940f31d1909d4684faa0cc84c08147e7bd7f SHA512 d60b4a1800e440f626d4ec9decfddf1675473401921df531865a0a40c159cdda1982aff1611e84c9b26fd81c0d9377688f58bac4b2ea920d01833ab8a2bdec08
 MISC metadata.xml 313 BLAKE2B 0787ee9b60242e11f855e6f419675b0885bd33b5275ec1c584e823bcf46f3977bd7815ea5757a800bb41b28d13aeb5adc904cd41535f688b320121d19bbb4397 SHA512 e13ff0b43306cd9263c0cf011c26cdb450c5dafcdec055cd08f4874ffd24184b830fe1af0538553c1d54ee538f0e132164f23f1ca41736172c8e58f11d2201a4
diff --git a/media-fonts/khmer/khmer-5.0-r1.ebuild b/media-fonts/khmer/khmer-5.0-r1.ebuild
index 8ffa9836419d..7991889184d7 100644
--- a/media-fonts/khmer/khmer-5.0-r1.ebuild
+++ b/media-fonts/khmer/khmer-5.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,26 +12,25 @@ SRC_URI="mirror://sourceforge/khmer/All_KhmerOS_${PV}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/All_KhmerOS_${PV}"
+
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -f "KhmerOS .ttf" ]] && mv "KhmerOS .ttf" "KhmerOS.ttf" # 338057
+src_prepare() {
+	default
+
+	# bug 338057
+	mv KhmerOS{\ ,}.ttf || die
 }
 
 pkg_postinst() {
 	font_pkg_postinst
-	echo
+
 	elog "To prefer using Khmer OS fonts, run:"
 	elog
 	elog "	eselect fontconfig enable 65-khmer.conf"
-	echo
 }
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 93952f080aa4..550d88ae1f24 100644
--- a/media-fonts/kochi-substitute/Manifest
+++ b/media-fonts/kochi-substitute/Manifest
@@ -1,3 +1,3 @@
 DIST kochi-substitute-20030809.tar.bz2 8675822 BLAKE2B c825801d5d47ff312338393c09c5d2b03923fe8b6a5434dab36acd855a27a9f167409e8562f701c7da5dd4b313d8f19e18b7ee09c63e9d024cd3a2bade3b47a2 SHA512 24d990383aa1afb32523d05577da48bf07cabe0814af9c2f10c55d1db6dd4fd5e4b9df566431fe25f871f78494e62c07d5082c7596c50c410b45bf33ca9b2105
-EBUILD kochi-substitute-20030809-r3.ebuild 766 BLAKE2B c4063d0869c267abe78c421ae81c9c14d0e2248189274e9cdfffae724fffc964da36519c5adaca4b78e15eaa82be27944027d31e043fc61734e6733aca1815e6 SHA512 cc3d49b61469fd6b6f11880fcfc4dba2d4df5bd9dc292d8b80dc4b25f673dabebf622302468b0bce159624753ae28e4b863fbb46dcc262c46316f82279dc5c17
+EBUILD kochi-substitute-20030809-r3.ebuild 702 BLAKE2B 802404f3278ab18217b416286d96f9d8fa8703d0954c7b0c14b6384b5b841b8053e22287bcbb42e74b81f0e60db979f12538fb416c41519685d4a6483de7bb7d SHA512 a7d56454049253de6086f56e986eba6f0c06cb7c5bec4ad6cd3f0b85844921768c8e46c4c7f049c1658dc86b387c8e66d05814e0a314ed8c939f76e9503d83ac
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index e17e46617c7e..355417cf972b 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,24 +12,15 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-S=${WORKDIR}/${PN}-${PV:0:8}
+S="${WORKDIR}/${PN}-${PV:0:8}"
 
+DOCS="README.ja Changelog"
 FONT_SUFFIX="ttf"
 
-DOCS="README.ja Changelog docs/README"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
 src_install() {
 	font_src_install
-
-	cd docs
-	local d
-	for d in kappa20 k14goth ayu20gothic wadalab shinonome* naga10; do
-		docinto $d
-		dodoc $d/*
-	done
+	dodoc -r docs/{README,kappa20,k14goth,ayu20gothic,wadalab,shinonome*,naga10}
 }
diff --git a/media-fonts/konfont/Manifest b/media-fonts/konfont/Manifest
index 84cef8206ef0..21d5a3c229bc 100644
--- a/media-fonts/konfont/Manifest
+++ b/media-fonts/konfont/Manifest
@@ -1,3 +1,3 @@
 DIST konfont_0.1.orig.tar.gz 115551 BLAKE2B b5d986cf1815237528aa2b65695178bc229cfc2a2b74f52f34a4019af347da104ed21d9ddd8438674ebbbb705bceb9a55a70b35b94dbad8731ba077936595856 SHA512 b03460f08899bc00049a6def90125c7ffae596457a93762305c9600221c8f82b6a1f011b52fd434c8a44290f9c9c0b978b6efbdea541ae070fe86528344eae4d
-EBUILD konfont-0.1.ebuild 619 BLAKE2B 51741b2acad66cb25124ddc8cb3c5cb49f32db7ed1426dfb9d783e337a1a5074f8aa4f49e87ecf5dad24b2414eff5326fdf1e5bcd7335472fc2b48392e4c4708 SHA512 6112606726b8383d19d20354145895c138abaabed7437301c52a127acd689264a8353e4ebb11719bd2f91f968617384e1f247345cdcc6efc678e3e348e2ba7bd
+EBUILD konfont-0.1.ebuild 591 BLAKE2B b55e8ccf25baaceb6c393bd28428ed31f7fdd6cc912bdd45f8dc997b52df3257240fdc7123cdea9a0cc588210d1c1c1c5f01e0ac3af3b12d4c2dfc7067883243 SHA512 4b9b4ab9587dc34b74bbee01397c39e4da8049c640cc7ac318a99c7cbcb1390e37979ca2ff8002a6ee4b3de558c307273bbd4d847e5933fe38f6708b5d0179ab
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/konfont/konfont-0.1.ebuild b/media-fonts/konfont/konfont-0.1.ebuild
index f0040e33c07d..f9378906ce61 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -1,28 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 MY_P="${P/-/_}.orig"
 
 DESCRIPTION="Fontset for KON2"
-SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
 # There seems to be no real homepage for this package
-HOMEPAGE="http://packages.debian.org/stable/utils/konfont"
+HOMEPAGE="https://packages.debian.org/stable/utils/konfont"
+SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT=0
 KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/${MY_P/_/-}/fonts"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-src_install(){
+S="${WORKDIR}/${MY_P/_/-}/fonts"
+
+src_install() {
 	insinto /usr/share/fonts
-	doins pubfont.*.gz || die
+	doins pubfont.*.gz
 }
diff --git a/media-fonts/lfpfonts-fix/Manifest b/media-fonts/lfpfonts-fix/Manifest
index 12f069821f6e..eaeb55fc11a9 100644
--- a/media-fonts/lfpfonts-fix/Manifest
+++ b/media-fonts/lfpfonts-fix/Manifest
@@ -1,4 +1,4 @@
-AUX lfpfonts-fix-0.83-noglyph.patch 523 BLAKE2B 1acbe7b2abd66530ac04ce44503178c10c788b2a7495e1467f84d768ddfb584a984e6e3d23d732dd7691fe9eeb67872aff8e51abb2fdceec2e8650ea92558d05 SHA512 33a9dbd2bb9be37f91f7b3d8814c715b20f3b845aeb77eff4b10278ec53eecafa956d42663eff7fb4d9ab2b90a1aab79901367c27caa2b07b6d69333875b76fb
+AUX lfpfonts-fix-0.83-noglyph.patch 446 BLAKE2B cd0681d78f8770afeb5a0cecdd4965ea40587ae849bb3e9d273649c7e77949b3fddce73757dcaa00fe64ab81895b8eeb73df7b5a08e41d485cf93ae5a54add70 SHA512 34ba0f9f9d78bbc55a6d6fae3bc1d3b532e714a2488c019f77d7f6c9f9c70df6b3bb52e344cbec066eaa501bab9e96505033e7eb68212ce3807a5db5d23b5216
 DIST lfpfonts-fix-src-0.83.tar.bz2 172461 BLAKE2B 6d943a96d6dec6290f21b6df8daf7f1305c8f6c9175b544f0c64a7a0e18f671f9e2186f73bfe3ffb092d8adec7350f598d5a159e9ecd06b73e6ffb04d8641860 SHA512 154f36eca48e2869e6e5362c7d8de5511b4b7ab96466f147c21a792016d9065c8216dabfdda0b8763a6119510b3c4eebbe40ceb093ab89a308431b059716a23d
-EBUILD lfpfonts-fix-0.83-r2.ebuild 744 BLAKE2B 31a3db27d1a0002e3385cd47644237e6529c3ba30053d1f4ff38f6836a5654e2afb98f37dfb01cf6750ae53e1ac4d09296a7eecda7e4101cd425e674392f218f SHA512 75401050f5c6ee37ff70e0281ecc26e59ab61f01067b9a389681b3c757208b273f5ca0a8108cc6ff2c52a1e20d3e5d1a40ccb775f8f089fbb77abac0664e8bbc
+EBUILD lfpfonts-fix-0.83-r2.ebuild 709 BLAKE2B c812b50ed0a26b72857194a51cdd3b5515016c1167767febef09b773b21cba733d1a8b2ea350b7c53832e7228c3b6b00352c8ca006820283592a70bc2ee2f0f3 SHA512 7c24062b638b93d8e384a43a76954aea75970b5e18a12e3249385045b6c945c8e08d9c115d3871ab83f09b4fc8aee76c2a8e1392ab6ed13e33a7a3280c007b86
 MISC metadata.xml 314 BLAKE2B bd7daeb4ad582f34beb7287a62ed5ea91737dd33bbc3af7e06a91fe8804fc1e8099d6492f7b54fe19f3ad3943c90afc66531b68f9a6e3c8b7f6fa86a45f60231 SHA512 2932237b59ba528da0dcbc4083b633e5abbcce3ae633b9115f3dc2c8f022e7d348254104215023b432accdfc646b9cd98d53eb89967bfa7522664ee68f31b498
diff --git a/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch b/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch
index 77cf7a5fe5f4..cd0e8f0b9ff7 100644
--- a/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch
+++ b/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch
@@ -1,5 +1,5 @@
---- src/ucs2any.agriffis	2001-02-17 12:34:50.000000000 -0500
-+++ src/ucs2any	2006-01-11 10:53:15.000000000 -0500
+--- a/src/ucs2any
++++ b/src/ucs2any
 @@ -225,12 +225,7 @@
  	    if (!is_control($ucs)) {
  		if ($startchar{$ucs}) {
diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
index 371687a31729..4049c6c2f006 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -1,37 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit font eutils font-ebdftopcf
+inherit font font-ebdftopcf
 
 DESCRIPTION="Linux Font Project fixed-width fonts"
 SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
 HOMEPAGE="https://sourceforge.net/projects/xfonts/"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}/${PN}-src"
 
-FONT_S="${S}/src"
-
-DOCS="${S}/doc/*"
+PATCHES=( "${FILESDIR}"/${PN}-0.83-noglyph.patch )
 
-# Only installs fonts
-RESTRICT="strip binchecks"
+DOCS="doc/*"
+FONT_S="${S}/src"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${PN}-0.83-noglyph.patch
+src_prepare() {
+	default
+	sed -i -e '/^FONT /s/\(.*-\)C*-/\1C-/' src/*.bdf || die
 }
 
 src_compile() {
-	cd "${FONT_S}"
-	sed -i -e '/^FONT /s/\(.*-\)C*-/\1C-/' *.bdf || die "sed failed"
-
+	cd "${FONT_S}" || die
 	font-ebdftopcf_src_compile
 }
diff --git a/media-fonts/lfpfonts-var/Manifest b/media-fonts/lfpfonts-var/Manifest
index 648af02c9f93..867f7274839a 100644
--- a/media-fonts/lfpfonts-var/Manifest
+++ b/media-fonts/lfpfonts-var/Manifest
@@ -1,3 +1,3 @@
 DIST lfpfonts-var-src-0.84.tar.bz2 99445 BLAKE2B 9861bc41422d1513cc484ff875557e5e95991ac355d24d24bef213f0c80ef7edf7e0be32bc1c8de0d96bccd6ef9a110fbdc3218b262199522bc915d2e13d38bf SHA512 8ab814acb962760a2ab01ba1d604a3f77754587809cea8dd8f36dbc14eb654882d0cbf0ef4568f60d5e68a258494547e1278a392b79fdccf1d3ef4e105b87ab2
-EBUILD lfpfonts-var-0.84.ebuild 523 BLAKE2B 7bf03ee3ea8ad32e299da925d23638c81c7b750741ff37dbedece241838c247723494b98d1d314f9ed2a55a052852623a1eadb958dc06eccc25955dddc3862b8 SHA512 332526fba1b2e78f7dcfd792f16a0882554be10d303b35e9bb75bb1989347126c66cc7af3529834146365302fb1bf4af99fdb29568a8a13649158dbb6f6a9851
+EBUILD lfpfonts-var-0.84.ebuild 520 BLAKE2B 5ae26b3b05a02a634d65cbb093270adc71996174e22748f52a453e85ea3996000c8ae5d9c364abb17be6fb93c9aa92d391666e343eff02a4731c298ecacf25d3 SHA512 7de2b5d98eb0e44111dc76d05c9573e4db2c99a662112b0803ffbbb3b2e7ab112cee19fe12d7466e0eb43d3be062999a0ef8e3167e9859c2a389fad24937cb70
 MISC metadata.xml 310 BLAKE2B c731690860442f554b77377aaedc27943b2be18ce867991d900795ce57ed1f7370d487e4975153a517053f44826fd0cf9ae47537d7842d02bba7990f613632bf SHA512 9cd2540f5a870b6d00e48c1ee2bc7f452e90af020c21f796afe14326ee0d10293ba90eb44380f0c3c3eb9cfdc3ab35b3cbf6fab94c36fa2fa969ff23d72600cb
diff --git a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
index a84f06240eba..bee6bfa66a01 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font font-ebdftopcf
 
 DESCRIPTION="Linux Font Project variable-width fonts"
 HOMEPAGE="https://sourceforge.net/projects/xfonts/"
 SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 611d2d6e291b..fa3991b2a283 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.00.5.tar.gz 4935865 BLAKE2B 059adc20217238a0783ea669d7e7
 DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
 DIST liberation-fonts-ttf-2.00.5.tar.gz 2355722 BLAKE2B a782ab6668168b85cbfdba85df99a4ed4e6c173db7c47a2a2b0d67a1484bab70648b7b950fbb51448dd3cd31f68c3ea68a977966f0cf3cfd0aed903b8922c29b SHA512 fc00494842475d040c01029b6fb134fec9a37516a5e8e1b9ba945a2b38fe2ef3df6a0acfc00dc024cf2019f1106092d063c8322eece1be1cf8690db4ed8a653f
 EBUILD liberation-fonts-2.00.1-r3.ebuild 949 BLAKE2B 31e981baa4879a0838ce6e51113da376a55f2a84f932b42a7efb91eb3112dab0bdb2b93eb13573622a9937d1b3d2d6bba357763c7dd06ad787a75ad4ddbfc1b6 SHA512 7dfae220ca92c82e73a6f441bf994f3b5a493028d258539a51e8329022835dcb83f4ca05ff80d1593bb810ee0ccd6360c12f0eafaa1e7f0ded5925cc6a5ceb29
-EBUILD liberation-fonts-2.00.5.ebuild 971 BLAKE2B a930c145d3befd309baf10935786b2256ec32aaa8112f408770cdae389f5d7250dfcd51d87a4ea7985358ed8e02ec8181acb17bed31b7529a7f2d97ba68873fd SHA512 44fe2edd8d3c6155b50169e9376d38f0ac1a9661ba11fd7eb2a3cc6f3e74fbee00f70fd1dd6d3d312f6d00488298b78267dd0942c5411ac501011455cbb597d5
+EBUILD liberation-fonts-2.00.5.ebuild 950 BLAKE2B e86025d3d2287a1520800ea92d7f2a373c6191f1a86d322df939d3e07dace08418137e05692baef19dd21a4249d502d76d6c669123fe7978159ea60453f0c079 SHA512 df9341272fe404930d9e4106d3952a77a315cd068b2b421d8bb0b0f9cc0df72e6938b54b206ee852f1684d3528b054ddd4d66c09422bfe17c9068fb6181d476e
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
index f7cb941b8238..7cff094ba513 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit font python-any-r1
 
@@ -27,7 +27,6 @@ DEPEND="
 		media-gfx/fontforge
 		dev-python/fonttools
 	)"
-RDEPEND=""
 
 pkg_setup() {
 	if use fontforge; then
diff --git a/media-fonts/lohit-assamese/Manifest b/media-fonts/lohit-assamese/Manifest
index 9944e4c3fa59..c14769eea9ab 100644
--- a/media-fonts/lohit-assamese/Manifest
+++ b/media-fonts/lohit-assamese/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-assamese-ttf-2.91.5.tar.gz 73176 BLAKE2B ccd3a2335b5f1ab4925e45344fd12ce67315e041be6d75ae08db6f60e565899d1f6fb3039494665bca7370703a04b8cf26964983ead99f6c22930b8a7d8ed426 SHA512 beee1d5bff35bf53dd8386c373e8655572a393eee5e0c7e413764caff63536fbedc02880413e83880155af629a7c2240cdbd6c13e608c90ba1bf6e6d91be4e81
-EBUILD lohit-assamese-2.91.5.ebuild 645 BLAKE2B dd46504ad3b0e178a91fc77070df35705db50b89dd0692f74c4f71f8fd7fb48642728c4e5efd279decdcb8d11994b679d82689086dca2f6accbcaa30b13835fb SHA512 59a95d217555080dbaa7a24568994446f524dd19196eeccc057e10e29f23a2be3fc7c1ad2826bed3559476f19a31d5516ed9737af3a2fb3912ca5325d7da8102
+EBUILD lohit-assamese-2.91.5.ebuild 637 BLAKE2B f66abc446a5a52e10eb030b4dc29c8934eb360d576d6c4581a426cc3c43227d8059d27fb42122a0e0a69b815e0bf159a4915290946974d4e9d4177465e7a79cc SHA512 64478faa18fbfa03b2d5d6e37d14f9e58087d1c6c90d9540174db895847538720a30f3137490662cf108dac6716f74ef98fd62b3053f6f3ad040c769f68e515a
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
index 3b48d57c11de..a4717f21abfb 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-bengali/Manifest b/media-fonts/lohit-bengali/Manifest
index 6be5bfbe2f01..e0364fde182e 100644
--- a/media-fonts/lohit-bengali/Manifest
+++ b/media-fonts/lohit-bengali/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-bengali-ttf-2.91.5.tar.gz 73056 BLAKE2B b08ebc7a79e32d8bbc492edc68b4e28e5086747c2d0eb13175d38308de4dbe2e65445c4b4f733b366befe6454fb97f0d6a205d7982e08be1f84498750d69909d SHA512 f3c2b2856604e82e2d745ec0a9262f7385039543639526634586189d6cd0240473c3195276923151ecb4e793bc56d3bc1824bf7c60fc533fd8c2ade2bfe85430
-EBUILD lohit-bengali-2.91.5.ebuild 644 BLAKE2B e9617c1d8b30bd4ace1ca8372f67f0350754a2e42d7b96900f12dbc0701446f900d05fda987524f7884525fd9f1859ef813a0d52fb6f132796592dfe80b76f1a SHA512 72ca0398610ff3044b874eb243e70acc2915d33f76f9233fdf6b857df81f57a5fb62eb1c7a3293934c43476b77428d5dc4844d7e5b99e80a2b0540a509420912
+EBUILD lohit-bengali-2.91.5.ebuild 636 BLAKE2B 715e4cf81a1de52319913f182f3458bcc292d041c138858c7f7efa95e20cf16cae9aff6717b7c5419f041f16da2960fb03b00d8cb403ccbb6c51bbb7d1884fca SHA512 6fb607a949c3358802f03563147851c9d2e98add189aa9f50bde5058a2a821f81176605fb84824a3fa09de3b8727e3e598114ccdd18805ffae3846599e65fa93
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
index 297b96607b71..6a9afe74206f 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-devanagari/Manifest b/media-fonts/lohit-devanagari/Manifest
index dfa6aca7838b..de3b3dd21af9 100644
--- a/media-fonts/lohit-devanagari/Manifest
+++ b/media-fonts/lohit-devanagari/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-devanagari-ttf-2.95.4.tar.gz 89631 BLAKE2B e8554cf92754e43d03b1ed0a2a3725432d6318f09ecc898f57f74d4a1e70bc90bf440a01478a9d09a54ff545e8ac956ab6c0113dbe7380754ee5202a048b4bd0 SHA512 b637c11e0c7c48d9cf67c265ee0df79029c20cd523748ee00b406b62c11f80842a1d58eb2e5a5f03c2457de08a6e73d4eb4997e3b524994eb32e76b63ed69b73
-EBUILD lohit-devanagari-2.95.4.ebuild 647 BLAKE2B a125e45e29f4e8fe48839baf56263456984635fb08e149cb27db6e637e1d68bb90e64757395363adb9db8d2dad331d2e941ad4c48de41e5ce14b1f3e0d5841e0 SHA512 85d714fb67dfa49b7a4b10f25b155178b49eb722b7107dca4ab724fec45b72791fea65c44c54d266c2ce93f67850768400bb8c57015d2b5f81db69847b184be1
+EBUILD lohit-devanagari-2.95.4.ebuild 639 BLAKE2B dd251015a3ca202ddce2cf2ec94ea17d710aeff75af98a294bcd82829c02f4027070d65dadb078fa4090969f2d995d9c439d6c17fe4adb5d28f8a9d109c93fc4 SHA512 d9524b7129c4feebaaab7452ab848f598d8c3ee77fb72f66f20d7f8e3efd33b266d478a34160d41e29840f13fd9240bcdbe5ee4525e5f71bc79d6e2539aa7329
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
index 6f6c5d1a62f6..e9c5628916d2 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-fonts/Manifest b/media-fonts/lohit-fonts/Manifest
index f2be283091c7..750d20048ff1 100644
--- a/media-fonts/lohit-fonts/Manifest
+++ b/media-fonts/lohit-fonts/Manifest
@@ -1,4 +1,2 @@
-DIST lohit-fonts-2.4.2.tar.gz 684860 BLAKE2B 41fedd2a798dcb85eda5e35913a5c718a027a21ed77d576b5996d1f90bfb3d55c9d1ab892fda82b74ce0bc59dce0a74c6023b58e3a424232bf6f00f3c7583e85 SHA512 f4f06f7f37118a704f80901a925c6c871d7a5911d16665d0d469f01bae09a706a576e023524cc2334ca373639ef8bbfd97c1fdfadd8141603999ac72634cd5fe
-EBUILD lohit-fonts-2.20150220.ebuild 774 BLAKE2B a1d08d5af83a76f976c36751ef19061066760529470f34884b131e1092f173859f62783c727ae8b0b3e574191ad69f38c2e7ba5efab170cf012e7ce3c1da9179 SHA512 7df620b2c71393af8c80708e22ccb0d030043ac99304e5ab69610d3d2f21bd97d3345f9f10ba297a59e139f23221b4b54abd43ac168643c0f66f39ffb1c1d54d
-EBUILD lohit-fonts-2.4.2.ebuild 647 BLAKE2B 1e4f536eb5b6cdaec1fd1675a93a2f6ccde2dd531ca91a25f0fabcd49cd8823e6b0b5389600916c4d6de8e8dcb7301da8daac8a38a9d435b93172059e97a1b99 SHA512 8ef579ba6e9dc1fd33c5bc9c5d3a6b88f5cc5e63464cde77b3790d5eea4c19a9e168ad5beed05bff491bf86c9a8fdc01ae9630e8afb5d8f9c251a1bed3da9099
+EBUILD lohit-fonts-2.20150220.ebuild 763 BLAKE2B b12a362832c6f2bf54c0388fa07e8da54135a34e587c6629399699d25f418266108ba0f7f938fd2b9ace49b76a5421ed0ca07c8061495c5e77f95ef621af97fb SHA512 5ad248de4fa51c13b37798262766f136d70a8794938aeb7c2d170283bdc7ad9f4ec5622f2b007fa6c2b334e8bebc97556e85cbfbec599c7e33679f8d0ace30ec
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index 5dc0c9ae7151..2d9a756a9956 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ HOMEPAGE="https://pagure.io/lohit"
 LICENSE="OFL-1.1"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
deleted file mode 100644
index 07b6f635b177..000000000000
--- a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-FONT_S="${S}"
-FONTDIR="/usr/share/fonts/indic"
-FONT_SUFFIX="ttf"
-
-DESCRIPTION="The Lohit family of Indic fonts"
-HOMEPAGE="https://pagure.io/lohit"
-LICENSE="GPL-2"
-SRC_URI="https://releases.pagure.org/lohit/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog README"
-
-RESTRICT="test binchecks"
-
-src_install() {
-	FONT_CONF=( $(find "${FONT_S}" -name *.conf -print) )
-	find "${S}" -name "*.ttf" -exec cp "{}" . \;
-	font_src_install
-}
diff --git a/media-fonts/lohit-gujarati/Manifest b/media-fonts/lohit-gujarati/Manifest
index ec59b3726adb..a758ad7681ea 100644
--- a/media-fonts/lohit-gujarati/Manifest
+++ b/media-fonts/lohit-gujarati/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-gujarati-ttf-2.92.4.tar.gz 38179 BLAKE2B ef0061fdee5b5096b3cb86b0d7abe917e15a49d890cd3bc3071340a1ec2a69bc2f861b25c3e367c01f290a8001a244aeba509e100206552d8e9c84066b5d1273 SHA512 e84af3d32d2947886e8d2bf3757ee2bda1003bca683a965cb9e484b549f656061d6fd01110600f468d4f4f00ed895caf3a85806ef93b2caa26b5cd4c1433c8d6
-EBUILD lohit-gujarati-2.92.4.ebuild 645 BLAKE2B 8cab28c70367600f35b95af205dad2a8c2741a2def32ec61eee822fcb33b33fd95ea9f3614c440164e306407ba4279e817b811cbbaa1eed7319e13472e3827d2 SHA512 719a42dddb6746adf16f91a2459fee76655b2b4a7326b6f5597a29bfd6838a40fd77eedb88d50bbec255d08e613ae92b56446ed4d5ee4e823311db30f28a607c
+EBUILD lohit-gujarati-2.92.4.ebuild 637 BLAKE2B 607b5bb83a275c1b658681e9c5f4ff061b74d0bbdc20e9406c9d9cd2958a6c36a18f3636bda39031e514022a90217b12c906e124dc9624dd4f2b08875cd8d262 SHA512 e82516e50ac9e6aee8b47443dea20b72db6dd48fa9685f8a9b9bac059a152ef9df34fd15388b122d3acc11b1e0e62632e7f1bb3015dbd1117dd6e6bc9a387f94
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
index ae7a88f49b8e..fa3deb17e700 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-gurmukhi/Manifest b/media-fonts/lohit-gurmukhi/Manifest
index fa2b228cf761..dc05375ac435 100644
--- a/media-fonts/lohit-gurmukhi/Manifest
+++ b/media-fonts/lohit-gurmukhi/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-gurmukhi-ttf-2.91.2.tar.gz 18397 BLAKE2B 8fbd43dc1cd315796320a53452834324670ff7ddf4c0b070e98538ac468cc22d9c94558d0f315edf40014d5392b979ca80cc6a87f052d28255236ede859abfe8 SHA512 714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
-EBUILD lohit-gurmukhi-2.91.2.ebuild 645 BLAKE2B 82d6b983e75f820430f801b2485b07ef9d8ac727b1b7b7c44d158a8093d77b0e5186e71e0ea0f2e318c2dce39ac1f4a2322e9df2117f7128db814b6b75c561c8 SHA512 1dbfe639a8e192963bd0fcc22fb07b9099388109663a20a205b9d12d1478d20aabc20e4d585707fd31a0b5ed6ab1457e6b0d07fe657d7712b519cef93b178bd3
+EBUILD lohit-gurmukhi-2.91.2.ebuild 637 BLAKE2B 57e00d3ba71ae375df324a1d42476b7e30b8e0d4b4926bae5b27eaba8dc7a7e294cfdb76510de80e0753a6f27465aab55bbbf5af0e95fd6c8d3880779e4c6a66 SHA512 69a4837436fca7fab836d4e705230a6574b0ab83b5ec8eba4c907659481f0472a449f178c79453762687b08190baf2e35b24de010e18d384a9d8bf235cfa7736
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
index a73bd5a63ac0..a43244113305 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-kannada/Manifest b/media-fonts/lohit-kannada/Manifest
index 8992a2cfaacc..fdcb7f628ccd 100644
--- a/media-fonts/lohit-kannada/Manifest
+++ b/media-fonts/lohit-kannada/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-kannada-ttf-2.5.4.tar.gz 54045 BLAKE2B c3a62733d8a40325cd14184fb4c8b689d3a508dd61a4de59ad3ff98b8c9cdafd4281e9d856c8bb73f414696f81bf4c40030abbf725520949af54529da8525840 SHA512 a9468454ecb90bfbd43b326aca0a675762dd6cecaf5d9b130812d8ca3b19cbd3552df9ac92cb035585112387fb2e422e6e6a87510d0436d73537a8ccc4c5fc99
-EBUILD lohit-kannada-2.5.4.ebuild 644 BLAKE2B 489e2696de7608ff63252b1b476465ea90d8b998bbf8638a5c4e6d819b35473a5044a432c6617ae0d85e8951d224858ca725faa30b73c6f7a33c7e2705cd914e SHA512 aa4df96a62d15e9f442f3c8b06e9d66a2ce3e2046dd4be255c41025b6c2bdbfc5403c92c6fcec338cf1b01a26f9cb1a0b77e8c2718f5f325d166dd1507b5e589
+EBUILD lohit-kannada-2.5.4.ebuild 636 BLAKE2B ae1372c25e2a12ea217bdff979a1e166e938b4eb8ded9fdacb926ca6362d4db51d167ef83beb8cd03ad0c295efe176247a57fe1dd9ec087dbd6e6840bb5200ed SHA512 1b7db6636c521f1c4861e156b07c5b8bd98eca865a31108a430178edb3dfe1baf2da3fb22eacf82d8a144cb555fb5a2e2e846d82832d45a0f24a2a9677d028b7
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
index d43dfb278093..3ad1bf3a2df4 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-malayalam/Manifest b/media-fonts/lohit-malayalam/Manifest
index 3b6a51a17960..03914c7c37eb 100644
--- a/media-fonts/lohit-malayalam/Manifest
+++ b/media-fonts/lohit-malayalam/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-malayalam-ttf-2.92.2.tar.gz 33959 BLAKE2B 6ce1476132fe881a67ef14bc734d1d730db340511570dec7150702c905d43620d2d7ba21b06c85ed27da9c0599579b87979feee7fc14a9873da5126de1ba1c0c SHA512 82a5ca34da6a91c4a6b32a0b170d88c2b5a0e92896c5acbd3acf9526d76a16bc4b6078f0fcb5f96793b4552ad990a8b7ba6224c28d963f7765da2654652ebab8
-EBUILD lohit-malayalam-2.92.2.ebuild 646 BLAKE2B 0d0dd7aca432d22e0c925b1c04965d1d1705db930952401eeeba01063e6897a9e1b6e182da2b4430683d4a8acd898d43c2c8214e9160595c719090563bd90146 SHA512 003cf93309c2b7822a5ac67696fba047290ff622d73d5be2281b366d7b4d64fb38a58236e5a64d8628f11ac13ad1418278bf449083092eadd1c7ff8580637896
+EBUILD lohit-malayalam-2.92.2.ebuild 638 BLAKE2B 623a2613bf1c3e4ea7c4225ffeebeda8c58ee9f7d67ee41ea146d8ff74ec32459f2b15a9e60d555abd2ca5298ea69a480234b4763262f142cb82e3348c516929 SHA512 364f2a44bc61c032a403557b77816db1562d549aba43e1d20c94c79fd87f1c30dfa806d15c6d579caa9bda6546f48fbaf1faaae81861767be1e983389594acc4
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
index b25eece5881d..5710c596b308 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-marathi/Manifest b/media-fonts/lohit-marathi/Manifest
index 6c61ae08760d..ef8767c94ac3 100644
--- a/media-fonts/lohit-marathi/Manifest
+++ b/media-fonts/lohit-marathi/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-marathi-ttf-2.94.2.tar.gz 46754 BLAKE2B 20ff96b35fc6763577b1dc3846f9b8c3aed71083a1cd3411e8c6c5040097f00660cc5d80a73443db92d8cb24207bba67ee61d0d8d686a3490d2a05c4cb335f5a SHA512 2fa8d431db5fb93a17df16c02b89039cb56f78208a1a077f6d42631dd69b2f58ea19aceb88fe32753e38f53fc1a277c48d0aab1191875acba2bb1cce200f2a04
-EBUILD lohit-marathi-2.94.2.ebuild 646 BLAKE2B d3bbe9207cf907a79ede24483992ad3d690ce85b814412c39c801289905babb779d0f7473a11a4d7a83abe7e6491d8c3f5c9b31f4ea872041b6e4508f289f498 SHA512 d3b9761a64fd5587bb4bb79c6261fbd02cbdd0f2c7a201524cd39658a939fb630ee637f058e0fde1361497fe065a8e5768564b9ff093386d81fdeebb75222b6f
+EBUILD lohit-marathi-2.94.2.ebuild 638 BLAKE2B 8aad8e28b0c14c79a7c841e86d0333cb6c863b9dff59d4d5903350ed6493c5467526669e5b838a71bf696bd3558486c0081a432edee13faec06876f3e943d42d SHA512 bcd53b1c9016141831aad7058b66c6f3e4216195013c05946cd461d13c0bb068a0fa6adeaf2d1db86a4c7d455968677e560b6f2b9a417fdca3ec659c02c30166
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
index 89bde8d205de..f2460498cf26 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-nepali/Manifest b/media-fonts/lohit-nepali/Manifest
index a915123b37a7..1b082d183dcf 100644
--- a/media-fonts/lohit-nepali/Manifest
+++ b/media-fonts/lohit-nepali/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-nepali-ttf-2.94.2.tar.gz 46747 BLAKE2B 0e1560404cf2a1f8ca06fac92caf2cbf10ac40ee691f3a434e84f1e9e5e951bd2c6bd5323b0da090d5ca1802ae82a4d3ac2bd38c2c478168ade11143aa693a1b SHA512 9ad9b5c393a1e622738d2a17dd3821b2c18840bfe2da023bfc818b5244a79037bde00b0659c9601b2fc6eedc33d765d55d7831f535cdc03bbcb4f54cc9ab38a4
-EBUILD lohit-nepali-2.94.2.ebuild 645 BLAKE2B 142afd45a112e9b6b9a43e5536d196f8f87380f9b4fd62d3b7bdd618170915781cd4bd3d8e2bdbb0bed8d82ae5b9a4cbc58d8593ec1882d351064a993d8fd97d SHA512 57685158d2282621aa6bcea4dfc1f08f7ba6b5aa6763411ab8ea194126f3325ee96d47d662de18ff4a1689c0eaede2f7d564b0012d31915a9d98e81d248d79e0
+EBUILD lohit-nepali-2.94.2.ebuild 637 BLAKE2B e5144c6aceeaa58a320759dfb3383b6a4fcb242bb074edea564f56d07887f238ea0dccf7f68563d74def31aaa038a874bc257b17f0d50a3f026d94bc17d9dfaf SHA512 6880bdc8851d12aa1297d777b2934ddf7dcc8cb129c9b5b27de12d07a38a9b24169061425d88e8aa264fc4bfc036e9a854f6ea062770f85d979afc40ad40f440
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
index 11608c34c15d..67f768170423 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-odia/Manifest b/media-fonts/lohit-odia/Manifest
index 1a31c088917d..9c4707746ad0 100644
--- a/media-fonts/lohit-odia/Manifest
+++ b/media-fonts/lohit-odia/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-odia-ttf-2.91.2.tar.gz 52842 BLAKE2B 2dbb6fb5933a75ee0f3ea63970f956e2102903e09cf5cb76e7096527314a490a9819872fc42cae7ff2ffeff0e71b625c2c9a023dff240933ede070fe2be7b7b3 SHA512 170350be1005e0eacf51a3c89fcdc897e6e36fe543dd5ca8d876c22c14df8b3fd8c58608969a0b3cd4b1c74445082f2ab5476ea72888fed5871d3987430ff2a8
-EBUILD lohit-odia-2.91.2.ebuild 641 BLAKE2B 370e9ef5c148a5ddfe09217bb79df070cd5b4e05e06fe5a9f3031e4fdf6ba0627ddd5296032a7f0406806b0049b6774f156304e9d58eed4ebba88df157c010ce SHA512 d3e9e3609948f61249d33c1c22829d0cf97ace104845f18b649c42fa6c9150649c0778db7151c0a0caaabbc18c5c8eb04f92e4bb1ab20406ad02971cfe59e60d
+EBUILD lohit-odia-2.91.2.ebuild 633 BLAKE2B 1c682fe5c95006a2a2ff9534f88dd01749d41d9ed70d167810080aa62d85ace31cd278cd8e326a6bd56c9bc9943a604dc35d9929b58e9f142f73e6368cd77d88 SHA512 1cfd278062f828122439234972870b543bddbefd9de46c9aaa004e58d1939f3afcd903577b6c92d144e94790efd12c571251f19c82f73182ce672b54c3f1fdef
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
index 1c2abff4f043..464925e814f0 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil-classical/Manifest b/media-fonts/lohit-tamil-classical/Manifest
index 5a38a31a21d8..d156b6a307fe 100644
--- a/media-fonts/lohit-tamil-classical/Manifest
+++ b/media-fonts/lohit-tamil-classical/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-tamil-classical-ttf-2.5.4.tar.gz 32010 BLAKE2B db05ce2c85fed95b4fb536c7fd96568d456222c61132ebb11e1e27f7c7e251ca8d683bc698204d9505f8681023b70c08a80a5b1311080201f6d83fc4d5c0a504 SHA512 f934d5e9d2aa5a76e9a709c0df5d33eb378095d8d3d45bd53d5cdd5345348722467aed22e8e0c0f0be5c72cf1bec2e70533df8932ac903f20da7aa770e7a3b62
-EBUILD lohit-tamil-classical-2.5.4.ebuild 652 BLAKE2B efa531c934b43a2b1140eaa1e102c251456cf6526dabe7feef0d713ab74c6af615e358560cc3720d0029e36ea9d80b28ea08e63f59ec71b550e0dd17427052e7 SHA512 71fa898f39f1db517997b74cb1f68825d7315a57c943cb8c0d77c0321791297154783279494ff013812f401684c18101477c7012e316c0a7c36e94298701882a
+EBUILD lohit-tamil-classical-2.5.4.ebuild 644 BLAKE2B c3ec83f824d02aa91091ddf79ca7b7524e93811ce552d5e6a4a8976bb874d6a242ad4a829b492e3f758c322268bbc54b20e937ea8e87846671399be30acf1d28 SHA512 9a507fc6648afb336c0fd462821b44c3cb9725b93179ef7c5018e805d79fbf1d428900402fb060aebfa94398ef2b1c602f69b4d77dc7ff9e86d7888410c15406
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
index ea5d977fbd88..437a0b508342 100644
--- a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
+++ b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil/Manifest b/media-fonts/lohit-tamil/Manifest
index 60b88d62250e..ef076f25f110 100644
--- a/media-fonts/lohit-tamil/Manifest
+++ b/media-fonts/lohit-tamil/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-tamil-ttf-2.91.3.tar.gz 28713 BLAKE2B 034a03c8a3f53841a7799a0f2a7aa4010f6dfa6b311649d6bca2683df3fcf661d13eb17bc7b09dc384faba7145041d508f5aa4c92109f962e7dcce86ce826ed4 SHA512 935ca653e033820e9189544444fc36663ef712226bf96d69a05f13161c5ad874ee6baa12d06695110c113d7185f60a8af287989e4630f9f6b4e66ab079b6f8ef
-EBUILD lohit-tamil-2.91.3.ebuild 642 BLAKE2B 0f677361fd7c784b73de1b0040ae389c1856c77cd1509734e8aa53e92ab118a64207bc97770446f88f10ec3d4c43800fa21f9b7f4a3ea05142261b884e04282b SHA512 ae30b583ac7a8a7bdcf063a95f68fafabfc3da57047046a4d2db0c27260fa7fd352e07135557c52b8d2dc47f708c72db4b63e0c61536d23ef5b1b6fbc9ffd725
+EBUILD lohit-tamil-2.91.3.ebuild 634 BLAKE2B dae10cdf9aaea92ab96a991a0becba53fa8a237202158ad291839a6ac35460212ce05c0316744615f0da9ba48b32cd7cebd60138d4b02e3b0968ba2e17a05cb7 SHA512 24ade0241f01b9e49e691c72694b5d32f2c111408fe8b4b51e149cb22a660b83f441741399a2b5a8ad86c715c19390ba5948a2696063f42d3a1d1d0f1bf71f6d
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
index de39ced3d9bf..1b6204ea4c83 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-telugu/Manifest b/media-fonts/lohit-telugu/Manifest
index d4b5344bc494..ad6e97fe8178 100644
--- a/media-fonts/lohit-telugu/Manifest
+++ b/media-fonts/lohit-telugu/Manifest
@@ -1,3 +1,3 @@
 DIST lohit-telugu-ttf-2.5.5.tar.gz 134577 BLAKE2B add7820ecadb8f720f0bbc40c97a6c8ef87312a0d0e1f14b02c938a3cc4dbd2af79703dd861fa936f3b97700df2b1db39712f051af78da1c70ba32ac8353f5e7 SHA512 9a02da13a5ef511f11623d245cede6a0414d8d62f0038fef4b4fc395a2ae2dfc927e28f3a445c61b416bc03cda21d53699a93657dd14b21fe4a7ada0250693e0
-EBUILD lohit-telugu-2.5.5.ebuild 643 BLAKE2B 12212b9d4abf19615868be2ffcb5fed0c018f47f8915248e8ae7ecbef4e41dd5008b6c69d18b03670f7825e5379dc02cbb6d9ef0d385671d63827ef889bad134 SHA512 af80b126511c1806ff0d241ed5a7943402991a9ce1289dfe0f037bb416a56a43ffa8e0bc10241225e368c2e1f58905a18ffc894cf7a2490dcb12312b6b5cd2ca
+EBUILD lohit-telugu-2.5.5.ebuild 635 BLAKE2B 2c723b2c32e8f457e67d8d305053b06ca69d00fed9d60cb5b911e35174e0c6c750dda9883f6160fb713529235a830fcade7ad38fbdf702556027ca8debeea3b5 SHA512 11d5f14578ecf04f7274ada7777fd970cdb1ef6716d47833ad74208e13a08611d21168c8ab87e5db88f94b713ec8ad823cc9918c121bcae12d264d95d63ff5f9
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
index e18dad1194e8..0110a54bdf6c 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/mgopen/Manifest b/media-fonts/mgopen/Manifest
index a303b5d3dae5..353ec33e0187 100644
--- a/media-fonts/mgopen/Manifest
+++ b/media-fonts/mgopen/Manifest
@@ -1,3 +1,3 @@
 DIST mgopen-1.1.tar.gz 892402 BLAKE2B 42c0da1bffad2c0d5620811c5d909512654f80fc914a6eea22dce6fe74d27c8732ac9286b00a09642d6783a70d67a26d40f49abb0ab9dbc51d236280aa35312d SHA512 01ce8f79d9e4f260ac1d9ad122305664c692fa5a40f5006aa5c880d06936ff0c70582bc66b3b44da0a3afe4ce9d0fe3e11559cd5f1310d82e2a29682a53e692f
-EBUILD mgopen-1.1.ebuild 426 BLAKE2B 09ea63aa6afc8a30668d2ecdd73133f50d52948a89afa01bee13b633d0953632f37a1b02cde98860259797a6925a6bcd233885e2ab5beef931e4f06f6e5bc36f SHA512 902fae3c224806adc7533e46e58f2dd41becd15c904fa27b2de48498fe1c96e8b54d86acbb702efba2b27b92db1c155bae5ad58578729abdb107ff09efdacbd1
+EBUILD mgopen-1.1.ebuild 414 BLAKE2B 2d6c3e555a7ea1819f018d0fbf2b6bd4c5937f05b36ce33b017afbc2302753e77b2d9782fd035186b37c27b1bd8bfa18dd484c6125fd12504729551ea86e44c2 SHA512 22fbf8790b87091e18fdd8dd37e4cb9cc63ea89b2e7e2624b6c55201808355bb699b9b381450872c10635db914b3dc72af652fa996f274034fdffd7724fd22f8
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/mgopen/mgopen-1.1.ebuild b/media-fonts/mgopen/mgopen-1.1.ebuild
index 6c18597475ed..ab74699f96df 100644
--- a/media-fonts/mgopen/mgopen-1.1.ebuild
+++ b/media-fonts/mgopen/mgopen-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -13,8 +13,6 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="MagentaMgOpen"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 FONT_S=${S}
-
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/mikachan-font-otf/Manifest b/media-fonts/mikachan-font-otf/Manifest
index c27a498249e9..0e200ebbc359 100644
--- a/media-fonts/mikachan-font-otf/Manifest
+++ b/media-fonts/mikachan-font-otf/Manifest
@@ -1,4 +1,4 @@
 AUX 60-mikachan_o.conf 451 BLAKE2B 435a16b9dc29a642ff006bea4cf0bf274c0544e51bbbc0a201f8f3a33643ddcb516b57b253b5eba8e8c87ad3caacc15f8e038f0178fb95d31cd8448385388e1f SHA512 9bf5dc2944a8e34bc5e6343e75b76a424e586cea27f64ca3a1ba0b155b423b83e33990547df72a0bcea0b38271a28d32e710a345dae16b49b2da6e333d8b44f1
 DIST mikachan-font-otf-9.1.tar.bz2 8702143 BLAKE2B b08dd4394b1ae54448d712573cd9d157516a7bdf377d31103133749365ae6313005d1045dd407e1eeae4aefb054a210c104360a3707669dbc57f17ba12fef79d SHA512 e012ea28cb935347876628a82779b259bccc35e608478a5d00ce6aec89e97cf26dc33f8e4a9f69028e8ed3f52cbd9284a0fa08983e1a25fb7b82b50d47f06d83
-EBUILD mikachan-font-otf-9.1-r1.ebuild 565 BLAKE2B e0722b544a3034228d0104b7663260eda294a056f91c96c8cc08188602ab8d08b8a297bd2478ee1ce56cd65915edf0a432cbf4daefc075c02f535bbf6db1dfeb SHA512 9e5fd83021f619e9415f3202792fafc04620484d476d040fe2f292ff3fe2a53c1896216cc0921a346c96a21de3e2e11ed544c1df9ad62b3a11c4449de626e9a9
+EBUILD mikachan-font-otf-9.1-r1.ebuild 561 BLAKE2B c9be6750bf1c9f8284437a617d651284b14d25566925810033f1d80bb4a44ad78141c60f49f39c010adf1cd2230b615e27ef80642e48bc181855442cdb28b8f8 SHA512 8b57663f373c36bd1ec21e3a1af674b1e7f3b677ee366afbc2afebe5280339c43698e1dfdb2cb38f56e3fd736edd92c0034f366964216b60690951105c7ab3b2
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
index 8ef1c6b0b225..e1fa3067f742 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -14,11 +14,10 @@ LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 FONT_SUFFIX="otf"
 FONT_S="${WORKDIR}/${P}"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
-
 FONT_CONF=( "${FILESDIR}/60-mikachan_o.conf" )
diff --git a/media-fonts/mikachan-font-ttc/Manifest b/media-fonts/mikachan-font-ttc/Manifest
index 2d652042071e..5f745b068d28 100644
--- a/media-fonts/mikachan-font-ttc/Manifest
+++ b/media-fonts/mikachan-font-ttc/Manifest
@@ -1,3 +1,3 @@
 DIST mikachan-font-9.1.tar.bz2 12247325 BLAKE2B 8530626a8aaa0e0626d4fd91b3fe3aeefe1ecf067d3cf19b5b90bff10c38ed4bac740087c466b0b2127185420c7385923faadf722ec3a419fca1ae198858a58a SHA512 df629ca4c79ab4b6cfae68769aabca8c1c57cb62708d1d9903fdb54601cbac3a49f94eafa21e43cb9c6573e7d874729b9f0ccecf296537bc8bcd16b5ab99abf0
-EBUILD mikachan-font-ttc-9.1.ebuild 639 BLAKE2B 78d0fec4eaf79ccdfde3915d546af448cbd6200735fc5ab26b6254bb4c8ffc01ef586784858fe8db958fbcbf5c1a5e207cc3e5807b5a33d56123c76d7ba2aaa4 SHA512 c860085d9463ceaa6de395bbf8cb95b982a99d2a61ca9241a39d9b2552f70172178aab1a6eb5574c7f5cd782ea6e954804d30ed59298a0a12e90448e5fb26668
+EBUILD mikachan-font-ttc-9.1.ebuild 642 BLAKE2B 1069808249e886174ae54189459073f1dead99ccb09f51ac0f421a527f0b3cf7df0b156f02d552510f6e7f51950e210a6acdac5190865f2d1795f053aa539c7f SHA512 3bab45d5364c5f75e9f2f0c014efefff039432344ce8205142f37d6e1d700866eb66f44824c434b4b925b8fa3b95ad1511efc4d4e6b5fb6f82579d0c5762cf75
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index 15e62429e2c8..1cdae503633f 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -17,9 +17,9 @@ LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
-
-FONT_S="${WORKDIR}/${P/-ttc}"
-FONT_SUFFIX="ttc"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
+
+S="${WORKDIR}/${P/-ttc}"
+FONT_S=${S}
+FONT_SUFFIX="ttc"
diff --git a/media-fonts/mikachan-font-ttf/Manifest b/media-fonts/mikachan-font-ttf/Manifest
index 3ebd6e897aad..66c45e0d3954 100644
--- a/media-fonts/mikachan-font-ttf/Manifest
+++ b/media-fonts/mikachan-font-ttf/Manifest
@@ -3,5 +3,5 @@ DIST mikachanfont-8.9.tar.bz2 2086087 BLAKE2B 7b99cd22d961697e916d7546ff4f568927
 DIST mikachanfontP-8.9.tar.bz2 2099227 BLAKE2B e7aa5859337ba4e69cd5b83ef3583b0477712702968e5edc44b37d736e33ba62a0da7e1c41bd3b5c4c71e16ddfa0e08a2ecc05e869342e771dbe3849dddac74c SHA512 7aab79c8b3ffcbd25304a5fa4ebc94be8b2d8e305c61fa73ac3cbe612f0ecc22e6a0a6539798fcae4630685b0b2c280e1b808c744f491895d7292cad3e03f986
 DIST mikachanfontPB-8.9.tar.bz2 2138026 BLAKE2B 75ce6a618865c0d8164e213b1ed4b4ecd3e1e785156b8bf95c9729be05ae54af7249d3ed4a72674f54b7d7f7e2ea1c8e5c04aadd5a83aaea90f277991749e59c SHA512 9c2bd190a9e7d4621cfb461979bee7686e2d58d48d7ba7f2f4ddf262d11cc791fac06c30b25f5133f7e59185af3600e8d7dd10f8dddf5b64aac76045371ffafb
 DIST mikachanfontPS-8.9.tar.bz2 2102476 BLAKE2B e510552b874eb725abd145f2d550505c83b59e55cffdeb37fd95e7929c0d83f719285ce99f5340d966baea0c217211bdbcffd699e10e43997bf7a36a82978aee SHA512 2615b71b0c0e32459150355a89ff7877c1eda8d246137022f99261ea5604e9df801797fd6ff8975bbfc5c5920170f3bdfc9e050e7180518b1bca7f4ed5b01de3
-EBUILD mikachan-font-ttf-8.9-r2.ebuild 1042 BLAKE2B cf92843f10d1687b91a3e45cb50abe78e8cb84ab58d759af1b6e62673f19a22545150e8659eb5427b6e799c4d4b458a5bd5aa773be349350e19c63168e150cc9 SHA512 1a3e600ae58b55bd3174e87ade8c6b230a2781d125e1287176ecce991e9245c3558f911a94c99559ba54ef46f9ab2e840b6eaec2170d93302a877707806d5c31
+EBUILD mikachan-font-ttf-8.9-r2.ebuild 1021 BLAKE2B 6448ea20bac259d073042abae13c715121ffb8eb725be4379e9563611612f4fe8aeb6ed4ac035a1ebdd3dd7292a4ca60e6970927db0c322bbae12cabb3c78040 SHA512 2f5ca01a680e7d254ad3ccf1b23b40b2ac513df9dee19387424692bcf85bf7269195bafaea06d4619582791cc77952b2b18eb0665783ae4921477cdafc121fb2
 MISC metadata.xml 414 BLAKE2B dfcceac5bef0da178b6edc05fb4d0cf8c2b36ac526be3a42c2d66ef2df79bc47951d0769feae31ad23638ab2343dbcf32a0784625c526fdc66b2e87b32360828 SHA512 733c65aaf57d8df7fdf5783ca2e67d0a7ebe5b194f97ba3b3218b65fa5236c3c1e9f853d09e3f36852f0dcf28df28000d35f60278d4d7fe6c86c1e02fd7f83c9
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 4150ce579921..0d9ad05c752d 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -18,19 +18,18 @@ LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
-
-FONT_S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
+
+S=${WORKDIR}
+
 FONT_CONF=( "${FILESDIR}/60-mikachan.conf" )
 
 src_install() {
 	insinto /usr/share/fonts/${PN}
 
 	for f in "${MY_PN}" "${MY_PN}P" "${MY_PN}PB" "${MY_PN}PS" ; do
-		cd "${WORKDIR}/${f}-${PV}"
+		cd "${WORKDIR}/${f}-${PV}" || die
 		doins fonts/*.ttf
 		newdoc README README.${f}
 		newdoc README.ja README.ja.${f}
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index a5a613204422..bd08c442b506 100644
--- a/media-fonts/monafont/Manifest
+++ b/media-fonts/monafont/Manifest
@@ -1,4 +1,4 @@
 DIST monafont-2.90.tar.bz2 808897 BLAKE2B 844b056c9aed06799bed115fb0ef3280dd5182f97b0207c411b568951ea0fa727e1498a94dfa114d725011c226716fb488831cf2dacb0e320fdf70297ca7b639 SHA512 187cc4d7245c2a730a02d5a60d6db92f2bab5a3a36ba56a9e7a767391587e5cb136a9e0c0143308936d1d214e6ae2e0ffd2dc9374d931ba52c81aaab7740d6c1
 DIST monafont-ttf-2.90.zip 1712768 BLAKE2B 3847a71bd9ec17743dcf25fad3c49dcf597bcc59f20f5fba4704a05d182e69b0e0721d7768bf1d0c7b08ac019e2008640f4110487b47da34e963d5d4689952ed SHA512 0cb0ddf13f398f8504d387e590748c8bf44f01f672eb1f1bffac7c3e027f730ea0e7db41d10727beaf42d26e10e2e518c686669bcdc33a7113343863e49a0a55
-EBUILD monafont-2.90-r2.ebuild 1447 BLAKE2B f48464dacb084f37b2983f2a0277c04d56353c757624a13461cb236175adf3e8f4d40e5126db5f7a316ffb6473550e3113f1834dc16c562d4ad9bc3ee03a35a8 SHA512 91a28e7b103632d8c3be08eeacb91b30858b1816380d2f150d49c006bf7e29473d66f6d20f54095a285e925c4c7aa766d8d45c0626fee3d13faba1bdb7c8ae72
+EBUILD monafont-2.90-r2.ebuild 1413 BLAKE2B 848b4904b4688880cfd256d5b09087b9f4327b0d561da1c664872b4ecfc83f6823d178eaa68370dabbd16a020ee89d4db6e937448e0a45ec255fe2bf645f7afb SHA512 3a5be740f7c9f66b14ca348dd64a006cde505bf54a222960967a0c7a6419d9fcc8d5c22033bc56858f78bdafa7576e65c6ec03ecdff45d19a3ac1a9c1e5286b3
 MISC metadata.xml 411 BLAKE2B 3305144925ef270e00f4d8a037dec8454f0839388f82dc82c9ba7388425ca429574a4ef28b07254b8662323256c9710a92f41dc9928c80ea5335fca07ca7c39a SHA512 a55793b608e9f4298c382335e568cb8ed8c8e113b63b975259e1b0d12cbc0645c2ad2b4bf3602901ca8d1515a0acca580f60b49e00738674c02be15c218256cf
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index d6f100c47b5d..e08506b5e6e7 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -9,48 +9,50 @@ MY_P="${P/_/}"
 
 DESCRIPTION="Japanese bitmap and TrueType fonts suitable for browsing 2ch"
 HOMEPAGE="http://monafont.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-		truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="truetype"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-DEPEND="x11-apps/bdftopcf
-		x11-apps/mkfontdir
-		dev-lang/perl
-		>=sys-apps/sed-4
-		app-arch/unzip"
-RDEPEND=""
+BDEPEND="
+	app-arch/unzip
+	dev-lang/perl
+	x11-apps/bdftopcf
+	x11-apps/mkfontscale"
 
 S="${WORKDIR}/${MY_P}"
+
 FONT_S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 FONTDIR="/usr/share/fonts/${PN}"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's:$(X11BINDIR)/mkdirhier:/bin/mkdir -p:' "${S}/Makefile"
+src_prepare() {
+	default
+	sed -i -e 's:$(X11BINDIR)/mkdirhier:/bin/mkdir -p:' Makefile || die
 }
 
 src_compile() {
-	PERL_BADLANG=0 ; LC_CTYPE=C
-	export PERL_BADLANG LC_CTYPE
-	emake X11BINDIR="/usr/bin" || die
+	export PERL_BADLANG=0
+	export LC_CTYPE=C
+	emake X11BINDIR="${EPREFIX}/usr/bin"
 }
 
 src_install() {
-	make install X11BINDIR="/usr/bin" X11FONTDIR="${D}/${FONTDIR}" || die
-	mkfontdir "${D}/${FONTDIR}"
+	emake install X11BINDIR="${EPREFIX}/usr/bin" X11FONTDIR="${ED}${FONTDIR}"
+
+	mkfontdir "${ED}${FONTDIR}"
 	insinto "${FONTDIR}"
 	newins fonts.alias.mona fonts.alias
+
 	dodoc README*
 
-	if use truetype ; then
+	if use truetype; then
 		DOCS="${WORKDIR}/README-ttf.txt"
 		font_src_install
 	fi
@@ -61,6 +63,6 @@ pkg_postinst() {
 	elog "You need to add following line into 'Section \"Files\"' in"
 	elog "XF86Config and reboot X Window System, to use these fonts."
 	elog
-	elog "\tFontPath \"${FONTDIR}\""
+	elog "\tFontPath \"${EROOT}${FONTDIR}\""
 	elog
 }
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index fe4676e4e1aa..c294c1a6af80 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 662 BLAKE2B 831b9ebe31c02efc34727761b98536fcf7fdcca0e926e23c28de7cd673645ba9626a31ae3eff893716f8aed5644b4b284d68bb7e97aaeea1b924b19ba20e9a98 SHA512 ead8713cb04048270caf50ce21de0598f17a834beff5dac53f5cb376dc0516cec2e6917cfcebbe20442711b09be3844987e3597c725ae53827c52b704a30d219
+EBUILD mplus-fonts-2.2.4-r1.ebuild 672 BLAKE2B c364b75173ad5cc7218d100becdccc77eb37665dcb7880d791fb2aeeb99907105cf0e48313472ae535a600ddcf5687a35ec3ba7279fbbf0ec7187f995dd618f6 SHA512 ed4828079e62f7ae9d2f79c69ffcc862f4600526c6cb9291525ea7fb13532771eda2f7af76c67aab139c2511f76def1a43a0d91377a9c6572fee6ce13929b63d
 MISC metadata.xml 417 BLAKE2B afd3ff35d1939503c1e6638acf5dec0ec8545cdca271d8c40f67f7386c6d9328292a1d6f15645f913615ab01a6ae4c3ca5b32551256e4e4a530958a447caa5a4 SHA512 a7b75bfcec2be8a238c1079dff5ada5b5ae6e5e4ba4fb634dcd83baee4558ca10a958c3fd0fc7880d7fde815dd56cccdbea8639b16ba713f6517796f19227f49
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 925a07acbc80..261dc72e5590 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
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X"
 
-DEPEND="x11-apps/mkfontdir
+DEPEND=">=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
 RDEPEND=""
 
diff --git a/media-fonts/nepali-fonts/Manifest b/media-fonts/nepali-fonts/Manifest
index 56248240e290..4d10944b6b5c 100644
--- a/media-fonts/nepali-fonts/Manifest
+++ b/media-fonts/nepali-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST nepali-fonts-1.tar.bz2 555877 BLAKE2B deac623bb4bf0e64c26846a62494e3dd841a8241751e2de66f271964378eb8d7abc98f9f9d0d59db6093bfd1087935c4953e322c80afd7e24947237526528edf SHA512 f9f494aaf6be60b9abe621618a3883f966212dd12357095704b1daa28352e417f521adf3b4863b397ec9bc5f9cfdbfe45959433b7614f3d858f727a6c001ef87
-EBUILD nepali-fonts-1-r1.ebuild 510 BLAKE2B 886912d76ae95beedf81091288dbb2b188c1e59cd36879a631b5d803fb9e264339b71d558d5d6fc26c3cbd4d678e1258e7164e6bf20a64082f144a153ee7c928 SHA512 ca2613f81199f9d7801b5bfad9b358f8281f217b41e4b62da14db89287825de5d117a21d8a825a85000256fa7669344066bb056baa4fff91ff7bad421b613bc3
+EBUILD nepali-fonts-1-r1.ebuild 496 BLAKE2B 5ebaa5cceb9aa2db0744a1e6c6eb34e506e36d64e8edb01786205f9fe845689cf08366e4d910565ff87ae59c0f52c24ef085da1cc48020686898e675d76db8cc SHA512 aef7536aaabc6256d5a5cc939201e5fcc4730708e0b00a99f44699365c67d09664bf97895990b9270b0ce2da642c674c8ce793092b66792ccfe207f5682ccf1a
 MISC metadata.xml 234 BLAKE2B a936e880a7cf2b37756f6cb1ffa44992e9f812fecaee521bc5aa804ad4371731df2b3f647e1432bff27713782a3f8ccbb7fd1105243cb1bd67006f8a98b57ce1 SHA512 eb2691b4aea3787af7906a40be13e5a6daf385faa6e743f1f1fc083473844dbbc489ebe243ee35792b75a4042074476d6622c670d538d0e14536362c485ff8d1
diff --git a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
index 523c6b8a5501..2248ab2f25b1 100644
--- a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
+++ b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="a collection of fonts for Nepali users"
-HOMEPAGE="http://www.mpp.org.np/ http://www.nepali.info/ http://www.nepalipost.com/ http://www.moics.gov.np/download/fonts.html"
+HOMEPAGE="
+	http://www.mpp.org.np/
+	http://www.nepali.info/
+	http://www.nepalipost.com/
+	http://www.moics.gov.np/download/fonts.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
 
 S="${WORKDIR}/${PN}"
-FONT_S=${S}
+
+FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/oldstandard/Manifest b/media-fonts/oldstandard/Manifest
index 30ee1fed9f7a..35e89dfd9564 100644
--- a/media-fonts/oldstandard/Manifest
+++ b/media-fonts/oldstandard/Manifest
@@ -1,4 +1,4 @@
 DIST oldstandard-2.2.otf.zip 398951 BLAKE2B bd379fd16421aeef4cffcc3c6023d884498c02e031ff3f4061cc220d52483076adeb5e5fdfe9a89fe9c035cc64e52bbd48638cb562146c7f72086a45ee678f49 SHA512 f270b295b7fde03efcffeae2b78a107e6c746a569208bb2f3e08537d954e0f5654851cce5510ec8200e1e860ef5629c6c371705fa1fbc36919e2d07c325f6e7c
 DIST oldstandard-2.2.ttf.zip 844435 BLAKE2B 5782fb6b7f6e941d14df52156f2b6bf19f65f7c51ac8ca46f1d74129937b997811c81f30b7d5c0d7814b9cb54effc8371a732b766ce601bf65d67f2b754ff60b SHA512 1d889cea0f29bb5bb446e1aab3635cb6d9c3489965fca0e08f3f601e492fe709f7b5d0479ce12a3e211e73c4b0f8bfb09832d2af5b5332ddf6c32cabfa4e550d
-EBUILD oldstandard-2.2.ebuild 575 BLAKE2B dc7cc3519c8d884f7a2d115cb077f559d6c34c796a3f7c172b8aff10798974a4fef294540aa8f750b99b07cc1e98fabc595a8c3ba979b732f8897dadaf4764a7 SHA512 8f2d5a5b452686439c140b85dbd0544dcd0ae282c8780773ce9247b172fb10c2f4f66c3de9188e6fef35d85b8094b7e5d35ed0e4d4169a2f9d898b54e39644a0
+EBUILD oldstandard-2.2.ebuild 576 BLAKE2B 5728a62acd702619eb136a4ac95edb17ce172f1a5a2db768d9bcf5505c9e9d638ed032dafe54ac0dfb3563b1d3e62ad77c29b084cc2bb3a71a87823e67eb0c83 SHA512 4df2269bb712ee8832aeb4f76a0ed4c287696770e6158c544a2b0e1f4720fb689bf0584f8bf2eb16570d80d0f67e2dcc4f211de42184277d0fd5a8bf83b11da3
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/oldstandard/oldstandard-2.2.ebuild b/media-fonts/oldstandard/oldstandard-2.2.ebuild
index d5aa25d9ec5f..ece12183130a 100644
--- a/media-fonts/oldstandard/oldstandard-2.2.ebuild
+++ b/media-fonts/oldstandard/oldstandard-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
-S="${WORKDIR}"
-FONT_S="${S}"
+S=${WORKDIR}
+FONT_S=${WORKDIR}
 FONT_SUFFIX="otf ttf"
-DOCS="OFL.txt OFL-FAQ.txt FONTLOG.txt"
+DOCS=( OFL.txt OFL-FAQ.txt FONTLOG.txt )
diff --git a/media-fonts/oto/Manifest b/media-fonts/oto/Manifest
index 9e4c32e3e166..0a291973f17f 100644
--- a/media-fonts/oto/Manifest
+++ b/media-fonts/oto/Manifest
@@ -1,3 +1,3 @@
 DIST oto-0.5.tar.gz 588248 BLAKE2B 1ca216eb5adbb97fab875fae6656122ff82bc4750f2d69030a42bcb286faa97dd00fb21561062e2d1ec2ac86a108aafba43c24305deb93284dcbe4a95a814ce6 SHA512 cfcc00f666517618ce7fda5d5ab9dc97f3df4cc7aa5ea5a3172fb3d94748a2096d662df056ebb51effad8513c7bf8b191728f9cead4d28d87959ec637bb4cd28
-EBUILD oto-0.5.ebuild 463 BLAKE2B e9fc0d24b72c5a25063a61991c1ad97636d280eedea96f91993b0f3a52156e947210bbf3afcb84dad730ba68aa4cd571d3baf57dcb831424e20ab5695989a249 SHA512 9b14f9e442f44673fa6eb7624bfc3d8e4a82a8c74a45983aa8e14dcfb998eb967a7775bef7501af3bac1039b5d6e4949dd892e082cecbaa3c7da1cca814cc1c3
+EBUILD oto-0.5.ebuild 326 BLAKE2B f0609d3dee19c00e9e8cbb877c52f3b076eb4d550a91193ff596335c1ee159684920b18d7009ad508af88adbecd38c7638362516cf9a842a8cae33bd1924a704 SHA512 a5cc1fc596fe07766e5d8daf94b4c52fb07f2a6199317f7b0cf4ca5bceb88012263de0973747343bbef08a3f2740af64a635b75d1d361e8f541d1699f5e526cb
 MISC metadata.xml 311 BLAKE2B c017b3612d45397a188ffb4ad12164fc74996494b54b44b17134e68097d4a1e32d7a32ce4b1592ec5db2a3bc3fe5b675ac592f6f66072c8e2e3229b96b157075 SHA512 2c08ef5b5092eb843dddedd5c5b0cd6b9dbac42dc3315fa63f78d7e4554d44c6c964ab0556fd072b31370a9918bfbddc1a0970bdc432e936a13d0e70462d354a
diff --git a/media-fonts/oto/oto-0.5.ebuild b/media-fonts/oto/oto-0.5.ebuild
index 5863d6b6e929..be2c85997c6a 100644
--- a/media-fonts/oto/oto-0.5.ebuild
+++ b/media-fonts/oto/oto-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Open Type Organizer"
 HOMEPAGE="https://sourceforge.net/projects/oto/"
@@ -10,13 +10,3 @@ SRC_URI="mirror://sourceforge/oto/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~ppc ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-fonts/oxygen-fonts/Manifest b/media-fonts/oxygen-fonts/Manifest
index 12dc344fdcec..3f1d59cf5412 100644
--- a/media-fonts/oxygen-fonts/Manifest
+++ b/media-fonts/oxygen-fonts/Manifest
@@ -1,5 +1,4 @@
 AUX oxygen-fonts-5.4.3-fix-d-and-t-accents.patch 1720 BLAKE2B a6c6d8383db8470412cf2a9d3e60cffd1c808d5edc188b6bf991abc64e42bb963c4204fcbc8ee37f87ead26315d5e9073677bd657116bcfd7060f14d6ede13af SHA512 ef19f8e7d4a62a811402ac6604a338c030f6e7e7e74cf967040f22d2d6e49aa37cf0e2404bdd612e83ba29ecd73df4f91431fbc608fec0a125d19f80dbda807c
 DIST oxygen-fonts-5.4.3.tar.xz 161700 BLAKE2B f0232b46e35a2a66905907da772de3ab8dc60c823c400825d7198d860870f447f83bf8328d086d1a676b6f223bc99b4335249fca49d3d13a4b2f575831d060bd SHA512 6dab7b2ef3f7540cd28e91435662f6c43ef9e972fe4ccd1e58ba8904d1b4e8f1ca562384d02df1fc7c5dd5366e9be1ed0a1590a9b9a182621e4bab26ffc3497f
-EBUILD oxygen-fonts-5.4.3-r1.ebuild 763 BLAKE2B 9d530ba2d2c7fff9db6d3b54efddc7256144c4acdfa7ac2afc6f618b05207fb7478312d5496d44e9a835653fcc4596a106d178ece5de7cebdc3b782a453d97cc SHA512 13af093ca8babb47b0f3dab2d6fd2e890a9ebf943de3279bbbc58a1a75ac4c9f19f59049a1e47dfdf1956f5072ffe05bf20e8a9a64816b6d83ee63c74acc56f1
-EBUILD oxygen-fonts-5.4.3.ebuild 778 BLAKE2B a58f3f6b56a458cc228bc56fbc9ff25c56d4ce261d232649b395171658a7b330c35ada0efe2f3e57598a975ff1d4ba83882c030ae1858f50334c9cf8858d20b0 SHA512 d786954b3458b8adefe5013c821bce9f7a324c24f9623a44f3d15e360ffa6c7f67dfde9bf9fdec40e20ee2742d50221b4872027de36fa5a1e8e6c6d0c872ccc4
+EBUILD oxygen-fonts-5.4.3-r1.ebuild 762 BLAKE2B 8e8ad5a0ae3329467cd4e8ebb16f2c4538a586fc756363e8f2dd934d763a2ae8b9ca088ea975f3edbcdce896662dc50399bf15c65391cfe3d8842cbb6d3d28b0 SHA512 7b5ce5ce970d2a784aa1067abcae28a0e8d0943b518ff543437428bfea319b3765d7a5b7eae6a60aa5073a10ed2b9b20e1144150ad86142fd05fb78dd1940314
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
index 41c1df5c8716..4e9dd767cbfd 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
+++ b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
@@ -12,10 +12,10 @@ HOMEPAGE="https://cgit.kde.org/oxygen-fonts.git"
 SRC_URI="mirror://kde/unstable/plasma/$(ver_cut 1-3)/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 	media-gfx/fontforge
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
deleted file mode 100644
index 627c010b9df2..000000000000
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 font xdg-utils
-
-DESCRIPTION="Desktop/GUI font family for integrated use with the KDE Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
-SRC_URI="mirror://kde/unstable/plasma/$(ver_cut 1-3)/${P}.tar.xz"
-
-LICENSE="OFL-1.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	media-gfx/fontforge
-"
-
-DOCS=( README.md )
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	font_src_install
-}
diff --git a/media-fonts/pcf2bdf/Manifest b/media-fonts/pcf2bdf/Manifest
index 0eba62b17e6e..bdbe4aace9c2 100644
--- a/media-fonts/pcf2bdf/Manifest
+++ b/media-fonts/pcf2bdf/Manifest
@@ -1,5 +1,5 @@
 AUX pcf2bdf-1.04-64bit.patch 8844 BLAKE2B d183800ae3a24d886dfa0f722dcf03e1d56b5fea720ebc30a21f47a87250fdb5a3ae9f0207a152d65e1152842d288647067d8ffd4495b4ac4da63f26f9474055 SHA512 4bb7241e52a0de3445aa2ce08529e9954cfefcbe5edd41d6331a7e2ce86667bd3d4afdae7f346e3d877665a19385783810668f986546a27fd343bb6ec6be1ce6
 AUX pcf2bdf-1.04-gzip.patch 419 BLAKE2B be124f814fb80b82c41cb09869ec7a32699d74941ccbcb28788b7382054ac748b2d48e105d4972be07cbdec5ab58518e589b56536d0aa61aeb63910235f60c2b SHA512 91b7ae36113fe8c9d637137d06ee657074aa9e7dc8cc07676f7286a7d4b7679b4cb5d0a4de8b48a943e82806c201564724c276df0ee3e08ed4c231faf12c2a53
 DIST pcf2bdf-1.04.tgz 9686 BLAKE2B 8c264357859a8e88165711e5fb11cb36acdd15d51f986cae96fb6e818f630805105df68e2743c3a6a4484eb35f7de700e374207d6699b7ad22cd579da1c671db SHA512 dc8329047ec8529410fdb4e15cbf409293b31ed7d50a2f6771a17c0abef3c393f2566590eca133856abefd03b09247859c4e055368e9c19e20972ab2e30991b5
-EBUILD pcf2bdf-1.04-r1.ebuild 746 BLAKE2B 826e170e6e61711c7c331d4ffa0037b6709a93ead27b69156853895053391d1d3ed794fa05a5a36e925d48daf883bb51ec48a5bc31b189443ef6c20585b363a1 SHA512 6ae875197f9d9a22c28e354f75563f9e95f8343e88e56d6fa382c8aecc3defd129ba83c1282b656d64e088f298defaf1a446c15c29d86fa6d1e0b9d3d3ccfa43
+EBUILD pcf2bdf-1.04-r1.ebuild 666 BLAKE2B 5212c6bb2bd7b63a3f6fd9ef200ae8ecf34cdce13437dac95dac00f6cdd6376b74438ceebbef233f764dbd58dd6e547203214d4d1d36360e899f287d1237bfed SHA512 99b77c47d98907bd74babe427c0cf1c40bfe074ac97d9daf41bc98f1d844849bb04f3d2be532847faf3b03a14e046e0ac80112d700369ea56fc12df5470d241f
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index ecaa05f44c6d..c27ad5f8f8e8 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Converts PCF fonts to BDF fonts"
 HOMEPAGE="http://www.tsg.ne.jp/GANA/S/pcf2bdf/"
@@ -16,20 +16,18 @@ IUSE=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	epatch "${FILESDIR}"/${P}-gzip.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit.patch
+	"${FILESDIR}"/${P}-gzip.patch
+)
 
 src_compile() {
-	emake -f Makefile.gcc CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die "emake failed"
+	emake -f Makefile.gcc CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
 	emake -f Makefile.gcc \
-		PREFIX="${D}/usr" \
-		MANPATH="${D}/usr/share/man/man1" \
-		install || die
+		PREFIX="${ED}/usr" \
+		MANPATH="${ED}/usr/share/man/man1" \
+		install
 }
diff --git a/media-fonts/pigiarniq/Manifest b/media-fonts/pigiarniq/Manifest
index 56b94eab34c2..5d14acf6797c 100644
--- a/media-fonts/pigiarniq/Manifest
+++ b/media-fonts/pigiarniq/Manifest
@@ -1,5 +1,3 @@
-DIST pigiarniq-1.zip 358252 BLAKE2B 1e040e1bcf71f398e7fa2c98e77c6a44a4a2bfc4454d2bc720fa3604f10df27c6743b04c46bf4422087f77c25da7b1f2a1c06611e8ed524808513e052715e10c SHA512 56b6048a44c046cd7350cbe426d520ed81074e4f4ee3ed342e30a9a6a1efecdd466646c1e274da03fa205753ea0c94109c52228d860575f52002c2cccf09b075
 DIST pigiarniq-2.zip 375948 BLAKE2B 6e1ce0c054c8e5ac6dda5453d24c543a4e1117a6a39e5e50bf567be2d24c419be8a87baca6632874655a815d3e9f95f475e33620d1f6ab3e4ec06ca2e6d29d1d SHA512 73789818671781ce9c5ea21fa4586e564ea8cae554559a55cbb7ef2406f5f8794677039ee299f3029073492d9f6f1052fe99ba34fe942e9d570044e6d7690d0e
-EBUILD pigiarniq-1.ebuild 417 BLAKE2B f5a03b3dea60c6561e37ecdb358468389570c6af2cd8a7beaa80cf89e2b21c0f9cbbffdcb76c35cfce8a3897ce6ed05f36f8caa0926ae489aa16f6e588d12f96 SHA512 58cbb90fc3671b88fcda5a66947b4e2011acd2b39a549ca45c194dfc1a4bb7fb7ce540dcd6f6e60ab4e4c9d5e4ce5fc404a60d92818a1314c3248e9fd1279695
-EBUILD pigiarniq-2.ebuild 437 BLAKE2B 85110bb513eb966e191e08bb44e403ef0db92580bac02a3b7147d980292e04ecdb98489d6b05ee47cfcf5ff38d43ebf839c5c040459e808d9f00f6b483da7974 SHA512 b8ffc99021d85dddf0976c3a6b105511ecb281674ea336ec34c7b6b61fc2580aff1a342240d99b1cb33b1c52141af9907d82c11d95c4e59174ae73a8e74789f3
+EBUILD pigiarniq-2.ebuild 435 BLAKE2B 0cb07a351e66bb66b190226a9c3f9d4bcc0dd7435f781489455cfd226721f92b1a05d4b9282a603329e113c9c7f1ba6e2f6e1c042816dbec48fa84e1343d6fd2 SHA512 747d678e22592049f0b5ab7e2bb5292ac1ba6e2daadb68be6aeb3edb57f9da0d0ec1620df673dc3231983ef26d92f85c53f44521f316f924d1cfa286e8a069fe
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/pigiarniq/pigiarniq-1.ebuild b/media-fonts/pigiarniq/pigiarniq-1.ebuild
deleted file mode 100644
index d99be98956ff..000000000000
--- a/media-fonts/pigiarniq/pigiarniq-1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-DESCRIPTION="Nunavut's official Inuktitut font"
-HOMEPAGE="http://www.gov.nu.ca/english/font/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/pigiarniq/pigiarniq-2.ebuild b/media-fonts/pigiarniq/pigiarniq-2.ebuild
index f078462e88d7..8728ac685d8b 100644
--- a/media-fonts/pigiarniq/pigiarniq-2.ebuild
+++ b/media-fonts/pigiarniq/pigiarniq-2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ch.gov.nu.ca/fonts/pigiarniq.zip -> ${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/pothana2k/Manifest b/media-fonts/pothana2k/Manifest
index 21616874347b..e61de0c81e39 100644
--- a/media-fonts/pothana2k/Manifest
+++ b/media-fonts/pothana2k/Manifest
@@ -1,4 +1,4 @@
 AUX 65-pothana2k.conf 744 BLAKE2B de23abcc8777bc2f820c3a3bbbbf874594bb2970ff2492dc5eff84c42e0c4e0e8a7084d5feeb5989e9c23564875893230b773331bca952a5d8adbd8becdbeb5c SHA512 426f5c64f0919f01f285ae0e54af30d1ef6ebd451909cec6d1de832edbb1cf10264541f6ca73546142be7132cf61e32036c262fa1261c98513cc59f87fbf0ed7
 DIST pothana2k-2006.zip 1068921 BLAKE2B d4db59628fd7d32f87f56d7472454daf47c157c3529b39c44369e80ef7be3680b7278bfe9376d37e11261666ddf617bfe9c3bd730b39f7358feecf06ff6aa89c SHA512 4a43203c794582b15779874b08cc5125d35c4d11a57dd3859e1b90c6201038617b1172ce3adf8a8a432c2f56b3149d622a8d3f853b9df7c3d9a1eeab87621423
-EBUILD pothana2k-2006-r1.ebuild 556 BLAKE2B 0ef6a12a108b72c1051ab9d903ec6dff035e54d4336717563e243d256bc56bf28a3d9dbfc2686de2f42f9a6605e73d8fd4724a6f77bf70592a53e428ffa2314f SHA512 f788f272ed88de39e5b011baa5e23b95200d8809edec52ec2b2d962e9a5a7916e6e77e06e7e792abe695ba55543e50e6ead696bd6d476e8ad3b73667622098e5
+EBUILD pothana2k-2006-r1.ebuild 541 BLAKE2B fdbb2bd090a424438b0d1ca386b191ed49e6af0262ee0318fdba75adcaf0966258445f17f9ec8e147d5c5285d98553bc9f9d7c685616de5ed812c10312e19f0b SHA512 4fb110cd3f1263fe5ed559c55b704ffbacd637bcf301561183cc0eb8f1f86926c3af9fa42130c20dfd452ddb59023c2881cd79a9abdb845b0697bfabd42fd514
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
index caebf55ef402..535d0df3faed 100644
--- a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
+++ b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -25,8 +25,5 @@ FONT_CONF=( "${FILESDIR}/65-pothana2k.conf" )
 
 src_install() {
 	font_src_install
-	if use doc
-	then
-		dodoc MANUAL.PDF
-	fi
+	use doc && dodoc MANUAL.PDF
 }
diff --git a/media-fonts/proggy-fonts/Manifest b/media-fonts/proggy-fonts/Manifest
index c8f196ca0bd1..13d55fbed64e 100644
--- a/media-fonts/proggy-fonts/Manifest
+++ b/media-fonts/proggy-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST proggy-fonts-1.tar.bz2 46338 BLAKE2B 4ac61bc492443be4fbb7bf8a8e4ca90f3e028753406b2fe99bfd27a5cd4e53cfc3426fc2789f75cbb7693278dd53d5e8886993018d5baa967162c4529291a362 SHA512 b0641fb416b582b1a8164630de176f2412063c78723f57ff307a41d54e95b00291975dfe13b518dd848f7902ca5c9cc19b5674036505f5a1f3015b9ae1208ba9
-EBUILD proggy-fonts-1.ebuild 434 BLAKE2B 71a20cb94503407014d467139c2c1eb91442eb4158aec5af978bd792ed3484cd6d3d965b635687a425652654d4b9ee2baf94d3179fef943fb49aca9bf0e2cf43 SHA512 02297dbbeac936897005d3dfc2d6fcbe2dfe2918dac6d6b984bc7a391901a4ae4d09f948628bad2f4eabbb2af99a7294b0193a7fc90fea3197344bd79dbd5dd9
+EBUILD proggy-fonts-1.ebuild 435 BLAKE2B 3eecf333af0464450fb63c0671c1097524147c71afc0247671c07e06a04333136fc9639c014979dcc02981e5512e042ec16a75a739e022d49c293047683fd2dd SHA512 bd60d3e7ef72e594e2250debf9ab2a1139eef40895f4a09670b0c761ef418a0e06c91ec6b86d1468798433357f782d6ed1904c4f37dcde82cbfa6f444875a381
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
index 81e77ca4ef5d..97323d8fbd17 100644
--- a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
+++ b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,6 +12,8 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+
 S="${WORKDIR}/${PN}"
-FONT_S=${S}
+
+FONT_S="${S}"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index 4fa121c6412a..b8b94551a42c 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -8,6 +8,6 @@ DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06
 DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
 DIST quivira-4.1.otf 1549016 BLAKE2B ec99585e4998c0411d4d5fb364d97ab479069549be475cb195b0b1512ac94c66ba5beeb7d07dc26cbe130ab44090f189e20d71a794334831808ddf58d05b63c1 SHA512 8f76c0e05aae7db9f4a155725f024dd019500bcb14fb1398182f897798128dd2ccf13840446382780b0c4873e6f8dc2d8a2e1c49e9bf17266b52248beb919c65
 DIST quivira-4.1.pdf 1632238 BLAKE2B 755dfd91812cc7c49875f9ccaadff9934dc5d7f86ce4cd2a1473d7c43aeb83f54dabf67985cbe14690ec4655b847c78bd9a92dc277520c63964ac548990f6a9e SHA512 7863b8c4aebbf9e1c8ef6033b6eacb9bceb9d52502ba90c87924809485c3071931a6f1382072bbe5ba1e39aa844d2e9551fefd746929040230ea6ae32b2ac748
-EBUILD quivira-4.0.ebuild 1188 BLAKE2B f5a1c0c547728fa2323e06d0a2456e52a93b03cddc40c7e19dc8a87e4837f7748a2abc931c947b326a0dda0ccf4d6bcf70dad97af6255f74e07e8594cf97a909 SHA512 84606127f4bfaa3c973d7e0a9e61d1ec0ada36b98b205c8a4b1282aa8bc98523392276e85c6cde473655877d10ab28219b0d80770a6a2ef65b5ef4c75d183425
-EBUILD quivira-4.1.ebuild 1188 BLAKE2B 0bbfb1bf3749e50c02113fd4de89bdbd78d19a69aad7a6387c67fcc0f627aba85d159303caa3abbfb5460e0e232d0736bb0480b8fdea24851521137ce8dda9c7 SHA512 e36155f8f8e8ebd8fce3a4fa1afc17952121d34bcde01b59e5c9c9cded4701bbd3215d0c8097f738cf69fa776515ec7b13f8280d086ae7b528dd6c0cf56b8a66
+EBUILD quivira-4.0.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
+EBUILD quivira-4.1.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
 MISC metadata.xml 584 BLAKE2B 24a5dcc1462e9cd796888fffc048851540811d9e75cdf5b804832e4f29f9fe4cafbaed037872c251839182b9f48e56a9b2a655089f72d45583a44c708e50e47e SHA512 bc10043cd40ac32b7d4309fbec2d702ed02b56d8cd822ed324c39e925c66c3bd070f3472d605c0c28e6ab64f8c401e1f87ec7977142a29c98d4484a7c1010c7d
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
index a840ef402440..edea0e21cfbc 100644
--- a/media-fonts/quivira/quivira-4.0.ebuild
+++ b/media-fonts/quivira/quivira-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
 		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
 		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="freedist"
+LICENSE="public-domain"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index c1824c7bc3c5..edea0e21cfbc 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
 		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
 		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="freedist"
+LICENSE="public-domain"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/media-fonts/sazanami/Manifest b/media-fonts/sazanami/Manifest
index 497a86e3203e..62cbd763e7af 100644
--- a/media-fonts/sazanami/Manifest
+++ b/media-fonts/sazanami/Manifest
@@ -1,3 +1,3 @@
 DIST sazanami-20040629.tar.bz2 8622710 BLAKE2B 385144c6d10a20853d6db3db5ef8eeca9ea73e588d087d28fee0655ff89d5024542a47d59e00adac86aca01645e95afdfe72354ff060905903f501fa5027b4e8 SHA512 53ad198ecce7580da9d3e50a6313910d689061d9f85fa6b2f66bebe765295635ca24431c27a750254b86d6c1a697133144b0dd4aa8bf645125a1fbf76049c813
-EBUILD sazanami-20040629.ebuild 668 BLAKE2B c27fc8808e44791dfbf06021745dc5c2a128f94120a77570e98fd4854acaab328835cd114f5e8c545084d0ebcc4033a0b27569aed485dad3d1b241a1acc74a38 SHA512 a54df95e9316a9d0f3762619a05566cc88383e04ad562244aa3be3b8458008b78e77ba7fc9b4533d05b10dc5c504a1cffd63dd0f8fc3bbc7c30dbe01d4787f9e
+EBUILD sazanami-20040629.ebuild 616 BLAKE2B fae233dabad467c71acbd9f9d24b8a7bb81aa880f2f99e011ad8ad01de84db625270487f9688ea39bf6933b6d94f5bbea035bee7edf0f508c4f0fd9fdc0d6c1e SHA512 ccf24fbb9868a7caa16d0922be8b3cd6be280b9a4c5773432fa3bd95eabe016de8120f64105a933dd2453064bb4931b5e895737f95ff8c196dd188bb2d4d2c0a
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 5ea245da4d47..83d5c7594580 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,21 +12,13 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
 LICENSE="mplus-fonts public-domain" #446166
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-FONT_SUFFIX="ttf"
-
-DOCS="README"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
+DOCS="README"
+FONT_SUFFIX="ttf"
+
 src_install() {
 	font_src_install
-
-	cd doc
-	for d in oradano misaki mplus shinonome ayu kappa; do
-		docinto $d
-		dodoc $d/*
-	done
+	dodoc -r doc/{oradano,misaki,mplus,shinonome,ayu,kappa}
 }
diff --git a/media-fonts/sgi-fonts/Manifest b/media-fonts/sgi-fonts/Manifest
index a0abf3fe9dd0..949fba52415a 100644
--- a/media-fonts/sgi-fonts/Manifest
+++ b/media-fonts/sgi-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST sgi-fonts-1.0-705.noarch.rpm 163657 BLAKE2B 8deef97d74d795e13c68240e1a1ffd893f3a876f948c9e0c35dbc022995a272964c983891579e23b1bcdd687056a806cfaeea7d88cfdb70d7c577524855fd3ed SHA512 72db00629180896501eefd8ef46f79439dbf4714cc3716c92a61986f82f42dd5e8a0b0b0afc2aeb1a064a0c0d554c776c46832ac96063f1d1949cdd9725ff9ca
-EBUILD sgi-fonts-1.0.ebuild 493 BLAKE2B 5961614d1836ddb6ff82b7194fe0380717bef9585564fd8e9cbc86b03e67eae4002d97879f7a4a58281053fa67b4ec9d193346a141869cd07500d9160541d98d SHA512 e1de845e8cfc7e9a8516b975544196542b83bd01046821a2f38fb14a921fdf350b100e0f95cb17d0c36d505d5a7bfc8c1550fe7dbd3a2864650431f844f3a187
+EBUILD sgi-fonts-1.0.ebuild 484 BLAKE2B 7e8efb8443b19c6c4b4d0b0755b2ee4ccfd642c8bc31d9aa5aba10be87d24243ecf864490cde6d8d630d15f26497daf285cff12fb65430b766757d4d36e4332d SHA512 549f608b8581ca0e6ff9140184a75be4b84935af72c38ac261179dd8ac55d5bab3ef18934d25c8aba158b5b998df3eb872e7f43874866362134e188e2d959e4c
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index d7b3e8a5fa07..15b0b7e6e5f5 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit rpm font
 
@@ -14,9 +14,8 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86"
-IUSE=""
 
 S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
-FONT_S=${S}
 
+FONT_S="${S}"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-fonts/shinonome/Manifest b/media-fonts/shinonome/Manifest
index 86622a860a17..b8a7a1955898 100644
--- a/media-fonts/shinonome/Manifest
+++ b/media-fonts/shinonome/Manifest
@@ -1,3 +1,3 @@
 DIST shinonome-0.9.11.tar.bz2 4943752 BLAKE2B 0cb04d55f89f60b01ed72e07ce9e27e0044ca5e16aab06556c01cf4afbaa288bdeaeff5a8956f76bbc51540d92a748c54ad8561c109677834c0580a98855c21b SHA512 9defcec9b02fa9f71b0ddf0ce544f2f49361697a45c2c6063cfa32f0b45db6c16f4ee7fc575a270aa64c0051859f01549dd773d1eb72695d93b9305a9b9d0a62
-EBUILD shinonome-0.9.11.ebuild 690 BLAKE2B a6df8dfac26eb04c59bb10fdbe338b5e7282375fbd033afc3041076159626a0f2e749236321c7b2294cf1818fcd1b9e2a51cd0aa80cf9eac625284996f327a41 SHA512 a84429f840ce8210d0ab23868ce99098ce203b9113c55f5ec6597586a6c64b804bab1efcd5adfc61b0da2f424cc9adafca3716a9dfaa2feb231e32ac0a9fd075
+EBUILD shinonome-0.9.11.ebuild 700 BLAKE2B 061c7f6f2001c3c7e8780ffb96de8d88641b7a14ed2d1ff8848cfa903a549c15f06de236608d35bd2a4193de46e87df8ad32406753905624dbc6d3c6265a99b7 SHA512 7bb5c8a07d8c45cf3911cee68423b9c5cc247c4ccbc8190e99df0f3393ffeb992ccda31aae11a1f4fae9bf6c08b32c03c984890c9cd473b4a9e720ba4f0f1af1
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index 1a05e6cfaefc..dbb420925c3e 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
-IUSE=""
-
 DESCRIPTION="Japanese bitmap fonts for X"
-SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
 HOMEPAGE="http://openlab.jp/efont/shinonome/"
+SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
 
 LICENSE="public-domain"
-SLOT=0
+SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-DEPEND="x11-apps/bdftopcf"
-RDEPEND=""
+BDEPEND="x11-apps/bdftopcf"
 
-FONT_SUFFIX="pcf.gz"
-FONT_S=${S}
 DOCS="AUTHORS BUGS ChangeLog* DESIGN* INSTALL LICENSE README THANKS TODO"
+FONT_S="${S}"
+FONT_SUFFIX="pcf.gz"
 
-# Only installs fonts
-RESTRICT="strip binchecks"
+src_configure() {
+	econf --with-pcf --without-bdf
+}
 
-src_compile(){
-	econf --with-pcf --without-bdf || die
-	emake || die
+src_compile() {
+	default
 
-	for i in *.pcf ; do
-		gzip -9 $i
+	local i
+	for i in *.pcf; do
+		gzip -9 "${i}" || die
 	done
 }
diff --git a/media-fonts/sil-ezra/Manifest b/media-fonts/sil-ezra/Manifest
index d99e6c67e2db..4ece8a6f5c8a 100644
--- a/media-fonts/sil-ezra/Manifest
+++ b/media-fonts/sil-ezra/Manifest
@@ -1,3 +1,3 @@
 DIST EzraSIL251.zip 634131 BLAKE2B 25c80feeebe6fedf0680bf6568097cac0a4cb5acc7f80b20cef4e67ac43a1ce7e929a89b4f6f3e6cc3767a8fd443325bbc1b9e68500c9e06d8ecce333e4c33bb SHA512 ef907ab9397c64a3a6f0638eb49d79b8386e6f84b52e6b94cbea22b5dc6011005acb7ac27fbdf3f84e85439a61c2a9ea52e4bafc8daf3cbb15149b2a90db5fdf
-EBUILD sil-ezra-2.51.ebuild 583 BLAKE2B 41a12a592473a0a1a59c3a5cc10e8d24b54d03a3baab14af29bc79a5d7f441f2c7338b32763c62fd7a1825f85ffeeeb68245d286ca55f3918553da87c45cb6b6 SHA512 af34451d1ea9db282bc5f4fd1860f2af490e043d9ca89e7b2f9c423faf4ff9db34f79db6d9c226c45799dc9a5f2d58307e864e8fd476572d08131d4450357f74
+EBUILD sil-ezra-2.51.ebuild 571 BLAKE2B 2dbc26d68c47b09c997e575bb76df7f564b9ceebffa573cde641bfa1041889d7cf007eff88721eb92989cdd35def7740a9e74ac84f26e8db01ad657debaf15ac SHA512 94405e2c425351b80d4ee864f14bdb6a9a0b8226304903f7a2afd1e8c4131ab88f5b591b0e199ec654366e7914620d5e160b731715445bec2658aa4005d22fce
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
index 0aa20b2c137e..47c65407f14d 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~ppc s390 sh sparc x86"
 IUSE="doc"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/EzraSIL${PV}"
+
+DOCS="OFL-FAQ.txt"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="OFL-FAQ.txt"
 
 src_install() {
 	font_src_install
diff --git a/media-fonts/sil-galatia/Manifest b/media-fonts/sil-galatia/Manifest
index ab42ff083439..f39039541f11 100644
--- a/media-fonts/sil-galatia/Manifest
+++ b/media-fonts/sil-galatia/Manifest
@@ -1,3 +1,3 @@
 DIST GalSIL21.zip 158917 BLAKE2B 24939c3d482c5103b117490a6e496669e39865797cd9c8d93fd4fbacdb992e64aebee6f59b70fceca2f0ae92e08ee45004ea98d7b9e7f50edf9d58b23117beab SHA512 ff408660ab892d04e81db24f4395ffb1e3732921a2277173dfcc1b080338c68d22aa004f3838959ece724114ff0e5cf3be101c41341ec5ba22a1736458e25672
-EBUILD sil-galatia-2.1.ebuild 500 BLAKE2B 5d7cb2acbcfa82bb3eb4ee6d336ed4324393b353a4df5f346910c8db4b69df30453470c6010dce49461b622b4f7f3ea62346e84f80510de8ce2d8b1b0552ddc0 SHA512 f1516663da64b70947575541356a3d535c9fe9379cc87ef3476789e90653c3fd0747d57deb42e3f91be72dc6c80cfd56d72d2373d64d6d30124cc86284aba84c
+EBUILD sil-galatia-2.1.ebuild 479 BLAKE2B 2e38714e608d6adfa47c1a05fa8190290bed9c06d6eea6e5b5faa81b2586b3c3b629d593e9a36d43aa51812808928071614b2ef72aa5689b26076c7d7d09c523 SHA512 f3492175583dcdaa80248f7d524458cb2dab3805a0d1d911f553e3012c85473025f6bfad9a9ec3df85d75e1d14662f1cd803ae80ab517d827108a84948806648
 MISC metadata.xml 743 BLAKE2B c4f224a328166bcd66e7f4c6942c686350beff6abd290801095bc5fe8a446f9df18945a9e2eec68deb4ce7fcb6e52ac76959d73a5b844597a9c2382941423144 SHA512 963c0e56645d8a6da8bd1949e1c4fe61aca109f4b878cdc665beb319adafa157ead40ef0f4c3df3c743fe63b73766ef8334932b90ec20469581aa12b35cab512
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index 1b253b60cefb..ea03349de977 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -14,13 +14,11 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-DOCS=( FONTLOG.txt )
-FONT_SUFFIX="ttf"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
+
+DOCS=( FONTLOG.txt )
 FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/takao-fonts/Manifest b/media-fonts/takao-fonts/Manifest
index accd2e3458d1..5b31307e2aa9 100644
--- a/media-fonts/takao-fonts/Manifest
+++ b/media-fonts/takao-fonts/Manifest
@@ -1,4 +1,4 @@
 AUX 66-takao-fonts.conf 956 BLAKE2B 30f0a5b12eb4ad1b5b7d27d95e9cc4d56daf0bba7d4de80f2885b573dfa4a8f6516798cc54dc09fa904ec87992526d2eb6decf032d79532f45f293bfd7b85eca SHA512 78b83b1381b60ad3a69b7fc072c63ea4b0010e9ed534de8e683fbd1724a38b009a8e89e3cdec7ee48aae984b02024e7dea307854f4b8ca859078b43a6ec582f5
 DIST takao-fonts-ttf-003.02.01.tar.gz 29678930 BLAKE2B 1e4589b091b8b367a3f7609fd3c1d0ed90df8c2d34e6e480f12c0fc67b5b3001969dc778204ffb1dccfe30f15d09496590024bc742ef90ba6150c9f2f82df00f SHA512 06d408f00066eaad72fe19796e3ebc3cfe17cd6a46c410bf4a4452ae14790c2d3dbf57cd628618fa738de10e6d581cabebe4dc7040c21bf8fc70c851b39e80d7
-EBUILD takao-fonts-003.02.01.ebuild 580 BLAKE2B c0a3451fc777822cd9ac6faabac24247818b2156502937ff310f4d25ba293c59465ef021221b4a2a679a91cb150db0daf7fdb960beecabab4e509c038d608c50 SHA512 36b7be7fa73b3a47d660a3c5337a7c4e73d43027677e29cc6f292f74cd178d0a33f3c7fa541d4deca84e1c652681c4dcf4a01574cce4c1cb06332689882a3eba
+EBUILD takao-fonts-003.02.01.ebuild 577 BLAKE2B a0db221041cb4e6de95a5a74aeb57907d378ce9a87ff65d5a9c786a9d9ee39eb58a6c685da2c74e48d51d517ecd26c21af8520219bffb190242e7add0de3be22 SHA512 424bd6cae9e1e6cca22467f5e0edc6d7257138528b861bd321d25c724035bebe843c1bad420e44d1a0a4bbfc852860e495f2e6c422a74d1bf1991121599261b0
 MISC metadata.xml 412 BLAKE2B df1700d6b3588a0305c22ff35a9fd6514d44f327859dcf2a0cefac0c466352474cdcafef69bb80ead17df8fd684ba5717fa438ce1f3e34e4075930eb6a056579 SHA512 557030859498156ea46ca6f5c8d51b6a046ff7b75566e5759354264f3694c4624501f0545cc036cbc7967fc8a6b95cd0735589bc7c493724f6cab1ffc772516c
diff --git a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild b/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
index b95c4798ac15..554808ca756f 100644
--- a/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
+++ b/media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 MY_P="${PN}-ttf-${PV}"
+
 DESCRIPTION="A community developed derivatives of IPA Fonts"
 HOMEPAGE="https://launchpad.net/takao-fonts"
 SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${MY_P}.tar.gz"
@@ -14,6 +15,8 @@ LICENSE="IPAfont"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}/${MY_P}"
 FONT_SUFFIX="ttf"
@@ -21,6 +24,3 @@ FONT_S="${S}"
 FONT_CONF=( "${FILESDIR}/66-${PN}.conf" )
 
 DOCS="ChangeLog README*"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
diff --git a/media-fonts/tengwar-fonts/Manifest b/media-fonts/tengwar-fonts/Manifest
index 81253cc1c328..565adfd780ef 100644
--- a/media-fonts/tengwar-fonts/Manifest
+++ b/media-fonts/tengwar-fonts/Manifest
@@ -3,5 +3,5 @@ DIST tcurs100.zip 13296 BLAKE2B d046f1bf70380b9ed3d8447e091e8f5f0b478302b9d5a9bc
 DIST tengn19d.zip 120028 BLAKE2B 3281d2902125ab2d369290a52f94868f5dece7ab5fe36fbaa896d4a0921b0356189b89a3f72e50cabff2c43f34405eb484034f42cb4d7d8511282b14d1ccb652 SHA512 4a0cfbe9718999b0556d4ccaa1f66dbcef09a0c1861d6c977264b0d840ed5afa3bee043fc49fe1811f92f6b46245d017035c11fdb5f222b34feacbb40e4ebf07
 DIST tengq19d.zip 185778 BLAKE2B 4090dbc00984a82f324d1806c214512e11310f4f1b5bc3f31bb63124af888f7a1b9e0254df2b59bf3d578632fca9419b9e6f17b9003025be46913c0df4f3407c SHA512 9e15591bcf9286ee2d1062e0202f2de9cd2ad088446624ff7a1a90c2e76249f90dbd6491aacaccb65491566d62a0d96d5bf6d6a379fb7b8ece5750be849298d4
 DIST tengs19d.zip 228717 BLAKE2B b53ad1926f1bbb0307d6df721acda796007d010308c5f01428ec87f684e9ed7274d1a1385a84f88fd7af89e02810bacced9e31416bd3bb6e21d76eda89fe823b SHA512 d8f809056b9c5930420ad610f50d9dc8336341246b79a33e6f32a8ed023f28275808bc25ee158f9528d7d345456eeb38f03fef3a741f823d538eb78e7cc000eb
-EBUILD tengwar-fonts-1.9d.ebuild 730 BLAKE2B a1a1ccdc195fa49b1fc34883d3d065c468bf819ef8eed05d67d3a668b330a299be052767923d76646c582140eb2435bef4a24429865449f1066b8e199aa3a715 SHA512 97c7cf2e06861d8b522a7b699ad5dfa2ef882e7832290a32049556144efd3699ebffc022fee2c829db33c1b568e367ce4d13fe73990263577f8e2195b0ae6e69
+EBUILD tengwar-fonts-1.9d.ebuild 715 BLAKE2B 45cb11145bebcaf7d5986033cb492cde5adc1ffc3469f4208da1832ebc5a93596038f60a2d330c46bf9ecfd3f11f54004e82a5ce90944a29617ba7192723447f SHA512 f152c70042fea76841844bdb90a860a0c1fa31f987357c1f48b4398e65c5d2a0768589b07ca7440ba8203919ee92fa13648e4f0675a0f75968e655a0105098a2
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
index 96b3e26dd736..733ed0051eeb 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,17 +12,16 @@ SRC_URI="
 	http://www.tengwar.art.pl/zip/tengs19d.zip
 	http://www.tengwar.art.pl/zip/tengn19d.zip
 	http://www.tengwar.art.pl/zip/parmaite12b.zip
-	http://www.tengwar.art.pl/zip/tcurs100.zip
-"
+	http://www.tengwar.art.pl/zip/tcurs100.zip"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="ttf TTF"
 DOCS="*.txt *.TXT *.rtf *.pdf"
+FONT_S="${S}"
+FONT_SUFFIX="ttf TTF"
diff --git a/media-fonts/texcm-ttf/Manifest b/media-fonts/texcm-ttf/Manifest
index 384c67776be2..722edd90f97d 100644
--- a/media-fonts/texcm-ttf/Manifest
+++ b/media-fonts/texcm-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST texcm-ttf-1.0.zip 75261 BLAKE2B d212682074cd379a90be1b585d64ef62248999dfa71fff4c5e858ce927893301ac651d0716b9f588f31b266ed9fbd03a8898b21d26a03abf3bfe2a78a64ef63d SHA512 5dfa793a632d427635f1f38f1b57974dec2d24cd6848565893b821489bf8c5ccad544d6aaddf05e85cc9e77bf800a8f1a1d8f40b57d9d004e47824f78371d34c
-EBUILD texcm-ttf-1.0.ebuild 542 BLAKE2B f5972106ed635fa70e14409e26592003ffc33971ff38dd865291025a5b5c4d19aa263d0040aa4e1801b0a9fb9cb0e0828e02b36c429ca60a34c5de2acdd41e48 SHA512 2a6e797cc9d557455673ec6931fbde6b3d2ef7069bf88bd63a22f3cb2632fcb3e5484ef8f8a2bf8bb6c40ff4e1ddffe40b210c73d38f605cfa2060d452d2e5a7
+EBUILD texcm-ttf-1.0.ebuild 517 BLAKE2B c192e8a108a4307fac51065659d850322cf6375a348a049b63f4d811678fe44b264e5353b3cfa8c5a40b8720cf7c3cb8de3b616ffeb6733fd175a9b369065da4 SHA512 26e1a44199c88875d383b589732705187d91ca95861d961a60b23f2612b7653920e7ad2df91f8f6a50abb6883adfe11587652a5197f59eac2929e97f82b560b8
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index 7cccd401498a..25456e9238d5 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -12,11 +12,10 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 LICENSE="bakoma"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}
-FONT_S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
+
+FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/tibetan-machine-font/Manifest b/media-fonts/tibetan-machine-font/Manifest
index 2454158a3390..3364d3508591 100644
--- a/media-fonts/tibetan-machine-font/Manifest
+++ b/media-fonts/tibetan-machine-font/Manifest
@@ -1,3 +1,3 @@
 DIST TibetanMachineUnicodeFont-1.901.zip 1664901 BLAKE2B 3cb1b6011363d26c44d10799feaeddaf687d41d836152a8d07ab583b91b8c6d78f37fb1cb6cabf3ad9b2c4cc3d8773ba24a325a0f31637667fc9fa68853b667f SHA512 1c21430951d74a2262323456f215cbd28625e0c4ad9d78141203e876fa14f4780838ca0bd7c655c96b36b3046f0856bcd447480443467bc2dc6cf662bc99aa19
-EBUILD tibetan-machine-font-1.901.ebuild 632 BLAKE2B 602b630d792696d6ed040e12f732d29287d013c037b95a564a9ae270edf139a79b6f0b23612a61688858431a09db257482bef75185a288b8ca6510bc19899319 SHA512 22ad53dcc96cecfd0215d9f4001727d5f431515758ea9625fa79b3d136f86ee7bad1b3d04ee8d962c037d5706f2e309a3aaf147cbae8324141da3f494deacb95
+EBUILD tibetan-machine-font-1.901.ebuild 611 BLAKE2B 3ec775726e09276f50c594b5ed974a54b669b0b0fcbf48dc8e7c34358c58efb5ff6a7a12311a9ce0489199213dfe16ec6e0f8a32ba76d2c48a88c4d7a0d6aa12 SHA512 e4dfab23977e137aecf5de71cf0c31ee299deec0ffddd465d9cfaad2e2d7858b0886c2c2591f4075472c19bb252ab68285ec74658e2d8f86173f19360c431b2f
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild b/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
index b8f91d34d57e..8ee15a0cc8ce 100644
--- a/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
+++ b/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -14,13 +14,11 @@ SRC_URI="mirror://gentoo/TibetanMachineUnicodeFont-${PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
 
 DOCS="ReadMe.txt"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/ttf-bitstream-vera/Manifest b/media-fonts/ttf-bitstream-vera/Manifest
index 95bc418391d8..1ffc5b5b25d3 100644
--- a/media-fonts/ttf-bitstream-vera/Manifest
+++ b/media-fonts/ttf-bitstream-vera/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-bitstream-vera-1.10.tar.bz2 264276 BLAKE2B 3715109947cb534094d5a5bde49e46ff342eb5ef7a6ee348ad391e1b480fdb97724bfdb539653516fe571536b732c7f0d1bf31ff48c443f8921b6517573ac703 SHA512 75b481553dbe27711ff779c13990397f76d59de819085e55092fb2ee86d2780232512487a5dce33b29e38edfcc73e34efbba07f7016e7ff4e59bb35301e7a392
-EBUILD ttf-bitstream-vera-1.10-r3.ebuild 483 BLAKE2B a0237ca85ffb8e9e606d81d76cf736677f660ea65251328678e97bba31184a470686fcc6b2b0faa33bd2ed6e1fda3e1cda50c08df5eaec1fccc277d6a9f540a8 SHA512 28c47427c96478e8b976d188e3998bd6c6a2737695f5eae9fc50b6ccd4252e43c23c6568bafa46538d390a392a7704ae6a104f8256ccc1a62688a9dfd3e7d23c
+EBUILD ttf-bitstream-vera-1.10-r3.ebuild 548 BLAKE2B e895fb33a74f6d0c4bf33202eadc252a1a454eef6cedf4ecf5785ca06361094f8876861b2cafcc2af5d4e40569eec2c12b40718fe259c9cb635593f01519a833 SHA512 4bb8a675ff0c84494e2300b6acc53e913740394664a46d87d1cc9f88837663508b661a87e8707189955a8053b8b9aa6e25a50a3f3ef62108c68e04dfbbb03f7a
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index 430ad8c7745e..c2987c66515b 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit gnome.org font
+inherit font
 
 DESCRIPTION="Bitstream Vera font family"
 HOMEPAGE="https://www.gnome.org/fonts/"
-LICENSE="BitstreamVera"
+SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2
 
+LICENSE="BitstreamVera"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-FONT_SUFFIX="ttf"
 
 DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts-extra/Manifest b/media-fonts/unfonts-extra/Manifest
index 3752da61381e..b2f007bc629c 100644
--- a/media-fonts/unfonts-extra/Manifest
+++ b/media-fonts/unfonts-extra/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-extra-1.0.2-080608-r1.tar.gz 11375538 BLAKE2B d6075e5ac0de7b6d72df02a6dd9bd5bc4df59b7cf6bdec48472cb69a719e2639e21873f7df68017063cba678bacb6d71136d78deca885759c854c7260e47cc26 SHA512 9ae5e8b933680b9422aa96cd0151359d228c1324b430e5f2bd1f7e3e0b26d81902b1b3ab99ef6d1fdd08b88c35d791af982618a9a56188af60b5e9679bd0316d
-EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 518 BLAKE2B 4fd0246ab96ec474b3f3e9a42222a4d666960e4bad3ac744c2b4adba6b61488adf9cff6fe55e29419151f32b77f571872cd1076f46aabe3c0f3e21333e04d212 SHA512 196889b38ef668ef22afd7b751465e128d67168e52a8653455186eebf435344ae6f3e94c8c2158fc1ccd1924fa9edb0fc978eb77db52c58a85f38963703d2b08
+EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 520 BLAKE2B 219fe5e518e193b2ecd2855f05de81b3432667a4fbfd93c09282c05bedf41de4679b83e77271761743c5fb381ae138993a63ab4d0ace18fc4232f4bba8cee9a0 SHA512 7f86bd80965e9d6bcecd0138729b55b90c32d9fd0653cf8da80896c6621a75bc866cad8e292014fb2666d31495280d618038d3086b9e983114af7a8dc93385e0
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
index 0b241ee71c4a..b4538534decc 100644
--- a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 MY_PN="un-fonts"
-MY_PV=${PV/_pre/-}
-S=${WORKDIR}/${MY_PN}
+MY_PV="${PV/_pre/-}"
 
 DESCRIPTION="Korean Un fonts extras collection"
 HOMEPAGE="http://kldp.net/projects/unfonts/"
 SRC_URI="mirror://gentoo/un-fonts-extra-${MY_PV}-r1.tar.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
-
-FONT_SUFFIX="ttf"
-FONT_S=${S}
-
 # Only installs fonts
 RESTRICT="strip binchecks"
+
+S="${WORKDIR}/${MY_PN}"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}"
diff --git a/media-fonts/unfonts/Manifest b/media-fonts/unfonts/Manifest
index 96e5ef8337ce..4480a1774e3f 100644
--- a/media-fonts/unfonts/Manifest
+++ b/media-fonts/unfonts/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-core-1.0.2-080608-r1.tar.gz 20117428 BLAKE2B 9b14a194e71aab389b7f72819238398df672fb457420db7dbea9214324b1286a5be44f7f8cdbd67dd9de93f77d350fd6ed2146d4471e0c761a1476d114f97024 SHA512 ab7c394931b5dcc6a7f6db89b69928ee769cffcca08e1266ecf4864bfea06d9dacc45c4d821786de8dad04b84b0de78a9db84bfcbb0ec506999dbb791570d941
-EBUILD unfonts-1.0.2_pre080608-r1.ebuild 509 BLAKE2B 0dd3bf5588e9a26f76fdde83244dd769ca549915f9c09dab9b8da2ecaa6dc6b503a563f47053e730fdb54b1cc1f4c6b6f7e37ac9439b5a173dbe9e3bf630a9a6 SHA512 a4e0ff757061f84e986f284c974283febb3c7f758dd6360d471bc34a1bf59f8dfd7d8084573c42979809bfceb6aa316c34f417593a560d0aff4bf5cad945613f
+EBUILD unfonts-1.0.2_pre080608-r1.ebuild 512 BLAKE2B d822d10ad15d111434d9a2cda179472fc89f17a8a6cde4e6a03be9382f6fceb0f01382bd55dae2ce62a9e1b29eb9170a71a7742d0bd922dc29767e36cf3739b3 SHA512 4370997866a518a62d8ce329b284838a58c0b2d2d5e0d28b943d6f65395dbef1962f1b756a850bdc706c6958b843e272cca05bb55d5657b694c00141892eab36
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index dc3701816864..965747716b03 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 MY_PN="un-fonts"
-MY_PV=${PV/_pre/-}
-S=${WORKDIR}/${MY_PN}
+MY_PV="${PV/_pre/-}"
 
 DESCRIPTION="Korean Un fonts collection"
 HOMEPAGE="http://kldp.net/projects/unfonts/"
@@ -17,9 +16,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
-
-FONT_SUFFIX="ttf"
-FONT_S=${S}
-
 # Only installs fonts
 RESTRICT="strip binchecks"
+
+S="${WORKDIR}/${MY_PN}"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}"
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index e23e30b21f26..b177dc01827a 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 BLAKE2B 9f4c026af2ee6b472454be43b4e1d11616770cb63841fe022762f18a7c71abc37e442102a3d54b880a6a34117442cf45b2d65133ef9cca564e55a26ac1179824 SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b
-EBUILD urw-fonts-2.4.9.ebuild 1968 BLAKE2B a8b19d1c757c78161b46310031130b7d86e7216281fe982a4ca3fefe21c170f3d7fe5625e940750f0bd1bf39a3adc175c087d6c2d3c1140b87740f3143900d24 SHA512 df0c278e6d21a1773912c4de4b60637c7207046a0ac94f71728a6a4ca12c414f0bf428414181968b75d25b5dda79dbac7171812983a49d99ef1fee32d196ff5c
+EBUILD urw-fonts-2.4.9.ebuild 1922 BLAKE2B 25b1eb125be5e361b1cb24225e03a83734fc0f48f55d29822a9e845fa07d7096777a2efc4290b8ac6f16721968e429793130c9e6a529e5b06fcee36176e46ebe SHA512 07b10607c403d0c7e843f35671f472c6930ea72d78dc4b5cffe9462abd8e3eac96416644487d124b043754c629377ad02cd260babda46ad5c84a424560ace446
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 3e98c730fec2..5fdb7bcdb458 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 # At some point URW++ released fonts under GPL license. After that they were took
 # and improved by Valek Filippov and this work was somehow related with AFPL...
@@ -23,31 +23,31 @@ EAPI=0
 # Tue Jan 8 23:00:00 2008 Than Ngo 2.4-2
 #  - update to 1.0.7pre44
 
-inherit eutils rpm font versionator
+inherit estack rpm font
 
-MY_PV=$(replace_version_separator 2 -)
+MY_PV=$(ver_rs 2 -)
 
 DESCRIPTION="free good quality fonts gpl'd by URW++"
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="${DEPEND}
+RDEPEND="
 	!media-fonts/gnu-gs-fonts-std
 	!media-fonts/gnu-gs-fonts-other"
 
-S=${WORKDIR}
-FONT_S=${S}
-FONT_SUFFIX="afm pfb pfm"
+S="${WORKDIR}"
+
 DOCS="ChangeLog README*"
+FONT_S="${S}"
+FONT_SUFFIX="afm pfb pfm"
 
 pkg_postinst() {
 	font_pkg_postinst
+
 	elog "If you upgraded from ${PN}-2.1-r2 some fonts will look a bit"
 	elog "different. Take a look at bug #208990 if interested."
 }
diff --git a/media-fonts/vc-fonts/Manifest b/media-fonts/vc-fonts/Manifest
index 77ed0a0d0da6..254c48011291 100644
--- a/media-fonts/vc-fonts/Manifest
+++ b/media-fonts/vc-fonts/Manifest
@@ -1,4 +1,4 @@
 DIST bleed3.bdf.gz 3351 BLAKE2B 6e308fae7f892d839856f440630fd925ccd798d633155230a5dc1e4f9d09c79bf653b9641765c3dd1fc9bf23e082b7e1dea46a01fb788537c4878f26cc92c176 SHA512 3efc415d4220640ac84c5b32da6094aee2d693e96a0d679d2b01f6e1d3543e21b5cc4e5494cdb552138aae6d83d12133b2e0d7d0f144dc516491f31a62c15e6c
 DIST vc-fonts-20020207.tar.bz2 18154 BLAKE2B 46e47d0a85a8d7bd229850de16c80479ddf612efc35255f8a068792f774b48c7ce4bed992a40ca41fe0db879bfbba95609c50a958f7f147925414320c65ac174 SHA512 f65bf2edbeeae8af244ab255685076cc09729a31a10653032df59fc9751416082fdd2817c6d0077954bedb7d1554ac633a1abc01f5808285c259700dca18d310
-EBUILD vc-fonts-20020207-r2.ebuild 650 BLAKE2B e5b569652dc336ef09ead5b51e636d34f6838be8d07442f99d712ed5dac494be6527187896cb65bbf93e1f5f151b74fe0ed1a9573bdd9b68fee6974f657dcdf5 SHA512 42c5762e4647ec6040f82ea30b46f6bdb4df91131292cc8ce3752b32a08e13d23526dbfde50feaa45c2b6087907c4468ec5f458942449fc08e7ef5e5faf75319
+EBUILD vc-fonts-20020207-r2.ebuild 628 BLAKE2B bb2c2ee4418760e0ad65e8994d2508f7b69d4c02a8e525a9d91aa84af9fcc01b28894733c56f613e7bfb8c45b8a0018b073bef0da15977493fcdd1b5cf017211 SHA512 6c91979407f464a7e62e62919a83a89dc16501d2d7c561dbfebecec197a077fce93334902cc1bc81b62529f0ea5239426f102510471cb5141992f601cb85b023
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
index 2ac1d4fc9943..8f608d887731 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font font-ebdftopcf
 
 DESCRIPTION="Vico bitmap Fonts"
-SRC_URI="http://vico.kleinplanet.de/files/${P}.tar.bz2
-		mirror://gentoo/bleed3.bdf.gz"
 HOMEPAGE="http://vico.kleinplanet.de/"
+SRC_URI="
+	http://vico.kleinplanet.de/files/${P}.tar.bz2
+	mirror://gentoo/bleed3.bdf.gz"
 
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 LICENSE="GPL-2"
-SLOT=0
-IUSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
+# Only installs fonts
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}/vc"
-FONT_S="${S}"
+
 FONT_PN="vc"
-FONTDIR="/usr/share/fonts/${FONT_PN}"
+FONT_S="${S}"
 FONT_SUFFIX="bdf pcf.gz"
+FONTDIR="/usr/share/fonts/${FONT_PN}"
 
-#Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
-	mv "${WORKDIR}"/bleed3.bdf "${S}"
-	rm bleed2.pcf.gz
+	mv ../bleed3.bdf . || die
+	rm bleed2.pcf.gz || die
 }
diff --git a/media-fonts/vdrsymbols-ttf/Manifest b/media-fonts/vdrsymbols-ttf/Manifest
index 06c4173b121f..22e121caf5fc 100644
--- a/media-fonts/vdrsymbols-ttf/Manifest
+++ b/media-fonts/vdrsymbols-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST vdrsymbols-ttf-20100612.tgz 662333 BLAKE2B 5de2f5294c44d2255c229be57bc86130207f07329910e3c53171eca0f81942bf9b5f514c21358365d410d6b80f4dad9745f9e1bccd0710b68621e717920345b3 SHA512 fe5d19fbe8db9eb214f1fa47d376ff6a1fb39a3c75246f326c48115cc83378c4a0566672358559a3a37b18edf1efd11d177741cbb8d15844e1b1c3854ea148e9
-EBUILD vdrsymbols-ttf-20100612.ebuild 569 BLAKE2B eb43f5b47864295d4cf09988f08be5e3b2ae618e57bb89a2e65dccb380dee34d5b1ecb4dee27d5288ece3d65cc9a988a133772b47e1af8a2affab03f54eff396 SHA512 cf00d2dffa68061136b043b2a61f03d0be7b0287e38851a24db5f23c1bb9d8aca9812dd88756a2a9fd4f724bf676331fdd733c7cafa628501fc3e92b9c81378a
+EBUILD vdrsymbols-ttf-20100612.ebuild 554 BLAKE2B 5a9bcbabc2211cf3595b740ac5dfcf234b0d4c0536a15aa7b7f988072783e959ebec91313998f2756d661314fb5dac79bd0013075b6f32d945cbb6d51c67d636 SHA512 e4c00f3deee2eafbc6402f8dd4bf77f72e15c794418cc393e709cea79baaa46961db4fe354ba7ac44d1a13c0e71168d3b78fc7f2e0bffc714a91b53550334408
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-fonts/vdrsymbols-ttf/vdrsymbols-ttf-20100612.ebuild b/media-fonts/vdrsymbols-ttf/vdrsymbols-ttf-20100612.ebuild
index 690c10ad98a4..8e0d113c166c 100644
--- a/media-fonts/vdrsymbols-ttf/vdrsymbols-ttf-20100612.ebuild
+++ b/media-fonts/vdrsymbols-ttf/vdrsymbols-ttf-20100612.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-S=${WORKDIR}/vdrsymbols
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Font that contains symbols needed for VDR"
-
 HOMEPAGE="http://andreas.vdr-developer.org/fonts/"
 SRC_URI="http://andreas.vdr-developer.org/fonts/download/${P}.tgz"
 
 LICENSE="BitstreamVera"
-
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
 
+S="${WORKDIR}/vdrsymbols"
+
+FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/vlgothic/Manifest b/media-fonts/vlgothic/Manifest
index 5977c841a55d..c557cf26dfa8 100644
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@@ -1,5 +1,3 @@
-DIST VLGothic-20110722.tar.bz2 4797664 BLAKE2B 03e3afb8914234843a22221419d106cbea48b3dfd2d74367932a30c405e08850e4405d8346e8e1dcf27b20f106c2a91acc143091d416c7e888a72baead49b550 SHA512 91693c293e0ef9db01532a08d3f5f96104e7eacda580213537dedb9d8d8318b8520aa292cb625629db1d6f2a4714e977f55d23721fbde746c10049c971183f1b
 DIST VLGothic-20141206.tar.bz2 4952134 BLAKE2B b650481bd63c71f996e584c60e612201d131c6f89a4b2d5843be30922ea05358add61cd6c5fe3205a1f81f5e79a049c284fa90092196d79f5c114d4a58205806 SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d
-EBUILD vlgothic-20110722.ebuild 525 BLAKE2B f1337b817cf1495036485fd3d51cfd06376b5223dca4fef38b030f250c86fd00c587164cd73987de7916c857b31458f78e8d09654da1f4b2dc03484546e87f42 SHA512 a28e5941a20a8dfb4619a32883d38034b414e694bbf547a4d996274361d341b69887a56905aa86d3ea5bb2ad65048b7f93baf29590974e863ec9c599ca665f6d
-EBUILD vlgothic-20141206.ebuild 546 BLAKE2B 7a3e52e33dc3974f209394999106c9712adc434bd26a3abc85c34a9cae6cd9a32c059f955d6560afa990e30882597701f23c5ef0441f9386f7b2662624c646ae SHA512 85e4e35e326f17fa099b3e5cd21d3442002ce9f3629d5bb60821a0b2ee472ec4f6831d51f5883dbc47de3f3a794ce4baff494a50ae1306e6f4b5b3479170c015
+EBUILD vlgothic-20141206.ebuild 529 BLAKE2B ac642e25ed951d067b88b29bf87e35c96d9538035256cd59e6b5a149529478148fa95bc05a8bf1a9abf38af942b39ef7770744bd6344f9d1e11110f716070fa5 SHA512 984d5bc29d0ae1596943aabf6f4de104cdb8a6688b9005efb6c89e7cf6dcf20c48aa415f659bd86feffb136a5c01180f96e157de0fe17d714509b67390c5cf60
 MISC metadata.xml 430 BLAKE2B 5a58b9c299fcb447e5d3895a54cf16bc8c3e2233c062a35e0d6dd3764bc7ba78fbad57a07ca5c02ddbe90a6a4967d268c7c9a44599f996a4c6674d765964bf9a SHA512 ef2fc0344b55c169ba468dcfbc72cddb81c68f63974add68430c39924ac5f7aa77c2130815496c68a025f7809fa0454aa0b44a0c50892d6db6fd64052adfbcc7
diff --git a/media-fonts/vlgothic/vlgothic-20110722.ebuild b/media-fonts/vlgothic/vlgothic-20110722.ebuild
deleted file mode 100644
index 15d9b83c3142..000000000000
--- a/media-fonts/vlgothic/vlgothic-20110722.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-DESCRIPTION="Japanese TrueType font from Vine Linux"
-HOMEPAGE="http://dicey.org/vlgothic/"
-SRC_URI="mirror://sourceforge.jp/vlgothic/52711/VLGothic-${PV}.tar.bz2"
-
-# M+ FONTS -> mplus-fonts
-# sazanami -> BSD-2
-LICENSE="vlgothic mplus-fonts BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/VLGothic"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="Changelog README*"
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index d41bfc2fafdd..25963876bb5a 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 MY_PN="VLGothic"
+
 DESCRIPTION="Japanese TrueType font from Vine Linux"
 HOMEPAGE="http://vlgothic.dicey.org/"
 SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
@@ -14,11 +15,10 @@ SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}"
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
 DOCS="Changelog README*"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index c048a97ce4aa..562c615f996f 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -1,3 +1,3 @@
 DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1ff594cb48d488cf800114a4fc4884c02e7e9400bcaa4d6b6d344283e7a2de885f9c95dd33beba690ae7d9 SHA512 f6d3283a06204491119ce3a3796dace7db640469192b9d44fd44471a185dc580a2ba8160f2983371b6160cb782adaabcd02872cfc2b1d05b10f3d6e73c60cded
-EBUILD vollkorn-2.1.ebuild 625 BLAKE2B 609df26730cf383ec0c6990cd124c04a0487be24bf649c0359433efd2e5075d42e66a5d2f81b2ba0e70e8f10ab28a892d5edb79376f371d7e9f10b1dd0dc5026 SHA512 022d9b318f47bd7c1e7655eb5b6de8d10641768d3a8e6a59d72a7062ccd565aca7d9140402ff92659be25d2893d768337478508dc3eb4283304b6d8324265e31
+EBUILD vollkorn-2.1.ebuild 612 BLAKE2B 5f1e48cfa584eae8b506e96c13fd417ca2cf542739ae13f9c1e80a36b860f8af1d7d4c0696fb4811e2c554b7ce623573010115387a0e0b583114d7d3a840c19f SHA512 5dddb89b5694bc8135ddcfe4f90648c1dc617d62fdcb8d24bf153eb8021af0952b6a266488e3e410d18ac05e81b3976568460e0da74ae80dad4d048609c8abca
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index 4be7e54553b6..582cd7cb3eea 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
@@ -13,14 +13,13 @@ LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
+
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 DOCS="Fontlog.txt"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-# Only installs fonts
-RESTRICT="strip binchecks"
diff --git a/media-fonts/webby-fonts/Manifest b/media-fonts/webby-fonts/Manifest
index ebe26208f531..3731368d43ee 100644
--- a/media-fonts/webby-fonts/Manifest
+++ b/media-fonts/webby-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST webby-fonts-1.tar.bz2 7915 BLAKE2B af914cf3132a808acfcba204072807dff5113b4d413c5609d0b68735651bd76f34f1e2fcb6d1afa19af0c9693604ed101db842cc3ed5c2b69d0c153729c68a7a SHA512 5ab4b1ced4937429cda2c4d18892a781048bed0fba74e158868df113712536620af2de244326af80d79526fd4299f7671a348c11831c2a4f231390e5f68759d4
-EBUILD webby-fonts-1.ebuild 404 BLAKE2B 081a395b4ab888e4dbfee48a634fca494882ad7c7177937c10a22db381fccf2ab25dc93bc80e111f31cb698baf667d5114f90170078ddd1459eaf837a7c5c79a SHA512 87288778e2c2ee134621fbe7e1927118a84c5ec711a6f970f7ebdf547f0164bb8ac72ab63a1855146a994b45e9e1be4b02dd4e1137e6e48895c98d77fda05108
+EBUILD webby-fonts-1.ebuild 406 BLAKE2B 6a291e16b34eb9c6473b1b8ebbf91f78a095b3f658473edb8ae338dbbd305bd5f00f809d7d3adf09f7976e74da45990691841fd97e5ee0691e1b2c5b6cd2d24d SHA512 3e755858caf9add8b5b777ad8f096092cc3fcb5edc4f8a2f6b24d8528052f16669b540f48d2e18a4b26c746a111820063df5d8dead2dff5737475405e20c99ab
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/webby-fonts/webby-fonts-1.ebuild b/media-fonts/webby-fonts/webby-fonts-1.ebuild
index 0f31c0b86196..5d65668506d5 100644
--- a/media-fonts/webby-fonts/webby-fonts-1.ebuild
+++ b/media-fonts/webby-fonts/webby-fonts-1.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="A small proportional bitmap font for use in webpages"
 HOMEPAGE="http://www.proggyfonts.com/"
 SRC_URI="http://dl.liveforge.org/fonts/${P}.tar.bz2"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 sparc x86"
+
 S="${WORKDIR}/${PN}"
-FONT_S=${S}
+
+FONT_S="${S}"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index 34c442bcf6e0..44e6596e6e85 100644
--- a/media-fonts/wqy-bitmapfont/Manifest
+++ b/media-fonts/wqy-bitmapfont/Manifest
@@ -1,3 +1,3 @@
 DIST wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz 4041184 BLAKE2B 63103b63f17a1e9018093f0346a0aa8bc89804b2fa919e797b0716343abec743ab87431c35c2ea26f63a2544820e316e1e5b9663bb7d49da327e7b0ddb9270a8 SHA512 190c726e79c43be90b5620b3f5892e8cb7a11085a06180dbadb2d56208f1813bf7b0909deb035957cec5bd6fdb5d5f049aaea46f8f26fbc9f5d43d835c1349e3
-EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 595 BLAKE2B 9d00e553f2100e500732f7f2f9c9c25577b79208656cb5809b9460ace0076934d41088fb54744b2d8d83738ae80099fa72cca6ba08ff25a718989fe916230e7c SHA512 fd50b0f0b5fa83c05b0e19f6d7dd83384623fa14e035e847e33c21264953896e472b51f03f7ecf1d4480227764dd22f3e042040daea2f202cfa68d7d48bd9e10
+EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 553 BLAKE2B bf0d5c7191be82f9018638987da15e6f54bf0a5af7fa11bdbc516affc05c4fb8e1f41b6469ba67c30b2f89053a4bfa8482a512525e35b3e75b81eba48ad8ede4 SHA512 92a9c9767767d71e0f4baa5bf34fa50895dd5218580fdc51bcff8e2158229398b43a5338a612d62a2f289d25cc53bfb347e5ea71c82609db3d2ca9905977a76f
 MISC metadata.xml 829 BLAKE2B a67c5dba6f711b919dd61abeb130847aec6d4a375c6f4647dbd80e3f57135784646fe65693a2632d7c1e0bccd5db6b5a1a9ee2609bd1537bd9fe12e1a5a50a0e SHA512 b5619a21e31cd3c3445825618cd500089b690e798db303f045c0e735e065bb66ee10d2f4d4ef88fb8f3ebc2914b5f730aa15c344369c0e32b2465305a7127092
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
index 031d261e8dd0..1d5e0c9f62fb 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 MY_PN="wqy-bitmapsong"
+
 DESCRIPTION="WenQuanYi Bitmap Song CJK font"
 HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home"
 SRC_URI="mirror://sourceforge/wqy/${MY_PN}-pcf-${PV/_rc/-RC}.tar.gz"
@@ -14,15 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86"
 IUSE=""
+# Only installs fonts
+RESTRICT="strip binchecks"
 
-DEPEND=""
-
-S=${WORKDIR}/${MY_PN}
-FONT_S=${S}
-FONT_CONF=( "85-wqy-bitmapsong.conf" )
+S="${WORKDIR}/${MY_PN}"
 
+FONT_S="${S}"
 FONT_SUFFIX="pcf"
-DOCS="AUTHORS ChangeLog README"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
+FONT_CONF=( "85-wqy-bitmapsong.conf" )
diff --git a/media-fonts/wqy-microhei/Manifest b/media-fonts/wqy-microhei/Manifest
index 6e425a911a20..614dbc1aaef7 100644
--- a/media-fonts/wqy-microhei/Manifest
+++ b/media-fonts/wqy-microhei/Manifest
@@ -1,5 +1,4 @@
 DIST wqy-microhei-0.2.0-beta.tar.gz 2418536 BLAKE2B 62a838151dd319f73d031e3d7d40f3311524c7bd4387a3b99959611338b33fa4494ee3f7e042831e7a33cd93b8bf0b557369d641a907631d5c8e23415e518cda SHA512 c1e09c83f6427f637b3c93c7f89e427bde7fb22cedcfbb806fb036f13a553551f28d985516c7ab4c2602b4159502de36b52e6cc9b41c9b6d6e36778a6de74037
 DIST wqy-microhei.ttc.xd3 1896 BLAKE2B 257aebe2503390cb63ddb92ef4951ff84eadd45eb80a3567b489a598f0d399e4fcf73c0de03a9b6324e321439defcc3af329406a6c7bf146b988a1eaa10b6dcd SHA512 e18bbbb98e80c231dc6a4211b57b44f5025de17887e7e09efad0f5125c0b93ca5c6098c2064d65087b0c901b0563b06258c87f801c4348422eb6c738e55ddbd9
-EBUILD wqy-microhei-0.2.0_beta-r1.ebuild 741 BLAKE2B 8233d2949d3efd425e860024b960a15d927b603e21c0be424f4d322c2f1cba5d3ad25fa585835fc21d70e2438b3fd9cb00ee4dddf1d571752306139951f0a7ce SHA512 e22ba7f68a46d486d4265fa24ecd37b326cbd832c184f0bb97e361f28f98cae5b9dedfd0cbae8e902fd3ccd332bae4145506dd114b0425c11ff9d2d4bdaa7b96
-EBUILD wqy-microhei-0.2.0_beta.ebuild 521 BLAKE2B 79cf33289dd49d8af270621e9413ddaba553ea3412e250469bf0916ee324030e7de3c6186d97e38100d42259c5b12d6b33ee32fe35d9598ad9694a370e58ce3b SHA512 6c3653c9db77578833a6b216fa7b3230a649997beacdc3435cb6bda9068d5cb767cca46d2c4ba7967635c963f4bb9d85579a48476e05c4f532fcf69aba9f3101
+EBUILD wqy-microhei-0.2.0_beta-r1.ebuild 736 BLAKE2B 11344bcb777539c8fee64e4fb692d9aee851c7c067d86d6faaebf89827fdee7d4eca91547444408548ef80bfe44330dc7443c85142b5352509880b9adeaf1a6d SHA512 95baae5b1c504823b7ae68eec896cfe6e62921007dfea2b564eecf9935b591482fdf8e70b415a6fdd02c75afd601c10f40a3874dbedc1d0ab40655294941e84c
 MISC metadata.xml 406 BLAKE2B daba1ddbd3bbbb206a673a0dc6543fd4310d9fa99eb68fa6b63c50d54bbc4ce3f5081fd2d573ac115fe2b1b1700b0d52db6f6e350fc6a643d33e399c175f77fe SHA512 20f61183a0d947662483e8f02f2caa2f685d62983b9946726a02d1095230958879f0aa229039989d294ac2f8f518f8061724a3ff551cd1deff15e92d4179d2cf
diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild b/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
index e406e42ba55f..f7b7ec08b58c 100644
--- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
+++ b/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 # Only installs fonts
diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta.ebuild b/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta.ebuild
deleted file mode 100644
index 6125a5ea5196..000000000000
--- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0_beta.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-MY_P="${P/_/-}"
-DESCRIPTION="A droid derived Sans-Serif style CJK font"
-HOMEPAGE="http://wqy.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-
-FONT_SUFFIX="ttc"
-DOCS="AUTHORS.txt ChangeLog.txt README.txt"
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 4a5375c695f1..db946fe56c47 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,5 +1,4 @@
 AUX gzip.patch 472 BLAKE2B 3804de127898501b76be41a8bf016bc1eb224b19a1d56ee1dbe6345352de5f6634692d2c45c1747bf38bb9a90fdaa42cb359e711b7591398576e51e624940099 SHA512 b3ba5684c9d60435032f69e22f74feda6d4a49689db9ef28acd5ca8fbc8190c344e8cb7991ea707f21317f55dd2edaaf12b6e0bb14d70d204d252a63b184a280
 DIST jmk-x11-fonts-3.0.tar.gz 624357 BLAKE2B 5513e46116cb7ac63e69d4d0fe03f627e437a11ea378c4213b1cbf13035a5e1c14dc4c1bf230e6490829b4cafc2ba3dd1b733f8549d28aeaa1e7389e527e8b85 SHA512 7a99689be59eaf50742932ce27c8b41a99d10076adf9c2990e11745a873eec610257d50e844f8380658d340cf821724d459dc9b6b189666180596f2bf255957f
-EBUILD x11fonts-jmk-3.0-r1.ebuild 756 BLAKE2B af8c310da7119c996013917e4d7c82cecc2ae53ce0faa99587ad196a87855a51fc45b6c9c2ca1fabf6267e93498a9f73171989fe027416d1ff224c2ef21f5012 SHA512 d847b0f2fd8b3950c541d226452d1183ea6a98537eca1d90f3a96578136d83bae5de350a3bd52b9fc2d81ab63c5bea867fc1d90316234d21465ab240508d1dbc
-EBUILD x11fonts-jmk-3.0-r3.ebuild 745 BLAKE2B 4870507346612029d634acf11c8eecc199abbc03c0c6499ff7ef7a21fcb358dc5c918c7a66c5a14e28c595a51d76ccab54c211278f78c5b9155171dc659009e2 SHA512 4af811442061cf18d724951059b88c458a8a8eb3d7ffdafe8776f94f30a5f995ef385539273555d3b084332b201d3b489f4406481926c90e6f8e5984576834f9
+EBUILD x11fonts-jmk-3.0-r3.ebuild 666 BLAKE2B f7762171821b04761f7db7dcc56ae36d6c3da84e4304354a4be8d9056fe379229c4b8ca9b8c22e0c16a959a5de418641c44f11c9e2e376bf30a348d7678b32c0 SHA512 607dbedf33fa5b8b0d31462a766b5dc160e7e6b56124d45ef39683525e4acb96a41b329d1c6a081068106d56134e63e42b8bea65874c51e935f14949f83cd454
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
deleted file mode 100644
index 1f561ed25693..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="This package contains character-cell fonts for use with X"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND="x11-misc/imake
-	x11-apps/mkfontdir
-	x11-apps/bdftopcf"
-RDEPEND=""
-
-FONTPATH="/usr/share/fonts/jmk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gzip.patch
-}
-
-src_compile() {
-	xmkmf || die
-	emake || die
-}
-
-src_install() {
-	make install INSTALL_DIR="${D}${FONTPATH}" || die
-	dodoc README NEWS
-}
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index bbb83bf52277..5b4c856ce68c 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -1,38 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-FONT_PN=jmk
+EAPI=7
 
-inherit font
+MY_P="jmk-x11-fonts-${PV}"
 
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="This package contains character-cell fonts for use with X"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
+SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
-DEPEND="x11-misc/imake
-	x11-apps/mkfontdir
+BDEPEND="
+	x11-misc/imake
+	>=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
-RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eapply "${FILESDIR}"/gzip.patch
-}
+PATCHES=( "${FILESDIR}"/gzip.patch )
+
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	xmkmf || die
-	emake || die
+	default
 }
 
 src_install() {
-	make install INSTALL_DIR="${D}${FONTDIR}" || die
-	dodoc README NEWS
+	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
+	einstalldocs
 }
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index d4b7f047616f..b82ed53fbb0c 100644
--- a/media-fonts/zh-kcfonts/Manifest
+++ b/media-fonts/zh-kcfonts/Manifest
@@ -1,6 +1,6 @@
 AUX kcfonts-1.05-code-fixups.patch 4629 BLAKE2B 26135dad3608b8161d39491576c42ef8140403533f05b2334825cf4f09f75d8a3a5be24fe4257014020eca7303a395f09877eaa851d966c4972bf3b6e5ac4e92 SHA512 d6c5f3bc5dc3f876bfdb2cf43d6d26cafc6f1c266674f96c40cd50aa5406669ce3059f7ec9a7edda123d072a165fffdf7e19e7043c149ce4e68274916cb52d39
-AUX kcfonts-1.05-parallel-make.patch 362 BLAKE2B 7566d4588ff2daf66895a7a78a271c1f02fe3fe1547321681fd46bf7d7bc0a4941b019f9d2d0e05c60bd4da3a5fed44eb0f6e369d6361884d61beb6594968862 SHA512 16adfcdc4a570dad0fc2abf9cb36fbf40309a0ceb1d9c3938169ba965603c9fdf89516b82c2645fef3ff39e2fd0acae19c59c36ba4ddbaa8aaa044f9f9f941e6
-DIST kcfonts-1.05-freebsd-aa_ad.patch.gz 4825 BLAKE2B 681e23308fe202d6f3276ffc0a61186d623bafb95a7af66949ee2df52ac76632dfd65247b98e0f6ee639f19e098fd86a205e2b96a705982697db7f68a3bedfd7 SHA512 31146c530e5f3845b184029e22c71b7ee8fa1fd73e0fdf3e6cf90500129e70a58738d75926c97c71467571899f8a1f2f71df5a15fb68a503a5f06a4354ea42f6
+AUX kcfonts-1.05-parallel-make.patch 289 BLAKE2B 8f23ea32c830425ecaa45b01713d2c85e073a66f4fd0edd9c3ee48d31119da012428031e5e978266c0f4a16d75a9b161bea282b6af8a2f4bb8347bfbe38e2710 SHA512 8e00add5e6ace48ec8de7e6960f50f634317c7e9f0b57c723b9b6ec8b8f0e8d92f81b5339302284d839a3b8af79880e0de0208473fcc3e4eab500cb47aa72964
 DIST kcfonts-1.05.tar.gz 903701 BLAKE2B 344017187fb5ff1a13cb9e05e84a56d38a7b7d14865ec471bf9c36c383f1681b1944346af2d3b1f67ba340b8101a968ef527f0a27ee7e5ac3837f1c67da33325 SHA512 a8b94e8f8095a8578ff340637bf4a197db56948d0d7ecda0d4f17da51bafc09080761f32894f88a54c88945f72b10a11dcb04e5841c19c4eb6852e263fb64209
-EBUILD zh-kcfonts-1.05-r3.ebuild 1014 BLAKE2B fcde38e08c9f24d312950251404d85af61a708a93cf646911fdea79692fd89d336acb5a538575490cab2f0f610014fbfdea47497fd3a04b3b97a79620fbf66d1 SHA512 b1b9702a16f2e1fde964b369fed3befe53389969d16589ba87c53525c8ff7b6277155a8d0a9d9e263577eb4b228996feec33fe456e44d0529415acd7e2751620
+DIST zh-kcfonts-1.05-freebsd-aa_ad.patch.gz 4749 BLAKE2B 3d488977e76ae71587ced990816a85173b5a3196df3803ba517d99b8ad4244d59355a0b9c34d683c7cdf8b5660a0f411c9d544379caf0ddca1f8bef35eb7028b SHA512 2881c31ffc5b8fbc2e27edd6f139436da89bd3db3a654bbcb4b8f037db0388bf592b83014b750057264694040c8f2c3d28718f46ad3cf1fe5e13256df7666fae
+EBUILD zh-kcfonts-1.05-r3.ebuild 949 BLAKE2B 2ff20122b137b1a78fbb5ee2bbc8b1cdd6a0e787eea8fee2790ddaa016874d482a403de0ebdbb931c345b069553c333286bd53f3f44569e7565ccf40397481b1 SHA512 c923fe22b1f017d9e46350808e97ad5adce6dd544b4919603c34d5a0c0bfe19ef481521881b87631e500b34834c72f2bd5c73edf205aa2e0037e6a2ad065cbfe
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch b/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
index 93fc8ed9608e..46d552b3a63e 100644
--- a/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
+++ b/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-01-01 10:45:14.000000000 +0900
-+++ Makefile	2009-01-01 10:45:32.000000000 +0900
+--- a/Makefile
++++ b/Makefile
 @@ -31,7 +31,7 @@
  	$(CC) $(CFLAGS) tran.o kc24f.o -o $@
  kc15f:		tran.o kc15f.o
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index fcc568527812..c08fdae5871d 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-S="${WORKDIR}"
-inherit eutils font toolchain-funcs
+inherit font toolchain-funcs
+
+MY_P="${P#zh-}"
 
-MY_P="kcfonts-${PV}"
 DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
-SRC_URI="ftp://freebsd.sinica.edu.tw/pub/distfiles/${MY_P}.tar.gz
-		ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
-		mirror://gentoo/${MY_P}-freebsd-aa_ad.patch.gz"
-HOMEPAGE="http://freebsd.sinica.edu.tw/"
 # no real homepage exists, but this was written by Taiwanese FreeBSD devs
+HOMEPAGE="http://freebsd.sinica.edu.tw/"
+SRC_URI="
+	ftp://freebsd.sinica.edu.tw/pub/distfiles/${MY_P}.tar.gz
+	ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-freebsd-aa_ad.patch.gz"
 
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-DEPEND="x11-apps/bdftopcf"
-RDEPEND=""
+BDEPEND="x11-apps/bdftopcf"
 
-FONT_SUFFIX="pcf.gz"
-DOCS="00README Xdefaults.*"
+S="${WORKDIR}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${WORKDIR}"/${P}-freebsd-aa_ad.patch
+	"${FILESDIR}"/${MY_P}-code-fixups.patch
+	"${FILESDIR}"/${MY_P}-parallel-make.patch
+)
 
-	epatch "${WORKDIR}/${MY_P}-freebsd-aa_ad.patch"
-	epatch "${FILESDIR}/${MY_P}-code-fixups.patch"
-	epatch "${FILESDIR}/${MY_P}-parallel-make.patch"
-}
+FONT_SUFFIX="pcf.gz"
+DOCS="00README Xdefaults.*"
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-fonts
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)