gentoo resync : 27.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
commit: 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree: 4d26462d027b14926335894749d2e01d982234d0 /media-fonts
parent: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
246 files changed, 1285 insertions, 1853 deletions
diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
index a840cf3146d2..dd9c650af005 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A sanserif typeface in the style of xkcd"
+DESCRIPTION="Sans-serif typeface in the style of xkcd"
 HOMEPAGE="http://antiyawn.com/uploads/humorsans.html"
 SRC_URI="http://www.antiyawn.com/uploads/${P}.ttf"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}"
-
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 src_unpack() {
-	cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}" || die
+	cp "${DISTDIR}/${A}" "${S}/${PN}.${FONT_SUFFIX}" || die
 }
diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index daef5ad21fda..dbe66ecb7f28 100644
--- a/media-fonts/Humor-Sans/Manifest
+++ b/media-fonts/Humor-Sans/Manifest
@@ -1,3 +1,3 @@
 DIST Humor-Sans-1.0.ttf 25832 BLAKE2B 4190361e42ae30a5870ba79a1125e16569c6eeb2ad6fc739d18068c36d39dfb33d46ee0d0944af6f7b61fdbd7cffb992ef6e69bcc736d322897b612305fa9bcf SHA512 f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
-EBUILD Humor-Sans-1.0-r1.ebuild 470 BLAKE2B 1cb8726f6b05f42ddd634386e6aac1b934de3e8894c0fb30dc07b05d4d4f628988be902f2e4595fcd4bc4cbde80adcec5ec4836eb13bbd6a300957d1cf403de3 SHA512 f399b467438de103cb65cae033172d1ac861104550c1849a3a78773592ebe4eeb8a6f54b98778cda4dbadaca194c94514c22d192c4e3c0e7022c7d5220a65746
+EBUILD Humor-Sans-1.0-r1.ebuild 447 BLAKE2B fbca4c26c6c08e86ce53278f90dfa76393e7901dcb1bb0cf2d21b41439b431d75804902e9b7a4aae0c1595347f2dc72176e3506d9e61b99d74aef170628dda24 SHA512 da02c706f946fae2bc64e1f942821a1854e72f1030c836f9e0e3ca4e5f46409617cdbe4441a501305b6a8fef9a0a299998e1207415920484ba07e2728be9c2ca
 MISC metadata.xml 399 BLAKE2B 18589286f55caa559d9c006582a0a4ffb6d167f2c993bd33cf9688ac594ba284f93992f21b26a7f2e4b128c05a59743a28fc3e4c89e6d7ad17e56ff9c8aa8416 SHA512 d21f88d0778e3740b65408dc1b451c215a56dd05501751ed5a5767883a8942ddf494cf9182a88d4c8143d88fa5e84af21b40a9b018a42659a004eea91f7239c1
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 69bd5499232c..feab4dbd9734 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/ahem/Manifest b/media-fonts/ahem/Manifest
index 05791baedf18..fbc80b583b92 100644
--- a/media-fonts/ahem/Manifest
+++ b/media-fonts/ahem/Manifest
@@ -1,3 +1,3 @@
 DIST ahem-1.0.tar.gz 35539 BLAKE2B e08e9847aadbf7a46fc6e19dd7194d256f24d17f06002ad2c152827f2c2ee82ee40c0f8d5829477e36ebfdbd7f435ff92aa545c4870e0cb91e47a159120a96ad SHA512 626e37c3a6c8b78443e6ed4be565f1f568f3542c8a6e7587e584da21e007875a69b8a84a977f8699eb39c5755661942a7543799b789ddc795eea806195f3fafc
-EBUILD ahem-1.0.ebuild 448 BLAKE2B 6b4a8b73436803a7289529ecc64c3cf552b4681a792601ab583f6b62a99bad84df217bea6c68651e13c424abe093f058b3712e876461747917280b56f5a8af2f SHA512 dbfbb9ba3975ac563d2396dbcde58857bb6da9b6fcaf97914e6be263eec3927026858c85952d94dda17ea2a08937c82a95729c4baf44308cd52110ac1b806add
+EBUILD ahem-1.0.ebuild 410 BLAKE2B 7e92d1db9f8f9fbc4be1f11f0c4aa0fa865564dade0697ab9a450259b8ef481b80a3dfc5d0677c3a6bc192be93e2d2f9f85fb4d0bf0c9323f7a681f8c67100fa SHA512 5d870eb76d6be678e72102972d3de9409e3509189585ea225e020fe049502f5533aa0cc83b1ae249932230e60a90205e896e65521dcf2fd9d3432e6927dd02d5
 MISC metadata.xml 242 BLAKE2B 852fa1bdbece95256f2a92d7a3fd3141d8a0b9f39387e14697f4e97fa3a8a0123784635977e600941e4e17f46f318b3b7b52c5ac0d85f9f1640e5bd129706657 SHA512 3cdeca97afe277da128de9af34c80c6049587a09362632c78d64ab1ec52e31819000ce1d93d1b704c74028ec93a78500c203196973eaf1264f30e7e7d0093a92
diff --git a/media-fonts/ahem/ahem-1.0.ebuild b/media-fonts/ahem/ahem-1.0.ebuild
index 096fbd9cf5bf..a896e7c135b9 100644
--- a/media-fonts/ahem/ahem-1.0.ebuild
+++ b/media-fonts/ahem/ahem-1.0.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A font developed to help test writers develop predictable tests"
+DESCRIPTION="Font to help test writers develop predictable tests"
 HOMEPAGE="https://github.com/Kozea/Ahem"
 SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/a/A}"
 
 LICENSE="CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-
-S="${WORKDIR}/${P/a/A}"
-FONT_S=${S}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/alee-fonts/Manifest b/media-fonts/alee-fonts/Manifest
index 1f7bddf086a2..148113750151 100644
--- a/media-fonts/alee-fonts/Manifest
+++ b/media-fonts/alee-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-alee_13.tar.gz 702378 BLAKE2B 3a99b6832dc0216bd86065257b30bafff281aacbdc48d16bed843d134d2176b5d96b9a9aa242caaafe4581a90627cfd56dce6815e701148e85b6f89f43fb12e7 SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c
-EBUILD alee-fonts-13-r1.ebuild 510 BLAKE2B 2e46f9111166a0e9f89a916423549aaf896386fbeb157d153301afcb3054f6cb6d78437f62bec49437fd6a560f2641ad688f664d0e7cc49272d41cf4287d1a1b SHA512 a0521db59ca8f665f1af10b842defb5275c97663761b88aae20a9ae58c60b550112159ea24ce10b171368facbd7cf589c7c25c78275c7ccce866f399ea27b9f6
+EBUILD alee-fonts-13-r1.ebuild 490 BLAKE2B 2ba4084fb7871222c48feca4d816c58ea2966667a285c6cc402af27167e31acd41d112530ca50b2e87162aa95dac89b10f08db126be4c8ebe925e96cbc282187 SHA512 543fd6ec4666cf71f676eac346c88838a977803028f51bcf748cfa0dc26fee4fff9ebb5654672ff899060d4b94d461104081eeedbe9c50fcb3251a31f3cef9bd
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 09e726335aac..fa62324e3d64 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A Lee's Hangul truetype fonts"
+DESCRIPTION="Lee's Hangul truetype fonts"
 HOMEPAGE="https://screenshots.debian.net/package/ttf-alee"
 SRC_URI="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
+S="${WORKDIR}/ttf-alee-${PV}"
 
 LICENSE="Artistic"
 SLOT="0"
@@ -15,6 +16,3 @@ KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-li
 IUSE=""
 
 FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/ttf-alee-${PV}"
-
-S=${FONT_S}
diff --git a/media-fonts/alegreya-sans/Manifest b/media-fonts/alegreya-sans/Manifest
index 0f13cb8c0928..a283f8c02f85 100644
--- a/media-fonts/alegreya-sans/Manifest
+++ b/media-fonts/alegreya-sans/Manifest
@@ -1,3 +1,3 @@
 DIST alegreya-sans-2.008.tar.gz 16351420 BLAKE2B 163593cda1419bbc24503c9c892349c941a7de9e85e6f26614d54092098d0343d388018cd92d940e55ab073347ad38dc961b03bc2982ea6b96ea5415a437018a SHA512 8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4
-EBUILD alegreya-sans-2.008.ebuild 571 BLAKE2B 55ae568a9575b4047873623414a8dc9b8c52e2ad0a843bed9237741868ab44058ea1b1d46dc910731d15d4de1a3efd52e07888d35b0cfc41c5de5671e503ef49 SHA512 c9108d16a497bbe3f0ae0bb652f79aa62a9eb3da94905471306956b1860b99f579cf7a2bf8016869dbe776bc0a528b8473a4a0027150dd113ea22db0d7adbc1b
+EBUILD alegreya-sans-2.008.ebuild 572 BLAKE2B 1cb53ec998ee9deb666baa6b7ae6da366dae9eab550ba063099ee5dab1e761e928cf71e6fc9091e736e9c7deb521282bb6c05b1ab18fab1c3609842ce26b2de6 SHA512 9d6884410922c8a20df9124ec6467654dc3e66347eb80ec6c52a21c738ce7cbd97dc26c7aa3e6e024f4ecef9121ad8c2c6a982ad27725fb0ac0c2def457be523
 MISC metadata.xml 334 BLAKE2B 19a664636579edd6ca0a99d72eec9c0bdd8c69148ef85d9bdb6fe46269e6aaf98199f7a45d3f88dfd141ec8ebcea2d95509ac792cf605f62cc7ccf6b593f2629 SHA512 997159235cfe76fa19578a74a7c2f3a636476632ccf856fc7d6f494bc3a618b90f42fb76ccfa6cf6b36d6419f9b32b35efccab843748f3400d1e91b9b472532c
diff --git a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
index 8693611571b8..fb4ddf45dcb3 100644
--- a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
+++ b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="Alegreya-Sans"
 inherit font
 
-DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
+DESCRIPTION="Humanist sans-serif typeface with a calligraphic, dynamic feeling"
 HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-sans-ht"
 SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
+DOCS=( CONTRIBUTORS.txt README.md )
+
 FONT_S="${S}/fonts/ttf"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/alegreya-serif/Manifest b/media-fonts/alegreya-serif/Manifest
index 9451015a1300..0228042d4163 100644
--- a/media-fonts/alegreya-serif/Manifest
+++ b/media-fonts/alegreya-serif/Manifest
@@ -1,5 +1,3 @@
-DIST alegreya-serif-2.007.tar.gz 14729050 BLAKE2B ccf4dd3827e6b3c32b1009de273723a2bd63aee992710676b20ef3a0dbb17a5608046d7d5955d5d38a6a11a4268ffb0985f5fb8044239de5a42ab5b5fd06efb3 SHA512 7220aaf9f9861ed4f3104aeb16f33267b5cc2139b91ddafbd7ff86f94faeb37bca558c642a03108094d0a60f9db77167c19996fdaeeca3fcac0346205ba4e785
 DIST alegreya-serif-2.008.tar.gz 14982944 BLAKE2B 1a8261d987bb7f2c24b5edf1b5e220909e8596634df03c86646742bca6445802b053f850430e98581d2ef2b02b68bf9a1a2d9b7f54dcf28775232c7147d9223d SHA512 ca4b9e7ccdd1568e841bb7bda60d184776ca36266567eef1fdf9ae44f7c688474bd91df93a8a3f59c45e22c02fc7e231bd6bfd0b5763932df8b0f933cdb127e8
-EBUILD alegreya-serif-2.007.ebuild 512 BLAKE2B 9cfb28bccbf7791cc9bf40d0ed363ab262ae33dfa788a48e7433b2c30efa3b2e26684b981e34b2affcfc40d7d24fc0c11bb59a94c412642ce5625bfe5b6b49d7 SHA512 85bde2775e6fda70824cdbcc05229ae50d2c2781b6ab583fd1007a960a4e6e4e1828440121b98ec2db5709dd0abf69c42b9e100366b83d9aac6351284a591926
-EBUILD alegreya-serif-2.008.ebuild 512 BLAKE2B eddfd2664d0a774d24fcb56b52a2f8dab75e6867d6c1f94a3ab3e1c8b3da4d5dad4c5663943817b1ae5ac5627b82908cf2659ae96edbc39eef9414d3e860324e SHA512 ac08685a0026ef6ddd2fec02e6a0c2f204573fe6343da199e0a58f14fd9bdd79d38dbba93c1f89d0d03d9f22fa88455d9697fee8471ff844f060367f22c716cd
+EBUILD alegreya-serif-2.008.ebuild 515 BLAKE2B af0de6d3ed3bfa8e7ca7d3a9292c642d18ec25e87c1d44042bd41d8aae0fec2d8f739f65a82711062f7730546e00a053717704ebc38aa947be948294cd6b1324 SHA512 7e6241e14297071d5432b4be7d47c395140cb3e0d364bb12880897636c6bf5e4d345c9549d0e23c7aaad2dee1e697a23d4571b749f2b90dcf8e2859ec6eafdaa
 MISC metadata.xml 334 BLAKE2B 19a664636579edd6ca0a99d72eec9c0bdd8c69148ef85d9bdb6fe46269e6aaf98199f7a45d3f88dfd141ec8ebcea2d95509ac792cf605f62cc7ccf6b593f2629 SHA512 997159235cfe76fa19578a74a7c2f3a636476632ccf856fc7d6f494bc3a618b90f42fb76ccfa6cf6b36d6419f9b32b35efccab843748f3400d1e91b9b472532c
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
deleted file mode 100644
index 84a71f8e333f..000000000000
--- a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Alegreya"
-inherit font
-
-DESCRIPTION="Alegreya serif type family"
-HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
-SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}/fonts/otf"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
index 22d4109a1b68..248fe18c98c5 100644
--- a/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
+++ b/media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="Alegreya"
 inherit font
@@ -9,13 +9,14 @@ inherit font
 DESCRIPTION="Alegreya serif type family"
 HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
 SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DOCS="CONTRIBUTORS.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
+DOCS=( CONTRIBUTORS.txt README.md )
+
 FONT_S="${S}/fonts/otf"
 FONT_SUFFIX="otf"
diff --git a/media-fonts/andika/Manifest b/media-fonts/andika/Manifest
index af3e6fa7ead3..77a52250528c 100644
--- a/media-fonts/andika/Manifest
+++ b/media-fonts/andika/Manifest
@@ -1,3 +1,3 @@
 DIST andika-5.000.zip 1246559 BLAKE2B 38313970d5cb3b9178a440b97390fb0885e71698f1e1e10a3739d80b8e2e3c15519830f9a5e809bd04951717c99abc543a29534630da321998bc47c78f6d83be SHA512 e1cf195a523aa70b464889bdcee0c9606c82eef0da658861329c4c142ae25f14f1e3feea1118219fe7e9b5c13965c4ed09ac7507d746a1f2c77e402957c7d3d5
-EBUILD andika-5.000.ebuild 556 BLAKE2B b0229bbb66001b5a6e88e6874740b752f7ee345300f5b7af879d1078423bd048b47ca4eec4f4d01f9acc5a9806aaf9764c7318c6b2ea37f62046290c24ce1f25 SHA512 67002b194cf2edbf50374cc491fc7da0e21ba466feae8128bad0865df3db5f89d382c45a6016ba99beb91fdbcc50a96b2a31fa4d1b5e7e132e690e092befdf6b
+EBUILD andika-5.000.ebuild 518 BLAKE2B 0c9104be9d7257b8fd448bf682daf91864afc2eda92fb29efebdeac9f3497c63db24a7c3659be9f8eb3eddfde1cad624d7ce85f0804a15f0cb8f5e9120a30a7c SHA512 146b0cd63d6e0f7da6eead936d77ac127f4b918c31967d561941f06231c355dafe604f17bdcd19e07a99fc415aad2b1c1c7c038bcd73542f6ce553dcd98e9a71
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/andika/andika-5.000.ebuild b/media-fonts/andika/andika-5.000.ebuild
index 36050f219a08..365b6af119af 100644
--- a/media-fonts/andika/andika-5.000.ebuild
+++ b/media-fonts/andika/andika-5.000.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Sans-serif font designed for literacy use"
-HOMEPAGE="http://scripts.sil.org/Andika"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Andika-${PV}.zip&filename=Andika-${PV}.zip -> ${P}.zip"
+HOMEPAGE="https://software.sil.org/andika/"
+SRC_URI="https://software.sil.org/downloads/r/${PN}/${P^}.zip -> ${P}.zip"
+S="${WORKDIR}/${P^}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/Andika-${PV}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="documentation/* OFL-FAQ.txt"
+
+DOCS=( documentation/{Andika-features.{odt,pdf},DOCUMENTATION.txt} OFL-FAQ.txt )
diff --git a/media-fonts/anonymous-pro/Manifest b/media-fonts/anonymous-pro/Manifest
index 79f9891f984b..58b7b211ff2a 100644
--- a/media-fonts/anonymous-pro/Manifest
+++ b/media-fonts/anonymous-pro/Manifest
@@ -1,3 +1,3 @@
 DIST AnonymousPro-1.002.zip 284289 BLAKE2B 6d454bd249b3136aa501ef2db959f74edbe4cc8d0dc288c923a0a0a3445bd317ed9ab43e28689bf40dce117907f9c01d7976138a38de8032b7bff5eeb3998266 SHA512 7606d520ad79fbf4e13d676c1aff61b764dce74e170f8783b8e606f7907c4b8db0871e5568504d15aa23ca26e925ada4eb6b60fcf27171dccee0d3d32d9a92a1
-EBUILD anonymous-pro-1.002-r1.ebuild 568 BLAKE2B 3b084e5517fe65992bc54df70af77f1fbd61cb102444d1beb9ed039df31c3dfd1e4e5bffb2e5335497845c8355f9288756efdc280d45b48ae005b38d2c503436 SHA512 f3a86fc13dcfae9a05a4740e06888c6c1fd73de2a0b57182f5f3e9dcbb1e6c26cd6e095826e06fcad6ea4884aa006dc023653f9b2f0568bca18fa24dd9dccad4
+EBUILD anonymous-pro-1.002-r1.ebuild 537 BLAKE2B 2fe0fcb23e6b8b37b69518cd199cbec223c1c2e6962c9330e63d4e99f462c7d6acd7f48d9254ed9522670136f8dab8c6ce327300fac636741f726503a2a97b90 SHA512 ea0fda2e8b7b70053f310aacb08694810477d9ae176c6eea887492c6c78937ffc983f7c5edacec8130440ba0531b86a6ff724a09b8634b2d7f2a9e72930da321
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
index 1f1a6c073c10..d264c3fcc58e 100644
--- a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
+++ b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+MY_P="AnonymousPro-${PV}"
 inherit font
 
-MY_PN="AnonymousPro"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Monospaced truetype font designed with coding in mind"
 HOMEPAGE="https://www.marksimonson.com/fonts/view/anonymous-pro"
 SRC_URI="https://www.marksimonson.com/assets/content/fonts/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}.001"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
 IUSE=""
 
-DEPEND="app-arch/unzip"
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/${MY_P}.001"
-FONT_S="${S}"
+BDEPEND="app-arch/unzip"
+
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/arabeyes-fonts/Manifest b/media-fonts/arabeyes-fonts/Manifest
index 919e1c021503..1b4936310fcd 100644
--- a/media-fonts/arabeyes-fonts/Manifest
+++ b/media-fonts/arabeyes-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST ae_fonts_2.0.tar.bz2 1550827 BLAKE2B da4ba24968875d2f475600301091c486b7da8eae2d229604020e59cb6cbc55f43d9849b71ca285d94e27ca3715ec376770610ea305b78d2fc441a6143cc6a29e SHA512 46c94aa1ce872aa1ad4dd01d698d4691a6301786f8be681723df9bdcdfb86db12b15bef2a6acfed704b29867e9c01e385b4c2c490548ce68f7994b8127a9270e
-EBUILD arabeyes-fonts-2.0-r1.ebuild 561 BLAKE2B 2adc7ed1589af1b7b58dbc15537eb3eddebb76fc67846a658de2eeeb87a114982e061615b8adefa4e72a8e5dd4da346362d6e89d962d3b2efa708fc701acda08 SHA512 3debdfa16e717244aa0d4675b7aa42aed5b5ae973fe1f3af046c9efa33b309115631144c3f6c7ef89d667d1a8487dff4fccc8b578e926491f963a34f105f0f05
+EBUILD arabeyes-fonts-2.0-r1.ebuild 562 BLAKE2B cd67c8f8fdc03c0dfbd22e923406a1dd24a08ab70b7ded9162fbbe60066b69b230d23b9f4be4f93bec0ac645e087651115bbf901c26a03ff984acb48b512f5e8 SHA512 fa6ef5c099496fff4b0dc334eb1dc9897ca263b64fd5c76422cdf953ec75ddcdbaa0fc2b52208b64c98ec3276a52c1c5bfc0e9464b0212ef669f6338b0c8b1f7
 MISC metadata.xml 316 BLAKE2B 723c24d6f84b81214862b9b87b53411988f5c8301c69cd4f6bd891221c166d2bd19e2ca003b5ff63bd292cd4ead03782e606c2a221ec427ca68f1a89eb5342a8 SHA512 d4e5a2e1470726810dfa15fc49144adc9caa1664fde1314a38c40a29b7d24e6c7dfd7c8f7eadf9ea8a07d12b3a7c3fb1b9f78f3530fa5ec5d67188f577942255
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
index 817c60059d81..bf87ffb9f679 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit font
+EAPI=7
 
 MY_PN="ae_fonts"
-S="${WORKDIR}"/${MY_PN}_${PV}
+inherit font
 
 DESCRIPTION="Arabeyes Arabic TrueType fonts"
 HOMEPAGE="https://www.arabeyes.org/Khotot#2.0"
 SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
-LICENSE="GPL-2"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~ia64 ppc s390 sparc x86"
 
-FONT_SUFFIX="ttf"
+DOCS=( README ChangeLog )
 
-DOCS="README ChangeLog"
+FONT_SUFFIX="ttf"
 
 src_install() {
 	local d
diff --git a/media-fonts/arkpandora/Manifest b/media-fonts/arkpandora/Manifest
index 509b724656a0..1e6e2455b1aa 100644
--- a/media-fonts/arkpandora/Manifest
+++ b/media-fonts/arkpandora/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-arkpandora-2.04.tgz 417520 BLAKE2B 4439c5cd9a3858792a3c76470cefc15ff1b4a86df397ea62ad5d67ec3292edd4715d8ca2d0c554e9390ecb117bb0b8fe96149bc73b4401f737ed0629c3ba40a7 SHA512 28d8bea0b68c29ae1ab816b7a35a10140c4dcf7d6ae8f5a5cf287e46fe6cf65c4b7514c1879cddd9d674747c811b376365b63d9939f41769a53c48bbc772cf86
-EBUILD arkpandora-2.04.ebuild 514 BLAKE2B cf8ef01b3657559fe5dbccd8323578fef5c0d7b60466ab5c1ed72536f66bcb6305dab83595e0a2ca27c82008861fb580fb35c896287a5843e0a4e2f8e9b7e74b SHA512 f07491f154263a431ce6191c791fdda8612d8df204b66ac22f388fafd32204af955fb59874074e8ce11bace0d5597ef7f927fd6765338255b1dacd72decd0c15
+EBUILD arkpandora-2.04.ebuild 529 BLAKE2B 19cd0971f94e3f899f7f1e7357f248276de8cfcbc7e1ca7f8f0601b170a6ead2cceeea02a1e24559799228ebd693ae7cfe4782ba8a3a725f4f2974fd7a0c4d7a SHA512 d97b8817d5acfabd3c2e91af5d10d8bb4c4ba8fdb6262b43b0b47750766b9817d851ba8c8e1d63ae07767bda168b19248cb316b777e3899fcd03a4315a577b7a
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index b0906c702d84..9d3057e647b8 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit font
+EAPI=7
 
 MY_P="ttf-${P}"
-S="${WORKDIR}/${MY_P}"
+inherit font
 
-DESCRIPTION="Arkpandora MS-TTF replacement font pack"
+DESCRIPTION="Replacement fonts for Microsoft's Arial, Times, and Verdana fonts"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" # upstream vanished
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BitstreamVera"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE=""
 
-FONT_S="${S}"
+DOCS=( CHANGELOG.TXT local.conf.arkpandora )
+
 FONT_SUFFIX="ttf"
-DOCS="CHANGELOG.TXT local.conf.arkpandora"
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 3038df09bc4e..4cab80ec4c56 100644
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@@ -1,4 +1,4 @@
-AUX arphicfonts-0.2.20080216.1-fontconfig.patch 5739 BLAKE2B c2c649277caf5223c17c788c2d97951ffffc7fd73ba206f0fea6c62c5143bdf4bd9886e14536a281caa26a9dbc355c4f37aea44ec88d5803d67739f993f57a80 SHA512 0c7fa9086f5ae33b9150a83a0d5620c4ea4f67d2f11fc5646640ca77f79c4fdea107e15d8a3a3cf314e399b0bcaa6baf14d4261407f2ac7217b384312f7f8516
+AUX arphicfonts-0.2.20080216.1-fontconfig.patch 5773 BLAKE2B f56e3ef7ce1115f927c154e03ddaac55fabed91a14023a2008093b1470b55c38cb0e3b29a82216386d2868c2abddeac1890cd4d3bb9d92c9df4249ec7fc89e8e SHA512 6f28a3dc17181567be888d0637ac10fa6d7621666a9b16af68cb537ab45df4275689462e8d6b2cfb525973308b1a690d4634cf610ceaf5619ec6cccbb4182d4f
 AUX arphicfonts-0.2.20080216.1.pe 119 BLAKE2B b10a4b920581fc7a940f6699c6f5d739174fe50968e5c8bc78cbbdfc6d6ac0972cbab91279f7ce4121b6d14cdf392bcb5f89f056ae08267e06314d22234ddeef SHA512 28ac49dbf8ca80f91e1dda4d5a065716c2012c89ca173520a58689ec88f89222186036e1a029f195f3c3dbca011ec5e20d8f94cb5323eba7e32630597a41f1d6
 DIST bkai00mp.ttf.gz 6013768 BLAKE2B f10bd74dab431f28088b443b83caf2fe3a54beda47df24d31c0109e18b28aa11c890b3c2ee7e03b02eeb4a98a9f6c3e62ac2a8a63855e15f57da407c053ac3eb SHA512 cec2dae60d2cea060c560587338e64e92b95e8fb7c6a4ee41946b9c578cd0dc7e457bcfa927011ca731210cad6906864bfbd5eb07acd2de317911f4ccf0646c6
 DIST bsmi00lp.ttf.gz 5653466 BLAKE2B 2cc8b32ec1d6c939654c251f7f5853e8fa770dbd8539d9401594e5ce0813842c12f8b69ce8c5a513ab55b9aa595c1f4858284a72eff401e8302e2890d80b74ff SHA512 9aa360213b25780def342043f5c0d4d6c1236778488119125a9b702cf26312f9759c9bb7eb1ac93e0169cbbd26e5a8cc38970d8df538903868dec95c3692efeb
@@ -6,5 +6,5 @@ DIST gbsn00lp.ttf.gz 2345803 BLAKE2B 6b4bcca2a6947b532d0471cb91e3e7d5265af5f56ea
 DIST gkai00mp.ttf.gz 2698942 BLAKE2B c8ca0e99239904bb80834878c9d77e228d8460e2f308ba7bee1f9606e4c423fe4e3fcadd91bcb521b2856ab778a570db5838d4976e7f17eaa9e235f60237c3ff SHA512 5797d1a4e49c4ba219381fe4e90225584513f47c29af77f8004bb318c5cddf2097be56ea6cc09ed31573e8ceeec5870129cbacafe81df3d68d8bd556594b2c89
 DIST ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz 10336387 BLAKE2B 89ea5d1ccabc30ae77c245c4ce2a8f9b058dbe5d1da5812158639a2270d20610633389cf1335f68e290525875f2e6ba50f1197c23993102571e3f14fbcc3414e SHA512 8c96d36f5e36eb73ec3e415cba7ee5f02a0b85c334af7362facb2dd9a7650ed3329cfadb21fe0fe7273f52c87f1bd1aeb039c40499ca32925db4cd96ebd03c21
 DIST ttf-arphic-uming_0.2.20080216.1.orig.tar.gz 10684442 BLAKE2B 0d5c73e36169cd91faaa9b61186a83f2d07baf5794a534bfcf330750aed643b4931918f7bfaaabe1b655f04faec36f5064c711cb2f68c605d63c4022cad78370 SHA512 ef96969d1c5f1bda14aadfbe112a1ba30ae1bc477a89838753287ceaf07804e59c2f3f306399e9d54074be99d0c963abdb33d789f3933fdd98453a1ef7731407
-EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2244 BLAKE2B 0f3d0ddd7957bb89249913064aef1e0549f796685a1269d1c36263af6f021ab2fc2948744205e415b18da33c15d86bbc2b53eebe66d64c2ca340cd6a1b5b2540 SHA512 e6fa0061a55a13aa140b5fea2a7c54d9266bf088a84b0f491e41ad52067b7aa6bf41a9b4aa65455d1c715e904e61de684c3057967d309c335c5de26c865574f5
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2095 BLAKE2B 91f42b854d3e6bb0af144b0748c747e30cefb52153ae189b9cbbc2c6d2a2f899539bb5a53dfe2a89429f70c261063405d0438a28c06f4c2f44d84dfb7250d82f SHA512 dfee12d564ba2576153cd92f7e84f6a35838f37bdfd56c32d3ec5274883385dbf27b3d327fbdd39d0dba294049458f9d485ececc9feccb2ef0ac92f62e0ce63b
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index e2f80f9e5cdc..bd3155d8c0f8 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils font xdg-utils
+EAPI=7
+
+inherit font xdg-utils
 
 DESCRIPTION="Chinese TrueType Arphic Fonts"
 HOMEPAGE="http://www.arphic.com.tw/
@@ -13,67 +14,65 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
 	mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz
 	mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_${PV}.orig.tar.gz
 	mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_${PV}.orig.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="Arphic"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="media-gfx/fontforge"
+# No binaries, only fonts
+RESTRICT="strip binchecks"
 
-S="${WORKDIR}"
+BDEPEND="media-gfx/fontforge"
 
-#No binaries, only fonts
-RESTRICT="strip binchecks"
+PATCHES=( "${FILESDIR}"/${P}-fontconfig.patch )
 
-FONT_S="${S}"
+FONT_CONF=(
+	ukai/25-ttf-arphic-ukai-render.conf
+	ukai/35-ttf-arphic-ukai-aliases.conf
+	ukai/41-ttf-arphic-ukai.conf
+	ukai/75-ttf-arphic-ukai-select.conf
+	ukai/90-ttf-arphic-ukai-embolden.conf
+	uming/25-ttf-arphic-uming-bitmaps.conf
+	uming/25-ttf-arphic-uming-render.conf
+	uming/35-ttf-arphic-uming-aliases.conf
+	uming/41-ttf-arphic-uming.conf
+	uming/64-ttf-arphic-uming.conf
+	uming/90-ttf-arphic-uming-embolden.conf
+)
 FONT_SUFFIX="ttc ttf"
-FONT_CONF=(	"25-ttf-arphic-ukai-render.conf"
-		"35-ttf-arphic-ukai-aliases.conf"
-		"41-ttf-arphic-ukai.conf"
-		"75-ttf-arphic-ukai-select.conf"
-		"90-ttf-arphic-ukai-embolden.conf"
-		"25-ttf-arphic-uming-bitmaps.conf"
-		"25-ttf-arphic-uming-render.conf"
-		"35-ttf-arphic-uming-aliases.conf"
-		"41-ttf-arphic-uming.conf"
-		"64-ttf-arphic-uming.conf"
-		"90-ttf-arphic-uming-embolden.conf" )
 
+# ensure that we don't overwrite one font's docs with another's
 src_unpack() {
-	#All of this is to ensure that we don't overwrite one font's docs
-	#with another's.
-
 	unpack {gk,bk}ai00mp.ttf.gz {bsmi,gbsn}00lp.ttf.gz
-	mkdir "${WORKDIR}"/{uming,ukai}
-
-	cd "${WORKDIR}"/uming
-	unpack ttf-arphic-uming_${PV}.orig.tar.gz
 
-	cd "${WORKDIR}"/ukai
-	unpack ttf-arphic-ukai_${PV}.orig.tar.gz
+	do_unpack() {
+		mkdir ${1} || die
+		pushd ${1} > /dev/null || die
+			unpack ttf-arphic-${1}_${PV}.orig.tar.gz
+		popd > /dev/null || die
+		mv ${1}/${1}.ttc . || die
+	}
+	do_unpack ukai
+	do_unpack uming
 }
 
 src_prepare() {
-	cd "${WORKDIR}"
-	find "${WORKDIR}" -mindepth 2 -maxdepth 2 -name '*.ttc' -exec mv {} . \;
-	find "${WORKDIR}" -name '*.conf' -exec mv "{}" . \;
-	epatch "${FILESDIR}"/${P}-fontconfig.patch
+	default
 	xdg_environment_reset
 	fontforge -script "${FILESDIR}"/${P}.pe b*.ttf || die
 }
 
 src_install() {
-	local myfont doc
-	for myfont in ukai uming
-	do
-		cd "${WORKDIR}"/${myfont}
-		docinto ${myfont}
+	font_src_install
+
+	do_doc() {
 		for doc in FONTLOG KNOWN_ISSUES TODO README README.Bitmap NEWS CONTRIBUTERS
 		do
-			[ -f ${doc} ] && dodoc ${doc}
+			[[ -f ${1}/${doc} ]] && newdoc ${1}/${doc} ${1}.${doc}
 		done
-	done
-	cd "${S}"
-	font_src_install
+	}
+	do_doc ukai
+	do_doc uming
 }
diff --git a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
index 5c5738a3bdf5..1f984f28e2cb 100644
--- a/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
+++ b/media-fonts/arphicfonts/files/arphicfonts-0.2.20080216.1-fontconfig.patch
@@ -1,5 +1,5 @@
---- a/41-ttf-arphic-ukai.conf
-+++ b/41-ttf-arphic-ukai.conf
+--- a/ukai/41-ttf-arphic-ukai.conf
++++ b/ukai/41-ttf-arphic-ukai.conf
 @@ -5,13 +5,28 @@
  <!--
    Sans-serif faces
@@ -38,8 +38,8 @@
 +        <default><family>sans-serif</family></default>
 +    </alias>
  </fontconfig>
---- a/41-ttf-arphic-uming.conf
-+++ b/41-ttf-arphic-uming.conf
+--- a/uming/41-ttf-arphic-uming.conf
++++ b/uming/41-ttf-arphic-uming.conf
 @@ -7,10 +7,25 @@
   -->
  	<alias>
@@ -120,8 +120,8 @@
  		<family>AR PL UMing TW MBE</family>
  		<default><family>monospace</family></default>
  	</alias>
---- a/25-ttf-arphic-uming-bitmaps.conf
-+++ b/25-ttf-arphic-uming-bitmaps.conf
+--- a/uming/25-ttf-arphic-uming-bitmaps.conf
++++ b/uming/25-ttf-arphic-uming-bitmaps.conf
 @@ -5,25 +5,65 @@
  	<match target="font">
  	  <test name="family">
diff --git a/media-fonts/baekmuk-fonts/Manifest b/media-fonts/baekmuk-fonts/Manifest
index fcafcde8d658..27bd27f34446 100644
--- a/media-fonts/baekmuk-fonts/Manifest
+++ b/media-fonts/baekmuk-fonts/Manifest
@@ -1,5 +1,5 @@
 DIST baekmuk-bdf-2.2.tar.gz 9547995 BLAKE2B 162a86425042dd615bd7b41565a41f0138697ff512a71589fdd964a98220b143abd43642ac6e3c66c5595b2f211609f3eff3407eafcace256149c0447f30abe6 SHA512 dc0aaf1f684f1e75c70cde3a5e3084e7abae38cbc6057063063f53abdadc200347e3e1c609535c1e44b050ce9540de3175b69d9551de31aa755ba7068632d898
 DIST baekmuk-ttf-2.2.tar.gz 29241850 BLAKE2B f14685743d6e1ce76d68f26e740621d768376884fdbd1a5b43c57a77b71d4fd1c634ef421f5161d88efd6a89ee6c7dbfdcb51aab1f64f17b45af2df009a6333b SHA512 779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b
 DIST baekmuk-unicode-bdf-20020418.tar.bz2 1841477 BLAKE2B 92b781ba678314a58e145488027f6fe998a13f9a75a5838a5bb9572299018feca2acd7dc54ec0a51a1b43fc43f3b394666ca9fe53a99d3011ccb78efd5e8cac1 SHA512 e32fd44d0d19f0a0ac6229763dbf4b4998b766206402fb161ce4d1f7c63019e360b0f0907603a6baf2950832f43ed529f5174fa613e62b93dc245e8ffce7085d
-EBUILD baekmuk-fonts-2.2-r2.ebuild 1042 BLAKE2B 688102e0a0a1fa4ed738278fd4d58693863ad7d54adf8eaa3af44084e5a47c54bc25e6398bb34c7dd7b95bf52cd25f72cf41e51e9a0be184851cc13d0fb1314a SHA512 57570116e878298924053f8fe3970e92d4dd9be332fba5a2300e2b65a527cac8794631d983e0bd609a7cc4258dd801bdbf30288f120494b42c90782af073c0c1
+EBUILD baekmuk-fonts-2.2-r2.ebuild 1042 BLAKE2B 6e5f6dd05fc3d6df0f295936dbea38508b2c524fa2e7d10809143057b57f911acda418e5a0f8d91ef8785cb10596b902120239cbe98b1efc40be42480a123353 SHA512 ed427bc2a8b5dc351aa698da70ce949b5dc4cd266a367c5f29bf8218854fca4d0526ab27cee04a59a63a5d10961adb112f57cfc0f0a6cae315f7fb82390e1b59
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 67486d2aa090..93d343aa01f0 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-inherit font font-ebdftopcf
+EAPI=7
 
 BDF_P="${P/fonts/bdf}"
 TTF_P="${P/fonts/ttf}"
 UNI_P="${PN/fonts/unicode-bdf}-20020418"
+inherit font font-ebdftopcf
 
 DESCRIPTION="Korean Baekmuk Font"
-HOMEPAGE="http://kldp.net/baekmuk/"
-SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
-	http://kldp.net/${PN/-*}/release/865-${TTF_P}.tar.gz -> ${TTF_P}.tar.gz
+HOMEPAGE="https://kldp.net/baekmuk/"
+SRC_URI="https://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
+	https://kldp.net/${PN/-*}/release/865-${TTF_P}.tar.gz -> ${TTF_P}.tar.gz
 	unicode? ( mirror://gentoo/${UNI_P}.tar.bz2 )"
+S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,18 +21,16 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack ${BDF_P}.tar.gz ${TTF_P}.tar.gz
 	if use unicode; then
-		cd "${WORKDIR}"/${BDF_P}/bdf
+		cd ${BDF_P}/bdf || die
 		unpack ${UNI_P}.tar.bz2
 	fi
 }
 
 src_compile() {
-	cd ${BDF_P}/bdf
+	cd ${BDF_P}/bdf || die
 	font-ebdftopcf_src_compile
 }
 
diff --git a/media-fonts/bitstream-cyberbit/Manifest b/media-fonts/bitstream-cyberbit/Manifest
index dc063a88c6b4..ae9501d2b7b9 100644
--- a/media-fonts/bitstream-cyberbit/Manifest
+++ b/media-fonts/bitstream-cyberbit/Manifest
@@ -1,3 +1,3 @@
 DIST bitstream-cyberbit-2.0.zip 6427108 BLAKE2B 4d79ea91f478df159ad230300bf94e42d57148cac22d01b2eea653e12651dfc71b667fdfdb92da282bdaf281d45dfb9fbc04eeee806a82b6741a313872a3375d SHA512 39af2720123e7d732e3dffffab37d949221211748594a66ecbd41bafcd387e4582433ece802e42f3d1f0728da9ed0c5bb00465f20fa2ff3687018ed94edf25a1
-EBUILD bitstream-cyberbit-2.0-r2.ebuild 627 BLAKE2B 72dd6539f16091833ee7330615058653912810635af4fe52cff3009fab2a836c77e0d67b63f2f01bc54edba7dfde2ad6e38816a1b76bca8c254dc3a6d63d5152 SHA512 32e1d3156b3bdd1f419d8429be7a0e5c88d62931194c549a169be0e6b443bd407c5c9aa9ef4938a43c7fb25deae36ccdd5274252e1bffee025041e0b39d20d64
+EBUILD bitstream-cyberbit-2.0-r2.ebuild 620 BLAKE2B 25379f77daa48e6e5307b730ccaaa7357e8e4732ed01ea189708fea82d7bf98d255aae88ab7d228227c4a88ed772015fc4a3418823eee234952adf15728c19da SHA512 bdee0ea6155e73b4bec55f4663c588ceecab80fd603e7f1689d5fa514526f0ff7c1ce16bab80f1431f65cd4d5e3fc7fdc4abcb6b778fff15887e8737e226f699
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
index dd46e6e5976d..dced0c4d5d14 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Cyberbit Unicode (including CJK) font"
 HOMEPAGE="http://www.bitstream.com/"
-SRC_URI="http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> ${P}.zip https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip"
-LICENSE="BitstreamCyberbit"
+SRC_URI="http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> ${P}.zip
+	https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip
+	http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> ${P}.zip"
+S="${WORKDIR}"
 
+LICENSE="BitstreamCyberbit"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
+
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index f2ee2ae54ede..714e000cfe50 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,7 +1,5 @@
-DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
 DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
 DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
-EBUILD cantarell-0.111.ebuild 1257 BLAKE2B 0a1b39b702131c214092b0ccb1f8e5cab88aee5e1c71929203fa18a86b29d37da70ca99104ec78f141a3e2f48f3f25ee6d8be35e781e9f73e5b9e19c289e2cd7 SHA512 620544a6c62c7ab30c8da32f47b72c5308c11e67ba921967e777da1c56cece0142889cce753c0676ab42c4a8a096cc7a880f04e3d1f336730a70f720daadcc1e
 EBUILD cantarell-0.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
 EBUILD cantarell-0.301.ebuild 1058 BLAKE2B a14f99b30ac0902cb6397d5786a145efdfb344e4b3230bea0aacc8a0dfeb7aa8efe4ca1567ff34c7d46455daf0570ed5b62f84ef37a6661a6e742caa4ab15548 SHA512 3a9852e32bfcbebb4cf3614024b1f6bc2a7297d305ae73bea18bff428988c95d4d5344b8077ed3c3b9bb199d2731157839e994a55d0df20d8787b2fdc67357ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
deleted file mode 100644
index 88be417fd972..000000000000
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org meson
-
-DESCRIPTION="Default fontset for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-# appstream-glib provided .loc and .its files required by gettext msgfmt for translation of .metainfo.xml
-DEPEND="
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
-FONT_S="${S}/prebuilt"
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	# Leave prebuilt font installation to font.eclass
-	sed -e "/subdir('prebuilt')/d" -i meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dfontsdir=${FONTDIR}
-		-Duseprebuilt=true
-		-Dbuildappstream=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( NEWS README.md )
-	meson_src_install
-	font_src_install
-}
diff --git a/media-fonts/clearsans/Manifest b/media-fonts/clearsans/Manifest
index 3d704b930431..2354db2197e2 100644
--- a/media-fonts/clearsans/Manifest
+++ b/media-fonts/clearsans/Manifest
@@ -1,3 +1,3 @@
 DIST clearsans-1.00.zip 3972903 BLAKE2B a60df319173cfea54fdd089abd96d7e9a52d4e54c6248db909b73ed76217a9a4ab7312921e6f6d5e7677f0d0a2b77d8870447aef0cff2113718d0f2a400c4efc SHA512 83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d
-EBUILD clearsans-1.00.ebuild 488 BLAKE2B 7c764d1be4dedb0fb2734e3dfc2ec62557314809332b60a0c30ddb4992434e727367bf64ed4603e95e6f449e7afcc62996f04861b97d514afb50b6011ec777b5 SHA512 9bae2c4410bfa5685ce7483ec9869a6f2d8609dabe8bd4645973d188d5208c824aac6e6872c01514be0075ad48bfc2685aaa8887edc66df95fb1bbcd07617ccd
+EBUILD clearsans-1.00.ebuild 476 BLAKE2B 5744f4f8daf50c162fb6dd79971163d6c5bf60bf4b2ae7da3d8905c4736c631b232e4012a97470773cdeb7952092011dd88a03777ccd12ec8f23b75e130d7238 SHA512 88f6fc595191195e2c28c2573140b4206804124b1650ebcfdd185b45d309f8289e3685d3f07428755902345e452bb10c2988f8a5a502c8fd10f9227dbd53c145
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
index d8195af05a17..dcf5264b489b 100644
--- a/media-fonts/clearsans/clearsans-1.00.ebuild
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="OpenType font optimized for readability on small screens"
 HOMEPAGE="https://01.org/clear-sans"
 SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+
 RESTRICT="binchecks strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_S="${S}/TTF"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/cm-unicode/Manifest b/media-fonts/cm-unicode/Manifest
index ab0c4a01719a..04bbac8f3018 100644
--- a/media-fonts/cm-unicode/Manifest
+++ b/media-fonts/cm-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST cm-unicode-0.7.0-ttf.tar.xz 4856068 BLAKE2B d92b5e58d54b601cd82372ac92adfe446aa9fd230192690781cb5ef5b564976b8ecdda386d946190061942e7770ae905f1d3a18d54416f78dcf91e8cc604a0eb SHA512 6340b7c6b220c8c887a4b77e77a01a43bedf13d08dd1d62570de70866d0bff908adf3fcb7907149ab2f5ab060650b39eaad3c01c1e8d028bbeb879b058190e70
-EBUILD cm-unicode-0.7.0-r1.ebuild 393 BLAKE2B abdb48c8774c349013db52c8203be40e9b9f83df55d899267d0e7b9f919b20fe60effc7665b6a4b6cf4e1b4f2546c3d42875a0b5c4e17b727f4fd39607236de5 SHA512 2cd6def074c7f23c80298ec0f76adf45e796c19ce9e04a091cede6a50af5db12e603e7e2d364a9e82e86babf0c8cf454f4cbdeb587f51206cb2d01cd3c78def6
+EBUILD cm-unicode-0.7.0-r1.ebuild 393 BLAKE2B 950a27a3711b761f17b058ed88c754ddb786f726788d073fa2a5a76b424f50a4534467ec3db56bf0ef711001eae5fbd8954ef2b8e15f0543b7f93d5e7521744b SHA512 afe8b97fe28370474476d40fb8913e526887ea4070e7f55da1a91adc570e6cb5defd638b9055dfba03e7c9964e16ea8bc36f3d22ea1e05d7eab4d31d290d7892
 MISC metadata.xml 318 BLAKE2B f1352cc26419ffa806b1a423628822c6471125e86bfe9ec52cff3aecd9d61e3dd5486e8c8b6cc2f0ae6693627ff4459076dd053b7c57890169584c29eda01e53 SHA512 0134dda1d074286b2c131aad0b699c4b16fc99f53f8baef62e3e4f168760242fa83ed5e4a2c01e2959dea149a45fa7a6854ab77b27ee51b6f5920c1b002bac96
diff --git a/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild b/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
index 07bd331d58f4..32d10001d698 100644
--- a/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
+++ b/media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Computer Modern Unicode fonts"
-HOMEPAGE="http://cm-unicode.sourceforge.net/"
+HOMEPAGE="https://cm-unicode.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-ttf.tar.xz"
 
 LICENSE="OFL-1.1"
@@ -14,5 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+DOCS=( Changes FAQ FontLog.txt README )
+
 FONT_SUFFIX="ttf"
-DOCS="Changes FAQ FontLog.txt README"
diff --git a/media-fonts/comic-neue/Manifest b/media-fonts/comic-neue/Manifest
index 07b35977acba..578f3914a640 100644
--- a/media-fonts/comic-neue/Manifest
+++ b/media-fonts/comic-neue/Manifest
@@ -1,5 +1,3 @@
-DIST comic-neue-2.2.zip 1547231 BLAKE2B 3c28d2ada0c9c634084b67694b83ae765594d7e732c870bf6db538967b922146863b023e5bf1407b08f8e9f77b264d867175fe5dbfe1f6a7e53a6fcc2e83f16d SHA512 4c13a764a8a5f1fb23bfb47b1840249286fded918d243227d360ae8005165de2e0e02cafca59a82a306129689d67347950d47ad5d8ae49bb165c0d4a18bd2d91
 DIST comic-neue-2.3.zip 2093174 BLAKE2B 80b345e3c61839d1abb803cc8a97d3b03bdf906408a9eb96aafed9e67d3b0f4a99ed82adef528b7fa4eecf9e1c2443efbedc32ba8c08e5731cd3ad180bdf3aa7 SHA512 37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5
-EBUILD comic-neue-2.2.ebuild 418 BLAKE2B bc6d0287f1e3d230141a2d7df1fcebd3a20d6ef8433e26a91eddf3f6befbfb9f2d942cee55703f9fd29bc8980bccb3fe90b5e7a527b0a53d3cd99b8ebff758ca SHA512 434a072b4925694307047899709d30510eb7bc89345b9bcf9091b947bfa42350456c293cdc46e5f9aec0ec4901a5d42b6f711fa690a5e3cc14d2aac6eed1ab0d
-EBUILD comic-neue-2.3.ebuild 511 BLAKE2B f8759469707cf2b5cd26fe206000093af43fe7eb45e135fbcd78fac043c707059a584bb452fe6903c34b37d139eb01f023c6c21e05a51583d4074a7bc0aed026 SHA512 7f1f14be57220373f77098ad14d12decfae28d309b46cb465576a3ae96c87b3b557bec8c7b98c5b364b3b4ad0232df4a2118eadc46bb5a6aeba5dc1cb2406e40
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+EBUILD comic-neue-2.3.ebuild 469 BLAKE2B becd866446bdbb7798ec3efda993fa65283a533060236cd422168a903f65bbeab96e21788cee478427e7077616f6c856a88087a4d40002914980a3130ea77d2c SHA512 cbf82ee006e99a8d746cd289f64032f46fe5538178d630bfce5305a9754fe40fd3dcf37f8c25c3c311409ca28af284f95da9ccd71c7ec740d31a5bb941f43e93
+MISC metadata.xml 262 BLAKE2B 090658f54d67004539d3c6efad6c7eaf36d45079091d36411f0df7cfdfa41adab2f78ee52469dc2e23f22908589fe9e9488c1c53bfe9302ba5c429c3fbc626b0 SHA512 36cc5ab05d2a01cb8101147ea8833c0da21cd10864622fc21b6517e1b2740f045f949d5efad647b20b324998ebeeefab63324ead95480673107f69aae8e46f23
diff --git a/media-fonts/comic-neue/comic-neue-2.2.ebuild b/media-fonts/comic-neue/comic-neue-2.2.ebuild
deleted file mode 100644
index 8b38ba343655..000000000000
--- a/media-fonts/comic-neue/comic-neue-2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Typographically savvy casual script typeface"
-HOMEPAGE="http://comicneue.com/"
-SRC_URI="http://comicneue.com/${P}.zip"
-
-LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-
-FONT_SUFFIX="otf"
-FONT_S=${S}/OTF
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 6932b1f00995..0361c1b3ed98 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Typographically savvy casual script typeface"
 HOMEPAGE="http://comicneue.com"
 SRC_URI="http://comicneue.com/${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 SLOT="0"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 FONT_SUFFIX="otf"
 FONT_S=${S}/OTF
-
-src_unpack() {
-	mkdir "${S}" && cd "${S}"
-	unpack ${A}
-}
diff --git a/media-fonts/comic-neue/metadata.xml b/media-fonts/comic-neue/metadata.xml
index d0f1df7c94c0..8b3b4d92532e 100644
--- a/media-fonts/comic-neue/metadata.xml
+++ b/media-fonts/comic-neue/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/corefonts/Manifest b/media-fonts/corefonts/Manifest
index b5cb646442c9..1302451f5c9d 100644
--- a/media-fonts/corefonts/Manifest
+++ b/media-fonts/corefonts/Manifest
@@ -7,5 +7,5 @@ DIST georgi32.exe 392440 BLAKE2B 1418400dc123717ed0ee2e7c7de5fcde4084b2d8446a664
 DIST impact32.exe 173288 BLAKE2B ed52e2933dffe7764bd466ecbe3f4af89f2a2386d9db05f4d19039fd4576e1aa8aeaf8a0b463b3c7ea7327cdd7bc17a05f900faa186c7a8c1ce9c619f2406b48 SHA512 6f9318806efbd3b3727e71170cc3ab378d6151887abcb7fad01bd4cb45c2e127f8aea81a3a99bc77c2ce2424fb1acbc230ffc6c23e390c8800710b45b1367c3b
 DIST wd97vwr32.exe 3953640 BLAKE2B 0b9ec865af5c906b692497a5f497c026e486d198cec810e12a13442d4f7c301bda7c74ef0a7b822a23013eaedd295bc5f16c92509a59755aefdad4aeea1b4018 SHA512 e5db496471970e358af5fdb6d02853fd45bfca1aa89d49ba8644622c28610f09a4b85c2387407b9d33a4055965e0b5e184704c161741ac69250327449da12122
 DIST webdin32.exe 185072 BLAKE2B 18369790ea9ac982606c5e79b204f02887e0d379ed47661b8f80edc1d6f9c0e484b8f7e8a72f8ff1800acbcf2d69b4d5583f18affde2b333170fa77d8c42a70e SHA512 2784ce1cee66f0f00f77d84d7aaa52a44d017245e0269558729003205c10a5e5368f9909beee733e77e202730b3cee2b2357fdbdb597a0023c6412e050b3a3ad
-EBUILD corefonts-1-r7.ebuild 1437 BLAKE2B 427772247a2855dc85278f3df98924e7c084b48107c2adcecd398b661735626d3488d014fa1e8e37a20757ac4d7976213cd34e3ceafc1b4f380da8eb0b6afb41 SHA512 d9ab0368f052fc660ca6db34d6bb6149eaaae7aec60aabbbec2f35f467c8fb1c918a53180ae18610a324bc3bcf78c0ec6acc63d7394b1be947ecc6ab8643a283
+EBUILD corefonts-1-r7.ebuild 1423 BLAKE2B 48ccecb1641331976ce774ff213e32a0608a68f78cac0a4389110d34fcd50c1837be9c1ab61e8559cf2d509b18d07eca99098785333707cf5d61cd8db7914103 SHA512 154e6101bbfdcf508702bc74a975151700fe34bea54203f618e000e51c4a03cd000efb39a9c84f994277830f9e5fb494b1423eaf99ff8e8bb18d4eb6e402fbd5
 MISC metadata.xml 490 BLAKE2B 63c426cef580c3be01a7289436651f77ba42493dabcf56d0e6905cfd55f35cf7fb30e11415105ee1bcd1a1e79993c4bb10ce8004c918f21688be95050dbe375d SHA512 ebd56a5d9640f4629939d1e10d980f3043eed52cf389373288b1e489abf35d2b5106942cffaa90b4ab0bbdd5040a515f55b690a12e7ab1ae1776769b33ab89e9
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 3ccd868ec997..19b38d3077f3 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Microsoft's TrueType core fonts"
@@ -15,16 +16,15 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
 	mirror://sourceforge/corefonts/impact32.exe
 	mirror://sourceforge/corefonts/webdin32.exe
 	mirror://sourceforge/corefonts/wd97vwr32.exe"
+S="${WORKDIR}"
 
 LICENSE="MSttfEULA"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X tahoma"
 
-DEPEND="app-arch/cabextract"
+BDEPEND="app-arch/cabextract"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
 FONT_SUFFIX="ttf"
 
 src_unpack() {
diff --git a/media-fonts/courier-prime/Manifest b/media-fonts/courier-prime/Manifest
index 447023b69b30..e7d024a0d4e8 100644
--- a/media-fonts/courier-prime/Manifest
+++ b/media-fonts/courier-prime/Manifest
@@ -1,3 +1,3 @@
 DIST courier-prime-1.203.tar.xz 241496 BLAKE2B f85a3c16d27d3d03657d38d126fcab255263acbfed7c251bc3f88bc172535a6733b8cb4e5ddd02ac5d41e3a63bcfc26aa25bc8172befff5bed2b01242bd8994a SHA512 fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda
-EBUILD courier-prime-1.203.ebuild 445 BLAKE2B 6d02dd4c383a0aabe8ffc36d217610120435b75c66db57817c7ac26c4ccdf44e24c8d85552c9a1a62fc6924c91212f79a6a8239c59687839708f251ce88f71ab SHA512 fe4af33c0de2fc98eae039f454e5ca1b493939cc9611b00e0377f32a2043fb01f6edf6e25d56a095c06bf635474164f1b6e8dbc45871675ecc6eb9c2ab3e5d63
+EBUILD courier-prime-1.203.ebuild 444 BLAKE2B 9ffe07d01b17531fb099b9f4f6180a944af130f3904d70a7aaaebf051cf10693691a73fd73fc3121678f372df469240a0499145e70ef88e37857e1973c1ccd03 SHA512 47b0fce4aafeec942a3e2305a5eba164d1569f7398f2105e820b1db7f96cbc33bf67c7531903d2b4d656f600fb6e4de5ba7714ca9858cc655e0cf6ee00244ff9
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/courier-prime/courier-prime-1.203.ebuild b/media-fonts/courier-prime/courier-prime-1.203.ebuild
index 7ca9a8d859dc..65e147085207 100644
--- a/media-fonts/courier-prime/courier-prime-1.203.ebuild
+++ b/media-fonts/courier-prime/courier-prime-1.203.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="A redesign of Courier"
+DESCRIPTION="Redesign of Courier"
 HOMEPAGE="https://www.quoteunquoteapps.com/courierprime/"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
@@ -12,5 +13,6 @@ LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+DOCS=( README-CourierPrime.txt README-CourierPrimeSans.txt README-CourierPrimeSource.txt )
+
 FONT_SUFFIX="ttf"
-DOCS="README-CourierPrime.txt README-CourierPrimeSans.txt README-CourierPrimeSource.txt"
diff --git a/media-fonts/croscorefonts/Manifest b/media-fonts/croscorefonts/Manifest
index 37e53a04b24e..04b9b6b577ae 100644
--- a/media-fonts/croscorefonts/Manifest
+++ b/media-fonts/croscorefonts/Manifest
@@ -3,5 +3,5 @@ AUX 62-croscore-cousine.conf 852 BLAKE2B 4616f113926cb805f819db360580271bb787dfe
 AUX 62-croscore-symbolneu.conf 366 BLAKE2B f9903ab279cc6fae210896409deaf118bdbffac68135be5e5360dedc89be1ba81e13b490923c7d322f739df507096dec8269024d8e5b48c7b985871b4b21a4f5 SHA512 2c0a0e37422cbcfe59fd9d18c0491b208537a2510b6475cdc4fafa8700628b152a5c09256cec274c79201455976988fbea21b1b600e3713f6ca9f6d0b633aed5
 AUX 62-croscore-tinos.conf 842 BLAKE2B 6483ec81aa6d93385081ca48c128a2943ea5e3f58696499d65eeadb5d59abdca1c81ecd2ce9d9d1c950db9dbbb65376014014c6efa13ffe5f2460d8b69eb8b9e SHA512 5cffeedc50c0d4c664a4f0939db603b0c0cbf48036ccd04f68cee1a40efd4bade3aecc6ae704648229c0e8ae8e18c6ea40f43cbfd2b6545f4f6fc3702a1d3d69
 DIST croscorefonts-1.31.0.tar.bz2 3223864 BLAKE2B 4fc011557f81c19d4bc79f014c438868d2a63fe8932140a51523fe582a62a07ee1e51799bb3b13cb801a6ac0af72f23abade4cacccbc4adb3523f3a8d440ea8d SHA512 dcd5ebb854f78353a1d91bb74a5ac7b5e237040994c7e2a69cf68511f06b10006fc3a490840d48c12ee7f862d2dfa3106c9e1787a726a4b158eaea5cd5ba8842
-EBUILD croscorefonts-1.31.0.ebuild 744 BLAKE2B 954af1d2255bbeeae92522ba37539ce5569347b0005f243341142f7ec21ba5a6a45f9101bb9ec80e321b6b07f33862ba98c885b85ca5bb6b89d3a09a687910ac SHA512 008c42421d3d28ffd5959dca19d62b70daa5437f16a5adb8cc5d68bf67c10e23a9227cbc03495d67c658ecf6dfe5eac184df885fb37eabed5ee42c2b9bcaf767
+EBUILD croscorefonts-1.31.0.ebuild 738 BLAKE2B b7da56fb5ad8747f405354c170c637d886350b90ce971419034ea7c9a60aa7b63e237e7deec2b55f479f1f8908fa3368029f6f73544a1dc8815a4679d3ecdd50 SHA512 bc495b78376ae22bae84722b9eef5392b4a6695e806fce19b5a4cf0649a4df4e8fb22630195f7409cb4350accfb99b429ca54d9176dbc64b962a35e32226c1b7
 MISC metadata.xml 790 BLAKE2B 1299513e819f53f388bb8d639aa070cc00acba9d619656e9891ac35ed043ef61d9ed285f11113bc27803201d0f6e0cea152cd2fc314f72db1ad65ecf1be837af SHA512 9ce6c85eadb03a6f058f1ed2c3f3d68db160627bd88513c8cf3886e5e6556ccf1582391a1c6c96dd0ca8baec1573acb88df4495e1bdffaf37f6c069fd9d08a41
diff --git a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
index 60efcf5cf45f..a0689b4926ce 100644
--- a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
+++ b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts"
 HOMEPAGE="https://www.google.com/webfonts/specimen/Arimo
 	https://www.google.com/webfonts/specimen/Cousine
 	https://www.google.com/webfonts/specimen/Tinos"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
 
 RESTRICT="binchecks strip test"
 
-FONT_SUFFIX="ttf"
 FONT_CONF=(
 	"${FILESDIR}/62-croscore-arimo.conf"
 	"${FILESDIR}/62-croscore-cousine.conf"
 	"${FILESDIR}/62-croscore-symbolneu.conf"
-	"${FILESDIR}/62-croscore-tinos.conf" )
+	"${FILESDIR}/62-croscore-tinos.conf"
+)
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/crosextrafonts-caladea/Manifest b/media-fonts/crosextrafonts-caladea/Manifest
index ea0f90046403..2d1b0403f18f 100644
--- a/media-fonts/crosextrafonts-caladea/Manifest
+++ b/media-fonts/crosextrafonts-caladea/Manifest
@@ -1,4 +1,4 @@
 AUX 62-crosextra-caladea.conf 470 BLAKE2B 0aa0519e9609bab2ba1e961f811a253bdd2c9b2a02d296380b8da4b15441937fcf5790e7b29163e48f1276ee5dc47d86bcec4d9ca04c5c614c8da2b2d7623d6a SHA512 5b48988b7dbf3dade207233a365c5c0c06f398a28e5e8606383ca9371559d9c8c6b00aacf1f1506831149315907279897c04f1a020c6af6f45721702f3defdfe
 DIST crosextrafonts-20130214.tar.gz 112756 BLAKE2B db2872ff3f587519a82062812838b12f8667b96e6ff2883f9441a87aeba3fa8c20798c3a64213a9196b302d09e7e8f2cc230602a898124d554900d67be085032 SHA512 71f3cfcfbec33d8526184dce32f244f13b29f97aff31c0609487f27135adc0a4d5950e068f8be101e4fd06498cf103be68d781fc611142f060bbc9cb0b81273e
-EBUILD crosextrafonts-caladea-20130214.ebuild 580 BLAKE2B 40cbc434e3e7e859d2a48589728a40168646cfb2d20be0a1456cd648f7c4d0dae7410a759a99d287d63f907500969fb86d0de574037b51bae7735c3ecd4690d4 SHA512 95ac85693dbca31b7ac60dceb3530f6cd0c4a34cd4fd3259908bcc0bb161fd00716a92ca6d4b2331ee04f063a34fd33499b9112c39f8f09970abe2daf5ea314f
+EBUILD crosextrafonts-caladea-20130214.ebuild 581 BLAKE2B d8235c4f3003919af2a19e71d10b5e48fef2bac48ac96d04ed12a5942c20524708449cdb60c80efbf3d4262c8c8c0497dbcb50baf70b218d856c2be4ed8648d5 SHA512 f0bb538997aad363468abbfe42bef7fa61df38e8a174b1aaecc20ae47bd18ee13cf4121b97787bb6263f1ff994caa11b0644ce06a356f82ab90255c723f2ea1b
 MISC metadata.xml 259 BLAKE2B 46523dd0c4d37cc8de2ae4a7cc88ae579064a3843997c11d00953f29a4e0b63ef1a3ea769ab417f9938a5cf1cb12966e984006aca981fd50131a20ec9bce8c0e SHA512 42777fc28db6d4eaa1c7b9269f3d7c97fbea301460356a5c478940e6fd15d9ee8b67231740d716d52e9782a0122ebb539cb6ea829d7e7a64429c2c0984f92921
diff --git a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
index 14028bd0bb99..43739eac52bb 100644
--- a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
+++ b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_P=${P/-caladea/}
 inherit font
 
-MY_P=${P/-caladea/}
 DESCRIPTION="Open licensed serif font metrically compatible with Cambria"
 HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=168879"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,6 +18,5 @@ IUSE=""
 
 RESTRICT="binchecks strip test"
 
-S="${WORKDIR}/${MY_P}"
-FONT_SUFFIX="ttf"
 FONT_CONF=( "${FILESDIR}"/62-crosextra-caladea.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/crosextrafonts-carlito/Manifest b/media-fonts/crosextrafonts-carlito/Manifest
index b2865c8ed2b0..efc421a8cfdb 100644
--- a/media-fonts/crosextrafonts-carlito/Manifest
+++ b/media-fonts/crosextrafonts-carlito/Manifest
@@ -1,4 +1,4 @@
 AUX 62-crosextra-carlito.conf 518 BLAKE2B 546f8d8c535f89599d6f28aede771d2440d2cf694123c6afcc710d7a5feb8635abd26e219880876785fae39492bb99e658bd0e89294a098f9756573bc5370a8a SHA512 2ee9cf89e6c882e6d5a82aaad721eb916b1d552b5386a22891e3d876eabb6089ca6182a3ccd5470d553405934944ad67786823f9894378e2497d04d00ab9f43e
 DIST crosextrafonts-carlito-20130920.tar.gz 1169488 BLAKE2B 9a7aab65bd6e523ca9d9c9b89eba43db2e909d669e9e3250f2eae97c3ab963c0f6ca9f90bd9f40e08aeb98346387242555c7e08d3254ca5e5e0bb083b31d193b SHA512 eb516060487d30353e06de711921c0d54c5844f2be69b1c1d37edac4b27303e9213a6bb306f309dc5827b2a6a2a37c9cb85b62368164eba6dd397dbaab3e3ba0
-EBUILD crosextrafonts-carlito-20130920.ebuild 532 BLAKE2B 4fc2b6e8f95278276d8294727209858f8e3ac647cf428680b2e980a8be2ead1290c15437ae597b30f21ce7da67fc290747db593312d69a69e96ef04c8de5ec1f SHA512 3d873e4b55d08c99add633de847e723d53c207dea422a2fb1b5845eb76bd436fbb1a21cb46f50f4f7009e72c11f931f82ee13ebd9edd0216870d71ad45cf7dcf
+EBUILD crosextrafonts-carlito-20130920.ebuild 533 BLAKE2B bc70b4d77d5c80da9bf4504c8b1554d0c1944f1ac4341a2773acc6e68caeb9dbd77518decc39d0a71f5a56c96d0390e353dab88f68872537e938713c47b48f31 SHA512 a452903f2c7168df44729d742bd16ac4cfbda537c2cf00520848b50299cabd49cd87f7cac0b47a1fc18ffa304ee336844239122381c5fc214ba0f2921eedf11d
 MISC metadata.xml 259 BLAKE2B 46523dd0c4d37cc8de2ae4a7cc88ae579064a3843997c11d00953f29a4e0b63ef1a3ea769ab417f9938a5cf1cb12966e984006aca981fd50131a20ec9bce8c0e SHA512 42777fc28db6d4eaa1c7b9269f3d7c97fbea301460356a5c478940e6fd15d9ee8b67231740d716d52e9782a0122ebb539cb6ea829d7e7a64429c2c0984f92921
diff --git a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
index 3b4bc45916ff..37dbf0c56ab1 100644
--- a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
+++ b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Open licensed sans-serif font metrically compatible with Calibri"
-HOMEPAGE="http://code.google.com/p/chromium/issues/detail?id=280557"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
+HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=280557"
+SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
 
 LICENSE="OFL"
 SLOT="0"
@@ -16,5 +16,5 @@ IUSE=""
 
 RESTRICT="binchecks strip test"
 
-FONT_SUFFIX="ttf"
 FONT_CONF=( "${FILESDIR}"/62-crosextra-carlito.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 59c45b5dd592..bcf1de3dce03 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,3 +1,4 @@
+AUX culmus-0.133-fontconfig-test.patch 7473 BLAKE2B 77e02be89533d98d69e8ceea04c240117cbee379baa4bc71c583934b1fc64cdc154c74ee15c27e1cdeba786de113e5e9f8c8c2a8650fa8cec0c394280d18e6b5 SHA512 eb9c1dcce7870797eb6724e4a27c3a6047d3bf1353844a4894a191a4ec8a33fcc1c01ee6ffd8c1e8667eeb0b090dec74d6189d79f7cba5dfc188437d7df592bb
 DIST AncientSemiticFonts-0.06-1.TTF.tgz 337085 BLAKE2B bf55807160e011bdf378364f0bd258bfcbe3fe8fb2ca0c611ef97fe7ebe63dfc408ec9cb49ca0523374a4e84e17a4e7d5b3de314495764b7167e75b85fb3fdb8 SHA512 554b330ad80b778ea1b590d74417a7ba7d5f534c06281fe25735f6b6af65d7dd33df667c1cca1b16ab8a25ade0076c710532e8340f3947f78f28c8e0122b335a
 DIST AncientSemiticFonts-0.06-1.tgz 1094932 BLAKE2B c4a3b5c1cc1ba8d1cb37ca01822025c3e060d1c31006855987593b2cd98f8f54a90a5212479cb6149f1e8dbd44211c8cff1e3be677ef1a6536825598bfee4831 SHA512 c77cca2de26efa4aacfc57c53710ed5bd099f22f41fe7f972285ae56957aeb38aa2b23a990c9c375c46c0b88e6af01b204676fd52165969c539f1e8b1f11a1e2
 DIST KeterAramTsova.zip 2418489 BLAKE2B 6906b4965cb1c9bc5aadba6a7c33b53c13bb8a8c495f652180de33fff4cba2e9b8e21e09e2fd54f9f7146e695db9039801d3f7789f31471be560f98f0a4eeec6 SHA512 9aa1440309a62068d780e674f2173d8eb427bead090bdc36b189315a9c982b0fd40553cba5551b907d752328c87229f0935d75745eff7049e5a7d07e5948893b
@@ -8,9 +9,7 @@ DIST TaameyDavidCLM.zip 572761 BLAKE2B f33bf233a5da417b0edc364e13d39f58b9746997e
 DIST TaameyFrankCLM.zip 742392 BLAKE2B 91eeea273e69a570ecf8c30fdba37dbc7d65a819748dfe8e131b6f9b87f2c08e53a3aa295e7b7a4616f6d005440028b91bd5a77dc43bbc303f71b43703915be6 SHA512 6f87d95f2359f1facba32594a0bf0fc3c69b1faf895cb9dbc48325b757ec1446eb70cef6f1cbc88f38025a0d549d310bb3c2b34f52617846da3702938ff01b1a
 DIST anka.tar.gz 21210 BLAKE2B 04d40f828a94f7aa58e4ddb83bf47e73f369aee1cafd2ae01126d9cbd34c6119681cf46a589eac9de901662a89547cb0a017ee3b3b8f6d8aec7d24f4dce5c66e SHA512 e343918245a05aa11243dfda65a00295d09f04a04bb56594155129e5744a7f100793940eb0d417d708e6f25a1856c20d09d5198bab03a2c8fba258816bd2d14b
 DIST comix.tar.gz 100296 BLAKE2B 038e09da9a33f57be3fc983185d2ce9054fecb65c00c522071730fc27419dfc9e6767440bdb50f5e3fab65c19d658e787ec64bb48b72d1d1ec70c62e13e1effb SHA512 eacf751e7d9503db1cab95190c4b9473d4e5b459bc4baeb9341f35a7859ff6068ceffdcb27bee2294ead9a18d3471ee21b725ae48d80c946817d9b420f7adb9f
-DIST culmus-0.120.tar.gz 1190095 BLAKE2B 8bc67812f2afda337ac5354c1f18c50b2e74ae5668c351f0130f88f2b010d742f80829b9b2af84a74c7933fc749c8623e27befd9ce8255c980fbb6ca1b637831 SHA512 e99578fc92d4184f92cb6fb8b990ecfb1da1a84e77e400218f40087380d36edd3a65ca4f776330c3d867bbe8b32e58fb13d8485e1ece689336756d3d7d69ccc3
 DIST culmus-0.133.tar.gz 1174687 BLAKE2B 17674939dab12b76280cf420edd00c8a39059415a0abfe3af79a3cddfa33e05826068d71c6bf6355f9032641b7391e763c36d39de4713d0fe1b44b7b4d6f1bb6 SHA512 97c17dbe4ad5b542a2bfd6c9c7a7afeeabae942cbbd3a718d46ceb18b4020fe7fdf93ade07a65a2da93dadff645abf0da4648713e3452d30bf2a9a79201f2845
-DIST culmus-src-0.120.tar.gz 1180742 BLAKE2B 0453dbb778c7e6cbad68165bcd9b8b1bbc54a646f70864c9ce6f8315b8c7ad269dafdc15b4360acf58b6d826ec7db8b31deee2e461c2c56aaf2eee5254259322 SHA512 1c57024e7cfbcf6a5237db317cdaf73327fe4bbd06b84cb9f1218f560723f3bd421ecc53c27e523c600f50586f9daf1223ecc641f81bdc45f6fbef82fdcc0146
 DIST culmus-src-0.133.tar.gz 2054572 BLAKE2B 12ecc62b0e0eb2fe665750c6abba7bf1673904013287afef8ba10b98bbe8d5fb0cf345753b6e48aa4c7ea893c015aee24ba7ec48d6b470987a2b25dc0ef73f08 SHA512 d15eafe199bdb1071fbd434797e4f83d37b757d97bf480e68d6a8181dc642352b698b637a9bbebe380cf6f52367d55a4a8a3573077bb5e7508950af81ad1eb63
 DIST culmus-type1-0.105.tar.gz 465679 BLAKE2B 4ba8a9fa14507c19df16ba9cf80325fa7ed01de6db9be8aaed535e20ecfba65c5b5e8ab98ac2795f5a6ecbe780817da567a280f6b426ffd2ee0b7b4a68ae0649 SHA512 f2cc3ddb31e72936802998a3f64fd265aacb40f8390f9f3f8556ce4ce546b90eeeca0fe3a8a326b4dbc79ed943c886900d08bc5f5e6dfd3508fa5b3eeb173f7d
 DIST dorian.tar.gz 141215 BLAKE2B 44e92f5c7534598e2b4de7ae2edc87f73482d185997fefd52d7f1b85baa190bb303efb9d77e39cd429e4c0be64cd507a763d8cdd4f9b1dea4ff4409a17d4b691 SHA512 f05b602528fb9a4ddb4eb876d48f3ef67d446180fb9374bb8b82bca61c9922bfa7cb7ad85a79d04a9ed7fcdf3690ab1ae574ff5e4b595ea9cc5a7d5516aa6fca
@@ -21,6 +20,5 @@ DIST horev.tar.gz 19261 BLAKE2B 4a2c372f8ec0baac10190dda5ff462a32143240f90393dad
 DIST journal.tar.gz 27112 BLAKE2B 516255f54278c02492e17f7490540ff9c3d838fea673dfb69406ac3d49a75dd7eb83b283b497250b10ae6d948e4a869ee5a04afead6aa8e80e45ab939550614f SHA512 8ec18622b889fdddce3a0cc834a86bf55aa051acdb40114bd10b46f9b0e2b28222a781ec9bad135e784216c70d05ee5a0cdbc475029579bcbb5dcc99351b407d
 DIST ktav-yad.tar.gz 89373 BLAKE2B ada55f47b018d2cd624fd17ea9df472aead17ec331d09a3c73be7adf21ef9b160cc076c6eece43438383952237de44a0b83e176964dc37ffa928cd653e15d816 SHA512 c5b065cbcd2389ef3a81e408347be0dfabc130237f55567b4666b58533122b7c0622f09d17fe45c1fd73f0117afd411c10e6961398fe2de5764bbc53d5557cc8
 DIST ozrad.tar.gz 16709 BLAKE2B c8122ca1a9aa984fc0bd913e073150dcc4beb50e60fadbc532ec7c022d8efe9ef0b43299dda506794ea674946091c705ca775bf88bc5cb7a60de0aa5bf25d919 SHA512 78f5b686b6bd472966a2e682f057b03b05bf2450a6cfc147668c13f6857c655067b83f8549038ffea15429f067f2ee57520e3722e1ad818376e410468298f382
-EBUILD culmus-0.120-r5.ebuild 4632 BLAKE2B 11b67941cf7b0c7fc7bf06fefd1f40cc312f1fbfd42343968fc391123ea94b9e140cd07084af03e5301a6e48e4f75e8e4e124e5901cd2ed593801def59d8ffb9 SHA512 57d1568fd50188a190c31d6cf226a71d60d871611c7b9f0d2e8761fa0a36fb9ac5dcaa478aec599ed4216267acdfae7671039188dca346874b719b670d90aca5
-EBUILD culmus-0.133.ebuild 4639 BLAKE2B 6df802e7d531ed9f6a036439fa9ff96d61c98d564e496481489687a4e41029bed354a8f242b74a1e42c5a99702622ada5159c9090bf78f1a89243be5c101bcf3 SHA512 cb21d9308c4f1ed715f03ddfe096e54eec50ffc14586302802a7736ab18e92adb4537e962fbfa37aa1c483ce190cc514fe61985c377f743e9c2687eeb5a7df63
+EBUILD culmus-0.133-r1.ebuild 5146 BLAKE2B bb35d8dfe74cca46b55ab61d11371fe272869e6a2be3e231acc9515046822566270c24c747607c581c611f6392276e44224980121725730cb7dc3b92a8469531 SHA512 394a02e9a91af769aa90ff5734d738bc5661b32b69850c2198d09dff6f50903ce958bd2f6812fea037a7b53a6f500b91decf88d82965cbcf1ea33e1a29649ae8
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild
index 95a55a83564e..1d3fec0e13b8 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit font
 
@@ -39,109 +39,114 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="ancient fancy fontforge taamey"
 
-FONT_CONF=( "${T}/65-culmus.conf" )
+FONT_CONF=( "${T}"/65-culmus.conf )
 
 RDEPEND="!media-fonts/culmus-ancient"
 # >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
-DEPEND="${RDEPEND}
+BDEPEND="
 	app-arch/unzip
 	>=x11-apps/mkfontscale-1.0.9-r1
-	fontforge? ( media-gfx/fontforge )"
+	fontforge? ( media-gfx/fontforge )
+"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 # Put all fonts, generated or not here
-FONT_S=${S}/FONTS
+FONT_S="${S}/FONTS"
+
+PATCHES=( "${FILESDIR}/${P}-fontconfig-test.patch" ) # bug 695708
 
 src_unpack() {
 	unpack ${P}.tar.gz # For type1 fonts...
 	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
 	use fontforge && unpack ${PN}-src-${PV}.tar.gz
 
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
+	use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz
 
 	if use fancy; then
 		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
 		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
+		mv TTF/* . || die
 	fi
 
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
+			mkdir ${font} || die
+			pushd ${font} > /dev/null || die
+				unpack ${font}.zip
+			popd > /dev/null || die
 		done
 	fi
 }
 
 src_prepare() {
 	default
-	cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
+	cp "${P}"/culmus.conf "${T}"/65-culmus.conf || die
 }
 
 src_compile() {
-	mkdir -p "${FONT_S}"
+	mkdir -p "${FONT_S}" || die
 	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
+		pushd ${P} > /dev/null || die
+			mv *.afm *.pfa "${FONT_S}" || die
+			rm *.ttf || die
+		popd > /dev/null || die
+
+		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
+			mv *.afm *.pfa "${FONT_S}" || die
+		popd > /dev/null || die
+
+		pushd ${PN}-src-${PV} > /dev/null || die
+			for f in *.sfd; do
+				"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+			done
+		popd > /dev/null || die
 
 		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
+			pushd ${MY_A_P}/src > /dev/null || die
+				export FONTFORGE_LANGUAGE=ff
+				make clean || die
+				make all || die "Failed to build fonts"
+				mv *.ttf "${FONT_S}" || die
+			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
+				rm -rf ${font}/TTF || die
+				pushd ${font}/SFD > /dev/null || die
+					for f in *.sfd; do
+						"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
+					done
+				popd > /dev/null || die
 			done
 		fi
 	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
+		pushd ${P} > /dev/null || die
+			mv *.afm *.pfa *.ttf "${FONT_S}" || die
+		popd >/dev/null || die
 
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
+		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
+			mv *.afm *.pfa "${FONT_S}" || die
+		popd > /dev/null || die
 
 		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
+			pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die
+				mv *.ttf "${FONT_S}" || die
+			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
+				pushd ${font}/TTF > /dev/null || die
+					mv *.ttf "${FONT_S}" || die
+				popd > /dev/null || die
 			done
 		fi
 	fi
 
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
+	if use fancy; then
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+	fi
 }
 
 src_install() {
@@ -150,31 +155,31 @@ src_install() {
 	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
 		font_src_install
 
-	rm -rf "${FONT_S}"
+	rm -rf "${FONT_S}" || die
 	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
 		while read font; do
 			ewarn "QA: missed font file: ${font}"
 		done
 
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES
-	popd >/dev/null
+	pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die
+		dodoc CHANGES
+	popd > /dev/null || die
 
 	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
+		pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die
 		newdoc CHANGES{,.ancient} || die
 		newdoc README{,.ancient} || die
-		popd >/dev/null
+		popd > /dev/null || die
 	fi
 
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
+			pushd ${font} > /dev/null || die
+				docinto ${font}
+				[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
+				newdoc README{,.${font}} || die
+				dodoc -r Samples
+			popd > /dev/null || die
 		done
 	fi
 }
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
deleted file mode 100644
index 9d57b2ead28a..000000000000
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-# The Type 1 fonts are just a stripped version of TrueType fonts and they are
-# not updated unless there is a meaningful change and we need them for
-# culmus-latex, see bug #350657
-TYPE1_PV=0.105
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia horev"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ancient fancy fontforge taamey"
-
-FONT_CONF=( "${T}/65-culmus.conf" )
-
-RDEPEND="!media-fonts/culmus-ancient"
-# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=x11-apps/mkfontscale-1.0.9-r1
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	einstalldocs
-
-	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
diff --git a/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
new file mode 100644
index 000000000000..17d35e823477
--- /dev/null
+++ b/media-fonts/culmus/files/culmus-0.133-fontconfig-test.patch
@@ -0,0 +1,191 @@
+  Description: Fix incorrect syntax for disjunction in fontconfig .conf file.
+  Author: Benjamin Drung <bdrung@ubuntu.com>
+  Bug-Ubuntu: https://launchpad.net/bugs/1034928
+
+--- a/culmus-0.133/culmus.conf
++++ b/culmus-0.133/culmus.conf
+@@ -8,6 +8,16 @@
+ 	<match target="pattern" >
+ 		<test name="family" >
+ 			<string>Guttman Adii</string>
++		</test>
++		<edit mode="append" binding="same" name="family" >
++			<string>David CLM</string>
++		</edit>
++		<edit mode="assign" binding="same" name="slant" >
++			<const>italic</const>
++		</edit>
++	</match>
++	<match target="pattern" >
++		<test name="family" >
+ 			<string>Guttman Adii-Light</string>
+ 		</test>
+ 		<edit mode="append" binding="same" name="family" >
+@@ -30,6 +40,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Stam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Stam Ashkenaz CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Stam1</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -40,6 +57,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Hodes</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Hadasim CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Monotype Hadassah</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -50,7 +74,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-Aharoni</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -61,7 +99,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>FrankRuehl</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frank</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frnew</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -72,7 +124,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>David</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>David Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman David</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -83,8 +149,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Fixed Miriam Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Myamfix</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-CourMir</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Fixed</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -95,8 +182,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Miryam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Levenim MT</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Transparent</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -107,6 +215,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Drogolin</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Drugulin CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Vilna</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index f11ca379c970..db6f6169e5e2 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,4 +1,4 @@
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.37.ebuild 2040 BLAKE2B cde88b2163d76c87d2bcb905294d2ba6c32d66c91ecba3e22e98f916e7951f7ff1dc21b64d428e7618933181d111c4194bf61086dbe4c7f517c5409a8bd07504 SHA512 7a2ecad59bb45284e58c4ae1a761fe2041c822c0319dd992eaa33436037b8b63fc5a64ec32cdf1ed5d9e2dc86ec6377d464109bf90033addb0faf8b054d25302
+EBUILD dejavu-2.37.ebuild 1995 BLAKE2B ea4dd1f90bb3ddafa435c6aa8a2c10eead916e754b0b53eaffebcfc17d192ba186d4207719cb237485bf6b640a5befef4ce64e9db89d1cf293668acbe9af0091 SHA512 2b99bb9ef1cb5698c8286abfac70f1c09e98bf430c0b21764a1a2080974fdc174e260484c005005e061f59ef593135abefd6712a303b95bb9e81a6d475c4207c
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 0b1bf5416c9e..ee96333abcb1 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font versionator xdg-utils
+EAPI=7
+
+inherit font xdg-utils
 
 DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
 HOMEPAGE="https://dejavu-fonts.github.io/"
 
 # If you want to test snapshot from dejavu.sf.net/snapshots/
 # just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
+MY_PV=$(ver_cut 1-2)
+snapv=$(ver_cut 3-4)
 snapv=${snapv/./-}
 MY_BP=${PN}-fonts-ttf-${MY_PV}
 MY_SP=${PN}-fonts-${MY_PV}
@@ -28,14 +29,18 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="fontforge"
 
-DEPEND="fontforge? (
-		>=x11-apps/mkfontscale-1.2.0
-		>=media-gfx/fontforge-20080429
-		dev-perl/Font-TTF
+BDEPEND="
+	fontforge? (
 		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0:1.0 )
+		dev-perl/Font-TTF
+		>=media-gfx/fontforge-20080429
+		>media-libs/fontconfig-2.6.0:1.0
+		>=x11-apps/mkfontscale-1.2.0
+	)
 "
 
+DOCS=( AUTHORS NEWS README.md status.txt langcover.txt unicover.txt )
+
 FONT_CONF=(
 	fontconfig/20-unhint-small-dejavu-sans-mono.conf
 	fontconfig/20-unhint-small-dejavu-sans.conf
@@ -44,10 +49,8 @@ FONT_CONF=(
 	fontconfig/57-dejavu-sans.conf
 	fontconfig/57-dejavu-serif.conf
 )
-
 FONT_S="ttf"
 FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README.md status.txt langcover.txt unicover.txt"
 
 src_unpack() {
 	default
diff --git a/media-fonts/dina/Manifest b/media-fonts/dina/Manifest
index 934a94bc7455..8ce72db5ace2 100644
--- a/media-fonts/dina/Manifest
+++ b/media-fonts/dina/Manifest
@@ -1,3 +1,3 @@
 DIST dina-2.93.zip 78625 BLAKE2B b2376faf3b94177d657a029bd0d31243e7751b4784b07de08f22977daadbf1e4fec4f93c024d1e1f7110353fd9831a6cc9d0a207cb324fbedd3dbd47923e700f SHA512 cccf05b32d401ba77861e39471d9f6489a85b839dd8d49ec008eabd107189bb0a95bdd36805bc7907ab96fa65792910408192a136340f62c34a61b1d5c6f6307
-EBUILD dina-2.93.ebuild 596 BLAKE2B ea502eadb6726402ceaf36b70ea45b035cd7b2ed510e323499981ddc2f5373815cf3d856cac29220e0afea723bd7c75f103df2ff55abea05ee0791061fdbf4f2 SHA512 fc87a0ab3d942f0c30b1d1cb013a75cbbf8b09f379cd1f87650dd6b899a55c11aa70f257c6b1715010a0d2a1701e3f301bdccb68970514499fd30bfb00834a9b
+EBUILD dina-2.93.ebuild 565 BLAKE2B 8b90d5cf5dda85b66a618b13e97528052afc69a6ee39f78ff2f8dedafc0c89907d5089dda16c4c534c869289c76bead4b8fa840b0bb8620981611dbc1d76fe5a SHA512 174fac2fdeaed3fb2ea585d6ae8912c1d98df071d95eaf97068d638db5c3834bd5781be9395e8e94abc19cd6b5aaf19eaf611f56fc7d8ba987e12c531ec9d009
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/dina/dina-2.93.ebuild b/media-fonts/dina/dina-2.93.ebuild
index 46aefaabe4ca..c597de4ebb50 100644
--- a/media-fonts/dina/dina-2.93.ebuild
+++ b/media-fonts/dina/dina-2.93.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font font-ebdftopcf
 
-DESCRIPTION="A monospace bitmap font, primarily aimed at programmers"
-HOMEPAGE="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-SRC_URI="http://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> ${P}.zip"
+DESCRIPTION="Monospace bitmap font, primarily aimed at programmers"
+HOMEPAGE="https://www.dcmembers.com/jibsen/download/61/"
+SRC_URI="https://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> ${P}.zip"
+S="${WORKDIR}/BDF/"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+RESTRICT="strip binchecks"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/BDF/
-FONT_S=${S}/
 FONT_SUFFIX="pcf.gz"
-RESTRICT="strip binchecks"
 
 src_compile() {
 	font-ebdftopcf_src_compile
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 7cb53c594d4f..224f83b0c678 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -4,5 +4,5 @@ AUX 59-google-droid-serif.conf 329 BLAKE2B 4d7042c7eaefcbaa8ba29650b541d613a899e
 DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 BLAKE2B 07124449926ae09babf6d298b8d180f4309580608614228257230348b2207ae565e6c1cc40b9b85d233a396a72c8db4ad8f9694a4807b95902a20e5fc055d6b1 SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf
 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 BLAKE2B e699ae9170d91a980fe295fcc22a8efdd499381447fcde3e2403c6c63f50e3579f71507d8df744077ea8131446c1668d344838bb38d049c8c15e2d9926907bdc SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c
 DIST droid-113-r1.tar.bz2 4227725 BLAKE2B 9b9c25b93c5b4b9335589af02e6844d52a5a01d37b168b117f0191793b5274e8d4c944dd15a949c4ad868d8c2e51412ec875e72fc642b388d4018e6bfadb9248 SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64
-EBUILD droid-113-r5.ebuild 1151 BLAKE2B 0c604a2bf4e8e0eef18f4004940d940c1df43e8c4c63c345394e80b95a7734d06113cba0a5d5bb0f0987153ffff6bb30128e617ce626e67edb812dca37c112a6 SHA512 de9fd519d66d8d9c56541e59f4a0bbad4c2f42b0313a1b1da3771626c8430667483b74dc87e9dafd06486ae4cbe7b9a173ab65c60aa1e6d2dc4ac0c00c5568e1
+EBUILD droid-113-r5.ebuild 1127 BLAKE2B 68ee88e88b4062388808ffcd98d75f18587f930a78e326a61e14bfb85f0208c1ac9fbe710155954fd6838eb561b2c98aacac0b108bbe2f4868265eb48e2d8988 SHA512 c830e301257237b5a1f028f592641a21a04c4bafcda7145384b17f7101001c36fdd42c9d6da6dfea5f18bfe6d49128768350d5753f8f43ec10ee9f0fe21a7c01
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
index 80a8f16631e0..06a2a1d627c4 100644
--- a/media-fonts/droid/droid-113-r5.ebuild
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit font
+EAPI=7
 
 MY_PN="${PN/d/D}"
+inherit font
 
 # $PV is a build number, use fontforge to find it out. 113 was taken from:
 # https://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
 DESCRIPTION="Font family from Google's Android project"
-HOMEPAGE="https://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
+HOMEPAGE="https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29"
 SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
 	mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
 	mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
 FONT_CONF=(
 	"${FILESDIR}/59-google-droid-sans-mono.conf"
 	"${FILESDIR}/59-google-droid-sans.conf"
 	"${FILESDIR}/59-google-droid-serif.conf"
 )
+FONT_SUFFIX="ttf"
 
 src_prepare() {
 	default
diff --git a/media-fonts/dzongkha-fonts/Manifest b/media-fonts/dzongkha-fonts/Manifest
index de219457ceab..e10912d5dac6 100644
--- a/media-fonts/dzongkha-fonts/Manifest
+++ b/media-fonts/dzongkha-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST dzongkha-fonts-2009.09.zip 2043649 BLAKE2B 2ba4c52f5b6ae071875ac1588a78f827d9401d398565b5c0f7486377cba588c14ef26a66015aa3bafede2c0abb3c19b3f39ff8c0fdde373da7b307ed96f044c0 SHA512 0d8019121d60714616ad15d4ca0e8d8c3038a0a60972524640c01ac7834661e981b6efb58b0469287b11712cb29cab2e194652aec0e84e8cc88d1b7395e31b54
-EBUILD dzongkha-fonts-2009.09-r1.ebuild 568 BLAKE2B aec55891afe36521d73a706395d92eabe5100811248afb0fec0a5a3caa9c39764ea212ccc6de1e45ce0bbfa0e4e30d9f484326ca9bf330f25ee7c289eeb957c4 SHA512 0cb0c2aa0fea8d8595d0df8d0024bafb9e9a1d11dcbcc94db74b011178e627357f96b280b96bb8b615806e9c036e8ef3b6e8ad4b18459fd645c58dba51d73edf
+EBUILD dzongkha-fonts-2009.09-r1.ebuild 551 BLAKE2B 3a97f8cf99f53c71b7d1f181674eda63648c010213f796398fd7f57dd69c88acaeb54921d29f869beae5deb07bfb26a9b0f53dee5692580f817d22dc1c3c745d SHA512 0b8c2eafdb1abcaaabd1da61b1f4f6b44968162eab37e3b6c461553ec4546be5eb2254216208cb8b201f712bb447c4bc95a763c677221c4c716698bec688ab85
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
index 1585b906ac12..c7301d0b47b9 100644
--- a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
+++ b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government"
-HOMEPAGE="http://www.dit.gov.bt/downloads"
-SRC_URI="http://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> ${P}.zip"
+HOMEPAGE="https://www.dit.gov.bt/downloads"
+SRC_URI="https://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
+
 RESTRICT="mirror bindist"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 src_unpack() {
diff --git a/media-fonts/eb-garamond/Manifest b/media-fonts/eb-garamond/Manifest
index fab2441c68a6..e676944b8ebf 100644
--- a/media-fonts/eb-garamond/Manifest
+++ b/media-fonts/eb-garamond/Manifest
@@ -1,3 +1,3 @@
 DIST EBGaramond-0.016.zip 2640545 BLAKE2B e78759e54116674113d24d8604c953734ae9d555a7317489d5280b2674bd0edc5262fc4d01a190993d31649a247146647fb4f13ccf56799f7bc3565ac90fd16c SHA512 f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955
-EBUILD eb-garamond-0.016.ebuild 563 BLAKE2B 1253b7d4431e94615e7e23780e235cfa54651a152f06b213c6587f4e9fb720ff5276ba78c84d2ebc01bf568a13c1f163a7fce9081dd190da7de26d4a69d6d567 SHA512 d12443496dc1091dac23b4af363645e0d20531ac7c8df490154ffafb708f1a5a0435d2503c9f7ca3a5a63cd07bd2730591f34d5047f1a6637a9cded47d61dedd
+EBUILD eb-garamond-0.016.ebuild 565 BLAKE2B aa80133ebaf1d194b65d6bc8931b4ea6d66eba1f06c9a7d4c48dbcc40d76883fcf5bc9d094eec411f1460b2f19e23f0a2f0287c220311c8cc4927f303061db4e SHA512 c32f59541acdceb79d1c0817648cafab731c118e43791f77071a5015555e5a9741bbcb78abef8739c2e75028d8c75ac43f50eedbb8b9756052e67e222fac20ae
 MISC metadata.xml 334 BLAKE2B 9afab341adce6e0845fab049e869b9fb29a18945ff2fed470d472d546341f24636fb6ce4cf917268b677a726231dcc26915eb9695607fa0353ab4eafa710e1d8 SHA512 5381edbddb4daa935f46d8814cbe2eb739081837f892e3e0544c31438e53ae146b6556b01597ab0b31da805f91cc6875ec0d0cc35be9e3920e4cca1d35eac381
diff --git a/media-fonts/eb-garamond/eb-garamond-0.016.ebuild b/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
index 6de7b6d096ae..eaca370cef3e 100644
--- a/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
+++ b/media-fonts/eb-garamond/eb-garamond-0.016.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Claude Garamont's humanist typeface from the mid-16th century"
 HOMEPAGE="http://www.georgduffner.at/ebgaramond/"
 SRC_URI="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${PV}.zip"
+S="${WORKDIR}/EBGaramond-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/EBGaramond-${PV}"
 FONT_SUFFIX="otf"
 FONT_S="${S}/${FONT_SUFFIX}"
-DOCS="Changes README.markdown specimen/Specimen.pdf"
+
+DOCS=( Changes README.markdown specimen/Specimen.pdf )
diff --git a/media-fonts/essays1743/Manifest b/media-fonts/essays1743/Manifest
index 85aa93322e02..af869fd59136 100644
--- a/media-fonts/essays1743/Manifest
+++ b/media-fonts/essays1743/Manifest
@@ -1,3 +1,4 @@
+DIST essays1743-2.100-1-otf.tar.gz 3582487 BLAKE2B 787ac5015b3da3ddcbad4a988c2b683159cb176789a39033e6103dddc5a101562b310e438cc1cebfc99ca1dc7efc15e256d3fd02c6cc283ebef70bc1ef8c7a0c SHA512 f1d205e9ad77be119a32b105a36c0a8ec45eedd19451c64643dbe13add46a6407d7cad9444d16d096b648405b4abb04b70bb943767308bcf7b6512398c2e4df6
 DIST essays1743-2.100-1-ttf.tar.gz 3107168 BLAKE2B b8c9b55b3bf0178bdcd4fd25e0fc151ecf5666052530b596bf22f6ae362464b5f9947a8e8e877dfa775acb9898a180b3dafb2fdbf4a5724a266088321a72b1ec SHA512 31885e430713e6931b1bf2f7ce307e964576f1f2909a60c4a0a9adfa6293fd1c02200155d3bd56d0714210c7e653ee1980425539a554b304c3a3c6fb6121bd2e
-EBUILD essays1743-2.100.ebuild 493 BLAKE2B 00923ad74b1dca8dd89d8ff3a59e061583e943fe0e672ef0a3f39dbeb946ce7d5c89e952d9967f46823d069affa350ca7a69e57e4dffb61f1343a8db6bdda7d5 SHA512 3f4e6e9a6c567c2814f4fe4189f8d99ce1ab4803eca16759c7d6d318ef26bacf263d0327501d8804156da85ddcd2941ff7145d3ce7dfa210db0c69df74969821
-MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
+EBUILD essays1743-2.100.ebuild 648 BLAKE2B 368dde9e391a53fbaf09afca9ba1439733ab1d60e9ccc59cf6accabb886d6a7f0545f744fb6f4af66bb524d665ccdbaedb339a1fb1b7aa214548e2d8e6d80a51 SHA512 5e859d6abd93218c489ff385a5a1912db08d45967dbc0af0953c3777ebbca75279fc4fd7d5bcd8486251461fd2d7cadfd0f60ee5c5c3e3991e8e928c93632798
+MISC metadata.xml 389 BLAKE2B 77660272e995f67a9db8c5f85a71a189a389ae464e96af97dd79dd1b704d3c7789d423c0e21f1e0dc596e4d6695540907305a190ef28d5c8c674bc0e37e11050 SHA512 f999fee27ddbf30914c8e9c4ecf56019c45f95738e97b813953f20d8968ecef732280b53671b87c6a6680d3eda4846a9d8b1b8ff4f605f124d6367a6745d8de0
diff --git a/media-fonts/essays1743/essays1743-2.100.ebuild b/media-fonts/essays1743/essays1743-2.100.ebuild
index 962931d7eb9e..8e23029b793f 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="John Stracke's Essays 1743 font"
 HOMEPAGE="https://www.thibault.org/fonts/essays/"
-SRC_URI="https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz"
+SRC_URI="otf? ( https://www.thibault.org/fonts/essays/${P}-1-otf.tar.gz )
+	ttf? ( https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz )"
+S="${WORKDIR}/${PN}"
 
 LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x64-macos"
-IUSE=""
+IUSE="+otf ttf"
 
-DEPEND=""
-RDEPEND=""
+REQUIRED_USE="|| ( otf ttf )"
 
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
+src_install() {
+	local FONT_SUFFIX="$(usex otf otf '') $(usex ttf ttf '')"
+	font_src_install
+}
diff --git a/media-fonts/essays1743/metadata.xml b/media-fonts/essays1743/metadata.xml
index 13ee79314597..d8434021029a 100644
--- a/media-fonts/essays1743/metadata.xml
+++ b/media-fonts/essays1743/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<use>
+			<flag name="otf">Install the OpenType version of the font</flag>
+			<flag name="ttf">Install the TrueType version of the font</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-fonts/exo/Manifest b/media-fonts/exo/Manifest
index 23ee7727bd76..6d007d6ebfda 100644
--- a/media-fonts/exo/Manifest
+++ b/media-fonts/exo/Manifest
@@ -1,3 +1,3 @@
 DIST exo-2.tar.xz 914800 BLAKE2B efd551b1cb6acef6bb565a167fc198a8b8ccdcf0ad7dd54a7dff2c7f0daade823ea0e9054e570c7c5cc5e6e1d202babf910b833680f518997f9f4c2a1a5cb95d SHA512 362f2391563f2e5684c8c0bd7ecec8bd4834758c901e38ddfde7eeb53c573529f197b8cefe7da48ae23de564b8967c03c27e32266649cd429ee5b5187fda16ca
-EBUILD exo-2.ebuild 463 BLAKE2B 5966256fcfce3a1f1355bb035f4aeb70ed353bad221689124b772f0d0607c1fd2d51664e16ae1d687a8c774e50f1a923d11e46bbc78b68f2f478ff99a94e4afc SHA512 d6644f17127806939a86906d46c6a51dcabe9d5b1bc3a080ed407b1767c6f24eb2b2476b0719d6c2dfe0a563777baa52ddca25f869513dffbd9a22dc2885843b
+EBUILD exo-2.ebuild 464 BLAKE2B b91444f66658da770e414385dff29f939a8d9c7df7be61d2badfb984be6fcbe88daf0ab414494d8ed25a26ea7bb6f8692717776156cb53999eb62020ebaa2401 SHA512 9c648e8ccbfd7d7b0495732fe3abe6f81d92621cad8fc7db1ee65259c8a6c77af6ec23c520f354cb112f96d4a69b5f5b4e8693b150af59e09838524e819d5aa0
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/exo/exo-2.ebuild b/media-fonts/exo/exo-2.ebuild
index bcde786c944e..7c5d86667ed4 100644
--- a/media-fonts/exo/exo-2.ebuild
+++ b/media-fonts/exo/exo-2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="A geometric sans-serif font with a technological feel"
-HOMEPAGE="http://ndiscovered.com/exo-2/"
+DESCRIPTION="Geometric sans-serif font with a technological feel"
+HOMEPAGE="https://www.ndiscover.com/exo-2-0/"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 # repackaged from two upstream zips (exo-2, exo condensed & expanded) + license
 
diff --git a/media-fonts/fifth-leg/Manifest b/media-fonts/fifth-leg/Manifest
index 98642445da81..91ff9e0e7d75 100644
--- a/media-fonts/fifth-leg/Manifest
+++ b/media-fonts/fifth-leg/Manifest
@@ -1,3 +1,3 @@
 DIST opensuse-font-fifth-leg-0.6.tar.bz2 265609 BLAKE2B d121f9593f2ee744e91360fb8af50354d800ee3d460573f8493c87aa7b803d7e0c71988524315d606988e18610057740ea4cdb2f54882784dba135e1772f1b2b SHA512 7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9
-EBUILD fifth-leg-0.6-r1.ebuild 495 BLAKE2B 9b47beb92e119e0798adeef319a67db849fba21ef590ceb94d1eee613415a6c74a9f2cf57fc9f799eb26e3025ab6ce909038407f4f96478ce7baaca03dd2f18b SHA512 b70037258a075304b9d97ca9404712ebe4c9d182ab5dd7312f16ce14362b139e433105c5894af5e1af1cb9ca0b782428ce2f17e757b161a927f5b14cd848b7f6
+EBUILD fifth-leg-0.6-r1.ebuild 457 BLAKE2B 1989a3b8674bbf01001444eed0f254bb6cbfdffcbaaeba62683bfe822834f3fafcd617c036cf5177a10a11333f515d594b070d95a44a64f0ad1d2a001ecc9988 SHA512 851986b92f3e8c08c10a8b42c8106a7ef9a9fb836f7a06ed0d717f12c53a45fcd0c4ca47bc218f090ffb8737c88fe0ab22162b8e7bc01de48406e89814b81c49
 MISC metadata.xml 347 BLAKE2B fdb054d0aecd35e7b747abc6df85bcacbb0438cbab3afe50a061e8626a8d4ccb39234dc638de5a8bca821806b517b4b28144e64101969723756592833f17c023 SHA512 9f9b7d43ae5c20225725504b96935eef4e8d07da81c5372871eed49df09cdf26428950f554e249a19f0e663b2b03f1b40dd293ce2f1a693f784fce656b488c88
diff --git a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
index 2458f54bb18b..7bef413394fa 100644
--- a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
+++ b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 OPENSUSE_RELEASE="12.2"
 DESCRIPTION="Simplistic, technical sans serif - openSUSE font"
-HOMEPAGE="http://jimmac.musichall.cz/log/?p=439"
+HOMEPAGE="https://jimmac.eu/"
 SRC_URI="https://api.opensuse.org/public/source/openSUSE:${OPENSUSE_RELEASE}/fifth-leg-font/opensuse-font-${P}.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="OFL"
 SLOT="0"
@@ -16,5 +17,3 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 FONT_SUFFIX="otf sfd"
-FONT_S="${WORKDIR}"
-S="${FONT_S}"
diff --git a/media-fonts/fira-sans/Manifest b/media-fonts/fira-sans/Manifest
index d2bbadfd550a..7f7441276ec6 100644
--- a/media-fonts/fira-sans/Manifest
+++ b/media-fonts/fira-sans/Manifest
@@ -1,7 +1,3 @@
 DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
-DIST FiraFonts4002.zip 22975177 BLAKE2B 6dfc143568605ecd4fa956d8ef567ce4d86e187e985e9f43213dda41dd9de2d417e7e29dafcf27ab97ffff11ca6571f0cd5ca084e623fa6a6dd84297cf514013 SHA512 9ce5350cea8fddf5fc5282a23ffe3d142ddb6fb778a78308bf4083be50f036feb1faadf72ade5c0e62638302c26a1ead91692ca016e0220d152871294b467508
-DIST FiraFonts4105.zip 27227111 BLAKE2B c8ef15673735537c0d849c3e0dfa46a0b9cdcb7fff1d82d50d18b0119192282fa3956f57fa182420f71479f9479a4b8da5f87cddedea2469fd01562dc7bf8ee3 SHA512 f451e99d761ae9e714461e1ac244ee1c12af11751f61c94fa7ed10bf04bfa26520fbf50d1aeae55346348aec932481888780ae12df27349c966ba79a3eeae37d
-EBUILD fira-sans-4.002.ebuild 616 BLAKE2B ab99924f4db432c8cb3ed7753a15b8942a5c6e50b21bea8598be0d708e9c4203934f8fb7b53bff92503ec264b1a5c6d269bea95c9626f6126ecd7bc1e3613c7a SHA512 1f49ed133338ecfab566b7717a86951ee3d6ecc6e46eec9cfd38fda015a6f408f6f8597998f40c0d1bc4f2acfb104fc3379864284290c849ba87a50b921228fc
-EBUILD fira-sans-4.105.ebuild 600 BLAKE2B 20ac4479827bae8547f702c6fbf767c7c285780c4ed06dbdaf582e5aace1ddc0bfd7a2c3eb9409463e0b0430ebae78fa94a701b554faf22b60a05e1a3e098b6c SHA512 26959ebef08d1f509f0b5ea44fb19b08308a74ab59f9e915de7dac0bd6c8258a524fb2c96e9ec60a680bd21390cca6b27b7e0691192cb5cba512121bdafb925b
-EBUILD fira-sans-4.202.ebuild 821 BLAKE2B 718e502470fefbad825758eaa10193ed08ba4ef73aa0620d24adc0b4fb6b9e07fc0e0740328dd68d8ac066da080c1ceba949b238590f065637f51c7166c39cd8 SHA512 59137446baa4530261c015f8ec2a04aab3ce01a9af72eb547d51f2f8093be89c0de366b7cec32c6903a139e009611608292bff12084abeb46455d954ae938bc7
-MISC metadata.xml 399 BLAKE2B fbe1c1518e1df8b646fad2460005cee18753f93d18a0e0737af0aa5d417c765dbf7db63716a93e9d8dde13b4d9e7afdbabc9c61a00c154ed72dda20c45a586d3 SHA512 ca38f2f10617c0ade03647233010ead6a9c38f7acf9a768f2daf8beefe73956b9326f3d876ea98958d003a4abf73b8b0db3942475e5b6d3a63c24597731859e2
+EBUILD fira-sans-4.202.ebuild 820 BLAKE2B 9f73eb0895ecfade3197ad93d302dddd701c7dacde84469e65baf9275401f49e70cc1a9a18095a6f616d145c2b501f84c627e779a774a3c91a7bc9e0a608b0ca SHA512 0a51a2632f9cbe32c1e40ca78311c595fac66d792651972fe8911f69fd708d8e413e4db480fa72c623941f07bfd858260f8cfb6cb0fda68f1449fdc26028c1ce
+MISC metadata.xml 411 BLAKE2B abd1563183f42af6f78d17ea880aa235dc9379c65b79059df8b50147588ffcea782842435db6b8f617a9aa17c096082e6a14cd5e266e4abfa560a90c32f6456d SHA512 dcf2cf6a68f00a6637beb1bdb6f8bad144c4a7a9e9e880549dd10fb4bfa30372eca68699fd2a4df4ce756ab6be4243418010a46136711431f5e244b7e3068162
diff --git a/media-fonts/fira-sans/fira-sans-4.002.ebuild b/media-fonts/fira-sans/fira-sans-4.002.ebuild
deleted file mode 100644
index e17cbbbf7634..000000000000
--- a/media-fonts/fira-sans/fira-sans-4.002.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-0/"
-SRC_URI="http://www.carrois.com/downloads/fira_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/${MY_P/Fonts/Sans}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/fira-sans-4.105.ebuild b/media-fonts/fira-sans/fira-sans-4.105.ebuild
deleted file mode 100644
index 8d02c5319136..000000000000
--- a/media-fonts/fira-sans/fira-sans-4.105.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-0/"
-SRC_URI="http://www.carrois.com/downloads/fira_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/fira-sans-4.202.ebuild b/media-fonts/fira-sans/fira-sans-4.202.ebuild
index bc843c1d54d4..3bb8e6d96631 100644
--- a/media-fonts/fira-sans/fira-sans-4.202.ebuild
+++ b/media-fonts/fira-sans/fira-sans-4.202.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="+otf ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/fira-sans/metadata.xml b/media-fonts/fira-sans/metadata.xml
index 4eb642804cfd..6c111693e0f4 100644
--- a/media-fonts/fira-sans/metadata.xml
+++ b/media-fonts/fira-sans/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <use>
-    <flag name="otf">Install the OpenType version of the font</flag>
-    <flag name="ttf">Install the TrueType version of the font</flag>
-  </use>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="otf">Install the OpenType version of the font</flag>
+		<flag name="ttf">Install the TrueType version of the font</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-fonts/freefont/Manifest b/media-fonts/freefont/Manifest
index b92ce07e844f..f9cb9226d691 100644
--- a/media-fonts/freefont/Manifest
+++ b/media-fonts/freefont/Manifest
@@ -1,4 +1,4 @@
 DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd
 DIST freefont-ttf-20120503.zip 6076197 BLAKE2B 949140181561e89bbf0487f1523a433ec0e3cbb7548a2168be6e1720d7e132fb2250acd025ab57b1ba4b295ed4021eb52de2e8f672c9767f63b06269cd6cb3c4 SHA512 dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e
-EBUILD freefont-20120503.ebuild 627 BLAKE2B 3c4b423ba045a3cb409d23af34a5a73c3c4865ee5aafc3c11d9f7a1d6970ba9b148cf8ca584de30ba15988b5df476f643b5f807e313548c33b801e5663ea79e0 SHA512 71d718d37c124e16c3ed2215de51b29323dfc347bdcf247ad160ec897386f7d60a0b09a856bb788cbb631ae94caf2aa38a323606dbc8ba7cd3d04fe1f561f347
+EBUILD freefont-20120503.ebuild 631 BLAKE2B 8c12938b31b5628e07c6da52ea068a2763de75b5d95dbb4e2ab9ca9d5ac818cb5ba9327f6c75988bf98b913c99de61656826f69f63b3cacc215a3bd9861397cb SHA512 ccc7f6ab3d813fa3b13d651a573e3bb322f3d87e621dbf7184f47dfeec261f0f2260797c40fb834eb0554da9083b38eafbf957728eadd311306051c56d98095f
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index 84f3a2fe234e..25f27559441b 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit font
 
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+RESTRICT="strip binchecks"
 
-FONT_SUFFIX="otf ttf"
-DOCS="AUTHORS ChangeLog CREDITS TROUBLESHOOTING USAGE"
+BDEPEND="app-arch/unzip"
 
-RESTRICT="strip binchecks"
+DOCS=( AUTHORS ChangeLog CREDITS TROUBLESHOOTING USAGE )
+
+FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/gidole/Manifest b/media-fonts/gidole/Manifest
index 642677986d5b..30fa9d5c800d 100644
--- a/media-fonts/gidole/Manifest
+++ b/media-fonts/gidole/Manifest
@@ -1,3 +1,3 @@
 DIST gidole-2.0.2.zip 141610 BLAKE2B b29db824167a9000084de9486910bf627b5fea1a750508ee3c2de899d8907e0911aaa3be80aa2dd2ea6e721c47f87637a6f00b578cbc5fe77e98d2b5fbcc5813 SHA512 adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727
-EBUILD gidole-2.0.2.ebuild 394 BLAKE2B d7bbefa47f9d1ac949394cde3720258698de98d61c94e566605b3279e50f3468f2e89466b38573d3c841a15f1e31762dd66cdc954783ca67187d246deb777645 SHA512 132f0ee5370ea5d4d6445e54b45d2758ee537f0956611bc9580530f5a411d8d166c34949d514f84e84f4da2b88d66a07ccdd02da7f543eb507808224701ab4f5
+EBUILD gidole-2.0.2.ebuild 397 BLAKE2B 3bc2046d7dba015a15db933a900745650d4d1f4569ce521de1230325f3b88f2158c95b25d96643569aaee428242ef551266d2a73a328aab638d89d5cb79830dc SHA512 9f77a0e048f4766edb2c3dd99560118eb17eb94c9e359dc7a9a0b4453d1e05bcfcddb7807a86423b6343086744e26bfcb56f24cb292f7bdd4d948ae5a6cd1af6
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/gidole/gidole-2.0.2.ebuild b/media-fonts/gidole/gidole-2.0.2.ebuild
index 0e02ce58ec52..a179302cbec1 100644
--- a/media-fonts/gidole/gidole-2.0.2.ebuild
+++ b/media-fonts/gidole/gidole-2.0.2.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Open source modern DIN fonts"
 HOMEPAGE="http://gidole.github.io/"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
+S="${WORKDIR}/GidoleFont"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-S="${WORKDIR}/GidoleFont"
+BDEPEND="app-arch/unzip"
+
 FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/hack/Manifest b/media-fonts/hack/Manifest
index 9db7069a2244..7e3a0e5d373b 100644
--- a/media-fonts/hack/Manifest
+++ b/media-fonts/hack/Manifest
@@ -1,3 +1,3 @@
 DIST Hack-v3.003-ttf.tar.xz 360136 BLAKE2B 73a029a2bdf154642c59effb3e3ab6ea8997e537e6934d7554b13b0d39cec999c9a3c4bea706ce6421e28b1e9c4e1f7154a7fa0a552cfcc5d95c845eabc5dd5e SHA512 d6480957ef77b0e117a564b76e7b8b041a28cfc89441d394a27e2a1b230cae7a67c0b9f3cbe6aab48c5d2cc832b0ea653017a3b925db1d0cc2885e02eab9a81d
-EBUILD hack-3.003.ebuild 534 BLAKE2B 83b9d2cdfcc599d3cbc79b6ac9e285da41839486e097671728220311632b4205fd1d3ade62652c176d2b690eaf149774b959c326ca3b2a0f453e25f46bb44293 SHA512 6f80b2819e4b3f18f1fabefc15d5fb5c3983a8353f4302bf4628145d74999ff26cb1cc37ec2a1b3539c01e51c292b52aaa651367cc7b7eef13629a1cbcb4d2a3
+EBUILD hack-3.003.ebuild 454 BLAKE2B ac688cce34c9581b46097f28010ca5512d30f0283b364ae12626292f658e88bd8aec2a2c945ef98fc60d2e097e3d8c83fbc24bbed5475b88c30772d192d8c94c SHA512 dac8bab42215289a9e32a11af0da6be4dc4320404995ab2cb8268fe105989aa4ec63a9f5957bcf03c1ae74bf1f57652d533202f9f9acde1619cb780628187459
 MISC metadata.xml 322 BLAKE2B c8e02209b20e037d40de9fdb967e13fa786facdb9a9a74b3f1cafc60bc039c13a3a0bfbd4e14032386df942db8326f6cf02511f6ca15d2262a02b7e88bea00ed SHA512 f50dfd6348f6c4425efe7a889e1dda8c6ceeeca5617f7f846ba00e5eb5a9e08f65098141432fceebfc212a831c9191c952bc373a6ca633863b6f385d970987c8
diff --git a/media-fonts/hack/hack-3.003.ebuild b/media-fonts/hack/hack-3.003.ebuild
index 5346bb339e27..3dc53dfb4c44 100644
--- a/media-fonts/hack/hack-3.003.ebuild
+++ b/media-fonts/hack/hack-3.003.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit font versionator
+inherit font
 
-DESCRIPTION="A typeface designed for source code"
+DESCRIPTION="Typeface designed for source code"
 HOMEPAGE="https://github.com/source-foundry/Hack"
 SRC_URI="https://github.com/source-foundry/Hack/releases/download/v${PV}/Hack-v${PV}-ttf.tar.xz"
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE=""
-RESTRICT="binchecks strip"
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
 
 FONT_SUFFIX="ttf"
-
-src_unpack() {
-	mkdir "${S}" && cd "${S}"
-	unpack ${A}
-}
diff --git a/media-fonts/heuristica/Manifest b/media-fonts/heuristica/Manifest
index 22dd55f399f1..2777209a1957 100644
--- a/media-fonts/heuristica/Manifest
+++ b/media-fonts/heuristica/Manifest
@@ -1,5 +1,5 @@
 DIST heuristica-otf-1.0.2.tar.xz 285180 BLAKE2B da3e625301b1dbf4848e1183a00d583e446495aa24d3ec9c1af48e907fca87041ec19acfa273d6a7a984d6a7da5a829c27817e195325deb0ec44f0ee769c26f0 SHA512 d3336c6fcfd5ab5bfb041230659c41ecbaa9e2d2f92d5c1c8c0dc8dff89a777ac87d8713467c94b065febde30c131cd05376573308f69d698d63e18eee433783
 DIST heuristica-pfb-1.0.2.tar.xz 816600 BLAKE2B b20a01f0bae9bfb60cab6c95213c9ea2a921185ff4bb8a29a92a6cba71529b3350ad9118b151bb575dd8f0399710edbacc419fa0730069820889ef58b6446799 SHA512 b5e8b72414b0192ff1577527025041a0f6a74c944191d54b5a734acc1cc8c3fff176c314a7a206a55bf59b9d99c79f7beef9404bcd9dce9e59d015c1d50cac98
 DIST heuristica-ttf-1.0.2.tar.xz 348524 BLAKE2B c0dd7d0aaf967b95502adc2b3d9213296c8f118598ec68bd62fd8f02aec0d6b81f59215db156348c0a6d45d376c417f82b3ef565340c3025ac795a00fc6ec91b SHA512 8b763a8f44444a96a454d2b1e987e095fc72a67c3c0be4d24a18b6ddd417cb2bbdb57475b5c9515c3e0efb96d4afd5cf6095685ab035f8af4fff7f7e6f9ffb3d
-EBUILD heuristica-1.0.2.ebuild 531 BLAKE2B 741229a47ec818c681cc11ede3d7ea0fb07ead615df2adbd252ac79c338843bc7fbf1fa90d3360e268ab2383fc5704695c6f549fca47d940f67df84aa98c2069 SHA512 1b613411340e55509305b0734c2fd01bface58e40e9bb4a7b60ef9c8d293dcde6edd38d1d8b73f74e9f623f748d7b979284ea6af887589643251dee5a31955e4
+EBUILD heuristica-1.0.2.ebuild 524 BLAKE2B 7851e32b7ada1d8b91572391b7a60fe82d6802abc3b7538523a8d63af5f29760b8759ba20f729eabbf37d478873f8d67226bf6f1e48da28995227c9a9cfc52bf SHA512 7ac9ec86c407e8886bb2f6d8f7a8fc138546c8a7f1d0f81f356845df7d1fd9ba546d9fe094e1961d6fd82380347b43183598eea4cac50e7e91b6e4a14f54da84
 MISC metadata.xml 318 BLAKE2B bc3e03db954a57b253530bc479d6721c8ae6caa5028426680ef5a846688e1648577c7255113985a1e23012a95423761a293106d58b915321debe42bec4143c26 SHA512 7957602f131a27199c6bd327d65d1a13af430e16191e46dfd34647482cd2e4f4b6fd2775e1265b7932cf00156f593c6d583a67b3f00786701bbfed6bf1c33bd3
diff --git a/media-fonts/heuristica/heuristica-1.0.2.ebuild b/media-fonts/heuristica/heuristica-1.0.2.ebuild
index 8bafb4335727..7cfd65a10ef7 100644
--- a/media-fonts/heuristica/heuristica-1.0.2.ebuild
+++ b/media-fonts/heuristica/heuristica-1.0.2.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A font based on Adobe Utopia"
-HOMEPAGE="https://heuristica.sourceforge.io/"
+DESCRIPTION="Font based on Adobe Utopia"
+HOMEPAGE="https://sourceforge.net/projects/heuristica/"
 SRC_URI="mirror://sourceforge/heuristica/${PN}-ttf-${PV}.tar.xz
 	mirror://sourceforge/heuristica/${PN}-otf-${PV}.tar.xz
 	mirror://sourceforge/heuristica/${PN}-pfb-${PV}.tar.xz"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S="${WORKDIR}"
+DOCS=( FontLog.txt )
 
 FONT_SUFFIX="otf pfb ttf"
-FONT_S="${S}"
-DOCS="FontLog.txt"
diff --git a/media-fonts/ibm-plex/Manifest b/media-fonts/ibm-plex/Manifest
index 7ac904ba7a57..71e8cabf446c 100644
--- a/media-fonts/ibm-plex/Manifest
+++ b/media-fonts/ibm-plex/Manifest
@@ -1,5 +1,3 @@
-DIST ibm-plex-2.0.0.tar.gz 77698418 BLAKE2B 01f058c285edf28618d2870b6021c3e77aef2719272d8c9a6e1eaa7f3863fb1dd9ac36b32e993e1591b25bd2a2c8bb4369b142d6cc81f866e756c8253f4d38ca SHA512 e76b8435606bf8f7dcaa330d2a861a60f3764886d04f88dceaf4a5a1dcda418df79fcbe9756541539181f35b853ee4ec9d43778338d1af1eb6e51a28cc514bb0
 DIST ibm-plex-5.1.3.tar.gz 205796313 BLAKE2B e1ec5212189167203be8dfa7949390dc134f10b759ed90a1595a4266314e8fb2f44e2bb22ac495fa303c3e5f81e6a13c6d4be3b78ddcf47f5d05b932ca4aabc9 SHA512 78006a48b65dba22216dc8cb1fd17313969fac6ca75e139d3963efda2a4f4da2a869146c2c11da033c3119942ffafda027825d0b0cb624594774a409dcfc1266
-EBUILD ibm-plex-2.0.0.ebuild 1416 BLAKE2B 10ab44bcf69b6c9a2e938b76b5f87454bc6109f3c7f1886b81bd07060fde899ddd2ca4d2113862b28a6075c5620e652ccd2b1ab0a80525fc4776d6cc4431347c SHA512 258ad5b3f04ede959d7d8876c9b78e0314fa6401838390dbdc72e8619029ed5496507fd7591ff71dca23c684ed0d0ff7e7643e3e7a8472d63a53a984e40a5b8b
 EBUILD ibm-plex-5.1.3.ebuild 1501 BLAKE2B 44ced239714a9b173f64b942befe3eb9f65236438a0384383c79115d9312e1c80744565c9c70b1ea60cbea92088486665a2d7f5291fea0e56e6f612380ccfb85 SHA512 ffcba6a0a2f48a34f64cd2a0be79ab51256017abff7448cca54bcac6bc7f9ca5b5102bdb66fb885c48f9b360ba6f712c00eeeb17b5524baad4a0eea788ff4cf8
 MISC metadata.xml 350 BLAKE2B 7440f75b2e70848fdcaa34ba78a2b847b16e7202fa43e84b17b3c8abc6e0da2656e4d9e7488ff6f077ca5f245c8ff8582fb36b1169f8e258f3cead8bb02bdad0 SHA512 28b8cb595c5b0b4c5b56cafd8639a1ae59684b765309737bfc620110b376b73a4c86ec94ab9b4ff3161f7b8fdcc66b2c1a13874791d29c0ba024ad6b224b427a
diff --git a/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild b/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild
deleted file mode 100644
index fe016c873669..000000000000
--- a/media-fonts/ibm-plex/ibm-plex-2.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="The package of IBM's typeface"
-HOMEPAGE="https://github.com/IBM/plex"
-SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="otf +ttf"
-
-REQUIRED_USE="^^ ( otf ttf )"
-
-S="${WORKDIR}/${P/ibm-}"
-
-DOCS=( README.md )
-
-FONT_SUFFIX=""
-
-src_install() {
-
-if use otf; then
-
-	FONT_SUFFIX+="otf"
-
-	FONT_S="
-		"${S}"/IBM-Plex-Arabic/fonts/complete/otf
-		"${S}"/IBM-Plex-Devanagari/fonts/complete/otf
-		"${S}"/IBM-Plex-Mono/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans/fonts/complete/otf
-		"${S}"/IBM-Plex-Serif/fonts/complete/otf
-		"${S}"/IBM-Plex-Thai/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/otf"
-fi
-
-if use ttf; then
-
-	FONT_SUFFIX+="ttf"
-
-	FONT_S="
-		"${S}"/IBM-Plex-Arabic/fonts/complete/ttf
-		"${S}"/IBM-Plex-Devanagari/fonts/complete/ttf
-		"${S}"/IBM-Plex-Mono/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans/fonts/complete/ttf
-		"${S}"/IBM-Plex-Serif/fonts/complete/ttf
-		"${S}"/IBM-Plex-Thai/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf"
-fi
-
-font_src_install
-
-}
diff --git a/media-fonts/inconsolata-hellenic/Manifest b/media-fonts/inconsolata-hellenic/Manifest
index 7e46d46c1066..1d8a82aa804f 100644
--- a/media-fonts/inconsolata-hellenic/Manifest
+++ b/media-fonts/inconsolata-hellenic/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-hellenic-1.19.zip 18362 BLAKE2B fa9999195802b7171c643fc68f4f984a521f393e7110b6219cf1b9bb87d89bfb43f298bd7f4ff26c3a0bae5f6352a857ed3a1635ff7d1d5e3125837a09f61bea SHA512 5834a46e200abea9045c0d88fbf8ec55486e87e1faf27478b376f1006737d37bafe4b4e1938a3dd28fd107c587db40de0ec77ebab4fd82317f0dff87fb11cfbe
-EBUILD inconsolata-hellenic-1.19-r1.ebuild 480 BLAKE2B 75c83dcf258b2dd3d6dcb7e27c29ca893458e4bbe20465bf3e19b3d10b41b34eaca9b4b5729a0b78c9b7ef743709994752621c6e2edfe88c67d24455bc426ba3 SHA512 8fafddcef8178e674923a54a40fdb74042c82b4a54cc1dbaa5176365af445fed7b817f1ede5e2207a6c6fbdf45d360b8060582496bf0fea1bbfdc6866d077145
+EBUILD inconsolata-hellenic-1.19-r1.ebuild 462 BLAKE2B 3f560cbcb6e0a224625f689a3b0c2f62a0f26157ea149b3a5830a37cb327fc18aae97ae3e8d76aa26604b194821664d2528fddf1d968e429bc8d124272aba820 SHA512 e69bf4c040918622ebe413814946ffe3f0bca9fb6aad099642e86ffbb0e47e019c4207fff189bae63c4faf013789502434f9e70120c5efeff08a8550e0165b9d
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
index 5c0ab15d5935..ae623686c7cf 100644
--- a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
+++ b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Hellenisation of the wonderful, monospace, open/free font Inconsolata"
-HOMEPAGE="http://www.cosmix.org/software/"
-SRC_URI="http://www.cosmix.org/software/files/InconsolataHellenic.zip -> ${P}.zip"
+HOMEPAGE="https://www.cosmix.org/software/"
+SRC_URI="https://www.cosmix.org/software/files/InconsolataHellenic.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${S}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/inconsolata/Manifest b/media-fonts/inconsolata/Manifest
index 368094cd0e12..1aa0bd9bc48e 100644
--- a/media-fonts/inconsolata/Manifest
+++ b/media-fonts/inconsolata/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-20140821.tar.xz 72544 BLAKE2B 7d08482d9a58c864f629112d608df08d79beb71ceccc6fa4eb1c669843d7d43e2828cd7f288798b0d8cf8eb2b5bdf6f969315afc6bda7f51de716744ad6906c4 SHA512 295c0ff893e421c4d2dcb298a608c76b1790646774e1d77a820a7fa626771a34e2353e6d27b8d49b177541b7f4d2343a12152a75eec05e15e384e0118b19c773
-EBUILD inconsolata-20140821.ebuild 490 BLAKE2B c957518db75478160109c650c94abced1f6ab78b56dc74c5b6c60bd26029498da6fb7851e479ef618aa382c1f065a8b143ab0a098873a0541dc206131887e6ad SHA512 2da1ae084f49bd0101c48117d8fee6b15376f9b3b123bd497c284af84b648738ce078e05bb89f20900f42f469222139e1dc0855b068c7393c1dce321c55b57df
+EBUILD inconsolata-20140821.ebuild 489 BLAKE2B 1b09f8e6f810301863ddf72477a49408d42ce61a7ca12f94d30487c1203e5c1c9006e39175df59dd5265d2e4be60b3696c907817f4b31b520d65b6eb35b5255b SHA512 2f715c4efd586b99dfd522d08cdfc9ed79f1e26da79116aec4393aec9abb4fcbf3e708dc57cdcaebdd16c4d34c7b0bb0fba8e05103de090fa30448f3031d2b40
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index f087685ae969..61504df547e1 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -1,11 +1,12 @@
 # Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="A sans-serif monotype font for code listings"
-HOMEPAGE="https://fonts.google.com/specimen/Inconsolata"
+DESCRIPTION="Sans-serif monotype font for code listings"
+HOMEPAGE="https://fonts.google.com/specimen/Inconsolata?preview.text_type=custom"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
@@ -13,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc x86 ~ppc-macos ~x64-macos"
 IUSE=""
 
-FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/${P}"
-
 # Only installs fonts
 RESTRICT="binchecks strip test"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/infinality-ultimate-meta/Manifest b/media-fonts/infinality-ultimate-meta/Manifest
index afb2b221a535..600a6a650a37 100644
--- a/media-fonts/infinality-ultimate-meta/Manifest
+++ b/media-fonts/infinality-ultimate-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD infinality-ultimate-meta-1.ebuild 2643 BLAKE2B 5a4845862544fee8919cc9960297d4223307df0379dafec35073fc9d7aa2077a52adacd6d24b27e36087a3cdd6a827edf1be53cc2f2df9b2e5dd79285d6d4631 SHA512 62c6fa807a6191fde3b11f99a5f86d7050ad79bc75e7abd5cd59a4ff9482ef1e85791e7e77f5e511dbb3bc628eb017ec97057ff182ff688c64aa973e41442014
+EBUILD infinality-ultimate-meta-1.ebuild 2645 BLAKE2B 0787e10f8a85f11b6f6fdfca244f5664a174ac2b922f3e69121cb6d8f88d8c7f519fa8f9d51fadc4dd84446ad62449ad5906f0a02ae624d97a9d78af153bff06 SHA512 4daeb012dc2ff80a38eeae7318e7e45d547f92b8c32f480e0abafca720f89a4eac8219a4a6424fc040b39f128520edac2bb0f47d5c9861960ad20af559348899
 MISC metadata.xml 518 BLAKE2B 9e70f848f87be0f892ac460247c39dee68918bf382bebc70c497754979ceffabeae811c1fecfe61d075832f492683742124626fedbf50fabdb2a09df773682c1 SHA512 405d34014a1578cf3ae30ff5bf42a51cd28309ef080781d193a66082c1d6689155f0592e4663bb83ea6aaecfe9e6b2f33a0a744f7a72273d46fef0167361a08d
diff --git a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
index c5e567197427..e63f1b5923a8 100644
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package for infinality-ultimate with fonts"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal +latin +free ms"
+IUSE="+free +latin minimal ms"
 
 LANGS="as bn bo brx doi dz gu hi ja km kn ko kok ks mai ml mr ne or pa
 	sa sat sd si syc ta te zh"
@@ -18,7 +18,8 @@ for lang in ${LANGS}; do
 done
 unset lang LANGS
 
-RDEPEND="media-libs/fontconfig-ultimate
+RDEPEND="
+	media-libs/fontconfig-ultimate
 	free? (
 		media-fonts/noto
 		media-fonts/heuristica
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 39b297adfc9e..62fbd942ea90 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,5 +1,5 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
 DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
 EBUILD intlfonts-1.2.1-r1.ebuild 894 BLAKE2B 86c75a4b62ff840f20ffd376f2b164f004b1f175e79b42821975328cb840f8b52d9967fdaa0ca2ae6a650d971d78a3407d47c4392299d56cde09c10fb9221d85 SHA512 42116031b3ee138300b06f8a21bc86c5b11f9f19a1d954ed296cedfe9f1dd70c17b36caf15194dca758b922844c05536d92f630ba1f4afa5f328a17456cc2ab2
-EBUILD intlfonts-1.4.1.ebuild 739 BLAKE2B 42e7df928aa7a0e9ca06b1633e497ed2af6f5f9364563bc1bc57d2c18220663549fefec56e3e515c413afb88520d09c9078295f0a92a9b485dc7b2134c92a653 SHA512 1f7887952afee7095c31147cc16b3288f88b5b3f8601d7be252d5ab67f08c202a779c759ef9eb26a3c092df2f71fd52b05d1c8c0af2bf223588e8ec37496b925
+EBUILD intlfonts-1.4.1.ebuild 738 BLAKE2B 67184ba02c9761a9f453d60f089d2245fd1e8e42d2c1d049e9c587f8ef78891673884b253cc1d8fbc57915ebfa28e155380cc6af7ebf97e13af19c11a73e23d1 SHA512 04d24c5bdfde48c58c02658c7bb2c1e4f742b7ccde6a6cdc0eecebb988b9c8b5ecf964f4790cc581674039da0de7a8585a25f45ee5dab56e600bc3675c8885de
 MISC metadata.xml 370 BLAKE2B 7783e99cf31647a374b109157e9df67f528f61cb89d4f7936172a7e001b10e0cfe45a96aead40b4618a987af0f68f44b6cc7ff2536eefdf8ab737ca072daf06c SHA512 c41b35cb543c1756b194ffbcf0c14935ab70b588dbdd4b51615901c5c7244eee2566771b6b070ec13451c0dda638f20303a12f3eab39c17c5dad6a548d7ca83e
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 57905969451a..467fbc94edc9 100644
--- a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain HPND GPL-3+-with-font-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="bdf"
 
 BDEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index ec94802c3722..a3215c2b55fc 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -1,4 +1,4 @@
 DIST 01-iosevka-1.14.1.zip 9725331 BLAKE2B 58f0e51ba06d27eab18336effbe825c7c7bc88f24eb457be49746f8d3b1591f2cfafb8c2a7c9b56a7528edb207cbee6741dbe394b82331c6207a4dc6886cb388 SHA512 7e1dee79d78b1bc36ff2f55140a3538802dafc22677193e0657a6649ca55d5b1de868de86ba26d9458a3afe481298356dcf641afa72ecea2d69adb6382a5fd58
 DIST 02-iosevka-term-1.14.1.zip 9672957 BLAKE2B b03751969722919b4c4172b066f372f334f45f38636cff8cba764a5c30d906ab000887c290b4583f418307c2efea7c3650f5557d535b1e7c26c2078ee29ebcb6 SHA512 6b17960b960365a81ba78a68b6ad04c6146f51855f0f6abc288c12d8dd50669fe245f94aa135b032df14d0ec7bc6b291aef1c8a86ccbf948b8e5678862febe34
-EBUILD iosevka-1.14.1.ebuild 534 BLAKE2B 4158b4bba42142d38950bf6084686c915eb035666d398afe85ac12951216b13e41287f863dcfa92eb192e3bb596e878eb5041d8318d94eec5b477e9a6e0ef0f3 SHA512 3512c07c0294fdeb8d9821047546fdec6eac3d6bf10263b00ee287b46178719de494f6ea71486934bf3e88d5efac623f2ca14b35810f8b4955dfb68d68d1049d
+EBUILD iosevka-1.14.1.ebuild 529 BLAKE2B 721eccec336335f31d8a2c8ca355502bc2278e59707b8ec76fd556f869f662e6459f1c65ccbd175c2dc64cebd979f8582e37dd9f6e55d6bf54f8712ad3c8d8bc SHA512 409ca2192ef4080ea4992eb1eb4348513d940fd52ad00bc936f76a64b70ee8561198563dd1889ec97746f560e1260005abf20eea503f7834a38424737c5d851d
 MISC metadata.xml 252 BLAKE2B c98b373c811fa8347ab7bdcd3c07d03151509e691762304ba6b5cff1513e617ba14c17bb286060ad30975fcfc25b32953d42c9a60b2f6a9b2917cb53bb7045d3 SHA512 e24fdca52235a7d57aed8adc92cb8e0f0d69e2b7ce8802f1d692bec984027179404529e008de74ea1a2f245a79d02bd1dc4b09c93c8969f826c80086e82fc6d4
diff --git a/media-fonts/iosevka/iosevka-1.14.1.ebuild b/media-fonts/iosevka/iosevka-1.14.1.ebuild
index 6d09199d004b..cd0edc89cc01 100644
--- a/media-fonts/iosevka/iosevka-1.14.1.ebuild
+++ b/media-fonts/iosevka/iosevka-1.14.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Slender typeface for code, from code"
-HOMEPAGE="https://be5invis.github.io/Iosevka/"
+HOMEPAGE="https://typeof.net/Iosevka/"
 SRC_URI="https://github.com/be5invis/${PN}/releases/download/v${PV}/01-${P}.zip
 https://github.com/be5invis/${PN}/releases/download/v${PV}/02-${PN}-term-${PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
 FONT_S="${S}/ttf"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/ipaex/Manifest b/media-fonts/ipaex/Manifest
index e16f4eff3ba2..afab7771e94b 100644
--- a/media-fonts/ipaex/Manifest
+++ b/media-fonts/ipaex/Manifest
@@ -1,4 +1,4 @@
 AUX 66-ipaex.conf 688 BLAKE2B 5cf4e28254e7134f837dd6a702c40b0d8885ce3df760c46d552146d946a3fb58df3a61da21dc53c0eaa4fc8c25725b4fb6e218a215f2e984e5069f86b9833688 SHA512 8e3de87f7ce44c10e2e0a1989613c6fc4fecfafb85ba4a4efb2f71e906bf9f7750f04fabfae71196b8b69b55da7ebec0d89ad5d7b8141e9f584b8ff20309a743
 DIST IPAexfont00201.zip 9764230 BLAKE2B ca059ee52fdacc444a971ed63371a03af98ae37210b2a46f4055abed49b27ca61f4c617098bfeb902426a7b51551dd92d8e864bae251fd047089b1f3abffc8cb SHA512 d23c4d320b0d69067f65054d8e14f8b65dc06f545d1c021f6146f34d980c1e655ed070d4d520ed810272fc7f7f6dd906b3e0da4d89514d8f3fcd2be83a3961d7
-EBUILD ipaex-002.01.ebuild 626 BLAKE2B 8938f9a03c575e7b3c225983c4f68de95d34948e69b07b2cbd34cbe18f7845cc8d0f09f37e5c79866a91a161f73f4ffcfb734bb114446da3c494b44a1eb6835a SHA512 6fd1c6eb98c822c5467e9597472c08b58cbc6f83dc5c9be12189c3a9174e18fb61ecc9fe4c6218bb5404273238be2bfbfd28f2c9443e26da32d66251a253c4c8
+EBUILD ipaex-002.01.ebuild 616 BLAKE2B 25a1b7e094abe373492721f562b77a3b7e30273336cf64d035500a3165fabf76767c44abb0a12b5d8e55415862df2e3677b7bde6070fed994a950a3bbbcf635e SHA512 c00bb1469f414af573eafbee1b42577a120438b2f2c51de201e8a590bb3bd59e2304ccb98d1c55f354850aad2f6b969f062fd4ff227892faa1208bf46ca54f88
 MISC metadata.xml 343 BLAKE2B 932f0c95bb5ff89be5a954ddac3c6356abaeebd086c7ea4c72bc888b8b418271c3116b95732794ed513d698da08b6b16db2c2b4cf88dac7d01b4e62b4ced6489 SHA512 1b5513ce33b0003d72a55482d3600e5c3c365e9babfd5f4ef18b7d7eb7e94735c0c3d1b8fd08c55b8f8e30429671b3732217453288c03b90130c801fb78cfb4c
diff --git a/media-fonts/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
index 6ae7dc9a7d74..f3d97e5c6078 100644
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ b/media-fonts/ipaex/ipaex-002.01.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit font
+EAPI=7
 
 MY_P="IPAexfont${PV/.}"
+inherit font
 
 DESCRIPTION="Japanese IPA extended TrueType fonts"
-HOMEPAGE="http://ipafont.ipa.go.jp/"
-SRC_URI="http://dl.ipafont.ipa.go.jp/IPAexfont/${MY_P}.zip"
+HOMEPAGE="https://ipafonts.osdn.jp/"
+SRC_URI="https://osdn.mirror.liquidtelecom.com/ipafonts/57330/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="IPAfont"
 SLOT="0"
@@ -16,11 +17,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-lin
 IUSE=""
 RESTRICT="binchecks strip test"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-arch/unzip"
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
 FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
-DOCS=( "Readme_${MY_P}.txt" )
+FONT_SUFFIX="ttf"
+
+DOCS=( Readme_${MY_P}.txt )
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index d9e4b674e558..48d78acd0fce 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -1,6 +1,4 @@
 AUX 66-ja-ipafonts.conf 800 BLAKE2B fb6de7c153a0560fe601b112ffd2d53ea6b8e528213a57de548c5129e934331299269c5a315071d8dfa6f26ec01264d3fb3b60a3aeb311299c83296d3f333160 SHA512 5fcffa0841412bf6012d36aaf2d3f37fe685da22833344d107b92b133693b9f22cf2a6afa75ad27509a3f26ec6f692f2a4acc04cb8caf089e248b014768a920a
-DIST IPAfont00302.zip 20113208 BLAKE2B 25c6e483b08350347dd8ecceaa1ec04cd1e39d9aeaf988e9d4bfdd60614dbcb3b275ee07da1eb26699499b1e9ad661114cd0222fcb32ed183218b30024b212d4 SHA512 58dfbb6b7ae5114aed28588d05d48649a2f216011d7bd2798a62558f1f55c9b998ad510f7b7a0ab9d272f75bdc69de1110bd67205ac61d221b0ce8fd71583685
 DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
-EBUILD ja-ipafonts-003.02-r1.ebuild 660 BLAKE2B 4df69d689be4d2c9d4ff7d37109652ffea7a73468e94385eb3b09fc910d7d9b0ec7a43cecf42150d42fe3ba707e810f3c529aee9392a332a834b30b1186bec2d SHA512 5ecf88be5cebaed3b86f775b54e8264552c90984ad15747599e03180287037d430d0e4cd10dfc6eb47fda8f7751285048f73c02cc2cabc155c809e5a4e304d06
-EBUILD ja-ipafonts-003.03.ebuild 646 BLAKE2B 422ce5c20bea3370620dd54d7b1157d1adb513564b87cffce0eeaececa60cf4e36385dafd91e8156075c16b1d1e67646ff3f09dd3479ca6d82ea60cdc44ed0f0 SHA512 3651ec5c51eebc95659f21dd202cf8f57da04479341b0db193cf3d783f264e6efd7a0f7cb25824c10ed672006a3ed4ecec2502656add0456785be0b3f9620f23
-MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
+EBUILD ja-ipafonts-003.03.ebuild 645 BLAKE2B 448eaaafccd8012019c3b689149e155ca3d3ac7f6d53de5ae8b66b403dff41596412cd3f977d83e88bfedf8b0644d133303d503b2d742eb68ea1e443e36321cf SHA512 4ed20e7877470c8bcac7337a920352829c63fbc4d2bc34ad6184b797de143ba5d9af9b0a6d781bb9c8a9f4f042c13aaa0291dd0f1221c648f1d01cd4c7fc192f
+MISC metadata.xml 357 BLAKE2B c6ad69b457b818fe1a2035085f9105b16ec1c0fdf881a527d30df04f18e3161ecd9003d4e7f9f613f13632676eb2c8fcb0f17929bf71b9d2319f036324b09ce0 SHA512 079b7a4055801cce6d1ab2fd4d4cfcc593b182cb99e3932dbb48745c4eb97610d8ba2c23107b60902442f55b8b211e0368b9a2420a76000729bb8b89a3b885a6
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
deleted file mode 100644
index b0f5b1887b88..000000000000
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-MY_P="IPAfont${PV/.}"
-
-DESCRIPTION="TrueType fonts developed by Japanese Information-technology Promotion Agency"
-HOMEPAGE="http://ipafont.ipa.go.jp/"
-SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
-
-LICENSE="IPAfont"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
-
-DOCS=( "Readme_${MY_P}.txt" )
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 3d8379098fdc..485dd301e976 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/ja-ipafonts/metadata.xml b/media-fonts/ja-ipafonts/metadata.xml
index 99d94f247165..5386d971b6f6 100644
--- a/media-fonts/ja-ipafonts/metadata.xml
+++ b/media-fonts/ja-ipafonts/metadata.xml
@@ -1,12 +1,13 @@
 <?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>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/jisx0213-fonts/Manifest b/media-fonts/jisx0213-fonts/Manifest
index 860dac8cfa23..825e5d5af0c6 100644
--- a/media-fonts/jisx0213-fonts/Manifest
+++ b/media-fonts/jisx0213-fonts/Manifest
@@ -10,5 +10,5 @@ DIST jiskan16-2000-2.bdf.gz 92122 BLAKE2B 6856224fca7353ceedf11778d56a909102aad8
 DIST jiskan16-2004-1.bdf.gz 303930 BLAKE2B f7602e0d8331b3fb94a3f20828a0befa8d406167d776e80900223c68de46a9f5379bb9e6cc150856bde6ffde8b7186c9a75bab07b3fca750496c2846869f9659 SHA512 2b967e6e0782b1a87b6de8b3c1ff6552ba869ffcbf624888916058a95ed8dd723539c50261dddab028ef49ac52ce70756296312614bf6c934b086e7037cbbbed
 DIST jiskan24-2000-1.bdf.gz 516369 BLAKE2B 626f981ad5381ba79d0c86f2716d4f435971cbc5d75686447b4912f628ef40a3c323e262cce8a2e46cf2d455ed794893fd657492aa08b100d909ab629054478e SHA512 0733b18ad3627a250372f64cac33cc4530a6ecca2f230f9667a9d767e618c02037351350649c6e1eee4ebb0fc1347289dcb14761f04b337c126df13996f772a9
 DIST jiskan24-2000-2.bdf.gz 155750 BLAKE2B b0382af4ba21b837bd0fc16042d750868fb9a4ca688bbdc9605616252a4c1cfa2c2231a6760a3fdf35e7315eaf19294a46c79ddf604606d1ce43b699019c9914 SHA512 8495f6a49d5e20f0134efaec2af06089e141433eaf32acaac29dbca0d0244028716c5464ac2925db2fe632b3605722b28dcd11fda7f27b04d204eba8792cf133
-EBUILD jisx0213-fonts-20040425-r2.ebuild 1194 BLAKE2B 020a3d3a22aa432bca8f0dc6801f0d0e261acb298d96634b1226d7b423ce40d4a95107fe8b22054ccd8464b0aced00a99d16b5814097e380fd2bb280862a4384 SHA512 3238aa46f255a307d12fce1b8714d993607e6d42082b9f48216860d3d858bd42cf7490dc02a48e3aebac8de87893c422146b0965e4d729cdfa1c66796aa360b5
+EBUILD jisx0213-fonts-20040425-r2.ebuild 1195 BLAKE2B f02ab6501f22005e37d24263998149dfcc825db5076a023c39ad2334f4b91f4aaf0870918f8371bde0d1172f627a049409ede31e85588fcf7b55ed15a670d47f SHA512 2fd1b7c7db63475a204cd74abd0601f1b693b9b3fd3e0484f0b1f9ec43678a9151a3087d672ed92cae3598b87b60edb55476285e68692e6dac3e2bc4a1d2cef9
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
index 59d1cc30fc7b..50c4d231d241 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
+FONT_PN="${PN/-fonts/}"
+FONTDIR="/usr/share/fonts/${FONT_PN}"
 inherit font font-ebdftopcf
 
 DESCRIPTION="Japanese fixed fonts that cover JIS0213 charset"
@@ -20,6 +22,7 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
 	mirror://gentoo/A12.bdf.gz
 	mirror://gentoo/jiskan24-2000-1.bdf.gz
 	mirror://gentoo/jiskan24-2000-2.bdf.gz"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -27,13 +30,8 @@ KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
-FONT_S="${S}"
-FONT_PN="${PN/-fonts/}"
-FONTDIR="/usr/share/fonts/${FONT_PN}"
-
 pkg_postinst() {
+	font_pkg_postinst
 	if use X; then
 		elog "You need you add following line into 'Section \"Files\"' in"
 		elog "XF86Config and reboot X Window System, to use these fonts."
diff --git a/media-fonts/jomolhari/Manifest b/media-fonts/jomolhari/Manifest
index 33f4c732a281..39956f74a06b 100644
--- a/media-fonts/jomolhari/Manifest
+++ b/media-fonts/jomolhari/Manifest
@@ -1,3 +1,3 @@
 DIST jomolhari-alpha3c.tar.gz 892490 BLAKE2B 7c94bd0e176d631aabe5ee0b7b8ec2d9ff8398a430ab93b7604d5b800baf01a6c1b7a0e2baebfec5e58b95a0f0098d78ef6171dec44cc93c22cdb7348bd407d4 SHA512 d56a14b0c5c34d202980f7ee528f9b5b6adad29c54050f62feefce6b88dab4c04606c02d7a18902d1e0a37575f4b2a048232c720a8ed29a727fda20825100df5
-EBUILD jomolhari-0.003c.ebuild 467 BLAKE2B 85f51072fbac5d7776dbadc01373850d5d806b5d4e90007bb275ba5791fa9950853b1da38a04d4a715f3a755894fa3ad4a43a7a050d62e4c44a854c6e3eeea6a SHA512 0bccdd2298ec602dc5c358ec3e9aefc316f930fee38ed8d660a9af796fb826d0dc352c2e3d9d9a2ccbf2509c45ac0dec43ca7258135d633f3a55b5b5c3586fa1
+EBUILD jomolhari-0.003c.ebuild 447 BLAKE2B 5c44f1dfee881ab2b4ce620a478290b584af3840bebf24f583faf862df007ae8e2f62d3931ccc41632c5ec9f34489027cdf85ed2edadaf279755f027696c5c20 SHA512 030a1011e6b1a01176f04ca43ad342387689b455bb5e1ce799623245c9a897de2027c9c618f27390fba1aa1540fb9c7e07a4e8a887909a43b50ca5717cdd084f
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/jomolhari/jomolhari-0.003c.ebuild b/media-fonts/jomolhari/jomolhari-0.003c.ebuild
index 3403c17bb329..36bb1740e6ab 100644
--- a/media-fonts/jomolhari/jomolhari-0.003c.ebuild
+++ b/media-fonts/jomolhari/jomolhari-0.003c.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari"
-HOMEPAGE="http://chris.fynn.googlepages.com/jomolhari"
+HOMEPAGE="http://www.library.gov.bt/IT/fonts.html"
 SRC_URI="mirror://nongnu/free-tibetan/${PN}/${PN}-alpha${PV:(-2)}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="OFL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-S="${WORKDIR}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/kacst-fonts/Manifest b/media-fonts/kacst-fonts/Manifest
index 3f2e400ed894..9dd394256906 100644
--- a/media-fonts/kacst-fonts/Manifest
+++ b/media-fonts/kacst-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST kacst_fonts_2.01.tar.bz2 323467 BLAKE2B eaccbff16567fd7dcf2473f8215a94bb46a5ac8d78457411e45ad1df9fa135102c33a9bcb64b9c90e4ab77f97951add5343b3a91e1843292d7ceb492430321e1 SHA512 4d79ff0d95830e3b5fdb69dc95e40b9070346ce8529686af4469442fe7ec54abed5e6836f27698728f9cb12c2bf5d56797c1b9592ee548a237ada419eb8b3b59
-EBUILD kacst-fonts-2.01.ebuild 463 BLAKE2B 4290fd1d340165b5b2f19116ae4977016a323e1a100d8149f215bd8d57a3e6f19ad75efa82826b1b4ca97e1b964b7b7e0cff8b86382ebe3b7cfb95b1d70ec0fd SHA512 17eefb7ff4515ff7d0b3a36bba62b60e7095de0e3c79abff37356e78fbaee12fd59b37c1433f56409c25a200f0ae617f6bacde63066524bc095e81fac00effc1
+EBUILD kacst-fonts-2.01.ebuild 457 BLAKE2B 03ff755c8eb31a4b66dc9e7e15baed89c0cc91caa93f0b77474610fcc1722bb78ff21f16ceb1dd927ab3478a69021aa9275a590eddd11495cc3bbf010debf91a SHA512 9235b98365a263a635e12b18338354a0deb20e117fa98428fca67fd89b60f187482a833f3251e0d88695305ce4fc5d6fbf0059bb9ed882ec5d7eb023cc0e3e1b
 MISC metadata.xml 316 BLAKE2B 723c24d6f84b81214862b9b87b53411988f5c8301c69cd4f6bd891221c166d2bd19e2ca003b5ff63bd292cd4ead03782e606c2a221ec427ca68f1a89eb5342a8 SHA512 d4e5a2e1470726810dfa15fc49144adc9caa1664fde1314a38c40a29b7d24e6c7dfd7c8f7eadf9ea8a07d12b3a7c3fb1b9f78f3530fa5ec5d67188f577942255
diff --git a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
index 914b89f5e706..beacfb235652 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-MY_PN="KacstArabicFonts"
-S=${WORKDIR}/${MY_PN}-${PV}
-
 DESCRIPTION="KACST Arabic TrueType Fonts"
-HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot"
+HOMEPAGE="https://www.arabeyes.org/Khotot https://gitlab.com/arabeyes-art/khotot"
 SRC_URI="mirror://sourceforge/arabeyes/${P//-/_}.tar.bz2"
-LICENSE="GPL-2"
+S="${WORKDIR}/KacstArabicFonts-${PV}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
-
-FONT_S=${S}
diff --git a/media-fonts/kanjistrokeorders/Manifest b/media-fonts/kanjistrokeorders/Manifest
index a276504ef050..9109351a88bd 100644
--- a/media-fonts/kanjistrokeorders/Manifest
+++ b/media-fonts/kanjistrokeorders/Manifest
@@ -1,3 +1,3 @@
 DIST KanjiStrokeOrders_v4.002.zip 9453962 BLAKE2B c340e53f4fa8fd56aa267cd5b9b1d9ebb15adcbe814c9ea00b9adacddbfee70e4925c7fa6a8939d16d0935e9c0067d69ba4dcf9ce9af346c2b457c001631b905 SHA512 49b5f5dbf70e900e547d5d0fb2fb51d2e8dc73e6dae3ee46e197ef5e2187c445fc39ca69cc69b5e7612b600e065cb17e760c3f48b6b7dde8f6ccccabb3382a6d
-EBUILD kanjistrokeorders-4.002.ebuild 567 BLAKE2B d41a2b1b8251a6f2f476cbc2107433b55b267aa54eb6ec1a2073ff6fbbde4c6706159c81a1cc93604f546c641b84ea3b62879a0a3cb16228670451ca912dba98 SHA512 043c6f89c1eb38439e4bf1077a595a776552441a3ca3c1836bc448739ca596b3f469a7eec78b4c1faf1f2801edc74224e4b0707b4c5f1e781e69e51b3591d5ab
+EBUILD kanjistrokeorders-4.002.ebuild 527 BLAKE2B 173856ceb5d20018e0b16ae31a34c3b0ffafc3bda7f331fd9d229a08446e9b2366c5c3304da08357a1d7b8ba2f03222eb7ccbda863f0186bad342c5596b0d0b8 SHA512 36900ef69f239282ba124413c787cf07ed2496e0f2fde62092a0ca7fa53911141993c037a56c1f7888a5e52c33cc74f811206ac6409711c95a4fa249aab74003
 MISC metadata.xml 332 BLAKE2B 58065f27878c71ac52b58b5b3f23c5cba42973338a01bfd7ef85a9dde2c7ec53d66f8094fa5ca38fd96fe22a29f9a6947c4e84131ed2e7aff23f0be2a550053c SHA512 9a9acadc7af90e8d744d4ae3b8e1f31973c9d00dd3843261a578111df0fe0fe24df44a9858a466a265bcd0bcc1d55fecdcc8a699a3d093030236fe0e88b03bd9
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
index 98ca221fbc9c..3257c5f73bb4 100644
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
+++ b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
@@ -1,15 +1,14 @@
-# Copyright 2009-2019 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit font
 
-MY_P="KanjiStrokeOrders_v${PV}"
-
 DESCRIPTION="Font for viewing stroke order diagrams for kanji, kana and other characters"
 HOMEPAGE="https://sites.google.com/site/nihilistorguk/"
-SRC_URI="https://sites.google.com/site/nihilistorguk/${MY_P}.zip"
+SRC_URI="https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,11 +16,8 @@ KEYWORDS="amd64 arm64 x86"
 IUSE=""
 RESTRICT="binchecks"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
+DOCS=( readme_en_v${PV}.txt )
 
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="readme_en_v${PV}.txt"
diff --git a/media-fonts/koruri/Manifest b/media-fonts/koruri/Manifest
index 20fe610b8447..7f6f33ce1a5c 100644
--- a/media-fonts/koruri/Manifest
+++ b/media-fonts/koruri/Manifest
@@ -1,3 +1,3 @@
-DIST Koruri-20161105.tar.xz 4260452 BLAKE2B 1c243192583380e789b3ad02d7eb02c764a8bf963bed0a9d35a7fe0ad6c7fb20549ebbbab9f281e588933f3ca9196f44f9d3a431f96066089f1f43c2f63b08e7 SHA512 edf50be2084bd8b03a5162f5c3ae6e474e45b3b9f2a18ed0b65b1527470a22a2ecacc5b675e396de11d217c057bf8d9ea9842977b6db5d3ee06b0c1c08e472b6
-EBUILD koruri-20161105.ebuild 536 BLAKE2B cce0feaeb9fa3bc567d0ca0614326b8f4eabe058a21a48dca5e641ded3f8b1654dc10bf504aa482ce089c75dce80437b14fae5fcc3b9f6e7799a16ecb47d013e SHA512 788c22d0e573b0f173e58de2d65aa15af226e59d89ae66de78e8303b3b5d4999ec3678db8a5b332c210957fb867c6f14816b12c23fd31527e73bc0445de8f2ae
+DIST Koruri-20180915.tar.xz 5185488 BLAKE2B e67e7e21dd6b9a0134f1419a924a264c2b491c1623ef748cdca6756ae4a88655ba6312ab58d0827e96f29e5a47d9aac6f13467289329d4bb0e2c939d70297a56 SHA512 0a78240e75782c07752e29e8591d5eab2b15fd0f784e569c60c438c2a1e49c462fa6e4e1734c1922d8bb0b1eb22fd4c74a71c0c0b7d127fb1d4c410835b98bd7
+EBUILD koruri-20180915.ebuild 531 BLAKE2B 4259108a16572d8bacb2e2860342ef57f852c9f128507c76c0e77ba51e6196368f6545f291ac421dbb1bb46ffa87286c4dadc12147e481390d321d215494ce34 SHA512 ec6541d1ea04d034a6fa83ba9a249a5907568a1729887c0973a19d997dbc9b937178738389654300377767d13238dc6af46eb6ff0e56ee90ee45454f9383e4bd
 MISC metadata.xml 327 BLAKE2B 8ed2059f0aeba53301b97074d1c2eec42040eac2c2083213c7477a3df7b7b358278f3f929b899ec2b945425c824bc91bbdad6524acdf368703328f46b54d28e2 SHA512 beaf7040f803fa5a00c98e10ef358eb67d04c2b780cc7c297204e088cca24bf480e645ec2a4b4667416179c2b82e0d56dd5a1b5b2f3b2d9f931f4061ef33cfc8
diff --git a/media-fonts/koruri/koruri-20161105.ebuild b/media-fonts/koruri/koruri-20180915.ebuild
index 4592f678cb87..855e0e29bfab 100644
--- a/media-fonts/koruri/koruri-20161105.ebuild
+++ b/media-fonts/koruri/koruri-20180915.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-MY_P="Koruri-${PV}"
 DESCRIPTION="Japanese TrueType font based on M+ outline fonts and Open Sans"
-HOMEPAGE="http://sourceforge.jp/projects/koruri/"
-SRC_URI="mirror://sourceforge.jp/${PN}/66647/${MY_P}.tar.xz"
+HOMEPAGE="https://koruri.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN^}/releases/download/${P^}/${P^}.tar.xz"
+S="${WORKDIR}/${P^}"
 
 LICENSE="mplus-fonts Apache-2.0"
 SLOT="0"
@@ -16,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 # Only installs fonts
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
+DOCS=( README{_{E,J}.mplus,_ja.md,.md} )
+
 FONT_SUFFIX="ttf"
-DOCS="README*"
diff --git a/media-fonts/libertine/Manifest b/media-fonts/libertine/Manifest
index afa6bdc1d608..ac6a77024cee 100644
--- a/media-fonts/libertine/Manifest
+++ b/media-fonts/libertine/Manifest
@@ -1,4 +1,4 @@
 DIST LinLibertineOTF_5.3.0_2012_07_02.tgz 3001259 BLAKE2B b585611591674d2dbbc616a572afee7d89e3ba7244a3b19abee2e99937da1db8047739a79ada23f2d0ef5febe39970e08b907e347994996da922a5131a3669fe SHA512 a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7
 DIST LinLibertineTTF_5.3.0_2012_07_02.tgz 3673659 BLAKE2B 46107c8521a5cd680fa7b2ebc7dec969c0bf326f7598dfe850570771ec79b10cc472953be045a539a4fc414c1612f6865e1b6b86f390514ae14ed601854384c8 SHA512 ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273
-EBUILD libertine-5.3.0.20120702-r3.ebuild 780 BLAKE2B 2d53ff3cc413520dc06df3750db98997e6c3ec3aa50efea050e71f14842ebc39dce8d82afaca74d5cdd4ef628885d82e3da5b91fcd32e9332d9219e873cc4230 SHA512 26c27c833ae19325c2216c01c1969dd3713ec0dcb08d0783bf7269bab50d6448e6939aa274b55b7f8eca98809bac4f7104e1686e1e7ba1c77ea4834ecd225387
+EBUILD libertine-5.3.0.20120702-r3.ebuild 761 BLAKE2B 0624fbbe72492da3b7a813aee42adce79f81efe1ec28295fe1aa2c032564ee2d4ec89b27f8e8dd20617ff833f8d41bdb953a6d975db1b689b6f24a97d855ea29 SHA512 78f2901df5f3589b991f0c0723b64f9ba5f16251d4c01a0f537eee59bf05af548aced0032a6242228c685e183993e6c476469bf629a506bc2c9ba4a6652f7f2f
 MISC metadata.xml 332 BLAKE2B 04e9e26384b60d2cd97873cd832ef6d71cff61e3c3465b3927de2d34b5473b6f921750be6f2c0eaa9b3e87ed7eea9a9388e3775713153617152bc75a8d323179 SHA512 494bd65f738485e4876e0309f61515f6b42a61d3ace6a403af533d268e80db72833387731656e6c14ed7faf73e2f06288f31c46c81eca174338d1f817cd2d961
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
index a8f4468ac7dd..f51440c557ab 100644
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
+++ b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eapi7-ver font
+EAPI=7
 
 MY_DATE=$(ver_cut 4)
 MY_PV=$(ver_cut 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
 MY_P_OTF="LinLibertineOTF_${MY_PV}"
 MY_P_TTF="LinLibertineTTF_${MY_PV}"
 
+inherit font
+
 DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
+HOMEPAGE="http://libertine-fonts.org/"
 SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz
 	mirror://sourceforge/linuxlibertine/${MY_P_TTF}.tgz"
+S="${WORKDIR}"
 
 LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
 SLOT="0"
@@ -21,7 +23,6 @@ IUSE=""
 
 RDEPEND="!<x11-libs/pango-1.20.4"
 
-S="${WORKDIR}"
-FONT_S="${S}"
+DOCS=( Bugs.txt ChangeLog.txt README Readme-TEX.txt )
+
 FONT_SUFFIX="otf ttf"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
diff --git a/media-fonts/lklug/Manifest b/media-fonts/lklug/Manifest
index 36cf0cc0d95b..5e4a58b8fb2a 100644
--- a/media-fonts/lklug/Manifest
+++ b/media-fonts/lklug/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-sinhala-lklug-0.6.tar.gz 382873 BLAKE2B cce5b23e2c83db860fc023a4acdfcc336c79b335e39ffd226d7c26d87b98ca12a23ed7aa7fa99832c4c72b2b3ac75e0681f8f70392cc7f0123a42dd08353c36b SHA512 d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa
-EBUILD lklug-0.6-r1.ebuild 446 BLAKE2B d81dc6728a5e8481d42e04721f0b67e7fd2e052d97a51eb86f1db18ae6575a1062e38c43491034b8ef239f6f1e8d8b547f610f2706610a8b699219348a3e2f17 SHA512 454f301b92324c7c04505adb217c05558a5713b2885fe8f37299c078f46eb02952c321e4f52f813d4c42903bdadbcfef03f61c5ee586307a2f1aacaee115c02b
+EBUILD lklug-0.6-r1.ebuild 439 BLAKE2B d2cf87df927779f998d502003c208c94c3d71c38844cfed8bc383bd554e04fc8b066e5343668aff073e6e4de9a155c7825c3c3e71a620c11069a79c6909867e1 SHA512 f4360086df894ed0eee6dad4845350c2cf5a2af60da157672802e9b22285d86e8e42d45f5deaa0262a52cd9a048d4cb05c117fddbd3958ff3e4f1e447af33a25
 MISC metadata.xml 315 BLAKE2B 552ff2bb3878109136f58c429e796e690fe2d9813291d1cd2f9617910e5d8ddbc5e9891560a081b90c6d866972108879d63be2058a0b975647c1fc05390c6701 SHA512 2d525597860e240d8d7d1282ea6b3a9459597e7980f9e82c99ed76e10a1d78ca71993fdb321279f45fe517a5852effd3abe31c7ef7b1af5dfa04af0b8c3d7089
diff --git a/media-fonts/lklug/lklug-0.6-r1.ebuild b/media-fonts/lklug/lklug-0.6-r1.ebuild
index 956e033f45d9..4baad572e768 100644
--- a/media-fonts/lklug/lklug-0.6-r1.ebuild
+++ b/media-fonts/lklug/lklug-0.6-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_P="ttf-sinhala-${P}"
 inherit font
 
-MY_P="ttf-sinhala-${P}"
-DESCRIPTION="Sinhala font"
-HOMEPAGE="http://sinhala.sourceforge.net"
+DESCRIPTION="Unicode Sinhala font"
+HOMEPAGE="http://sinhala.sourceforge.net/"
 SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
+DOCS=( README.fonts )
 
 FONT_SUFFIX="ttf"
-
-DOCS="README.fonts"
diff --git a/media-fonts/lohit-assamese/Manifest b/media-fonts/lohit-assamese/Manifest
index 264fa7e157ad..531ef65275fd 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 623 BLAKE2B cc6e7c9dfc0fa70d621a178caccec6d5cfbe8e00c11a22b1c3d5b86b16fb1441b2b91374d5daeb8a52c0fc5f6c224afd3506146157b0ae5a481a0f86c9b9addf SHA512 8f676cc7520428b0924573fab9101e1f008f5b060835b1ed899f0b9206fd3f9fcd4c30f0f4d6e9a41dd880a9193d03a2844471db3689e947099fcd42ea648e42
+EBUILD lohit-assamese-2.91.5.ebuild 596 BLAKE2B 487188907285165d3fc63457952dff8891062497a8212a86ff5e78768bcc973588bdfe0260ecbe94c05164d25619418f7c88614780248b90929d10a3b4122de1 SHA512 4e4c8eeaf175e79125a59a73d317fb57f5d8fc1e4d60d6132bce6f954d2d733443f14828be862c1a48394f7a6b2e031b17a8cce432620b68a8c092d3a6c43e5b
 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 3e93523f739c..f23786e39c09 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Assamese font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-bengali/Manifest b/media-fonts/lohit-bengali/Manifest
index 59a458a4e16a..329b0d7a7791 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 622 BLAKE2B d415f43eabdf8cc4f92ab0842f394a8db32f1cfff4bb779b3cb41eee864a4ae90aaf80ca49722adf7795e87df2738c5f992a5167f5446eeea4b7a1ac19d49e71 SHA512 f8b68e8133d57065e919e660b7ebc02434bd3b0c933417f5b32cafaada73e094b4c8a1ff6eb87eca351ea2cfb6f3e073174ab5f7cafb97112d768ce1e6ff569c
+EBUILD lohit-bengali-2.91.5.ebuild 593 BLAKE2B 0c47576751ba231d40869489e0fab39081122d41d96a80c922864c5e34bce6a3f0005ea3515707e69d1a50baebbe0f7b5a3cb0101d8f738ab2d534ba1388f9bf SHA512 7f3f5856f3bd94e939d5c6a29f0b76d98046fefa935a3086e9a18a3d6af12c2dae8d8b0d6a2d6a4675347b11d03be5484ed19f7c404895d2051f3a98fa18a740
 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 78e6c4ceceef..0df85af8cac6 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Bengali font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-devanagari/Manifest b/media-fonts/lohit-devanagari/Manifest
index 77db18a68916..dc821d362b5b 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 625 BLAKE2B 5dca9cce40f3b0badbcb0ca23cde18491625d7caef671d51e4c6666dbd38c1af1c6bef7f534f8963a8a785d893302b48634f9487c9c3737d284e63cb53d8cb9d SHA512 62d391f795f2c62656e6ff2f5832ab234ce403d316ebe767543179865668759a380cd97b29b31dbaccf853c389d03a20ab9e45c7399165b28f8c172fcbf0988b
+EBUILD lohit-devanagari-2.95.4.ebuild 598 BLAKE2B 55bb0957d3a3bafcc167b1af9570cdeeafaed42921b7a41e0999a280ed8108fc8ff416df907192037dc56f0c0ef52eb22feea0665df2253727d864cdf349de52 SHA512 69ce41cd67367dbdb83176d8f5db8e233fbd75ef0e31b228a11e79d4854fa4f064441ddfc3a082687fdf1e6ff408933ada784907ea9dde549dbe08da8131e992
 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 e5f5e8cf1fd4..eb1c8d02d618 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Devanagari font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-gujarati/Manifest b/media-fonts/lohit-gujarati/Manifest
index 05bc69532a85..197d2c1ffba5 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 623 BLAKE2B 4d1c206c3a1a1bcf89b5878a8d6774bacd81833c714995a3c7597b4c1f687d84b99e9c2d1e4b14a1c002b915a572aba0d7f6248c7230389cf5917144d2bc6dea SHA512 0902f129641f28d9e88ae9e7c6cd6a393af17ecc6e86944844728a1e12347b4d67af6cb12cb08da1b765990c8a1ff4f92a4d56c1cec11bec7f4aab80c68fd529
+EBUILD lohit-gujarati-2.92.4.ebuild 596 BLAKE2B 979ad74068e38ac50b95d7f31c869336e90a5442d6b894052665e1f903ac739b00aa986ba6b417b55f4fad90e8543bbcabfdb379f14256a9d0ab459f8578625f SHA512 44f91639a4d627cf96a654dceadb1c552a0d78b447599053df9c1438dfe9c5c54082c46ca20617633043138871001570197130d2e11e99d124b7388f023e5860
 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 d4d31fedb1ea..4e34613223c5 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Gujarati font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-gurmukhi/Manifest b/media-fonts/lohit-gurmukhi/Manifest
index f9948e8d188d..ec16f6c16c0e 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 623 BLAKE2B 46e6f365c7ca6e629565416e5ee4aa1b24e5771ff7d21de4595ac84b80100b21b1847aeadafbf59020273c23b5c88a503bfefaf1ed47b65afbbe0a4f1fadd3b2 SHA512 084d15ea5d4f09b856b2b852735c358039f7306639e8e4fbdb149f401e8a41b6965912237720a3b03f4a58fcdfe9b8c35834ba171df8a3e64cf51aa8a37c01b4
+EBUILD lohit-gurmukhi-2.91.2.ebuild 596 BLAKE2B d9423a217cdd24c558669b554809888ded960ad6c36ebfa8346708d4b5506dbe02ddf9f934d0f5781fb1829be8938e9991a72dd7ecec65505b9e4f64cd1f29c2 SHA512 a2daa606209ff490a81656dc10780ef6dea47ca1e5947f7a1042734c9fc2702a93ea85fe9fa0fbe25abcb47366c05ccbfc09e3f768b3dc7d1547950a09a9ee2e
 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 0fe2a51e4f8d..aa1fcb2af67b 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Gurmukhi font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-kannada/Manifest b/media-fonts/lohit-kannada/Manifest
index d97fb227c68b..bc5f89e96f95 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 622 BLAKE2B 9ce8fb218c9694fe92328f02128f2aa99e6dac1f75b2e724515497d0271671dc90c7775a85f889a9f292f7ea6004200e2cf1f6b51447e352769efa9be7f0493d SHA512 d3916c691334e79ec7f7dc7bf5c024be630522cc063f52b56359f1f0eaa30deee63daf5cd7597c6922082c09a6c1a9845714f51caff8522157717e8b3d361c58
+EBUILD lohit-kannada-2.5.4.ebuild 595 BLAKE2B 9593cb3bc94b7ccf8873e0f544ad8975d85888c6b4e6d476f23813aebefc60d0a379aeb40f6b0d1e39e618763e2d2fd5e62930621c2be53d8d4ae76aea0ac4eb SHA512 2a272b340ccacb7b535d2e9cd2e16ad2cd1d6d35168db7195d46d5429682adb1c70118b815afd39a0950c0468cd1a6b6e80d98d80b49d563042179d81f617153
 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 f415e1fb35a5..763fcd28d068 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Kannada font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-malayalam/Manifest b/media-fonts/lohit-malayalam/Manifest
index ba71eff265e2..1be85fe1fd4f 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 624 BLAKE2B 2630c3758e01644094b9139597c3f8b811e9e4ca6bb5f07df14c96d72cfeeff7dff01864ea30353aa9eeb4d716ca5ec49490d16dcd5e6b1a8a3dd270b8ad22b2 SHA512 901df01527384671a43652f7e5703b595c2d029ad00c625326cae8638f99bd28b493b8838e47e3893cb62361b42c9d11d664a7d63e90120edb4fb4c83af9670f
+EBUILD lohit-malayalam-2.92.2.ebuild 597 BLAKE2B 8603343d8736066130afb52ba76fc175936966ce031a5552ce875437fa59341b43ba2cd8575a403b50d58e2ceac7a87525e59e50080953cc67f8d3fce5ddf137 SHA512 6fae1cc982d35d249f069bcce978bd44364816816cc6adb447ebf6b854c5cfb2247d6293d5b7503ba99ca4c53a3c68188b45b1b55e3f46d38133f07198982f83
 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 24d092b2d276..813129c4b5e6 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Malayalam font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "67-${PN}.conf" )
diff --git a/media-fonts/lohit-marathi/Manifest b/media-fonts/lohit-marathi/Manifest
index fb55f07a0f20..907c687de2d3 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 624 BLAKE2B 583bbf57f8fe15ad7611c279523cb264cb613ffd44000ab33677e8816c6e769ec5b5a600e88a7e7aaf296c243ca5d986f39fe5058c4c0bdaed7df2b736dae4b9 SHA512 5867d31ff8ab80603294dd2f49b27c8e669509cf0327da3ed2a37b409649000e2f43570982d064da7e409d5fd667fa96e88c8ebc4956c1edf312eafed17ee7c1
+EBUILD lohit-marathi-2.94.2.ebuild 589 BLAKE2B 9ccda46e34a3874b23193cf2a7abef2e83ab334a965ef1e21d83c6f03aaef1420fdf81900875bfb46318b1a16fd3b4dd902615e18ac03b097524b4dc8ffcbaf6 SHA512 392f8a2f02cec5e7b5fb175aa44aafb8fc20b6dfa80ee97f934ac6548282ee0a1684e1e0aefc2b40da5736b33e6c6cd6afbbb593ec7bb09da1cb597dc1f6c275
 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 cde480f7c8bb..bbcc675ce363 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Marathi font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
-IUSE=""
-
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
 
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "65-0-${PN}.conf" )
diff --git a/media-fonts/lohit-nepali/Manifest b/media-fonts/lohit-nepali/Manifest
index 82cf86edb105..bb2db4f832a0 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 623 BLAKE2B 37f09c74bb4048db5e4d7857573dc58ed762530d66da1041beaf7d88420112b0aca544a2dade5d95c098e9cb74f01d1fdc3abff80a0ca8cb44b970083dc73630 SHA512 4a940f250179c211fa60b6497de40a5d147a18ba5130c85265f0ccca354ae8312796c5c8d7d70c8cde7e4b34db87190539d461ef55006c04101c731a97a44989
+EBUILD lohit-nepali-2.94.2.ebuild 596 BLAKE2B 657818cf77f1b8f9ef273e59d56ddb60f198278746388f7f1c87f644d2751392cb0f1a099f3f49096afecc6601823e431413832f4975cc435aee134635f384e3 SHA512 e7239c546b7786390a44f89cb8dd06eec8ee9af921e90dfd69814ebce1eb91655e68537b574fd512e282df36ac16ef078bad7474ec22fcbe65d89cda5ff93ffc
 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 ee6bf1238e32..37829854b4fd 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Nepali font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "65-0-${PN}.conf" )
diff --git a/media-fonts/lohit-odia/Manifest b/media-fonts/lohit-odia/Manifest
index d201eb4dbe41..3c0a7444d3a7 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 619 BLAKE2B b543e9c6095a8a9839e81584ad39007aee688f60852036ac32f94efbd9d2ad2945d60f82ad68bb2cf3d1eb03572d4ff3bf04d3d92203ca47e57bd044148e6f23 SHA512 0735bbed67b08714320cf3475c960ec0a0ff089b6d97447b18d5bcfc8cd5152bdfc67bea4ede56431d31875c9f6c7f6fc90b2d55a056c72b9ee23c973928f689
+EBUILD lohit-odia-2.91.2.ebuild 592 BLAKE2B 94c821c8e22e203054af4dd052d7c2c8c1333d38d4c3fd1d83572984b95877d556ca0044f15391cea6d907babf44abd230968119bc495ebddd34da317ca7d83e SHA512 6caaee644deca01c4433dd939f74a19bf0f0b545e537adbf06eed4533338af69c4b84389b5e5190cb488b03ff53c38d892b90f37a4e5e9887c5bdd32ba8f164b
 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 e7866074d341..7773d8429957 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Odia font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-tamil-classical/Manifest b/media-fonts/lohit-tamil-classical/Manifest
index 630cdb7dc544..16402d9d5d35 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 630 BLAKE2B 6f01dc9c4b43964e1aaef6486219f83a0dcd5cd7acfd216b75766b793e84422683b19f8d220ba3679e665f0ca65ac90fc91a1f9c3003588b1ef83d48048047e1 SHA512 2c4414fbfd6857e52d82d03b8b99748b6e78bbd877754393296b6defd9d4eb9009f96090788be1926157a6674490e1b1c64d02522b9eb9989ca1998861deb94f
+EBUILD lohit-tamil-classical-2.5.4.ebuild 603 BLAKE2B 46eb1c760f2410f04321eaaff85b9422431f2434bfada84e7b2ebc823148bc2d894c501e1d3077a07c7678367c55dc36eb0f6711f179e19bcb7f3e8c208f28c1 SHA512 e95adfb4194f56c54a22884cc979997045a9edef00f050e723ab41455e87a57de21a41e8bc9319d619b4c309786e1e953030d74d11f930210aba286881cf779f
 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 0c12137d3e0e..51748719214f 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
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Tamil Classical font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-tamil/Manifest b/media-fonts/lohit-tamil/Manifest
index fc5e41038ae2..0dd725d03b1a 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 620 BLAKE2B 5a14f5561b69b121432dc5f7f52b5c779c18ab186626c111332eb4bebeac8cfa8f5b9908244e880e5fed57b4c9c234f8b8edab0cacbb7cd1486ce954d9405494 SHA512 03c634de4ff32300fb744fab5fe4ae3a1ebbb5efd4acca0c88bd9518965b1475d531772bb76ee3f275722d5b489fdb876990e03afa0313e3d658c4162877de62
+EBUILD lohit-tamil-2.91.3.ebuild 593 BLAKE2B 26eb31af9ac8dce5189f54dd9bcfb28f094db7cbe502880f8e6ed33223860356b4b89c6fb9b13ac2cd70cc1ac24c314df5e208752a823d09983e4a4b23c6d148 SHA512 eb98e4bb5b11ce0103a52f074f4ef0c88e07c9d958c35e42f6a50eccac5de1cbec192dba31930955886016ab5707204122a88752cb670e87606d28e6c315e0ef
 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 9977147a2720..2371e0cbfdfd 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Tamil font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/lohit-telugu/Manifest b/media-fonts/lohit-telugu/Manifest
index 437cba652bbb..24e54b06e381 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 621 BLAKE2B be3e36e80a7a187bc5e0b7ea5956bc2d0cacce3a5856e5c98ab29634800b5850c9a64770d3628e56eeac46ef80edcc6bf5429849addf792fcfeb5da24686bb30 SHA512 3040980ee1e4c30de6b623a7667836677bf7f13a0a282f08fa3c2927c08c16475b48b469109d863bdd0865c757af61702f17267bc6df16650d79d1e480c962c5
+EBUILD lohit-telugu-2.5.5.ebuild 594 BLAKE2B 86e32d3d6d83b08b250b223843904961bb8128696ceb12246f23cdbf85d63cd91281a9a1f02595611cd59f1ae87b34e675c4acc9168515a6f8ca2c6b891fdb77 SHA512 31bb7f613474b447c71966d38953dcbdf1cbf69b7a27476ebd10f5aae54e679a7fb26ed256ccb339661a2373ab67db28ee681d6debfbe876db4f85e8ea081016
 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 4035906dae28..432ae239c39f 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
+
 FONTDIR="/usr/share/fonts/indic/${PN}"
 FONT_SUFFIX="ttf"
+inherit font
 
 DESCRIPTION="The Lohit Telugu font"
 HOMEPAGE="https://pagure.io/lohit"
 SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
-DEPEND="!<media-fonts/lohit-fonts-2.20150220"
-RDEPEND="${DEPEND}"
-
 RESTRICT="test binchecks"
-S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
-FONT_S=${S}
+
+RDEPEND="!<media-fonts/lohit-fonts-2.20150220"
+
 FONT_CONF=( "66-${PN}.conf" )
diff --git a/media-fonts/mix-mplus-ipa/Manifest b/media-fonts/mix-mplus-ipa/Manifest
index 80b1aeffe0c5..38aa0ee07f4d 100644
--- a/media-fonts/mix-mplus-ipa/Manifest
+++ b/media-fonts/mix-mplus-ipa/Manifest
@@ -6,5 +6,5 @@ DIST migu-1c-20130617.zip 4373842 BLAKE2B 00fd09bcfa67796d1d81b4724a247787c8852a
 DIST migu-1m-20130617.zip 4268071 BLAKE2B a5607fb7ef1d029bbb1f8a9b4149b75ea75a788e526aa82e876adaaa0e3e395f387a0a3c7b223163183685812da38914fce7c39b301eaa32e53aec38d204fdfc SHA512 6a0b33cdcadb57e856606c372740f1243b95c0dbd19b00873b9efa84056176ae7c3477258e90e6ef399b3f67e51a3a269792c30c7920d56d29ff3c5a3af2f8c4
 DIST migu-1p-20130617.zip 4365146 BLAKE2B f083c90b90814c91f2619549ddc61e4f256eb4b646d4d3552414bffc40a01058759d6b35ee35cdcf3471de51e5209e6ac0004e7b2006522abeb433ed3d8f65d9 SHA512 d7e04680d7bfc463d2bd757950deea91843b4c0ca40a190ef75c46cdb5dbf52e8953be9a373e1b253d94dfe3dba8a4f3b76c928e107e3f666009af4a408fb6d2
 DIST migu-2m-20130617.zip 4266805 BLAKE2B f71bd9785e1d4960f07242e8728c7dc2e52b189bb7d827e51fd30377ec94d196885b533319e07db6be3028ec5910c436712cd2a730f7d79805a9279826632d85 SHA512 926660fc18b113d0794c9a7bfccf1ebe5f08805de5d2d5bb4fbbbf9a17e86a748e09d75a693bbc8f5a4d5bbba7ac9b205ee47ab507069a22428740b89d855e83
-EBUILD mix-mplus-ipa-20130617-r1.ebuild 1006 BLAKE2B 9ae6e9b50bb67fa97476a90a2d99df28df472ffc11b00dff7e74e2a94370d6cbe2074a4d7d770d56caf51bbf53b70a3768c4e5d2e8c370117d495d847fe76dc7 SHA512 5c438e1bfd4633ef06874eb154c0029cc78532c26b1f19416f5a6371261202b5baab566f02b2198340726b8229c8ea78eab98c4dbf7f1fd15482c702b261cdfa
+EBUILD mix-mplus-ipa-20130617-r1.ebuild 957 BLAKE2B 1925e168e5356d2bb3b8b0ba2c3be78e41339d91f2fa8e1c0240bcbde6ded0daf87001e7ea808e8d31a522f062f5f483d3f45b652768dc9ece922504e3b0eda6 SHA512 061489a739d1fd9b30f4355df5ddec833559b26e37ff6a32aa7ecbc03eb3740d2fb319b99d1a2498c8bcde6674a9aaa3354364a479f222cad8e36cb193cf1cbd
 MISC metadata.xml 324 BLAKE2B 51017329fa09a00ef96fde9191a5004f261574980d0fb621f8d924e6f204437b95322de67b7112aa9ab7ad1d7ff73de5657ae6ff47cf9f4c6a3126b4741697e7 SHA512 4d86e705ef5287be8dd82f391cdf6557407e944280d238c21f7843fbf3427e22c8c377b6896fb86246e3dc0b6f2f4ed40e26128d39532513d3037fca1a6f27fd
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index da66cb1fc353..8ceffc47c530 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit font
+EAPI=7
 
 MY_PV="${PV/_p/-}"
+inherit font
 
 DESCRIPTION="Mixing mplus and IPA fonts"
-HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
+HOMEPAGE="https://mix-mplus-ipa.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
 	mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1p-${MY_PV}.zip
 	mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2m-${MY_PV}.zip
@@ -16,21 +16,17 @@ SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
 	mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1c-${MY_PV}.zip
 	mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1m-${MY_PV}.zip
 	mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-2m-${MY_PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="mplus-fonts IPAfont"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
 
 src_prepare() {
 	default
-	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
+	mv */*.${FONT_SUFFIX} . || die
 }
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index 9683ae530a56..5fd52dc0c8c8 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 1413 BLAKE2B d31a5968ba1017fa5eb01612154e08b823f32f11bfb926d594ba93d0ce22d67d01ac6af711eafe7b6317ac0e5a4e17fe66fb5b94e8e7f84a954daa0dd6a2b551 SHA512 478dbd5e8cd1d9de79615f00b1d5a7abe4c3f5eca3c12dca3685db78956d896fc3a26da7496cc65102a995be1b92add3febf1b75553d3a82dc84bf23e107e13c
+EBUILD monafont-2.90-r2.ebuild 1451 BLAKE2B 3c4bc458782bd00cd19e359caa51ec954ea06647a3cf5ba1e45f041949518150c17357e50568bebf16a2c53e39dc20a15c7463e5623487ba4a97a95c42857ad1 SHA512 a11f0f84f281d3e7bf6226b095df5910301407898d2a8293df0f9346b608b99b802d6b69bf1af79f5603a88429a382b7e20758fbe595e2cc3f9512e23f0b4593
 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 4c5c61053b57..3450333bdb20 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit font
-
 MY_P="${P/_/}"
+inherit font
 
 DESCRIPTION="Japanese bitmap and TrueType fonts suitable for browsing 2ch"
-HOMEPAGE="http://monafont.sourceforge.net"
+HOMEPAGE="http://monafont.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	truetype? ( mirror://sourceforge/${PN}/${PN}-ttf-${PV}.zip )"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -24,9 +24,8 @@ BDEPEND="
 	app-arch/unzip
 	dev-lang/perl
 	x11-apps/bdftopcf
-	x11-apps/mkfontscale"
-
-S="${WORKDIR}/${MY_P}"
+	x11-apps/mkfontscale
+"
 
 FONT_S="${WORKDIR}"
 FONT_SUFFIX="ttf"
@@ -50,15 +49,16 @@ src_install() {
 	insinto "${FONTDIR}"
 	newins fonts.alias.mona fonts.alias
 
-	dodoc README*
+	dodoc README.{ascii,euc}
 
 	if use truetype; then
-		DOCS="${WORKDIR}/README-ttf.txt"
+		local DOCS=( ${WORKDIR}/README-ttf.txt )
 		font_src_install
 	fi
 }
 
 pkg_postinst() {
+	font_pkg_postinst
 	elog
 	elog "You need to add following line into 'Section \"Files\"' in"
 	elog "XF86Config and reboot X Window System, to use these fonts."
diff --git a/media-fonts/monoid/Manifest b/media-fonts/monoid/Manifest
index 2a3f962d7eac..cfeef6d3fa81 100644
--- a/media-fonts/monoid/Manifest
+++ b/media-fonts/monoid/Manifest
@@ -1,3 +1,3 @@
 DIST monoid-0.61.tar.gz 22431008 BLAKE2B a5aafdcdce20da43544abf3e362b24948010019502dd0862321a94434ef3cdc9b74b149d555ade44d08440fcc72169cc85ecf0b8f6ee9cdea85b2eaba2271a3a SHA512 b94ffda585ce8fda14576140cf771173773490169a559c52d275471f6061667278d268ae80543270d9275f3512e40ea95129062b890dd31d33d61a7980b58a33
-EBUILD monoid-0.61.ebuild 435 BLAKE2B e3efb25a5188b511b192637d87994eeff292750e28c1b8409f417da945d604fe7796190f791b6702e7d1ff08dbbdc918dcd4e45f2b517ea458ca9f629556f4a3 SHA512 4b05bdc309ef6e658b7373841a960274de4cf8c6f918b9b6744584233b9e63df746bdfa162588b4ba2a498ac62dc038a3ec2293d716398fbb102f59cd41ae379
+EBUILD monoid-0.61.ebuild 411 BLAKE2B ba6f86b4a4859a1f55c08757e7f4440ec4e379a280c75df8abd50f60a8019446edea008c8025cbca75fd7a86991bd859f2d6cb2eff92f4ff167646b4d817aea1 SHA512 b031101bed15444114b4c5944b340dca49d2f7259bae6d8ea29549398b18ff463cc78a269281a0fa54a80613aa55c4ffbd5338cae84ea0964768073bfb129ac5
 MISC metadata.xml 320 BLAKE2B 734b2c07c1d037b2e70049f3a63af76ce310ece4f8a8b3884060369a81c1f5809ada444e62eebe7a56aba9284d0a3121f6d369950a1d08d563a01748e8859009 SHA512 4dc21620ea0e9305ed2c42dd354d31ffc5770787c940291e1491a41bc67b7075ba3b0a222bf875375884247d0a6ea3298ea72c7f6a07d2755ae57cf8ead8e639
diff --git a/media-fonts/monoid/monoid-0.61.ebuild b/media-fonts/monoid/monoid-0.61.ebuild
index 3db014349c3c..8f52ecfc8b74 100644
--- a/media-fonts/monoid/monoid-0.61.ebuild
+++ b/media-fonts/monoid/monoid-0.61.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit font
 
@@ -13,10 +13,8 @@ LICENSE="MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="binchecks strip"
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
 
 FONT_SUFFIX="ttf"
-DOCS="Readme.md"
+DOCS=( Readme.md )
diff --git a/media-fonts/montecarlo/Manifest b/media-fonts/montecarlo/Manifest
index 8182d41e4bae..3c9ef7b69f7d 100644
--- a/media-fonts/montecarlo/Manifest
+++ b/media-fonts/montecarlo/Manifest
@@ -1,4 +1,4 @@
 DIST MonteCarlo-BDF.tgz 4586 BLAKE2B aed07bf7368f347079c38682e2a08da70f13d9b864b105cab4fab2deaec8e593de20edcfe8c68ba58112c9a89a482b0f00a63c12b6607085db65a85563ee95b9 SHA512 92001a6b4fa1818562f5df1585267eac09376f6a43a87ef24bfc44c7ad19094453009ed3573076737e43af3b69bee8eb1dbd27d34786ea38376ad1b5df731775
 DIST MonteCarlo-PCF.tgz 5749 BLAKE2B 43ac7a6dbb16a86dcccc903c4bcd615735f3f114ec0d447b023d7359fd9bc651223751549a3c283952660b15f755daea8d31996254c019e4f9b4dd34cbb6609b SHA512 c4a69d66b6c19c63b2430fbd82fff5067e7ebe49ad0e4d19c93f566bf5644e8a6555742338a8517e964ed7c0dc05e5ceee28db443d23301ad016b7b42403f03e
-EBUILD montecarlo-0-r1.ebuild 627 BLAKE2B b1c6da0b8e925da2482f210d1106b2f9ecd71f01683603060b2bb2856c7943ebb85850e5d1e733e94c84e1b56d2afe1ccd2c44385186a4176bc8ae0f6699d73f SHA512 467b52ee89ad5a6b1ba4e170ccbf795a5f39d2f6f53350740b305909e4cfa0e8a46149c3640fd7d890d3a455e671061e3f7f6138ee79cc627af6dc6dd1bd7162
+EBUILD montecarlo-0-r1.ebuild 604 BLAKE2B f9e511ea38560dfd7aee6791296696e956b87ef019364c322068f7009b257ba6b8c65f4e965cd84afe369764ccd87bd26860742bb1e5d2e9175dc03ee99c4ef2 SHA512 8e9dd1792faf1b0defce1dce2f85917a615bf7edffa3cf6a55d33d44e80f7281108d7a2544557edfda6966b75caab284792cb9aec38b2610f6c537999563154c
 MISC metadata.xml 248 BLAKE2B ea0aede03e690cff6aafd3fd6a8e6407bcbb55b1fce81b02364a3d1fe573b595f2af1d154c353aa2dfe9928bceef94f1226143fdc98732c5c6f6524644f0d0d9 SHA512 863101e5d3435ef357495aa8f93136c479be4df179c84c21a372548d9474771a417aadc80084dbaa1e9831f202de650dc8e331f3f2de34eb55f17ef0b65161e8
diff --git a/media-fonts/montecarlo/montecarlo-0-r1.ebuild b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
index 7f66d5da210a..f3a420781b3d 100644
--- a/media-fonts/montecarlo/montecarlo-0-r1.ebuild
+++ b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_PN="MonteCarlo"
 inherit font
 
-MY_PN="MonteCarlo"
-DESCRIPTION="monospace font, created by programmers, for programmers"
-HOMEPAGE="http://www.bok.net/MonteCarlo/"
-SRC_URI="http://www.bok.net/${MY_PN}/downloads/${MY_PN}-PCF.tgz
-	bdf? ( http://www.bok.net/${MY_PN}/downloads/${MY_PN}-BDF.tgz )"
+DESCRIPTION="Monospace font, created by programmers, for programmers"
+HOMEPAGE="https://www.bok.net/MonteCarlo/"
+SRC_URI="https://www.bok.net/${MY_PN}/downloads/${MY_PN}-PCF.tgz
+	bdf? ( https://www.bok.net/${MY_PN}/downloads/${MY_PN}-BDF.tgz )"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bdf"
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/fonts/${PN}/
 	doins "${MY_PN}"-PCF/*
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index 56a30ac75acf..47a86109269c 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 672 BLAKE2B 488871f70de64dd6686a3586074c52058b110a7148b259e39ecf205c131d17e1d56d14c7ea1769ba2284c24816c02d762397877927248af2253ca2b54f10fe6a SHA512 a2fc89ee8c09cfbf2bc6bf60670e3b43a3ae0f78fb729639d0b771e315f2c8ef2104b92bc33c52bbc67855afa72e7ad3910027c777e6d3f369050e3d2dba0e21
+EBUILD mplus-fonts-2.2.4-r1.ebuild 670 BLAKE2B 908f42aa369d56bac34fe3a24ffd243447a2680b761b993160f8c14aaa9ef2ae9d1079d7f12bf002e395579e1e4e3d5a0708e6a18c5e1cd23438667b1c448059 SHA512 169133e00c2bd90371f3c0686b86f54a441e151529fb6b991d06c860737f51a39d47be605997397e99776815da28c76692ff5a9aaa84f26101d29239cc96ed08
 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 fdaf4477a381..2faea35b0f11 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
@@ -1,31 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-FONT_PN=mplus
-
-inherit font
+EAPI=7
 
+FONT_PN=mplus
 MY_P="mplus_bitmap_fonts-${PV}"
+inherit font
 
 DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
+HOMEPAGE="https://mplus-fonts.osdn.jp/about-en.html"
 SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="mplus-fonts"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="X"
 
-DEPEND=">=x11-apps/mkfontscale-1.2.0
-	x11-apps/bdftopcf"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
+BDEPEND="
+	x11-apps/bdftopcf
+	>=x11-apps/mkfontscale-1.2.0
+"
+
 src_install() {
 	DESTDIR="${D}${FONTDIR}" ./install_mplus_fonts || die
 	dodoc README* INSTALL*
diff --git a/media-fonts/mplus-outline-fonts/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index 8c875afe0288..756e3b4af9a4 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -1,5 +1,3 @@
-DIST mplus-TESTFLIGHT-063.tar.xz 10346584 BLAKE2B d053992dc6b1220361f91d9482eeea11bc32ec1989ef9b99e178f3f229c84f1d232111b7a97df195473bd957eccc973a0233da5263038e6beaf4a9ff64ff0cd7 SHA512 477b9669c14dfb10321b5986dece72fb44a2554ff6c9239ccfadf21643714984ee7fd1e42c9c7982fa17417dee0e7ef6b5d66fc7cceec05298add4ae3d9502fa
 DIST mplus-TESTFLIGHT-063a.tar.xz 10371708 BLAKE2B 0821600576564bbbd5b49ac0a268502e8ab77fc11d2a37c00d1ca75097c9385c340e8aceb14633aee759a608740cd02b6eba6892cb607f464703dba7dfcd3312 SHA512 bd491a71c63679977e09cbc3aef6035022299c4330b7799a879029d4c9d3ba9fed91e8bacc0aab190035fa288173e1a056dadec001b515bb3e47e77f9ece6002
-EBUILD mplus-outline-fonts-0_pre063.ebuild 911 BLAKE2B 084fbddc7342103e08f62e1e4fe22110b6fac8c6167331f29effbed6f007989c60362ec7e1d506d0b94654bd482e3312118efb36a87495a933bafe8c2e42842c SHA512 bd71f84605c5df3292a57c8f3de63f731848c14e15d7c826a92573d96e29fe38624e58b478bd3864ba72fca28910a78ff9acaa97ca9ca2100a2548f95cc7039d
-EBUILD mplus-outline-fonts-0_pre063_p1.ebuild 935 BLAKE2B 489617484632b81e9e8eb4c546d189d51793e257ffe22eda49a51505c162553934fe7b9339e7483a29886b8f6a1dc9133feeba1614d6dba219c253998414f1e3 SHA512 226d451f438b97aa24778749812c981a2424169fb8176f43a696b200b10bc073754d52cbd52bbccb1cc856ce8516be32efa9a0067e3c640ca7cc609b063fe3fd
+EBUILD mplus-outline-fonts-0_pre063_p1.ebuild 891 BLAKE2B 5770884c87c1241baf9dbd280eef3c7e4604dc98e82a9d7bae6061c0b213121ae544077e3bef6ed8adb3f49dbdf004290c493b1240bb64549263c212da22f69f SHA512 be2fb38093a37ad25ebf1b38bd7a5ef6e0192c10aff8b730a6ed8c836dd45cb31997490e7f3f383eeeee2545d8672c57c16e4a71b97ae9782835f8c2b0c34634
 MISC metadata.xml 549 BLAKE2B 9522a58a4c3feceab34c6aa60c8c34f514bdc9be12239b5b5337b305ef1bbfcaf8f57fe49aaf1ab05763a8ba2643bc2a4e8d37ce3bdbd12f5dca2a86de159def SHA512 280d7cad69c36ac0d3501c24e6790322d584782bcd33e44600c09de00673715c7b1315993ea1544a9533bfe41a8bef0aad3e73398469dfac62bee746b0eae1c2
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
deleted file mode 100644
index 3fb8501f8f72..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-
-DESCRIPTION="M+ Japanese outline fonts"
-HOMEPAGE="http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
-
-LICENSE="mplus-fonts ipafont? ( IPAfont )"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc x86 ~ppc-macos"
-IUSE="ipafont"
-RESTRICT="binchecks strip"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		media-fonts/ja-ipafonts
-	)"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="README_J README_E"
-
-IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont; then
-		cp -p "${IPAFONT_DIR}"/ipag.ttf "${S}" || die
-	fi
-	default
-}
-
-src_compile() {
-	if use ipafont; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.ttf
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
index 2ddd4e3cbe3b..5ebea0ff9e71 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063_p1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit font
 
@@ -9,31 +9,31 @@ MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
 MY_P="${MY_P/_p1/a}"
 
 DESCRIPTION="M+ Japanese outline fonts"
-HOMEPAGE="http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/"
+HOMEPAGE="https://mplus-fonts.osdn.jp/about-en.html"
 SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="mplus-fonts ipafont? ( IPAfont )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc x86 ~ppc-macos"
 IUSE="ipafont"
 RESTRICT="binchecks strip"
 
-DEPEND="ipafont? (
-		media-gfx/fontforge
+BDEPEND="
+	ipafont? (
 		media-fonts/ja-ipafonts
+		media-gfx/fontforge
 	)"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+
+DOCS=( README_J README_E )
 
 FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="README_J README_E"
 
 IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
 
 src_prepare() {
 	if use ipafont; then
-		cp -p "${IPAFONT_DIR}"/ipag.ttf "${S}" || die
+		cp -p "${IPAFONT_DIR}"/ipag.ttf . || die
 	fi
 	default
 }
@@ -41,6 +41,6 @@ src_prepare() {
 src_compile() {
 	if use ipafont; then
 		fontforge -script m++ipa.pe || die
-		rm -f ipag.ttf
+		rm -f ipag.ttf || die
 	fi
 }
diff --git a/media-fonts/nanum/Manifest b/media-fonts/nanum/Manifest
index d38d49bead8a..222e4c0f78f6 100644
--- a/media-fonts/nanum/Manifest
+++ b/media-fonts/nanum/Manifest
@@ -1,3 +1,3 @@
 DIST nanum-3.0.tar.gz 37345484 BLAKE2B 14c4ee523aad0040f8ae1038036c5275fc61cb612759157d6b8ac79d2a6c47f59400000fc9ade18b303048db912d31d7a6436ebb15180cd03faa3c515359a669 SHA512 f2fcb765910a5cc1e04d18c0007d84e2ec970e286f09d4cf212a13b6c6c8838e4932e37e15ad0801d3b596ea7ce2605f93826968c940ffa50707d9e7aa313200
-EBUILD nanum-3.0.ebuild 402 BLAKE2B 36c74c2089f50048f3402970a88a70f68050a490a115d9c51444ca9a7e7c1884df94bf47ccc5aaf2b9ed0c96e594611fd23d5cc82ff2e7deb0228c9f7a757ca0 SHA512 d22c1cf357d0a82e813711de02b67ad37866c04a0d1ff3b7a9e82932e9e9188bbeccff6c2f0469ed1ca2350f1618d03a2a8ff354459128fb2eb4a0cc595f13d8
+EBUILD nanum-3.0.ebuild 367 BLAKE2B 0988f6467304fac07ff46e3e8508360cb7780d6993ad671ff859bcdcf01cbfd3c3e212e955adf5262496d819f07b90a183aaeea1abba49df101e785e4b79b43d SHA512 3005db3b88e59a8e637356a0677dcd9a94c50eef9054ad119c174f23e561b095d580009539fb96ae640092a8c9106f721d142e1f1bdcfe52359b5c99dc167a8d
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/nanum/nanum-3.0.ebuild b/media-fonts/nanum/nanum-3.0.ebuild
index 7c16d14e20bd..a99ec20c0aa4 100644
--- a/media-fonts/nanum/nanum-3.0.ebuild
+++ b/media-fonts/nanum/nanum-3.0.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit font
 
-DESCRIPTION="The Nanum Korean fonts distributed by Naver"
-HOMEPAGE="http://hangeul.naver.com/2014/nanum"
+DESCRIPTION="Korean fonts distributed by Naver"
+HOMEPAGE="https://hangeul.naver.com/2017/nanum"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="binchecks strip"
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="binchecks strip"
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/nanumfont/Manifest b/media-fonts/nanumfont/Manifest
index e6006ee1ab9e..6f6ea39ae1ff 100644
--- a/media-fonts/nanumfont/Manifest
+++ b/media-fonts/nanumfont/Manifest
@@ -1,3 +1,3 @@
 DIST NanumGothicCoding-2.0.zip 2038498 BLAKE2B 965cea0994f106d44d68a2f348c72d76d3d943b068380fcadb2ea81db22354a84a301c452b596e7e2da2542cb3a6172a0dffdfc760c36aca7a782c0211486d74 SHA512 c69cf0dc2d72cac4f38a9ddfa90fb268b0d6673a9b74d728bf3fd08811d5cc8599cb17dae2a0e63e064aca0b733a56da27ae2fcc1efe2b02da631b14a54e1f3f
-EBUILD nanumfont-2.0-r2.ebuild 719 BLAKE2B 76533993365843c478655e039f4bfd749071f3aa070c2dbfbf77c5f9a70d00e6560e8e235f7c3ab773738ce70b1d16687381b2f930bc7a15844d3f5c70ded6b7 SHA512 6551ac10b4937af93529f06e98578d4c366361dee9662683f16332185b4896b8120399fc6d5cc1f8de04279c71ef37a7f567b8a7948a4695c6628d1d6373ecc2
+EBUILD nanumfont-2.0-r2.ebuild 684 BLAKE2B 88f879d9dce27472c63cb455effc25f054503f5c1373c271e52f1427f636922629fdc4a0e31784579854fd5e911c509e9bba89bee8c849752be9113e9254b1fb SHA512 8d2f5ef90ab6723b17a19d002bdd67b0bc4d1432312e137a48fb82a79aa72ea008775be281d68d5511e948e490373798e11dda402bc0b2b6ce1f0905db48225e
 MISC metadata.xml 333 BLAKE2B 9d3792a2eb82c78418d947f6a870d94fcfd9f468e3109186cd440418bb0c34935f19b9776c5ec2a93be75f374ea143827e06d075a9cd9fb92a50cf6407cb86c8 SHA512 899b5a869916993f06c848adffadb0af91fcad7ecdf0f5bde10d7a801adcf060b3fb2d2ec7909458319b098b4e5a21a1e64a030ffc1a1c4299aa6a57da17510c
diff --git a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
index 800a4d275ad5..8237555a800c 100644
--- a/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
+++ b/media-fonts/nanumfont/nanumfont-2.0-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-MY_P="NanumGothicCoding-${PV}"
 DESCRIPTION="Korean monospace font distributed by NHN"
-HOMEPAGE="http://dev.naver.com/projects/nanumfont"
-SRC_URI="http://dev.naver.com/frs/download.php/441/${MY_P}.zip"
+HOMEPAGE="https://developers.naver.com/projects/nanumfont"
+SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-${PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
@@ -18,11 +18,7 @@ IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
+BDEPEND="app-arch/unzip"
 
 FONT_SUFFIX="ttf"
 
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index 6e0ff2ebeec0..0ea7f25d6e2a 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,4 +1,4 @@
 AUX 70-noto-cjk.conf 3815 BLAKE2B 84c477a84c117fa7fef4922e6b289c4eab4147a291b447a3b6d90a01d513f1f0c64dcd341bdda7b9b9f8efe339ab6781dde49189e84640ff781091f630b4296c SHA512 8f45cd10f17b4cfc2b5d7d253e7ca1dba20eaff206f479377c25ef54f469aaa3346d1ceb422086d7b25bc3ce6b3cf0a43b5967affd1126c020059a4e319e0337
 DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af53928658c9f74ed3dac34955f5597e7cb14cdacc517c8b7bffe203d73e03a2c2d4013d3cfc47ce13ae3aa497c6547cd8dcce430 SHA512 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da
-EBUILD noto-cjk-20190416.ebuild 641 BLAKE2B 1b917df5476387202b44d086bbccda512fac14bf526955492276841f4bf336a392a5bcff1833f7307f58dc6a023895f946155a4ba9b8e1b1b5c6a48d0c097895 SHA512 073199a618f4d37b0d3abf4b1eee814d9d6448d392b78de5e8a1d1c9f4d5ec5ae7bfc17fdf50bb53dfad7457ad96adff7a2f66628700a06a218faa4464e226f3
+EBUILD noto-cjk-20190416.ebuild 624 BLAKE2B 891a6bf5dfc068f6c99fee2fa7e8964c64a9b7e6adf48aea03445b3e44b3e50a31bdb8c285ae841c37a712f2cb3d983e7c5883b89a4cfd40512f83629d41b837 SHA512 87b7bc469dbe60f557d4ab0f7d71bfdcfcc0df81f992f5b0aed7ff67f442d66242375d97c3598fdb226c20eab37c4e1bd9575d52f3b54287c9ca3a2e74acffda
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
index 374927cc510e..cda442f4370d 100644
--- a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+COMMIT="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
 inherit font
 
 DESCRIPTION="Google's CJK font family"
 HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk"
-
-COMMIT="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"
 SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
@@ -17,11 +18,5 @@ IUSE=""
 
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
+FONT_CONF=( "${FILESDIR}/70-noto-cjk.conf" ) # From ArchLinux
 FONT_SUFFIX="ttc"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/70-noto-cjk.conf"
-)
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index ef6a56066518..1fa30657441c 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,12 +1,8 @@
 AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
-DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
-DIST noto-20200308.tar.gz 853685953 BLAKE2B 1f25bf1b763161fc246b0a1ed532d4755e4ef441055d92a8a17a05331bbbe47b4f604492e0403088d5aac9a86e42b27354eb7d4c9bc6286853ce1562b7940344 SHA512 9afec0c150beeb2bb27af58b9118da4bf86a21f25b573be3a01186c0295b9d5f51918d9237fafc76a0388c87a2b8fd780ba450fb8b4c3e65addad729e8f56a9f
 DIST noto-20200521.tar.gz 861394318 BLAKE2B e30f7ec58130786414f2dd33acaf9c75f403718612270e346fe51df0cb74088ddc34b699d4af9a494446940aa58a4c2cd043f46208aa7a3004a194703efb464a SHA512 d1090eae56c74237da4e35989d3518dfcb163deee1eb4df64a6be0ccb7e6f2a2207f0602ee5f0156efa2bdb3d105073d2e9a65c8841dbab34207c89c05aeb8bc
 DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
-EBUILD noto-20190524.ebuild 1274 BLAKE2B c5b3e243a4200f8904b79670e61fa6b867bc17da95930b12b9b7cb5e52207a40828267772abd7ce1f128d8283cce59f4c2b7e0adc6f286b380390e8fcad74bc3 SHA512 1fbb07f9edacd6d6bf70df4d949068a780c2a51db2434ed0797e70e3516bdc8c82c6aa41fba2f2dfb57aab8e91f231e2f50868f27dd4e15d95044746280e73c3
-EBUILD noto-20200308.ebuild 1390 BLAKE2B 6ca78a4d10745bd033ba6bcd0a1dac2d0f31b0cc49b67200645be7831992aa75b89202911466e4c9644973b19e8aad1e0f42625e22a39708185c055c4d026ca8 SHA512 01853ea7224c78bf3bba6b19236fa4c072064dab1f4cc8b9fa9e1f24274ad1e2c286b56b5828aad65886b322826ed09056b6ec509b8c3fc454cb853a49a6c1a5
 EBUILD noto-20200521.ebuild 1383 BLAKE2B fd4a16466e669785442414f634a05ae060cf42f9fbbb5cf9e791ece64f14bc4fc23c629891f7379012fc91f79cbeabde9c818c1889d64134ce92fb1bd7a75a8c SHA512 f08ca325dd93bec505da040743caf5b4d89d0d9109b823ee0c3ec0495d5fe780a4707a146b8f933becc3b3e486d91e041ec3a1518659e9a48ecaa46484daaca9
-EBUILD noto-20201226.ebuild 1421 BLAKE2B c2c85bbb81cb23add5af46e411fb19508e2faa19455ab7ba8d29bf830baa2de2190f71eab72793e57bffe70f22fd69a5c497cd027e7a9a38672f47b4d0e7371d SHA512 a9a3302299ffe3b446cb852985bf4a04a10b55c06bc9e43ee65fea8acc9914d8c1e7b681f3e052fa5edbf324b36d6cc3ab318ea8112160446b3be3b9f76b6554
+EBUILD noto-20201226.ebuild 1415 BLAKE2B 24f9921db05642dd46ff9f4e107901837119a6817c14d1c58d1b5c714390f99a635f662cb9b4ae79d69e88d783d4db6fdad4c4db64dbfea6775c473758d45738 SHA512 9076f863cb865b309d23b0a1c69125cace7a7a9cf5ecb98170b4724f486acddadc8d8c474bee692d468ae01736e8a9b966bb5c1b87fd3ea70dff3aa6a11dfe61
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
deleted file mode 100644
index a359d571698a..000000000000
--- a/media-fonts/noto/noto-20190524.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="34e98229863e627d0f841e124a8657d5d0348b04"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://www.google.com/get/noto/
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	# Don't install in separate subdirs
-	FONT_S="${S}/unhinted/" font_src_install
-	FONT_S="${S}/hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
-}
diff --git a/media-fonts/noto/noto-20200308.ebuild b/media-fonts/noto/noto-20200308.ebuild
deleted file mode 100644
index 4100a27916bc..000000000000
--- a/media-fonts/noto/noto-20200308.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="1c9f53362889d4468fd1193b76c397c208d81da8"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://www.google.com/get/noto/
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	mkdir install-unhinted install-hinted || die
-	mv unhinted/*/* install-unhinted/. ||  die
-	mv hinted/*/* install-hinted/. || die
-
-	FONT_S="${S}/install-unhinted/" font_src_install
-	FONT_S="${S}/install-hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
-}
diff --git a/media-fonts/noto/noto-20201226.ebuild b/media-fonts/noto/noto-20201226.ebuild
index 439c26108925..28988b60d1cc 100644
--- a/media-fonts/noto/noto-20201226.ebuild
+++ b/media-fonts/noto/noto-20201226.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
diff --git a/media-fonts/nunito/Manifest b/media-fonts/nunito/Manifest
index 4264cf414dcc..0fc6744a3489 100644
--- a/media-fonts/nunito/Manifest
+++ b/media-fonts/nunito/Manifest
@@ -1,3 +1,3 @@
 DIST nunito-1.0.tar.xz 204616 BLAKE2B 79cb5b80e9f55022a3d25778cde8ac9635450c0edeb7a16efc2ed62914a01a2ce18312e67724cc89c844e4ae4a9f6bcd40c8ed1a0fb980ae2f4236ec4f799765 SHA512 5237fd1f1a10ba377fb434786d6dcca6df5ddf7d6d8dd0c4d1a50688c92214dc82b01e97fbed2fd1a0d4a1bda79e560aa6e4824c18e34ad478ce30c89a6e7f4a
-EBUILD nunito-1.0-r1.ebuild 443 BLAKE2B 7a07052a7eddcbed29709a5b63d9eb14e4179493662a331ba73b98223913f24e806e4790c3469e486b96cbc373d7c6b08a43bc28a351273560914f5e97ff856f SHA512 3c12290429a6f753a9f118beaaa630f65a91770a68d8a2c1950882f1cbe1d8c8fdd6b43061e6f89a8f078118dda299eddc4ec9755a3491b1419177a818440760
+EBUILD nunito-1.0-r1.ebuild 435 BLAKE2B 709fcd745cf3808acefedbc427c143a7707d54ff454ae97dcda24d4975bea42a9883eb4ce75a18f3f48b8f50d0a2396c97311bc11b4cbb029f2c67cb17de725a SHA512 b938ff084bdd0fb7756b96f158e35644975724b8ac4ec72a508964560db79c22f6c80b3be95a07badc5e62f191f4571ca856cb0ea5a4e47ecd003a6bd09c27af
 MISC metadata.xml 581 BLAKE2B 75ef116099006b9528eddae89a5e10a0f0ae48154df2ddf4bfb0d67797de03cbaa9433a2ee21f902d3066b922ba3724234d7acde482ab5eafdecc5ec55a62028 SHA512 68aba3c50fffc0911d48f4fe6c302873d8e01ac70071c2518b5ba8dd233ed86139fd6203ed02e54ff3a08fbf1bbf24d89a8f8496d99f3a1213200ebbf5ef6ddd
diff --git a/media-fonts/nunito/nunito-1.0-r1.ebuild b/media-fonts/nunito/nunito-1.0-r1.ebuild
index 619be073efb3..39f75af11283 100644
--- a/media-fonts/nunito/nunito-1.0-r1.ebuild
+++ b/media-fonts/nunito/nunito-1.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A Sans Serif font with rounded terminals"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Nunito https://github.com/vernnobile/NunitoFont"
+DESCRIPTION="Sans Serif font with rounded terminals"
+HOMEPAGE="https://fonts.google.com/specimen/Nunito?preview.text_type=custom
+	https://github.com/vernnobile/NunitoFont"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
@@ -14,7 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/nuosu-sil/Manifest b/media-fonts/nuosu-sil/Manifest
index 6fc3dcf8d61e..423659e149cb 100644
--- a/media-fonts/nuosu-sil/Manifest
+++ b/media-fonts/nuosu-sil/Manifest
@@ -1,3 +1,3 @@
-DIST nuosu-sil-2.1.1.zip 240011 BLAKE2B 0c5ddb764a54b2695dda4d1e7401e1ba6c3a72f4d7472bd5e94840c0b23dd1cfb37ed136c2253b556d14b4d7a2199a40a67b37cdd679c334f8362a79850e12c7 SHA512 6ef47c4c042a4dca60d3af8028bf41a5528f28b6d37b7d4e578c64d8f864a83a95f4240d5597e4c1cb74bf4d6ee66a05a558b06ac1c4b9e4e2fdf3930e420b57
-EBUILD nuosu-sil-2.1.1.ebuild 541 BLAKE2B 563a1e5c48afd83b3a6eddb473f9573c842c609a5243826532a0ec68c77cae10254d93320c0b4909354488bd1e35a4ade46d4cc5a7e0672095e6c5300e902aa4 SHA512 5acce98d13e6b7f0edced6571ecb84786aa07f20405499f35f894dcd74ab51f12af1b1af84b9abe712fa23339ccfb4dfd591894d4a385bd55759b1f0e5deeb59
+DIST NuosuSIL-2.200.zip 160601 BLAKE2B 61fcc33b91ee66f96ee1f7efe96c94970278645480fc6abccd6c95853e9e35af709a993af74a36d8d9a9f86bc2fd5b32a74031b9062e08b001a79d166c50fba8 SHA512 da5ba1dcbaa6cf18bb78b2720a53c453d94044d9de158fe394e26a6e6e18773c35b6073abb90b3b08e720b7105d06ca6388b7257cdd8b30d82b3b4013bd16513
+EBUILD nuosu-sil-2.200.ebuild 446 BLAKE2B e998b65d416938418831278cb8ed06177c825f2261a20f46b7530763273ce6c443f38a871c9075e033002b22f9735d50a9920f5807f6776bfb06a19101eeb27a SHA512 14552d24d321ddfca3e5e0bc5dcaa654b9add545cee6e7054631f1f5ec12da7daa2c388af87fc53be3b73f61071292aad3d03ffcbf9588f9677cdacf4117df2b
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild b/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild
deleted file mode 100644
index e58ca1297b9a..000000000000
--- a/media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Unicode font for the standardized Yi script"
-HOMEPAGE="http://scripts.sil.org/SILYi_home"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=NuosuSIL${PV}.zip&filename=NuosuSIL${PV}.zip -> ${P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/NuosuSIL"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild b/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild
new file mode 100644
index 000000000000..2e56df5b26fb
--- /dev/null
+++ b/media-fonts/nuosu-sil/nuosu-sil-2.200.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Unicode font for the standardized Yi script"
+HOMEPAGE="https://software.sil.org/nuosu/"
+SRC_URI="https://software.sil.org/downloads/r/nuosu/NuosuSIL-${PV}.zip"
+S="${WORKDIR}/NuosuSIL-${PV}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/ohsnap/Manifest b/media-fonts/ohsnap/Manifest
index 870ea5b60d96..02e3ff6e997d 100644
--- a/media-fonts/ohsnap/Manifest
+++ b/media-fonts/ohsnap/Manifest
@@ -1,3 +1,3 @@
 DIST ohsnap-1.8.0.tar.gz 107989 BLAKE2B 3144bbed45ead2c7b74f18535a2b1207baf5f418e012bdad371821fc47f94eb27d65ad82bdd15bd992eb24dc9ed0c92c6514c85ceb58ce76d623192461f4965b SHA512 6f0c6355f0d1f9f465388fc75587837e38508bf691ea219c70b809d13a623021e5d38330789caa0b2179b6792571f9de7188bde4ef51b59a967569280b9d6313
-EBUILD ohsnap-1.8.0.ebuild 404 BLAKE2B 24bd6216ebe6112b557b274f9dcff597034fc0d1d3e67d67fa3c9f6b6b15f02a3cf495995caf27ce5f5434f218800b93311d0d14b040da20f483534527c87190 SHA512 f1e41aa85363644bbe0493a6996cd69c618595dcec470aad6f69be2daa1cac65f8c4caee857ea75ced01333d8079103fa14181dc4dd9b75b5ede8cbfabc12e48
+EBUILD ohsnap-1.8.0.ebuild 425 BLAKE2B 8cc6f741fb12d25cd33b76a2142d4a17b22b3ab3ceb0bf3382f630d23c2c9514b60e90d6566937af3f4cb9541cae64e52a5fdb4e10a9d9a2ef33a1911c03ae34 SHA512 1f32a640f4aa4ba2fb2045c3507fa61e4d6c3d5f7f0f9e6df2f7dbce8fbce9f1575443c7264b39e20f5d00b51f108b6426dcb102a0c141e38bd0d0f0bcd7eb46
 MISC metadata.xml 327 BLAKE2B f12df6c08ab06f4762be5c51050ff8268fcab451b00ef898270a3709111764a204982da3469b48cca2af509e00c08b312362a7d7f4645cc24f107c1c173294c6 SHA512 280c2e8c6b94cb4c34804568157eae296b91c28259ebe63e72332552c357c221bea8837c0825e36b9b3d06cdb05e963c272001b0d5edc40de43829d3a56fa598
diff --git a/media-fonts/ohsnap/ohsnap-1.8.0.ebuild b/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
index a67f71a3c09f..2652a86162e1 100644
--- a/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
+++ b/media-fonts/ohsnap/ohsnap-1.8.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="The ohsnap / osnap monospace font (based on Artwiz Snap)"
+DESCRIPTION="Monospace font based on Artwiz Snap with bold and versions with status icons"
 HOMEPAGE="https://sourceforge.net/projects/osnapfont"
 SRC_URI="mirror://sourceforge/osnapfont/${P}.tar.gz"
 
@@ -14,4 +15,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 FONT_SUFFIX="pcf"
-DOCS="README.ohsnap"
+
+DOCS=( README.ohsnap )
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index ea077784600c..5611ff091e73 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,4 +1,3 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1-r1.ebuild 526 BLAKE2B 2e6f3608cda93abd44ae64353c0912111aee98a3cc28b8b120fbc5370d7563511a8ecf8cbe1200783603dee3344dcce78549325d986a765bb08041594c41ede4 SHA512 f32d4673bea4087d7b9070ebadccdf975824c5a256e7be288fc7971ceb1a7d2a9ac6e16e7222701c6a753601eaa0e4ae0045352f2333a349fa5fd5f76852c7dd
-EBUILD open-sans-1.ebuild 469 BLAKE2B 2087672d2f82bffc5a84e2616764b7eaa57dee6d0e8523a65f7c59ca435e2388d1f786a38b6170efd3c79297e06365c886b09ca82022c4578f62cdf7d3d71086 SHA512 9ca685e72c3c926c0cd23e0a69a3eb8fb42269b106e7a4be3a8401f1dd4b997f1533f23c76c701deda9d28616e78f6a004bb9f13cd72804677f7c90ce681b60c
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+EBUILD open-sans-1-r1.ebuild 522 BLAKE2B 058beda4a32b03e717ea3c698fb432bbd51e476a0bb97079a4e0720d2c0c584e489d8f0835eac47bf88c72f34532cf8a75ec91c9798fc376dd17d8258b34d8c9 SHA512 9f992125645f6197e48c6e71e6754512b348a04a26608cdd840cd4fc734b3f98137b20afcb6edcb24cb01abd34c24b027cff25bfdcf3cfd00a3a2443297d02fd
+MISC metadata.xml 262 BLAKE2B 090658f54d67004539d3c6efad6c7eaf36d45079091d36411f0df7cfdfa41adab2f78ee52469dc2e23f22908589fe9e9488c1c53bfe9302ba5c429c3fbc626b0 SHA512 36cc5ab05d2a01cb8101147ea8833c0da21cd10864622fc21b6517e1b2740f045f949d5efad647b20b324998ebeeefab63324ead95480673107f69aae8e46f23
diff --git a/media-fonts/open-sans/metadata.xml b/media-fonts/open-sans/metadata.xml
index d0f1df7c94c0..8b3b4d92532e 100644
--- a/media-fonts/open-sans/metadata.xml
+++ b/media-fonts/open-sans/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index 925c27bcd92d..3ed819be0255 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
 HOMEPAGE="https://www.opensans.com/"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 # renamed from unversioned google zip
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+
+BDEPEND="app-arch/unzip"
 
-DEPEND="app-arch/unzip"
-S=${WORKDIR}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/open-sans-1.ebuild b/media-fonts/open-sans/open-sans-1.ebuild
deleted file mode 100644
index 451f8c72aeab..000000000000
--- a/media-fonts/open-sans/open-sans-1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
-HOMEPAGE="https://www.opensans.com/"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
-# renamed from unversioned google zip
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-S=${WORKDIR}
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index d6877f81032e..2ae78db2eaa5 100644
--- a/media-fonts/opendesktop-fonts/Manifest
+++ b/media-fonts/opendesktop-fonts/Manifest
@@ -1,5 +1,4 @@
 AUX opendesktop-fonts-1.4.2-multivalue.patch 5022 BLAKE2B 71ab1c289670854ed2c9649dfd338b04dfa21c4fdb9344d58f245c1bd1825765fb9ea41025b5ec31475e032362149e3f5692af665a889a4b31a2a27e011adc8a SHA512 487053638d9fab66151a0dc15b8b721388c16812ec1fc1402c43ec2efdc2cbc2a8100a412d62f7cfd90afc8f5a5385a4a96a8eefbe9a0c8a9a3446f44ced9f61
 DIST opendesktop-fonts-1.4.2.tar.gz 22246044 BLAKE2B c00a55793278f900408b2958ed932e5a7cd4d7d1a7f01895ab13516f551cb0791bd1360a0978297a73ab3c57e2fa4f9f6fc5ac633296bda8f6125f0c0da432fe SHA512 09a5d8a8357f88716c68eb70ca1464c069645aeffe3aeef72a195f1e22e3baf260f655cddf7a8d8d2542c6a7420b61206b11d887af162277da84899a67662b50
-EBUILD opendesktop-fonts-1.4.2-r1.ebuild 675 BLAKE2B fb020d177b8f1372ba9bee8098becbd7e9cb813b2dd779f4e5a046f1e547c6e568c5706a9908de86e076148c43ce6f9292767678ad2320bfcaff3e68e03bc91c SHA512 62073fc5394107a9762e61008a4d0263a7f439ca92410fdb460b5c9ba00b48d4cb86abbb4e7193c603be2629e5f9b1a492ff09e7ab591d450ca50f5a9ee60320
-EBUILD opendesktop-fonts-1.4.2.ebuild 622 BLAKE2B 984fe74ff9435c8bd93ba7aaec9ac27d1342821132160d8d90736fc0f32b91f8b502fcf07459d98949ea6a4cdb78a63460477d61cde2053aaf4a97957ef0e99a SHA512 557e43bfdc73594ee64d22f0f08285ee665644bf2d396a8cd402818982454a35b8fd1ccf09a3fd7ac492306a68549f35e2cd7e3d26335bb03accbfe0d57ae1e7
-MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 673 BLAKE2B 0c3767dbbd0d9e81be9a41580a44a852cf2f4289e3b058269c408893dadee8db0617bc095fb049bbda4f78b979473df7c761d08ba898181ce7e6cb1a61e30548 SHA512 f6075494108a7a8a7cf5be4f6ea48eda30882f346b9f2cf2b812a7e2fbe4656c42b3c27aa70c409c008f13e8c0bb4c12a7d2381627fef9cb0f8ad52cb9adb93c
+MISC metadata.xml 357 BLAKE2B c6ad69b457b818fe1a2035085f9105b16ec1c0fdf881a527d30df04f18e3161ecd9003d4e7f9f613f13632676eb2c8fcb0f17929bf71b9d2319f036324b09ce0 SHA512 079b7a4055801cce6d1ab2fd4d4cfcc593b182cb99e3932dbb48745c4eb97610d8ba2c23107b60902442f55b8b211e0368b9a2420a76000729bb8b89a3b885a6
diff --git a/media-fonts/opendesktop-fonts/metadata.xml b/media-fonts/opendesktop-fonts/metadata.xml
index 99d94f247165..5386d971b6f6 100644
--- a/media-fonts/opendesktop-fonts/metadata.xml
+++ b/media-fonts/opendesktop-fonts/metadata.xml
@@ -1,12 +1,13 @@
 <?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>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index c1f73d605bbd..d6ba66c64cff 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 FONT_CONF=(
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
deleted file mode 100644
index d06e311225a3..000000000000
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit font
-
-DESCRIPTION="Chinese TrueType Fonts"
-#HOMEPAGE="http://www.opendesktop.org.tw/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Arphic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
-IUSE=""
-
-FONT_SUFFIX="ttf ttc"
-FONT_S="${S}"
-FONT_CONF=(
-	"69-odofonts.conf"
-	"80-odofonts-original.conf"
-	"80-odofonts-simulate-MS-simplified-chinese.conf"
-	"80-odofonts-simulate-MS-triditional-chinese.conf"
-)
-DOCS="AUTHORS Changelog*"
diff --git a/media-fonts/paratype-astra/Manifest b/media-fonts/paratype-astra/Manifest
index 741a9670d714..3ce2b72bdb22 100644
--- a/media-fonts/paratype-astra/Manifest
+++ b/media-fonts/paratype-astra/Manifest
@@ -1,3 +1,3 @@
 DIST paratype-astra-1001.zip 555264 BLAKE2B db1718554a25472cabb0bbf5e2e38176cea4f23b753e76547e1cd87e2719ddaea516418317a523aa26cddc4663b57e75bfab6a7a347531c8f2a4c81eb5ac1e35 SHA512 d92abe38224caaab97f5c18ce0f5d25ba43c970796c94cd0edcfa69364bff4443e0d145000e9afd27e9a870d0dd2c9cd47b20241e170ac9fa4fef751e5fcf854
-EBUILD paratype-astra-1001.ebuild 520 BLAKE2B 8a7219dbb2d51d781f5cd9c2ebab3bea04bd544be68b9f28875da37587b5f8ab3a8e03bc3287c1b3c604b04f13cae8bf85c78b0718dbf888956fd4b74b8efbaf SHA512 3c014915231a97fb3d69b79ddbbbccc6c4ae7df45c9c71ae2714a41a6d7526afe329302c2b026fd00e8897474ef70c2ad2f4e9b17bbfd0cfb01c4ae34898e804
+EBUILD paratype-astra-1001.ebuild 490 BLAKE2B 2b6cd20b0c5bd72c7b9f6461ec8defcd8327ae2f7964fc514568a353d8c7309cf2f244b6da27ae8e2b7c520ac18d157c6d6a2301fd5a89ffa39c84c6df86214b SHA512 79ee7b6d1cfa6b455b68ed6a2e63fc7bbade2df95909118b8217dc0e37d8e4acab5ea8d1c253312484cba903377b9cddd77192b41fd709225dda43842771118c
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/paratype-astra/paratype-astra-1001.ebuild b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
index 2a92f59970df..16fbe28d6ba6 100644
--- a/media-fonts/paratype-astra/paratype-astra-1001.ebuild
+++ b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="ParaType Astra Sans/Serif fonts metrically compatible with Times New Roman"
-
 HOMEPAGE="https://www.paratype.ru/cinfo/news.asp?NewsId=3469"
 SRC_URI="http://astralinux.com/images/fonts/PTAstraSans&Serif_TTF_ver${PV}.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/paratype/Manifest b/media-fonts/paratype/Manifest
index a5233030a52e..dcd4f8180459 100644
--- a/media-fonts/paratype/Manifest
+++ b/media-fonts/paratype/Manifest
@@ -1,5 +1,5 @@
 DIST paratype-2.5_Mono.zip 179606 BLAKE2B f68d24fe0ac1a8b8dfbd6897b00c8e4fbed5874dadb246116d6efda5538d17068fb7d339d9ddc5bb566abce1454f20ff279a070326b42fe98bd63782d82f8d0f SHA512 1ef322b42c423925f70a8863c7fbd0da80ffe103fef452e567f49bcd805a545d802de8b23e0263270ff6966b3dfd84d63db044eecb6f9cfdef5fc28f421fec02
 DIST paratype-2.5_Sans.zip 1563419 BLAKE2B 523855b95db89fe756309e38f4244a4a3de625816d6cbb1722e989150ff0596874bc0f5236315e8f2f42ff7b5dff2d98dfd372f61cf38e38cecdaf1d7e3bb873 SHA512 6cd6fe48fbc4dbebfd2b094f0f46473608c82bd8007d2306c1b84826e3448e61ea8cf475e850beb98f87814e4d3d6c14cd44d9c1ee053a5c52755518d07c359c
 DIST paratype-2.5_Serif.zip 950474 BLAKE2B c28ddf018d6cd263ea5e3e73c73a678974cd6b9e7131e856ad0833884e0e0d1b402f410db59f4867f32665b45cf5efdaf018d984f7fa4977e5b7bdaba317af5e SHA512 177ed7adaeff2bb306d9910f761411a25f69abbe379a2e2a957e8dc60d152bae8e0cd70d4b94205565a921af7078673f972bb68cd067cea952a2a001184cc2de
-EBUILD paratype-2.5.ebuild 595 BLAKE2B e286116986cce927ddbcf407c85b0f27d7a92522afca526495781c619dac7e1697ebfbdf759bd1d501f8c3bae300a3186448d5a870169ec08f06f500191bfdeb SHA512 1de4ae6010cbf3a8e986e6a1f1dfcafb256f9c87b01c690ef119a0bbd53fa720f19a37bf1b85edeed3ed3f7b27b4f258a617f1722ae2c5a79f92492740b23321
+EBUILD paratype-2.5.ebuild 580 BLAKE2B f3c881910d036dffd75ad61642318de1059b3347a7e6d68c181f6da27d95b5cb888f41a78632e5aede1da017af02345ff5c54b1fd43597422dadad520995d81f SHA512 c4dd706ca98dbf2d77213fba50c5550299f01f023b7b7443558e83fccb4eaf96fb87f6fc146e12bed1c59f4e12c6b69f704ef5c45ed3870e8cd1c51a01bcae03
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/paratype/paratype-2.5.ebuild b/media-fonts/paratype/paratype-2.5.ebuild
index 17871600943a..284d6c59c1d5 100644
--- a/media-fonts/paratype/paratype-2.5.ebuild
+++ b/media-fonts/paratype/paratype-2.5.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit font
 
 DESCRIPTION="ParaType font collection for languages of Russia"
-HOMEPAGE="https://www.paratype.com/public/"
+HOMEPAGE="https://company.paratype.com/pt-sans-pt-serif"
 SRC_URI="https://www.paratype.ru/uni/public/PTSansOFL.zip -> ${P}_Sans.zip
 	https://www.paratype.ru/uni/public/PTSerifOFL.zip -> ${P}_Serif.zip
 	https://www.paratype.ru/uni/public/PTMonoOFL.zip -> ${P}_Mono.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/pigiarniq/Manifest b/media-fonts/pigiarniq/Manifest
index 5d14acf6797c..d276e6eac2e9 100644
--- a/media-fonts/pigiarniq/Manifest
+++ b/media-fonts/pigiarniq/Manifest
@@ -1,3 +1,3 @@
 DIST pigiarniq-2.zip 375948 BLAKE2B 6e1ce0c054c8e5ac6dda5453d24c543a4e1117a6a39e5e50bf567be2d24c419be8a87baca6632874655a815d3e9f95f475e33620d1f6ab3e4ec06ca2e6d29d1d SHA512 73789818671781ce9c5ea21fa4586e564ea8cae554559a55cbb7ef2406f5f8794677039ee299f3029073492d9f6f1052fe99ba34fe942e9d570044e6d7690d0e
-EBUILD pigiarniq-2.ebuild 435 BLAKE2B 0cb07a351e66bb66b190226a9c3f9d4bcc0dd7435f781489455cfd226721f92b1a05d4b9282a603329e113c9c7f1ba6e2f6e1c042816dbec48fa84e1343d6fd2 SHA512 747d678e22592049f0b5ab7e2bb5292ac1ba6e2daadb68be6aeb3edb57f9da0d0ec1620df673dc3231983ef26d92f85c53f44521f316f924d1cfa286e8a069fe
+EBUILD pigiarniq-2.ebuild 409 BLAKE2B 9344e682f28ada077059c05c069e67edf5600ba87fa256e7f86e8f2ee8b255b1da584f4f5bdd8a095710e5ccd5777d106b39af654e4bc661962cc2e7ba98db0c SHA512 a5f4d9e11dc1fc3930211fe9ad675e4b789b71c1bf27e48c1a95ad0b2025607ba674e0ffe958e45e3504c6dd3ca9f5a559e2557c300645b04dcf79da00ae6b15
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/pigiarniq/pigiarniq-2.ebuild b/media-fonts/pigiarniq/pigiarniq-2.ebuild
index 8728ac685d8b..032b539e5648 100644
--- a/media-fonts/pigiarniq/pigiarniq-2.ebuild
+++ b/media-fonts/pigiarniq/pigiarniq-2.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 DESCRIPTION="Nunavut's official Inuktitut font"
 HOMEPAGE="http://www.ch.gov.nu.ca/en/ComputerTools.aspx"
 SRC_URI="http://ch.gov.nu.ca/fonts/pigiarniq.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/powerline-symbols/Manifest b/media-fonts/powerline-symbols/Manifest
index 113156b71eed..13ef0a53d3e4 100644
--- a/media-fonts/powerline-symbols/Manifest
+++ b/media-fonts/powerline-symbols/Manifest
@@ -1,3 +1,3 @@
 DIST powerline-symbols-20170508.tar.xz 4028 BLAKE2B f0ad0360fb1bfe2c160c531a8ce473bdc746800c4540e56c8a1c27500883922c67354d9d7d8478a9111d56bace51a730ac9683e6e21be112df7d0df288f7cf0b SHA512 6908cb029b28002021530ea330c9ce5626f6bc5ed2336750cd2678f4b314d043289e29ebea61003836bb0cbca9bbb91a1b748f1cf24e4f07932eaf18bf28eac5
-EBUILD powerline-symbols-20170508.ebuild 553 BLAKE2B 1ad83faa16376e69dc6842b17505e2594ca83c43947e7b9c193b584c0b4e4c4865a5529e43734c82915da6f7ef594e7c08d0322bfcc5a17c851601fe776dabef SHA512 8397f7eb1b103223851786f331832ca6106529955f6eceb52bf8963768e7c0dc0ca8b30ee51c3c6689966142cead39c313edb3b0071a0233a43cb80de19457f2
+EBUILD powerline-symbols-20170508.ebuild 543 BLAKE2B 6f5b62e2ed5735879df16c5b946d027c3cccace3b2b41520efc957b4efc5c4f085c77883e53f718d1e966b95f44f2d704b230bfe4d9c5f47904471ccb68781e0 SHA512 847864ee0b494fc164dc10ad49b14f4572599b715431efacddc1f47e1ffd23292d804196c28b246baef9048da9ba16c849ce7e16b36887e6bed33578e4b2e0ee
 MISC metadata.xml 332 BLAKE2B cbe33e2b2c8498b788b64ed38c2cebfea9e82813cb2c45771e5df4ba1d8040ff238900f3eb95e3de2011773f647904d114e293446030f51378e643b1d6a04d80 SHA512 628ae420eba99a6cb254b362d6477deec328910ada7d5dfc1aba9c3d3001e46b2e39acf2aff3dbbed4418504147a19de5974619922ed6734b5f092e177f114f5
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index e48ce54b5a1d..7a2d0156245b 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
@@ -14,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-FONT_S="${S}"
-FONT_SUFFIX="otf"
 FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
+FONT_SUFFIX="otf"
+
+DOCS=( README.rst )
diff --git a/media-fonts/qomolangma/Manifest b/media-fonts/qomolangma/Manifest
index 4d87987f55bd..6dd4deac477f 100644
--- a/media-fonts/qomolangma/Manifest
+++ b/media-fonts/qomolangma/Manifest
@@ -1,3 +1,3 @@
 DIST qomolangma-2012.05.rar 1593416 BLAKE2B bb3c64fd1dbddffb0acc99e3cfccc023fa8948f8829df3689a340d98342b22c8b949be7fafda24db5b4568e9e62258980da49678f144167b30a40517bc62def6 SHA512 a280a8160c0ca7ff485919b3358ea19777b84ac6c2e269e8e97b24623551d261e8dfa7fd7805ed23edadb046ee7b9aad081b87071ffbab580f6ba961a8f38f9b
-EBUILD qomolangma-2012.05.ebuild 474 BLAKE2B d02f506429da990e78d11e2653b51466eb7a26989e0ebc6e69c758fafd2107d0a867c18f70eba7380dd98bed237a7f3aaf75bfc6c75ee378fa6af21ae50891f3 SHA512 34d849a84af48c7a2dbbd4a96cdda306b8c05315288eb53efb920328341d7d2c6171656f97ed0361052c65183a96be76970248dfcb3f2000449f4da11bfcc202
+EBUILD qomolangma-2012.05.ebuild 466 BLAKE2B fc148017995a986a58da2e983dd9848b2fec9e16690a8dded051cb55a58c03ed2f2b1a0c981e3dd54167f000dbf3b34a57960cb623aa123baaffaf9f0cdd71a7 SHA512 47194c0359d5c19ba0e5d89f6ec7449b494b96b99664acd94373bd7d9053293582ade5dda70af20bb57cb3ea5b8e81e03ed189052535779e869eb4d7a7e4ba70
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/qomolangma/qomolangma-2012.05.ebuild b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
index c726a538fa58..974b66ea148e 100644
--- a/media-fonts/qomolangma/qomolangma-2012.05.ebuild
+++ b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Tibetan Unicode Ucan and Umed fonts"
 HOMEPAGE="http://www.yalasoo.com/English/docs/yalasoo_en_font.html"
 SRC_URI="http://www.yalasoo.com/files/CTRCfonts.rar -> ${P}.rar"
+S="${WORKDIR}"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-DEPEND="|| ( app-arch/unrar app-arch/rar )"
+BDEPEND="|| ( app-arch/unrar app-arch/rar )"
 
-S=${WORKDIR}
-FONT_S=${S}
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/ricty/Manifest b/media-fonts/ricty/Manifest
index 27f71bde95ab..fdab02a812f7 100644
--- a/media-fonts/ricty/Manifest
+++ b/media-fonts/ricty/Manifest
@@ -1,3 +1,3 @@
 DIST Ricty-3.2.0.tar.gz 13286 BLAKE2B 11f53c1e55d43af517343682025893e8d8e8cba3ba9c187114c92c3e5b4e4778afd89b73b920f2e70778da3e376640f8c99b0609cffbd90fa573b15ad2da8028 SHA512 77b7416e8c2e6847ec4c964dda8e4fa52ba3e63751ce030fbd0cd83a07a88c777319690777e48e945d36ebf06fe4717d10a7e02193f48575507c5c1f71446b36
-EBUILD ricty-3.2.0-r2.ebuild 1049 BLAKE2B 9404f0a96c0fa245a7281fee56c6671eeeccfe0e4b81235a345b52ef279c3441954686e9a2c506d8ad96a25d487d7b5cd933664bfdb35340f09f8e9f7ebccc22 SHA512 ddd85070b0c4fea800c117dff4b11fa8b00085758cd1e342d627161e88301fc19faba8aef0ff7fe9b590bb7028b11dc0cb34cca0efec36f0c5250e5f9ee43532
+EBUILD ricty-3.2.0-r2.ebuild 877 BLAKE2B 9a79c1782522d1bf69bdccdbc15e571cb3e51dbadfc6a1a936d1129ee641b30665b90e5377f9096e463c2b62aa2146a158893b8edff1b2cfc442b5c35c34d985 SHA512 094d969ca428e219c8d57d4532186ac7d0e268254559b1b4f64b000112153bb6faa6d12945da9af9582b588ff239258380e0e4da4212e863015571f99ec3b016
 MISC metadata.xml 318 BLAKE2B 0d2f085352785987bf21c4d46df5d19b543f676b683c4afceba84ca6b4f5b7770b306b4d36a48824efd3de389f0aae99bc54aedb5f61c1447e1842029936911d SHA512 a370bd25baf912693cb8991978e2e6599ebee2d69f84242558698da92f8b8209ba5d4f7a2c7034d4019d4af0c41ac6c557537d08d75ee5b8a3ff60314c9f2b89
diff --git a/media-fonts/ricty/ricty-3.2.0-r2.ebuild b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
index 40fca3d3a27a..1206fcf0d157 100644
--- a/media-fonts/ricty/ricty-3.2.0-r2.ebuild
+++ b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_PN="Ricty"
 inherit font
 
-MY_PN="Ricty"
-DESCRIPTION="A beautiful sans-serif monotype Japanese font designed for code listings"
-HOMEPAGE="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html"
-#SRC_URI="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/${MY_PN}-${PV}.tar.gz"
+DESCRIPTION="Beautiful sans-serif monotype Japanese font designed for code listings"
+HOMEPAGE="https://rictyfonts.github.io/"
 SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-fonts/inconsolata
+BDEPEND="
+	media-fonts/inconsolata
 	>=media-fonts/mix-mplus-ipa-20111002
-	media-gfx/fontforge"
-RDEPEND=""
-
-#S="${WORKDIR}/yascentur-${MY_PN}-*"
-S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
+	media-gfx/fontforge
+"
 
 FONT_SUFFIX="ttf"
-FONT_S="${S}"
 
 # Only installs fonts.
 RESTRICT="strip binchecks"
diff --git a/media-fonts/roboto/Manifest b/media-fonts/roboto/Manifest
index 87f891ba637e..d715085bb5e6 100644
--- a/media-fonts/roboto/Manifest
+++ b/media-fonts/roboto/Manifest
@@ -1,4 +1,4 @@
 AUX 90-roboto-regular.conf 438 BLAKE2B 495141f1945f1dc52ca439e15189899e4b4f46584a218b338d035c4d0c250e66ace88a0dd2522822dc493491f16813cca23dfc5b88e6e1bcadeade4b1ec5c348 SHA512 cf8e84eeff7c34d5d218c283c43a0440c2af6e46d6d7f8d68c5d0eb5fe6431ce3ecb89ce9f558cbca24a23658e315d2dea4472fd3905ad9f236efda4b7a8a8c0
 DIST roboto-2.138.zip 4324398 BLAKE2B 5573b551711ee7fcd931ef88886f8e3a5667966e4c1645fc8708c67b8f7cd704e2f5e008328b3a62bcfcf765a880ab103e45b4e07a64a5d6be0ec71136f50260 SHA512 4cfd20a1e19a986b17f731745a4d5ee909b852649e340d25de8197fbf6656005ccd3b4c591641938edbfebf0de81c71366a2afa007bb403285dea4d3dbfbd2a0
-EBUILD roboto-2.138.ebuild 567 BLAKE2B 7ac93160f8f74c71a1cf80f6ec1e4bf840f2f1703f1bb7e01feb72bae15e256cc8401138070d8205a874bf942bb85b45c686883cb331937b1afabf4b1d83d988 SHA512 c4938e4f6f66f0e4769bace487fb57df2fbc123bda3527f9fd7d8930c98b8536a3bffbf81c96bc689a0dad9b9bd7c0acee767ada5353ee47ff7eb666091ce1d4
+EBUILD roboto-2.138.ebuild 554 BLAKE2B 668da029f3482bd02d6b221d3ed1a20aca2ecc35894fbca397a2ba945d98382e0cefc8522cb404a38bfd7f6613bf23dc2121fed44d3993d1cc4b094f42a87a99 SHA512 b98663521069f2065d56bc260fd40d80b7c3daf15e3d6d6fd1022b4a3b8e991e83687b48bec159e70d1c7a5ae68e9d6b9ffbb390240a626c691fca929a9196a1
 MISC metadata.xml 326 BLAKE2B a7d2d8689edd75ae371d695ef9e08346b61c214444f51742180df110e22c071e362550c48f3d2dcecee059fcf890e66d4e5e3faaac6ffdbaa401bb9cc96275bf SHA512 8d079f482bb1fc7726801cfb2f16cd9f04677303f2ff3f9946d3f4a2c89461c5f4d92ea153a3b24a41bba3213f53fa2483f164f68cc1bfb5e1c49ef750c63f72
diff --git a/media-fonts/roboto/roboto-2.138.ebuild b/media-fonts/roboto/roboto-2.138.ebuild
index 3eb4aa954406..2bd9ec25fb65 100644
--- a/media-fonts/roboto/roboto-2.138.ebuild
+++ b/media-fonts/roboto/roboto-2.138.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Standard font for Android 4.0 (Ice Cream Sandwich) and later"
 HOMEPAGE="https://github.com/google/roboto"
 SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/roboto-unhinted.zip -> ${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -14,8 +16,5 @@ KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${S}
-
-FONT_SUFFIX="ttf"
 FONT_CONF=( "${FILESDIR}"/90-roboto-regular.conf )
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/signika/Manifest b/media-fonts/signika/Manifest
index 094657b420c7..3a713be6e2b7 100644
--- a/media-fonts/signika/Manifest
+++ b/media-fonts/signika/Manifest
@@ -1,3 +1,3 @@
 DIST signika-1.001.tar.xz 271728 BLAKE2B 704504f1e663e513ae36aad8c8c72a00e7ad082ab83db88fc7eff3a3d59130b557a6871580f5637fc8ea5f7d1cea2d391c0c8844a26995d463bfd9e21a5dba31 SHA512 b19c84439bebe8a7d7ecdf927122effecdc785ed26e2861901238b210ea582a76a406f3da55eda0b5795d8ae8ba80745473ce65c3e6a55b9d377a261a6bd73e2
-EBUILD signika-1.001.ebuild 394 BLAKE2B 43c72730e4d60e2652bb30c7ecaff8c0b5e90372bc9f52e70d859f4e544a61d0bc5e9f1bd26cde4d3299c467c08bbcd315b92e564682562001ab5fc6e75ab757 SHA512 521f79c5b9492972a52d58c963e32d5bbd735b68485471e01bded99c772679aaefbee3f3782feff4e5da7b81f21d654f47c7b2be691f82aad26bda043fa5da13
+EBUILD signika-1.001.ebuild 390 BLAKE2B 2c211e4b4bbd3946819cd4c1cce257a618c349c53c5ff4a98a831b454c15bf1572200a2299f29dd77319cac8916ff30569c4489da6052b00ca0253f4ce08f01c SHA512 9ca07f6e25c3c1f87583a3f6cfe1ce70608a8feac548d6815f496e4b543a8f5ae006bef8c255daeb78b4599f84173372bc3c13aa973d3768e97e4b9160b3f6f6
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/signika/signika-1.001.ebuild b/media-fonts/signika/signika-1.001.ebuild
index db0c801be95b..09114a375d97 100644
--- a/media-fonts/signika/signika-1.001.ebuild
+++ b/media-fonts/signika/signika-1.001.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="A sans-serif with gentle character designed for signage"
+DESCRIPTION="Sans-serif with gentle character designed for signage"
 HOMEPAGE="http://ancymonic.com/projects/Signika"
 SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index 9e235dd3d494..fbde140e4e13 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -1,3 +1,3 @@
 DIST AbyssinicaSIL-1.500.zip 1852827 BLAKE2B 59b29242f39fba70b60ca23363e82d093354deef9f8e46386fc5408994b9629b10b0400bdb860e5482a79cddd1ffa8b5057da62cafebfc128a49057abf195462 SHA512 56cfed3d41ea0a16d041b29f417296f4cc89f3fa8e718b3e352690a954168b018a5da68745f61db77395c292e92f8964d868c8824be5edfb24fb7539dcc62c59
-EBUILD sil-abyssinica-1.500.ebuild 671 BLAKE2B 594d911ee5b7f2a72f5e9764edf1476b37c239992c1e4f0bbcb2183d1828583ee120e2a635d06b43555e32c7f6c22c9c8345b28794a9b41e3754c29a1ff36164 SHA512 35a0db418f52cf85e306f479f06e822e8413ec00d71577d7247a0b73341068f707e8a026d4e1d2dba9bb8ebfeef6aa5e3192c0347ea0ebd251e5cbc84f8effc6
+EBUILD sil-abyssinica-1.500.ebuild 646 BLAKE2B d8a943ddfa11b1c934d50efb47a3db82850108289f3d25f324ee23e47b4ebf663aeebe8c05cf26427ad9a67a5834b2700fc0fd477bd5cf3e42a2b7939dba98f8 SHA512 fca7417e0379215170fd8c6c9a09b2904302c528253a33f94e43284a1dace6798b2bb5475947844a6f57cf5b7bc2c8d22f4fbe00e2dcf1b6cfc472da682abf50
 MISC metadata.xml 1078 BLAKE2B 77b83a9768d6536a29bb8aa73031b25c456faa20276c5e1e54de18b7fbebb6931e6be6a53b7cee0901f5dbd2ee48f9ca7b62d5e75b472805e76d3baf309684b5 SHA512 77da0918b61ce3649d2b7b25c336443e056f11915f8d757a20cb6527f7fcffd6152b9fbb15796e557d40fa8af65332622f71284000adfd356043d1edcabf64d1
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index ac32b0eddd93..afc277728f53 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="AbyssinicaSIL-${PV}"
 inherit font
 
 DESCRIPTION="SIL Opentype Unicode fonts for Ethiopic languages"
-HOMEPAGE="https://software.sil.org/abyssinica"
+HOMEPAGE="https://software.sil.org/abyssinica/"
 SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos"
 IUSE="doc"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
+
+DOCS=( FONTLOG.txt OFL-FAQ.txt README.txt )
 
-DOCS="FONTLOG.txt OFL-FAQ.txt README.txt"
 FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/${MY_P}"
-S="${FONT_S}"
 
 src_install() {
 	font_src_install
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index 089d6a30d37e..8d6575a36e9a 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -1,4 +1,4 @@
 DIST LateefGR-1.200.zip 727815 BLAKE2B e236126d08c729fedf5ea3fe7abecdbec1c91c1c350465a555ddf72c83b74145734379394647e9b2527558fe408a871afa0dcc6d386adc32ec3bcaed1221be9e SHA512 12c506516987782d3b3e07ba2cd9773a4e057d358250e9a4cc299287d751f82843d4e6969c714f5321531ac7897448b624dd8a2d1cf3bf213c39f90aae2f01a3
-DIST Scheherazade-2.100.zip 1114645 BLAKE2B 27743054c58afc93c79765abf6ac0698b394e1480e28fe59006da8a369d61a26fe3e0a2deec2df298fca6ee1f31185d3d0a0429b74803f049ae8e384735920a0 SHA512 53a6b684a9c6a6f136da28cc2f663fca9e22d1951203587394ff979c4769e4beb898ab73a7cabedf5ed6eaa2775d10c7281439f10331b203f0e03bd434aa2fb2
-EBUILD sil-arabicfonts-2.100.ebuild 725 BLAKE2B f828f3638c265c366ce04679e9d101df99380d037ffe2b11d4f9e33d67d30043f2207851767f9673bdcba90ad608fc56fa8ec667e5d87452c5da68d2a8088472 SHA512 fad895cce9f165d22915b44c8a99861df70d0b8da1d3de02f5ad33eca1376f67cb6ec690503a865e41dd484902280b2dca8960e19245edac358edd15a673d9fe
-MISC metadata.xml 1185 BLAKE2B 0632c1af557645a51a58bb7e3859a0897c39f4145c5a65c9f4316e1573811991b18e3e29ec55c38444471a6533d4770a2c80414c8ec2382839359ad5d46afbe1 SHA512 0fa80c2a6452c1da5049fef563358571259f73b0cf8bb65c17710a37760fd0643ee3bab66ea399531c8e7d190c46d7d1ea9a953a3a572c41c342babda2d73eee
+DIST ScheherazadeNew-3.000.zip 7242549 BLAKE2B 84a09105cd625dd841b63627ecbc7b5ab2bb0a3edfaf1e3a7c743b527362de1c913f212c153af8cdc0494f1102af4d9ac99929442d9bb4270ae5d3ec4de3d579 SHA512 d74faf7c4df1a9a2fca5c8a8e8102b78ac05f849ac6aa08985b045549441f37cc8fd2767f622b1eda63dea4473f94591b6a98976accd9316ce7078e8fa920e0d
+EBUILD sil-arabicfonts-3.000.ebuild 702 BLAKE2B 2191699cf7034752f2906b56e595249effff7585ddfc905f1197c2b3b5ce185a6bf0d4d00828884b9382e58c1c9b4a8952495c120ba793936720b3f6a2ab9c5b SHA512 8325880038c78a557441ae4d0f8b648e2e42d4d064e9f64ec24f77bb696dedcc6b66aef332007730c1bbc5e778f38ff9aa27cfb4b3bcfabea0e955cb355c5b05
+MISC metadata.xml 1173 BLAKE2B 599ebb8e020b30ee0ec95403689de8b5b0a39de3b52924dd7c49454eec1cac655249b8e8a5a5e6a2465f2d63fd064153507e0d2d43e97d5b50027a02e5a5e369 SHA512 a49e5fdfdced487ddd96fced67b58dd1a22cbc3b7a953d7637715a0fecdf771a9df4e62ad64c211dd39f35bd8cc61e73a811326253eb92dee6fa8424140d4293
diff --git a/media-fonts/sil-arabicfonts/metadata.xml b/media-fonts/sil-arabicfonts/metadata.xml
index cde6817f9514..96b4d62e0631 100644
--- a/media-fonts/sil-arabicfonts/metadata.xml
+++ b/media-fonts/sil-arabicfonts/metadata.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <longdescription lang="en">
-    Scheherazade and Lateef are extended Arabic script fonts designed
-    by SIL International for modern Unicode-based systems using either
-    OpenType or AAT (Apple Advanced Typography) for complex-script
-    rendering. They support virtually all of the Unicode 4.1 Arabic
-    character repertoire (excluding the Arabic Presentation Forms
-    blocks, which are not recommended for normal use). Each typeface
-    is currently available in Regular weight only.
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription lang="en">
+		Scheherazade and Lateef are extended Arabic script fonts designed
+		by SIL International for modern Unicode-based systems using either
+		OpenType or AAT (Apple Advanced Typography) for complex-script
+		rendering. They support virtually all of the Unicode 4.1 Arabic
+		character repertoire (excluding the Arabic Presentation Forms
+		blocks, which are not recommended for normal use). Each typeface
+		is currently available in Regular weight only.
 
-    Scheherazade, named after the heroine of the classic Arabian
-    Nights tale, is designed in a similar style to traditional
-    typefaces such as Monotype Naskh, extended to cover the full
-    Unicode Arabic repertoire.
+		Scheherazade, named after the heroine of the classic Arabian
+		Nights tale, is designed in a similar style to traditional
+		typefaces such as Monotype Naskh, extended to cover the full
+		Unicode Arabic repertoire.
 
-    Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi
-    mystic and poet. It is intended to be an appropriate style for use
-    in Sindhi and other languages of the South Asian region.
-  </longdescription>
+		Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi
+		mystic and poet. It is intended to be an appropriate style for use
+		in Sindhi and other languages of the South Asian region.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-3.000.ebuild
index 0b6689c03dbd..ffa90db5b509 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-3.000.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-MY_P1="Scheherazade-${PV}"
+MY_P1="ScheherazadeNew-${PV}"
 MY_P2="LateefGR-1.200"
 inherit font
 
 DESCRIPTION="SIL Opentype Unicode fonts for Arabic Languages"
-HOMEPAGE="http://scripts.sil.org/ArabicFonts"
+HOMEPAGE="https://software.sil.org/arabicfonts/"
 SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
 	https://software.sil.org/downloads/r/lateef/${MY_P2}.zip"
 
@@ -16,13 +16,11 @@ LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
+BDEPEND="app-arch/unzip"
+
+DOCS=( FONTLOG.txt OFL-FAQ.txt )
 
-DOCS="FONTLOG.txt OFL-FAQ.txt"
 FONT_SUFFIX="ttf"
-FONT_S="${S}"
 
 src_unpack() {
 	default
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index 16a7134ac361..746362356bfb 100644
--- a/media-fonts/sil-charis/Manifest
+++ b/media-fonts/sil-charis/Manifest
@@ -1,4 +1,4 @@
 DIST CharisSILCompact-5.000.zip 3056771 BLAKE2B 8ba790086166b606797242327ccfb9a8093354ef0f5dadbff6edc01c67217628e1c2a46973e17fafb92033af9d4f59fd0807483fd593fad388d5ccf850e34eb5 SHA512 59a444c4085f80719b1bff3cecc2d60176ed2deb136ddc0714de60e2bde1a43c136924e510790fcd7aa8d123f082b5570d80afbf188a15e8363f984dc1e75c80
 DIST sil-charis-5.000.zip 2967087 BLAKE2B 46725b826c53eff25c8a5c6fb7826b5cc9f910424f2afb3ac226aee9ae2cf17b013f17be4b0a19d9c68c63e0f091474125199e8bb4aa60c4d5c678311b1046f1 SHA512 f85da6c9b93c0ef81617241219b208ca262c12fcecae1d447163b7aff31ea8bfc3f09636dcfc0a322c86201a0d551288884e4017fded5bb71bbb54c8093faaed
-EBUILD sil-charis-5.000-r1.ebuild 964 BLAKE2B 471d2927fd29437bc1dd8dd4fcec96cfebdfab466c9b8aebd7eab140933bcd54cb4a2116c7f8b5fe9effd597d79c0f553696875061374e08f94fcc8b23dfd512 SHA512 cfdabd6d56f6b4158b1eaae74a6db72e39a73884724109ab7e5cca51adde30ac7146305d451021b89dfbbbd3e4e62e00a043eeda9eaa25b6240cbaa722e8e2c6
+EBUILD sil-charis-5.000-r1.ebuild 774 BLAKE2B 04ce68b57c10359bd03686fc37055c172dddc3996c2b044b1a583d460b226b9e125c7f5910a51ea636ac9556c69d7534ae2a4e893595d1f24a712c8452e63236 SHA512 ee4067af96d55efb50d05321cf3bf87246219de9f662a7f7fcce5476803204b925e60ccf80638d653a6e3216ae8532c8e249736c868a98139f4e1d4e9c9aff07
 MISC metadata.xml 842 BLAKE2B 2aff2242a26218da06b04bd3cd60ffd736661d7aedcefa0be78f514a9f500d918298835e4cef807c2fd07c33f863c518a459d9db9cfefdac126ac45b0550eb15 SHA512 fb1fa7439a87cadcd485cbe7ebcbc7b9477904fae953dfbdb53c92bdbfe30aa6ede685fbe07ff761d5abe1a74d2bde27726e9152e7bd34a8a71a160015a0b457
diff --git a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
index 0c6150e6577d..da202e039d6c 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit font
+EAPI=7
 
 MY_PN="CharisSIL"
-MY_P="${MY_PN}-${PV}"
+inherit font
 
 DESCRIPTION="Serif typeface for Roman and Cyrillic languages"
-HOMEPAGE="http://scripts.sil.org/CharisSILfont"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip
-	compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=CharisSILCompact-${PV}b.zip&filename=CharisSILCompact-${PV}.zip -> ${MY_PN}Compact-${PV}.zip )"
+HOMEPAGE="https://software.sil.org/charis/"
+SRC_URI="https://software.sil.org/downloads/r/charis/${MY_PN}-${PV}.zip -> ${P}.zip
+	compact? ( https://software.sil.org/downloads/r/charis/${MY_PN}Compact-${PV}.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="compact"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+# DOCS=( OFL-FAQ.txt documentation/* )
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="OFL-FAQ.txt documentation/*"
 
 src_prepare() {
 	default
 	if use compact; then
-		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
+		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} . || die
 	fi
 }
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index ec3217214537..f03a61470f64 100644
--- a/media-fonts/sil-doulos/Manifest
+++ b/media-fonts/sil-doulos/Manifest
@@ -1,3 +1,3 @@
 DIST sil-doulos-5.000.zip 1347526 BLAKE2B d6f5ea4ce5e5cf264dcd59a96e7bb328fdb7cce66d07e30743e8381ec5631eab6b32cdd929940d75bf7b9bca3f102fdd8619f56a813c022ea90020d4fa2d7429 SHA512 3698b3f330d34cfa2be93f9dfc87c113a0b3e174a40ce9c2277bb452161cda61aab4688338ab3aeaaaa3cc684cedc58bbb3f066392e3911246a230d1a9fb02f3
-EBUILD sil-doulos-5.000-r1.ebuild 616 BLAKE2B df257068c82145cbfab424b69d5d69388585e321d4d03a4368e9e9395e558004ee2d92f816e43ccc3e5719bb6e66ed404ea83cce0222d2758a6dcdbe0b34e0d8 SHA512 6a7285d84faca1cca67d9790199d6d608f9b3c650eae215559faec9f8894544ef77958e551ab3718f85e439efe82cf3ad5b6635d0313b8b83bc1b3b00640328a
+EBUILD sil-doulos-5.000-r1.ebuild 576 BLAKE2B c09844a14127a93ac4877fea8815decfe49f13e0a3b4d223a9bc1e76af0bbfb827a4e5a3e5c12bc1b07d6ff763f74d9c06438df19f8dd85c27d3cf5ab0018d26 SHA512 973023ec29845d769b2d35a6263ff73206611c11032acbcc25d9061dd71849a3fc102682a9a7d64b8fc29f1ac922e4fcbb1607fd1b1a4b5dc568c54479cbe49a
 MISC metadata.xml 1107 BLAKE2B d213d88142231e9bdd7f94e2dbfac584fe2a67de6ca0eca48d8d2440da63aa16a1490101132e04bdf1fa23eb30d3dfd2b1765cbf132ef0dcc85b688379d08883 SHA512 2f5692898543ee8f0fdb8621046604720d43c2ca9eb28a474c3cc01081fd877290997a65ac7457b3dc58c68ecf1636b05deaaaf52e89be5ebdde77b0f5ee71d9
diff --git a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
index 4c2d92dfc6c4..3d81a974858d 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit font
+EAPI=7
 
 MY_P="DoulosSIL-${PV}"
+inherit font
 
-DESCRIPTION="SIL Doulos - SIL font for Roman and Cyrillic Languages"
-HOMEPAGE="http://scripts.sil.org/DoulosSILfont"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip"
+DESCRIPTION="SIL font for Roman and Cyrillic Languages"
+HOMEPAGE="https://software.sil.org/doulos/"
+SRC_URI="https://software.sil.org/downloads/r/doulos/${MY_P}.zip -> ${P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+DOCS=( OFL-FAQ.txt documentation/{DOCUMENTATION.txt,DoulosSIL-features.pdf} )
 
-DOCS="OFL-FAQ.txt documentation/*"
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index d2b5873db32d..609f4e16732f 100644
--- a/media-fonts/sil-gentium/Manifest
+++ b/media-fonts/sil-gentium/Manifest
@@ -1,4 +1,4 @@
 DIST GentiumPlusCompact-5.000.zip 2089135 BLAKE2B 78d734a3289c1577869fb57126f66f13eccf268f8665fa15e9c4f34cfe43a52ba9e10e00d35382d5745070a6ce43f2c75622706185933e151eef3a6b340f2e0b SHA512 1959ef4e1e05a3d1fb68b2f89e0b90683508239118a7fcad8ba667753635790fa6a5c882111128150e8c9f71557947a11d7a156f931326a5844213094bec16ac
 DIST sil-gentium-5.000.zip 2025499 BLAKE2B e13130aaff0d3893260598605c2332e7316d451e544efead87bd527a275ef1565e5b76ddfa3491b32bae77cd773f3d52b1d063851a0f694a54516c65fef15c92 SHA512 6580fb6717154d25230c837ca6150265349171cf2ad670b638c5029e034ba446dd6adb9508c9b667c6ebad1b05357326f7684daa5517df55235a8728c48f419b
-EBUILD sil-gentium-5.000-r1.ebuild 1088 BLAKE2B a798fdac5f99bfcd88198e1a2a550961453d1bba5964391fb54a6d352c4e83b731457da57ff856cdb3a74eed801d9a41e878929b95c48765562a70b18c7c5759 SHA512 72e4cdfc083f68a51b913eed0838284d2b82d46f910d7fda1b3f2b9948ef5efc7d0b10235e962b17b992aacb5a23f3d1fec80ebe385cad4999d53fb00dc6b2d2
+EBUILD sil-gentium-5.000-r1.ebuild 910 BLAKE2B 90fff229735f82bc46a13f927604ab376db9c49654d870bd2c138a9e7dcfb45ca8cb05e9694a76916799f1d0500f17e58962ac9e7e6d6b6bf7ec12344b623627 SHA512 a1827f782917c198f66a7750093ae3ccd77610193905938ee884702d0f0d66f065f377cf53082c7130ab9aefffd9420fe315685ae59ee1c0253e616ccb518575
 MISC metadata.xml 1117 BLAKE2B e994bf44da56f29dd77dbc8de5b0f85a61146f079f4af32516d9b7499a4dc6e7902cc1e2c43af83d74b2d542c956c03c16b4f843b9e487ea2772242665d83900 SHA512 b2f33956c0bfef65d97a4e96ab1ca7a37db7f7892be729798d26fcecea8c76c66942df7bc675a9078fadab9cbd287960dd572381938f0b9c52519672161458d9
diff --git a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
index a189ebc10576..fb7bf477d703 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -1,36 +1,34 @@
 # Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
 MY_PN="GentiumPlus"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Gentium Plus unicode font for Latin and Greek languages"
-HOMEPAGE="http://scripts.sil.org/gentium"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MY_P}.zip&filename=${MY_P}.zip -> ${P}.zip
-	compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlusCompact-${PV}b.zip&filename=GentiumPlusCompact-${PV}.zip -> ${MY_PN}Compact-${PV}.zip )"
+HOMEPAGE="https://software.sil.org/gentium/"
+SRC_URI="https://software.sil.org/downloads/r/gentium/${MY_P}.zip -> ${P}.zip
+	compact? ( https://software.sil.org/downloads/r/gentium/${MY_PN}Compact-${PV}.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="compact doc"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-DOCS="GENTIUM-FAQ.txt OFL-FAQ.txt"
-FONT_SUFFIX="ttf"
+DOCS=( GENTIUM-FAQ.txt OFL-FAQ.txt )
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-FONT_S="${S}"
+FONT_SUFFIX="ttf"
 
 src_unpack() {
 	unpack ${A}
 
 	if use compact; then
-		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${FONT_S}" || die
+		mv "${WORKDIR}"/${MY_PN}Compact-${PV}/*.${FONT_SUFFIX} "${S}" || die
 	fi
 }
 
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 0b069bff3c52..701cd65d25df 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,3 +1,5 @@
+DIST Padauk-4.000.zip 1316567 BLAKE2B 466d9aedad691afa7ae94a24652b156888cda2a926846fe705c953e711b00bff7c053b1f6d4e4ae4989a6fc91d87e984539315b84c0fff10815b8cfd18b80da1 SHA512 3ed97d5e8b47f8883bcab980aeb4247f4878ef8306773abdc4d1387817a3bdd5d8981c01cebbcd6b1c8dd7507d30a3b2879d607df66fcf7bc33d3db5d029016c
 DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
-EBUILD sil-padauk-2.8-r1.ebuild 473 BLAKE2B 87976ffdc2328a34d09a8a2a22ea40ac20ddd3f27be1a0c8196416adf93190060b3da3fd28803b2801176c12c7f28721d9402e57f1ffc35ce8c876bef2e02bdb SHA512 9301ecfbc0da4366d8149178f6634c3ec16787598a52f8c2e39932500e99e8e5234efcf2d38d0cec60f280aefc1a4877646ce0e288821f445500970c9851eec2
+EBUILD sil-padauk-2.8-r1.ebuild 442 BLAKE2B 02df9ce281984f213c211e5d45c8e513ec05382f3a63417ef9688b9fd7aa0970ae7430eba8c58e892e20d78cc1e28b30e4c447671cc8f847f34bbdf99d27dcc1 SHA512 9d56ed3aed58444b9ae87cfbf10aaa1747fd1d999681210f8b3a23d2e08845cbd88de1d2d9b53d7456378f0831dc47d6a544aa303dc8cbd863c1b240ed6df897
+EBUILD sil-padauk-4.000.ebuild 481 BLAKE2B ffd82e34f7ea8f94838899495ebeefda640bbb241416297464403ad49e65ed736da4eb7962e003574f600f73259b3e7024bd5a398e23ae9ab908513861579df3 SHA512 339c33135f0ef233cdf03b6060b8808361cb53cbea89713d848b99a9e5a223e1be39174358e0797d917a33d3f25e51f931d278df6930a13365a3cb76cb02f3eb
 MISC metadata.xml 414 BLAKE2B d9beb4772ec5900f5d59dd25ddabb6839519b298affb780c548febe8e93fad52e53d1763b82d49b248cc3972bb5b7f3228fbad05c9fc2d611239faba2395ef60 SHA512 6cca51cb9d6fcd2c1253bccfcbe8ccecab7463bce295c430d81349cd7e7de227f7da7b8f301e600b4922137638500ff6a53b3a9cc803b1b6725c9b52de86c7f7
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
index 7fefbd209d85..2fc416dc3a24 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit font
+EAPI=7
 
 MY_PN="padauk"
+inherit font
 
 DESCRIPTION="SIL fonts for Myanmar script"
 HOMEPAGE="http://scripts.sil.org/padauk"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
+S="${WORKDIR}/${MY_PN}-2.80"
 
 LICENSE="OFL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_S="${WORKDIR}/${MY_PN}-2.80"
-S="${FONT_S}"
+BDEPEND="app-arch/unzip"
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-padauk/sil-padauk-4.000.ebuild b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
new file mode 100644
index 000000000000..4beb17558432
--- /dev/null
+++ b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Padauk"
+inherit font
+
+DESCRIPTION="SIL fonts for Myanmar script"
+HOMEPAGE="https://software.sil.org/padauk/"
+SRC_URI="https://software.sil.org/downloads/r/padauk/${MY_PN}-${PV}.zip"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="OFL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/sophia-nubian/Manifest b/media-fonts/sophia-nubian/Manifest
index af4d18053e51..5661b524166b 100644
--- a/media-fonts/sophia-nubian/Manifest
+++ b/media-fonts/sophia-nubian/Manifest
@@ -1,3 +1,3 @@
 DIST sophia-nubian-1.0.zip 190051 BLAKE2B bc2d7b4b54c836651f8fe489534d0751cb377a68cadc961dad5e45305628ff197491d4ab671f4fb6a6ddb385cc245f34b807778b54e1e48d6c17f1e475fe297d SHA512 059503c505836c5370fbb08fb9a9b15bf62b77b8f0c701232d2dd4b47f681a5038dbec431d4cfc17877abd3cb04ba0ab4da9b95651d2784bd11bb4c7efcde5fe
-EBUILD sophia-nubian-1.0.ebuild 552 BLAKE2B f6d3870dbee751ad143a42416d6d7b9d085e4b7c75dd77208f003e9859d16e1789a48601879c9a28bcb730420b50454dfe99741723fbffb0367ba5bf53fde4c1 SHA512 de53e83c78c45d1f146721191f8f7432e218346174ebd4b3db2f4fed5e6e03fc13099b9683d7273b1cfc464c0cc221a5f6477a921cc41006c8f8e5afe6d20af1
+EBUILD sophia-nubian-1.0.ebuild 503 BLAKE2B 66d96fb8024af43bc4e27b40c68aa0f72bd57685b08136039b6945e688fff06ffb798c41647dcea3eeb5b43662c398b61810a14e9416f00f7a5863162080dac5 SHA512 e6e85cd6d370a1f40ac9731561bb1e597ece52c9530bfd8bd89a5cf1cb0b54b29ac713b96caf618f22f28346c0bd78ab740dc1eab08ef3c231c58d43e645e809
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild b/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
index 5dc419af1001..58a4d00a4d55 100644
--- a/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
+++ b/media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Unicode sans-serif typeface for Coptic/Nubian languages"
-HOMEPAGE="http://scripts.sil.org/SophiaNubian"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=SN${PV}.zip&filename=SN${PV}.zip -> ${P}.zip"
+HOMEPAGE="https://software.sil.org/SophiaNubian/"
+SRC_URI="https://software.sil.org/downloads/r/${PN/-/}/SophiaNubian-${PV}.zip -> ${P}.zip"
+S="${WORKDIR}/SophiaNubian"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
+
+DOCS=( Readme.txt )
 
-S="${WORKDIR}/SophiaNubian"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
-DOCS="Readme.txt"
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 0721874f3e31..ac678816ee20 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -1,11 +1,6 @@
-DIST source-han-sans-ja-1.001.tar.xz 22688484 BLAKE2B f7f0ff84010c33a225f99b42ffa85552019bdc2fc535688a1d99814f5887213d0948fec6fa0fdc0a4600856528108080025a800d7ef246a3fee96b2ed1b57336 SHA512 fe9b36b1f7f5cbf546e63a8e5bd410cf95c2194a19f037b856f1888bd08dcf42e54dac1160b2654ed73ea54a41d9bced2c186b5153e77b0be8fc93163ab9784c
 DIST source-han-sans-ja-1.004.zip 26865889 BLAKE2B 26a735dc6d2e5de21cfb52a29d61ca1e85c3fcdb75ed50792a27ffce59acdf9d4a74261bc74981729d584c13a14e1beae1460d3f2a27aaaf0ffd128f37cd745e SHA512 ae310b2e8eb46935b26f53f8177188e26e4a55909a4ad96ff54682d250e661ca5042f76814b97c800f23bd2e55127f8957ccd42c8c55f2bb1333be7903a9d11a
-DIST source-han-sans-ko-1.001.tar.xz 20867288 BLAKE2B 3dae12f461b7f82d65dd96fc43c903974e6118a757f101cf3fcd9658609f1ae3c4a975437efe57da9ce260c48891cc009b5aa5c1e5c12c662d1b9c8babbf5afa SHA512 3a2e305051190babf00271572e7fec23451f19836144a356d76ce9a97f010807b5a5fb0ae7ecf8d2a8de2e1c0f38fc3fc55be8dca9dfc859c23cbf577b6314f9
 DIST source-han-sans-ko-1.004.zip 25290327 BLAKE2B de915dc85c84e584e1a6325b35e176c21f7d009653e2b5d8fe24c68df02dac594e64a1d0684a2a65b291a797b4400e4b0e3823deb0f92a473620703c4f8513a7 SHA512 c2a3cfe06254ea05e15c4858d7e6d5759088b41d5ba0f801769681d05eb57c2c981b2a4525a124d4a6c4945360d9bb0e687515d8b8d4c5831565972642298aa1
-DIST source-han-sans-zh_CN-1.001.tar.xz 41018072 BLAKE2B 65bed1b889545ff7474b670e1880f07753f45b873b43a63f5d24e616f7c342c7143ce4eb81d005af130859a1eabd33921bed609df9b87daea5c55a2f8f092afc SHA512 bdcccc7b16b0b83adfeb6dcf9040792b3ec835e18e63328c3e30b501f2771a0d3232fc4f0c10899107c40f990d3153951e6103979fa222fc68a93a608fcac3a9
 DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3b60a235f9bfe171f143b2b1dc3658abdc4731a5478f2edb8d0931b4df13d60f7fc77601078386ab5c4ec2d9e97a4217e11c385 SHA512 9a38ea7907fdc118e4fa420c976e255120a2f9176c33ea8ce06dbc09f46f95224675178e45c854b674f4a46642123e41a3f3f8f6e9f043e8dcc0322e05a70282
-DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
-EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
-EBUILD source-han-sans-1.004.ebuild 1434 BLAKE2B 84adbfec84eefc96362021003db661cb903d63c980777401d2d03d3a405d135fcdf4a2685acb9ea934ae7d19d3899be216f6bbe48b3c0375eea08e332c928fda SHA512 18c7437e340cce1c456eb86bd007cc4423e6118d71c4162fcdb5dc6f009a6d57873875fca1ae0e7d7802df798b1ffcaa7a66832b3777bed6a68f453a1092aa79
-MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
+EBUILD source-han-sans-1.004.ebuild 1437 BLAKE2B 852c598cdc674bca4aa8edbf4f99f8828458eb229bf2699dea4330241a310ee699ea71693348af6d2da7544bdbe81f67bd03614b20cf3e1278a0d0b1af67ea8f SHA512 9868b8f3426c71c039b158cf479d12c329a46161b914ee65f5a9f7b67618b7af1a761859cc9b98e5caaeba7569c1f8bff1aa479ba5f35f2d25af90609ffc2a84
+MISC metadata.xml 354 BLAKE2B e581ec18e1c98499ea8e709a632b0d3e59b83dc04294e3beaf77973112db4a04e036733dc323e568c6fcab9302fb4ad834929f3680642bbd79107c094ddc39a3 SHA512 a6c7818d11edaba928054eef070af8aca6dcc91bbdf131ed8c71dd612f48f00212ca8f0ca8ec05c793eb9ff7d2cc12881818c8be71bcb1ac286827bf8cfe39f0
diff --git a/media-fonts/source-han-sans/metadata.xml b/media-fonts/source-han-sans/metadata.xml
index a2973be3b850..0f4c11f008f9 100644
--- a/media-fonts/source-han-sans/metadata.xml
+++ b/media-fonts/source-han-sans/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">adobe-fonts/source-han-sans</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">adobe-fonts/source-han-sans</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
deleted file mode 100644
index 02d0d4834be5..000000000000
--- a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-# Note to maintainers:
-# The upstream tarball is huge (over 780 MB), so we repackage the
-# regional subset OTF fonts per region, for the user's convenience.
-
-DESCRIPTION="Pan-CJK OpenType/CFF font family"
-HOMEPAGE="https://github.com/adobe-fonts/source-han-sans/"
-SRC_URI="l10n_ja? ( https://dev.gentoo.org/~jstein/dist/${PN}-ja-${PV}.tar.xz )
-	l10n_ko? ( https://dev.gentoo.org/~jstein/dist/${PN}-ko-${PV}.tar.xz )
-	l10n_zh-CN? ( https://dev.gentoo.org/~jstein/dist/${PN}-zh_CN-${PV}.tar.xz )
-	l10n_zh-TW? ( https://dev.gentoo.org/~jstein/dist/${PN}-zh_TW-${PV}.tar.xz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
-REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
-RESTRICT="binchecks strip"
-
-src_install() {
-	local l
-	for l in ja ko zh-CN zh-TW; do
-		use l10n_${l} && FONT_S="${S}/source-han-sans-${l//-/_}-${PV}" font_src_install
-	done
-	dodoc source-han-sans-*-${PV}/*md source-han-sans-*-${PV}/*pdf
-}
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 462971468a8a..29eb7ae1eb4c 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 # Note to maintainers:
@@ -15,18 +16,18 @@ SRC_URI="
 	l10n_ko? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansKR.zip -> ${PN}-ko-${PV}.zip )
 	l10n_zh-CN? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansCN.zip -> ${PN}-zh_CN-${PV}.zip )
 	l10n_zh-TW? ( https://github.com/adobe-fonts/${PN}/raw/${PV}R/SubsetOTF/SourceHanSansTW.zip -> ${PN}-zh_TW-${PV}.zip )"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
+RESTRICT="binchecks strip"
 
-S=${WORKDIR}
 FONT_SUFFIX="otf"
-RESTRICT="binchecks strip"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	use l10n_ja && FONT_S="${S}/SourceHanSansJP" font_src_install
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index dba5fd889a02..7f813eb8470a 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -2,5 +2,5 @@ AUX 63-source-pro.conf 820 BLAKE2B 7a84b7f3aae165d17b9c0983846fe609efcf20e87c882
 DIST source-code-pro-20170111.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
 DIST source-sans-pro-20170111.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
-EBUILD source-pro-20170111.ebuild 1297 BLAKE2B f7a03099bcdc5d2dffbacbad00fafac6a228a15878bf9f5f03fa7c0d6c5f3e23c9ebfe144f4b5977ed08c2ee372617d87058421176b061ce79b74ac7d2b1ee80 SHA512 a6e998ad0bf11495bf3a8086c6bea76f0ce56ecde76df6d10550e8fabbf386818f516acc385d8f778e5fac674f54a779cd606b3c36d2334f5375f38e28078208
+EBUILD source-pro-20170111.ebuild 1290 BLAKE2B 06454ec2717e20a97ccc0ecb730f715fcc31057e7643d941a928c2f10ca8d71c93349e0cf2aba51cba17431548fb743fb66c4c191af02aff1e64a1c532267c0d SHA512 05a726859bab0688fbcb58e66a370be24c9bbdd37f7b0a94cb91dcb750a5bad84f667d97369eabeea4e9999ed71b4713dc48cb3494e9a81d9599a65ad359b68d
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index d26340e29e18..e37d56389671 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit font
 
 SANSV="2.020R-ro/1.075R-it"
@@ -15,20 +16,22 @@ HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
 SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
 	https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
 	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="cjk"
 
-RDEPEND="media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )"
+RESTRICT="binchecks strip"
+
+RDEPEND="
+	media-libs/fontconfig
+	cjk? ( media-fonts/source-han-sans )
+"
 
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
 FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
+FONT_SUFFIX="otf"
 
 src_prepare() {
 	default
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 6a0413047bb6..06f85edbe8a7 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,6 +1,9 @@
 AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
 DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
-DIST STIXv2.0.0.zip 3921396 BLAKE2B 3188b28e6f21df0bd3283cacac071399afb325cad3c36387e47448ee9bffcd452b59e4381663d06fbbb93d704a3510c23c31a88e832e75fbd7be85a179761553 SHA512 b5d1a98be67fb548d8898cee207b429a6b53617c0ee33b798273e4626e287af9404acf85e702c7fc6cd0b27da379a03013f77caeb57b957d7633efa722f69ae0
-EBUILD stix-fonts-1.1.1.ebuild 774 BLAKE2B be4a24f2f62be5e46a2b7847d0b0108c9d75aa45cd054f5ac63695882f0dd593d26c2474c32be0f8cfad89f8436b80d51c16420fb40941ecd731b34dab34d579 SHA512 6aaac661d65288765996b34711fa96c0d323abb24107c4b67304450f2c17177fea94842530eb1c3f057c7efb3cbc36177c26cc7e24ced4f9126a5103970d0939
-EBUILD stix-fonts-2.0.0.ebuild 690 BLAKE2B 8c65c732b600087b8d7299aa1bbb89d1558bbf4bdc4d9b13c5b79d7a49eba71c3ec5b832cc978a65faa85adc032660b8e896ca281eb722c3aec5d74c0637fe8a SHA512 2d9d87ccc0cae1085f998d5e43454a508885c8c456d443087f1d34b99b9fc9e97bbb226cf82faa8ab53e42dd046eeda3c481e654964f5b057764b275f523fe63
+DIST stix-fonts-2.11-FONTLOG.txt 27987 BLAKE2B b29daccfd54daaa59e694bf105d566fb14e4b4c8bf732dd9eccbdd610983e0fc3798a8f8c3bbca80e86190f9e44cdf27e527a721c0ef548addcf39c3f240c6f6 SHA512 3cd3c87b5b8c7ba4e4f76ed95349a375c5a365303f0e9a8bb26922c8b4382e47f4903531dacffd9f2d6df8bb0be8f50fb965695fc5c5ed69c443345140952067
+DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff9732fec997e1665bce256a381457a00b4508ebf052a2aeaa264bd13917c0df34610332a15fbf9a0951f00477d9e17bfb156bc62aff584c6 SHA512 be03b5539bff41b904a4971e07d717d2b8b5bc4805f05c18bb56ec79ee07d38dd7bd1274c0887fc3019594aa09945e59cee30a22a0406c7985dba72245987861
+DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
+DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
+EBUILD stix-fonts-1.1.1.ebuild 674 BLAKE2B ecabf1d65d90ea6e2d0404ec3d8bf98a773b97c9cbb65a923773122eb0f59e8cb197f99be05af1174a7a7a53155a1314df45d3aa675c073f72c178023a562fba SHA512 f0fda106b17ecc778db50db86a4ccd090f6cf7f79039a6ca9f42837e918efe29a15c9a404eacd5546e43e67f4a9106fa2bc87f676a0c07fdd0989acc21dba088
+EBUILD stix-fonts-2.11.ebuild 990 BLAKE2B c687d32b8054a03ecb8b7a590746db8cf5b525e6cba21e939d07bbb1e51a8ccfff472ad0a90484f20996f7ed8b7bab0397d62cb0eabff67be9991882f29316a7 SHA512 d9e55c455fd52348532b467480f999b2a0511f9e4115892aaf7b7956b4a05c986e7db1959c90fff1d8246523aef42a50b3e4b680ca97a482b250722058a8e227
 MISC metadata.xml 317 BLAKE2B 503285934782ce57ede0881674e286d015803dd09480ada7e3fffc9fffe82160bde205b2141f448f814c06fcb16066b32624d74c2c4f0a694c31bb6472d4c5ae SHA512 7e384d1a8a6b0cb9cba64e52c57cb6d762218f1032f0680c2e35efd00d1e4c92444fc1ab8e7782d6a85b1cbc7835faada3d2e89c9692383f54035bf7676e2af9
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index b91640f47201..32beaebcb6cd 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
+HOMEPAGE="https://www.stixfonts.org/"
 SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RESTRICT="binchecks strip test"
 
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/STIX-Word"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+BDEPEND="app-arch/unzip"
 
-src_install() {
-	# DOCS can't do files with spaces so handle it ourselves
-	font_src_install
-	dodoc "STIX Font ${PV} Release Documentation.pdf"
-}
+DOCS=( "STIX Font ${PV} Release Documentation.pdf" )
 
-RESTRICT="binchecks strip test"
+FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+FONT_SUFFIX="otf"
+FONT_S="${S}/Fonts/STIX-Word"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
deleted file mode 100644
index 160743fffa9b..000000000000
--- a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-MY_P="STIXv${PV}"
-DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
-SRC_URI="mirror://sourceforge/${PN/-/}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/OTF"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
-
-DOCS=( docs/STIX_2.0.0_release_notes.txt )
-
-RESTRICT="binchecks strip test"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
new file mode 100644
index 000000000000..3955c4a40819
--- /dev/null
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
+HOMEPAGE="https://www.stixfonts.org/"
+BASE_URI="https://raw.githubusercontent.com/stipub/${PN/-/}/v${PV}"
+SRC_URI="${BASE_URI}/zipfiles/static_otf.zip -> ${P}-otf.zip
+	${BASE_URI}/docs/FONTLOG.txt -> ${P}-FONTLOG.txt
+	${BASE_URI}/docs/STIXTwoMath-Regular.pdf -> ${P}-STIXTwoMath-Regular.pdf
+	${BASE_URI}/docs/STIXTwoText-Regular.pdf -> ${P}-STIXTwoText-Regular.pdf
+"
+S="${WORKDIR}/static_otf"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RESTRICT="binchecks strip test"
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="otf"
+
+src_install() {
+	font_src_install
+
+	local doc
+	for doc in FONTLOG.txt STIXTwo{Math,Text}-Regular.pdf; do
+		newdoc "${DISTDIR}"/${P}-${doc} ${doc}
+	done
+}
diff --git a/media-fonts/termsyn/Manifest b/media-fonts/termsyn/Manifest
index ab81c57e3721..efe236d60c20 100644
--- a/media-fonts/termsyn/Manifest
+++ b/media-fonts/termsyn/Manifest
@@ -1,3 +1,3 @@
 DIST termsyn-1.8.7.tar.gz 167997 BLAKE2B f2f9577500b27c409ebe28975b45ff4afefa2e0456fc7cbd7f7de38a7f613d4e9ce84cc15f29d6770f064ada71d5fba306746a0b382f1e29f67735825219ae4d SHA512 4c0937ce7fc2ebf5a9dc7ec53e5bd3855fbe95b50d70777514a43ae00c5850a16f4c1bb8adbd64418ed9657b977df65d04cf7b60f63bf25b0bcb91c6fbcb618f
-EBUILD termsyn-1.8.7.ebuild 409 BLAKE2B 626bc18dd34f97c5e47c56efd76a1fd5f47e9ee7dabadf5684ff980548bf97248e03b712e408dce03059c744ed720787478952bdb15ce65f945f533cecd0f10c SHA512 8a1af059364801eb143041401bd22e0deabafbfea157b54132c0f03c602d21dc097d4b0c51290c67f37e1241fe5e4059462c12304c4d16bb48acec71dac6d187
+EBUILD termsyn-1.8.7.ebuild 375 BLAKE2B 67857fcfb81309184b7e13e8643ae82d48fb554f2ccb331e0e096744f44ba0ec0d794026501fc4c33528b4b133bf9e6604e929c42d734fc5cb0b352f72d856de SHA512 3d2a05b84a03013a7d77930b6a41aad75582af01ce0f941a71ac51314815b291eff6e9e5a2b5d1d46c4db3c256bd247946bc154f2eb1820154b41e270b182c14
 MISC metadata.xml 244 BLAKE2B b3284ad8b6450f1df32b91157acf0521907e18036fbc18f0ada66bcadf89ea9645d01d37bb4be75458da1dd59b57325b5bca8dc07ca3eec4624294e74db71aba SHA512 0a2efba37c1f3ea6beb348e593662c60a8d665c43fa38cf4776f2ae87f224b2ac09016296ffd18b987e133b318ae8a12a5d0a8a1a5aeb6e2191c591d0b2dc29e
diff --git a/media-fonts/termsyn/termsyn-1.8.7.ebuild b/media-fonts/termsyn/termsyn-1.8.7.ebuild
index b134d4f7dbbf..5ca575e2f991 100644
--- a/media-fonts/termsyn/termsyn-1.8.7.ebuild
+++ b/media-fonts/termsyn/termsyn-1.8.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit font
 
@@ -14,7 +14,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 FONT_SUFFIX="pcf psfu"
diff --git a/media-fonts/thaifonts-scalable/Manifest b/media-fonts/thaifonts-scalable/Manifest
index a39f5d88cb0b..bcd84e9eb487 100644
--- a/media-fonts/thaifonts-scalable/Manifest
+++ b/media-fonts/thaifonts-scalable/Manifest
@@ -1,3 +1,3 @@
-DIST ttf-tlwg-0.6.1.tar.xz 1931628 BLAKE2B cf1f45f4f34cd38c45b5aabba0646a3cdd0e9a50908d9601a3544f7d56aa10ac463ec4b0afdf6d59cbba53bfb3ea2b9f02967ac0d8a4997cb1a18adfab7e300e SHA512 47364c9125509eb115abdaa60eb1f046d5bef694b2b51113e611b1c35c50300d682fc35c71e16ab3d6ffb43f36ba3e77af70019ec050012aebe04d9c0ece544f
-EBUILD thaifonts-scalable-0.6.1.ebuild 1623 BLAKE2B 4f50c0712ddde16faf19458c1f196ad5cbd10332567f241f6f1f13531e5b03e7768c0a9118e249513592f7f7b3f070aebc192909008b084db469dd661ed17e9e SHA512 27e964e5cd687c0d06873d2998267c7ebab8cef86333a53bcd052b47efa20f7be2e9f1b228843807a57dea9dd59a33aced5ce30cc7559362ccf79b8fca6e70d5
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+DIST thaifonts-scalable-0.7.2.tar.xz 1958780 BLAKE2B 6e976d0d7543acbf5869b21c5a488b2d0c3c8b9428a29c35736bb087bd5accbbb81a2766f670940a8006a2f4050818064c4753820a9a12691a3b39d80359da69 SHA512 dd5865da81bbb10665c561ae188197a3bb0831162bf69795298f80f8aff1a210fce8e3d961476a878851376d15d95dd7d36144d53e8123a309ea883ced1a7e58
+EBUILD thaifonts-scalable-0.7.2.ebuild 1336 BLAKE2B 037ee48c5e3bbea942677f97ff9b6eb6d70783a8494ccc6612de5ce62630c1b3593be85e5b7b2dd7820fa235a3d11191629b0e6f9c4262d9ea90f8a0cc3b8250 SHA512 1a82825bcf2d1e88abd612e614774ac207ff56f43247a2b90ce296db1ed0e3ee15bdf1b57fa2fd81e1d02124d481151f1c5f1ece3810f006de3d535fc43aaa82
+MISC metadata.xml 262 BLAKE2B 090658f54d67004539d3c6efad6c7eaf36d45079091d36411f0df7cfdfa41adab2f78ee52469dc2e23f22908589fe9e9488c1c53bfe9302ba5c429c3fbc626b0 SHA512 36cc5ab05d2a01cb8101147ea8833c0da21cd10864622fc21b6517e1b2740f045f949d5efad647b20b324998ebeeefab63324ead95480673107f69aae8e46f23
diff --git a/media-fonts/thaifonts-scalable/metadata.xml b/media-fonts/thaifonts-scalable/metadata.xml
index d0f1df7c94c0..8b3b4d92532e 100644
--- a/media-fonts/thaifonts-scalable/metadata.xml
+++ b/media-fonts/thaifonts-scalable/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild
deleted file mode 100644
index 9eaa1e7bce31..000000000000
--- a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A collection of Free fonts for Thai"
-HOMEPAGE="https://linux.thai.net/projects/thaifonts-scalable"
-SRC_URI="ftp://linux.thai.net/pub/thailinux/software/thai-ttf/ttf-tlwg-${PV}.tar.xz"
-
-LICENSE="|| ( GPL-2-with-font-exception GPL-3-with-font-exception )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/ttf-tlwg-${PV}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	"${FONT_S}/etc/fonts/conf.avail/64-01-tlwg-kinnari.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-02-tlwg-norasi.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-11-tlwg-waree.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-12-tlwg-loma.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-13-tlwg-garuda.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-14-tlwg-umpush.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-15-laksaman.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-21-tlwg-typo.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-22-tlwg-typist.conf"
-	"${FONT_S}/etc/fonts/conf.avail/64-23-tlwg-mono.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-garuda-synthetic.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-kinnari-synthetic.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-laksaman-synthetic.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-loma-synthetic.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-umpush-synthetic.conf"
-	"${FONT_S}/etc/fonts/conf.avail/89-tlwg-waree-synthetic.conf" )
-
-pkg_postinst() {
-	font_pkg_postinst
-	echo
-	elog "  64-*.conf enable basic support"
-	elog "  89-*-synthetic.conf emulate the Thai font of Windows"
-	echo
-}
diff --git a/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild
new file mode 100644
index 000000000000..e6cf8aa2a638
--- /dev/null
+++ b/media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Collection of free fonts for Thai"
+HOMEPAGE="https://linux.thai.net/projects/thaifonts-scalable"
+SRC_URI="https://github.com/tlwg/fonts-tlwg/releases/download/v${PV}/ttf-tlwg-${PV}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/ttf-tlwg-${PV}"
+
+LICENSE="|| ( GPL-2-with-font-exception GPL-3-with-font-exception )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+FONT_CONF=(
+	fontconfig/conf.avail/64-01-tlwg-kinnari.conf
+	fontconfig/conf.avail/64-02-tlwg-norasi.conf
+	fontconfig/conf.avail/64-10-tlwg-loma.conf
+	fontconfig/conf.avail/64-11-tlwg-waree.conf
+	fontconfig/conf.avail/64-13-tlwg-garuda.conf
+	fontconfig/conf.avail/64-14-tlwg-umpush.conf
+	fontconfig/conf.avail/64-15-laksaman.conf
+	fontconfig/conf.avail/64-21-tlwg-typo.conf
+	fontconfig/conf.avail/64-22-tlwg-typist.conf
+	fontconfig/conf.avail/64-23-tlwg-mono.conf
+	fontconfig/conf.avail/89-tlwg-garuda-synthetic.conf
+	fontconfig/conf.avail/89-tlwg-kinnari-synthetic.conf
+	fontconfig/conf.avail/89-tlwg-laksaman-synthetic.conf
+	fontconfig/conf.avail/89-tlwg-umpush-synthetic.conf
+)
+FONT_SUFFIX="ttf"
+
+pkg_postinst() {
+	font_pkg_postinst
+	elog "  64-*.conf enable basic support"
+	elog "  89-*-synthetic.conf emulate the Thai font of Windows"
+}
diff --git a/media-fonts/ubuntu-font-family/Manifest b/media-fonts/ubuntu-font-family/Manifest
index 1f39fdce0247..242dda6a1c2a 100644
--- a/media-fonts/ubuntu-font-family/Manifest
+++ b/media-fonts/ubuntu-font-family/Manifest
@@ -1,3 +1,3 @@
 DIST ubuntu-font-family-0.83.zip 2092263 BLAKE2B 996e2cf480eac3e3633bdcbc40766fe22b670152c9a4c462d9af7b1b85a7d0310ff118ad0f9f2670a56718391e684479bb5df74a5f31c2dbf4430dbf9c7cc189 SHA512 d9ab7afc8aab55810de6e403aa02c0118bb35d94844cc14bb07b71daef4c6d63a9c927f0e81a9f97d29904512d94fa0226fbff2341351ac000fc233d2dc55727
-EBUILD ubuntu-font-family-0.83-r1.ebuild 551 BLAKE2B 1a7756e69d0450c77fd5e1a6cb3a6c79e0c2a37b7f071e6afa02e87eeb8a246cb070d7eacba1d5f664e8cca7b6c4415510e3b441912989db3834c5478a41f773 SHA512 c68b90eaeec1a7de9c7b555660eaef7a40781aa6c32912b12cf1837dd5a23b935d01a309128f5348363d7ce556573d42c4619323a123f8b8f7a15c5558d0d476
+EBUILD ubuntu-font-family-0.83-r1.ebuild 537 BLAKE2B 33070434280388b5e16db1a89b773b7fddcae7a4531495702e9210b975f7ea6c528b7acd39c856cccc8cefb85d870041871fbbdaa2ede96e26a9108e51176761 SHA512 901b482e17a1eeed2690086dc16dc563edf645b225af52f6126db5595432b1168b05093c1abaa3b19afd85675e709246c75ae8517f321a12cf7158becc65d19b
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
index 2f40f2335ae0..768b2dd001d6 100644
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
+++ b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit font
 
-DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
-HOMEPAGE="http://font.ubuntu.com/"
+DESCRIPTION="Set of matching libre/open fonts funded by Canonical"
+HOMEPAGE="https://design.ubuntu.com/font/"
 SRC_URI="https://assets.ubuntu.com/v1/fad7939b-${P}.zip -> ${P}.zip"
 
 LICENSE="UbuntuFontLicense-1.0"
@@ -14,14 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
+BDEPEND="app-arch/unzip"
 
 DOCS=( CONTRIBUTING.txt FONTLOG.txt README.txt )
 
+FONT_SUFFIX="ttf"
+
 src_prepare() {
 	default
-	rm "${S}"/Ubuntu-M*.ttf || die
+	rm Ubuntu-M*.ttf || die
 }
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index 3cbc433b5312..855735fbfd69 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1,3 +1,3 @@
-DIST umeplus-fonts-20160402.tar.xz 1763132 BLAKE2B 3e1406085d8dd1f62f69455efd53e0a51281d9a2a7220ef21a588d551fbd9c078110cbbc3e35ddd16cb9d31ee29d418c128b92fb4a5f980be654d57447d60157 SHA512 36a2ab6f2919e3e4ec99662a296f56dc765fc55ca1de3ea7329030312c88cd16c589ef2a945f4b52509d52b029cef749371d3dd4c1aebceb5c0811d5b7313658
-EBUILD umeplus-fonts-20160402.ebuild 458 BLAKE2B 89cb39bbfcbf7723ccc27671d101ee9e8cae22d52f53c7642ed0a00d27a08f88f496c147e02b3b9e2b731232818e1219ecb13aad5b691b71c1f06e7af77fdc46 SHA512 3d5b1f238a504d1a57e7a7ac7dcf1ff14ac86f37fc4f424bbd4184e006d98947a32d2003122563382dfad37e16a7d779aab1cf4e415a56df61d46913ab6075db
-MISC metadata.xml 462 BLAKE2B f35780d07febaa7013c19dca08640407b0dc1594b24698ac4ca18e5f5aa6c4961c4fa9c456d72d36724c5739357bb37664470aefffce89ac640b1d9eb18483a7 SHA512 0e97c1316aeae497618d0dc919febc7ce9c9fbf35dc204179db31be3a62e7746db036f335249a5946562a61acc79086ef401ae2804383ad6d3a5eab0fc35fdb8
+DIST umeplus-fonts-20180604.tar.xz 1768840 BLAKE2B 5b0f2677fca36a59886f389189256c78276fef8a93215090505431aa22df220e0837ee230126d4ccc019c8c252a422406e80413aa38a7a775797a24c4f88cd96 SHA512 eee7ef831c7a6e434a129b37e96f0b41f8adc485200cbfaa1856b21e54f3f3c3e02d77b2954619144eb3b9c28d0d3aedaa66591955a8b98d2024b3cd2fa9692b
+EBUILD umeplus-fonts-20180604.ebuild 446 BLAKE2B c7c427bc0b4b184e362c771d59436160b0f49d68b1dbe4febb7276499836e650403254e2980fceda0e3bfcfbd9f6f9c280e2f0f0dcbe4605f7da7a83fe3859b7 SHA512 cf6f39d8842d15660c0e8d8c4691ddba2f974f4b3318cc6dfc28571f694aa02b20c51cebcedc1c5848ccad2c95e2f0d9db85fb36db3d5ef5de5fe29417dd9e43
+MISC metadata.xml 486 BLAKE2B 218f1fc2b3d7cd266aa30709f55f7071e6b94a2bb34dd7add65befb82718a162ed5720e3426ed3ed122e46ff3b5f6ea280d11dc95328b46a64fc3130fda81fd6 SHA512 f3cc0c50ace9cd4eafe4eb7da9f1a128c10371572a5af4405d74edb9c0627c0b650a45453a183c90d0f08faddfee000809dd7fd7733e43e1c0144912d0af9838
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index 461d81f58ce2..32fec8d24cc6 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -9,6 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">mdk-ut</remote-id>
 		<remote-id type="sourceforge-jp">users</remote-id>
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20160402.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild
index 5f84586f6baa..88183813b21f 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20160402.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit font
 
-DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
-HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
-SRC_URI="mirror://sourceforge.jp/users/10/10368/${P}.tar.xz"
+DESCRIPTION="Modified Ume and M+ fonts for Japanese"
+HOMEPAGE="http://linuxplayers.g1.xrea.com/modified_fonts_01.html"
+SRC_URI="https://free.nchc.org.tw/osdn//users/21/21734/${P}.tar.xz"
 
 LICENSE="mplus-fonts public-domain"
 SLOT="0"
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 366a88289aaf..583f0f37f3d8 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,7 +1,4 @@
-AUX 10.0.06-make.patch 645 BLAKE2B 7aea0a47997233e54f150d4a25f3fb376106378b93e86a68c8623d0c66e3650c6fb4bd4a6c98441f14f2ef176b40bfc23addc4168c78e34797b75b6e17b565cc SHA512 b205457eb2ffe1f4693e82a5597f1a95b95a62744101bd5a73a36060030541a855a62f84fafe255fafaf1e89b7f89c707dace2eccbe7b2746c3059404e7bd38d
 AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf2e8239691af1e5506dbad7eab1f590bf3bbfea45f174af0e8f8fa9d85b11542ea91edc218cdaa08d13b SHA512 f8a286c4ecd9af7ec32f2f90ba0ae91e2f9f4111cb1f65dbc4cef07dff787eae4ee96aca7e15a61d2ae8930f3537dd6fa77393dc720a4fc91300a2c9a5c1d9ea
-DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
 DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
-EBUILD unifont-10.0.06.ebuild 1173 BLAKE2B d7337cdda06f108bdab2ea4073537624fb604de5be3b9184f14d305413c9c21558cd7c105f3e6ff7ee33e83b51414161457d37d4464d9c086d9d1f9ee6177bcc SHA512 7474d5a58330937d9d0dea0efc657da9e5d48d65be4408818ee6ef5f40c264587e33d74030b98ec21c626dbe5447f1caedd76e4a3f8bbf48ea69c48ca0b7cb69
 EBUILD unifont-13.0.01.ebuild 1104 BLAKE2B 2a7d275d8ffa18b1a9615855bcd39bf4bf45236e0d8d01ec5379fbb21d55b980c2a5341d1f1eb40639dc66234c6b1bf0ec06a237b87007e3fc0f42a7a9ad34bc SHA512 a42cc9d4fa7c2ff88003555d6e2e8b19d0e88b3bddfa3f9c3e4f1371c50678dd4135e2f4c4f1b97bc42724f5f4bdc98169b2c766775eaed66af3443bf56b5a41
 MISC metadata.xml 484 BLAKE2B 808f3846b85c4cdc4f92808a932228f64586314b4d918eb9c90cbe67ad2752bcb8a73d5d64de317c883dd2f40c0519a7dbb5e7423338ec0103fe2b9648565b04 SHA512 8a04d2ffc38027f6b91be25cf18b98e7c991ccb7636ecd8a2d1890c38abd83547de65adeb6e41de87305fef834684eb9b921474e51ea1eccde8a77ae86a65519
diff --git a/media-fonts/unifont/files/10.0.06-make.patch b/media-fonts/unifont/files/10.0.06-make.patch
deleted file mode 100644
index cf09b7715b00..000000000000
--- a/media-fonts/unifont/files/10.0.06-make.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c2e07357abc86fc0e7715ef21dc3d279e3002819 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 29 Aug 2017 08:55:26 -0400
-Subject: [PATCH] Another parallel make fix
-
-Bug: https://bugs.gentoo.org/629278
----
- font/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/font/Makefile b/font/Makefile
-index 1cd7ce3..2c85e64 100644
---- a/font/Makefile
-+++ b/font/Makefile
-@@ -236,7 +236,7 @@ psf: bdf
- #
- # Print coverage of scripts in Basic Multilingual Plane in .txt file.
- #
--coverage:
-+coverage: hex
- 	sort $(HEXDIR)/*.hex | \
- 		$(BINDIR)/unicoverage > $(COMPILED_DIR)/coverage.txt
- 
--- 
-2.14.1
-
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
deleted file mode 100644
index 6c00044c786c..000000000000
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/10.0.06-make.patch
-)
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake  "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" COMPRESS=0 install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/urwvn-fonts/Manifest b/media-fonts/urwvn-fonts/Manifest
index f3d4f5483bf4..896c958d4fe6 100644
--- a/media-fonts/urwvn-fonts/Manifest
+++ b/media-fonts/urwvn-fonts/Manifest
@@ -1,4 +1,4 @@
 AUX 65-urwvn.conf 459 BLAKE2B ffa20a6891914076ae5f6a118d77890cf6b9bc5b8e9f590185e3be5246ae541a852a06dceece8f74bf003fb85c708d0d05e53fa59098d5cad4e4363858c6b460 SHA512 a0a676f600fae81ccc0909a2d1ba2c45cad77039be3bf367fe9213dd0bee6decd02637e83079ec4c03957b93e62b01c8c62d22456a55f26cd9b0d9d53fac3a0c
 DIST urwvn-3.05-ttf.tar.bz2 1322045 BLAKE2B 119b6ee2933db37f2c3fa24a9663db28bc9d43e755af28a48269359533061a423d01263c2194bdd4676fc9d4f909c32d3283d6330202d72eaf222c9d5cc6cbc3 SHA512 529f59fb0088a266bc6c71077b5f5f7d2282b544d375578f5680bc1cf5b52ac1942513d6aeb7faf26f93d08772489d630ebcbac90c646e01cb4a18c61ea5f392
-EBUILD urwvn-fonts-3.05.ebuild 939 BLAKE2B 238bf74676a47737d7f02bcca466aae950f5a8d7d5b4c5a66ffe3c8dda82fd4340f5bba8eb9b92deb4ed55e9256c35fe4f46bb99b03fcf0687d3e5bca8691363 SHA512 b177967d28293a3ae636247beaa89487d4ead7f947e1d4d9dbd9fdfe90895a9c12b9ff5de34acce9e868c607c93182839649bee58382d8fcf69f559d8883114b
+EBUILD urwvn-fonts-3.05.ebuild 910 BLAKE2B 771825560c37d986d470c3520bdd8bb3e1b064dbab418d91dc5b9d362473850f7dc3b61fcc926062df896e330894db1898c32a9a2e3acad4ce104514ff864974 SHA512 bfd9e7b5b1e9485e36233bba9e8785c546331e3994877a55d409a27894f4782d176856c4353e574519c65a7e55f17a7f069119f2708c5b4d9f61be4bd5db79b4
 MISC metadata.xml 323 BLAKE2B de0cfae6caaca4927175c57b300a199c2956d285120f80cc7d3f5f896466bcfd813086ea6ee5daad94c65b510d09bc979ffcd2ee0581a437a82dd86831214c48 SHA512 5555d035d07fa20f19f5c793fe4e92961f24b334d501ce8eb5fc3bc0cf46b118583ae920fe4598b110c4a498571e58aa003b859648322b43cdb3f33ee5d95d45
diff --git a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
index 4dd03c3cde5f..2eb40386ed5c 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+MY_P=${P/-fonts/}
 inherit font
 
-MY_P=${P/_/-}
-MY_P=${MY_P/-fonts/}
-DESCRIPTION="fonts gpl'd by Han The Thanh, based on URW++ fonts with Vietnamese glyphs added"
+DESCRIPTION="Vietnamese version of the standard PostScript fonts from URW++"
 # Check updates on:
-# http://vntex.sf.net/fonts/urwvn-ttf/download
+# http://vntex.sourceforge.net/fonts/urwvn-ttf/download/
 # https://sourceforge.net/projects/vntex/files
-HOMEPAGE="http://vntex.sf.net"
+HOMEPAGE="http://vntex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
+S="${WORKDIR}/${MY_P}-ttf"
 
-LICENSE="GPL-2 Aladdin" # see bug #434262
+LICENSE="GPL-2 Aladdin" # bug #434262
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}-ttf"
-FONT_SUFFIX="ttf"
-FONT_S=${S}
 FONT_CONF=( "${FILESDIR}/65-urwvn.conf" )
+FONT_SUFFIX="ttf"
 
 pkg_postinst() {
 	font_pkg_postinst
diff --git a/media-fonts/viga/Manifest b/media-fonts/viga/Manifest
index bb46fca32467..37385f64be2a 100644
--- a/media-fonts/viga/Manifest
+++ b/media-fonts/viga/Manifest
@@ -1,3 +1,3 @@
 DIST viga-1.tar.xz 18584 BLAKE2B 25ba19e324ab3d39ebb376e4511a61df46307281c09241eb30f3c6a2399c0ed0e459848e5cb76ecd2a00336d57e3793f7412e075aa5cb6c99428587b01430502 SHA512 cff4b5e1dd8035238b5a83878789ebfb490f61ffdd0c20d752b25985346de2c4ba88747ba11a196ead03460ee8b70fbbb68154f7415a63e82a2bf16847947dc6
-EBUILD viga-1.ebuild 407 BLAKE2B 5d92a896ca7b9ce85fa3b6e92ff93827dd43f07fd98c6ac16d5549337539ddf64a8e0ff0602664ad41cad58a97289096fc9c044618e87d253096a90598090692 SHA512 1f97f72bb382baa44de06d683405c6d309fb04fd3de36615de443f26623ece5f8701a860df1d62c1deed2d8f99d5f8218d8d723ad40ba7ba2f835282a10ea1c8
+EBUILD viga-1.ebuild 403 BLAKE2B 63cd97869461982809619d482684f4fc3a24534695f828635bef35d24bab2fbaed48b8b5f65010387ca567ce26d9582aa7b2a8ef9cf9b788cea5909c4509f20f SHA512 efb5b33279674ea0da9d1418c908bad03b69ca331da5d9d8b1646f546190c4e182fd22d97a0e36c8478ae5e178a6958f5e4a299190b45610efee23c952af2312
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/viga/viga-1.ebuild b/media-fonts/viga/viga-1.ebuild
index 696e7090cfea..308ca98fb1d1 100644
--- a/media-fonts/viga/viga-1.ebuild
+++ b/media-fonts/viga/viga-1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
-DESCRIPTION="A sans-serif font with great personality and good on-screen performance"
+DESCRIPTION="Sans-serif font with great personality and good on-screen performance"
 HOMEPAGE="https://www.fontsquirrel.com/fonts/viga"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
diff --git a/media-fonts/wqy-microhei/Manifest b/media-fonts/wqy-microhei/Manifest
index 4226a027c87c..6a3f207d76ab 100644
--- a/media-fonts/wqy-microhei/Manifest
+++ b/media-fonts/wqy-microhei/Manifest
@@ -1,4 +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 743 BLAKE2B fe6ef6b345f3678aded7a574b0f188d258a50a7b995f073d23a46545b12b2efd68003c8bcdb7966042ab2f5cf81b4da76ce9817f29fe674019dcee5a79566858 SHA512 1f07027b100a0758488791468f66cce1100ffd4af2f71d60e98187b629c8d851e25a776dcfbed16b0f653bd9e3d36fa7b7a3f40307f8f57e079df1669d5b9222
+EBUILD wqy-microhei-0.2.0_beta-r1.ebuild 742 BLAKE2B 375cbc9ae6e20c4d4e5b49f3504bcc0cf761a3f036ddde38bdb09301f2352011eed65a21064f37e988996265607ba4b99a54f61d5c41292850c8d1929abebd87 SHA512 d957fa57ab65228b766a30e60534d56c1fbcbfc7b61ab4a072a85fcf561aa2ef9145b4de7429c14495802a35ef008da8eacd6be73ca1aba5cb073facaa4804a3
 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 c2325ed0d0f5..a19277df8091 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,14 +1,15 @@
-# Copyright 2009-2020 Gentoo Authors
+# Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 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
+DESCRIPTION="Droid derived Sans-Serif style CJK font"
+HOMEPAGE="http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/"
+SRC_URI="mirror://sourceforge/wqy/${P/_/-}.tar.gz
 	https://dev.gentoo.org/~dlan/distfiles/${PN}.ttc.xd3"
+S="${WORKDIR}/${PN}"
 
 LICENSE="Apache-2.0 GPL-3"
 SLOT="0"
@@ -18,15 +19,14 @@ IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
+DOCS=( AUTHORS.txt ChangeLog.txt README.txt )
 
 FONT_SUFFIX="ttc"
-DOCS="AUTHORS.txt ChangeLog.txt README.txt"
 
-DEPEND="${DEPEND}
-	dev-util/xdelta:3"
+BDEPEND="dev-util/xdelta:3"
 
 src_prepare() {
-	xdelta3 -f -d -s "${S}"/wqy-microhei.ttc "${DISTDIR}"/wqy-microhei.ttc.xd3 "${S}"/wqy-microhei.ttc || die
+	xdelta3 -f -d -s wqy-microhei.ttc "${DISTDIR}"/wqy-microhei.ttc.xd3 \
+		wqy-microhei.ttc || die
+	default
 }
diff --git a/media-fonts/wqy-unibit/Manifest b/media-fonts/wqy-unibit/Manifest
index e3d0f379dbcf..398251e9d431 100644
--- a/media-fonts/wqy-unibit/Manifest
+++ b/media-fonts/wqy-unibit/Manifest
@@ -1,3 +1,3 @@
 DIST wqy-unibit-bdf-1.1.0-1.tar.gz 1168200 BLAKE2B 65d992525c1bac6f74983037a650729cb050322f150695af819d7ab8b57daec1a112ede8ff7054f9be5397a7fc823f65c89bd2f3eae624386a9c41bfb9a0594b SHA512 c16a8aa57fb5c55902373306b62514b2ec3bb9c5cd8494d5ecdb46f0407fd9fa72806c71bce28a27a7e64716b78862e8c2a9051a5652077b59e24693b1a30a03
-EBUILD wqy-unibit-1.1.0_p1-r1.ebuild 700 BLAKE2B 284f85126f135d9e759f7a70b58447c8bc0bcd2a9d523af523a1a0452cc25cfaad7ff1c08fba557fa696b3c183d0f5e989715f9309830210bfc308b3d20a8cd9 SHA512 de82738828a64cc2fbaf298de618f7732c5bde060ac42806bda435615aa6cb9825b288f3612f282a615f0252c3266838cb37799b72ec4a8de6498e0839dd3e9e
+EBUILD wqy-unibit-1.1.0_p1-r1.ebuild 691 BLAKE2B 7b1335183a8c9114906957075248602ca56d86f2f179e47737801e3727c522ff955cf07fe5071dfda42c8c20ff8365db3d5e9ff2afbc1c00102692a22b199f24 SHA512 1aef407e75c1faf35b623e778da7fa5f2cc63f33a8af86aedb83663b20f9ad25b6e8752c02fc5f1db17b5f9e8b24080968b8e8e269393b7d0201641bdf66d12e
 MISC metadata.xml 406 BLAKE2B da1b9d0858f2b8e72fd613faeee0c6e99c9f94d657fa54b910f5a90d146142208b582cf3b36cf09df9265a8c8880a6e1a2198540eb1cc2b4247a8d188c6ac9f4 SHA512 c3684a8c9b57db6be381f41d86af7f97ba57b480ecb048fc01aa948cad01db6fb0b2f64ca53258595f9c115e4b804d7aadbf57254ea85359cf36b9688c9c3869
diff --git a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
index f99e97246832..1fbd789e583f 100644
--- a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
+++ b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
+
 inherit font
 
-MY_P="${PN}-bdf-${PV/_p/-}"
 DESCRIPTION="WenQuanYi Unibit CJK font"
-HOMEPAGE="http://wenq.org/enindex.cgi"
-SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz"
+HOMEPAGE="http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/"
+SRC_URI="mirror://sourceforge/wqy/${PN}-bdf-${PV/_p/-}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND="media-gfx/ebdftopcf
-	sys-apps/sed"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="pcf.gz"
-DOCS="AUTHORS ChangeLog README"
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
+BDEPEND="media-gfx/ebdftopcf"
+
+DOCS=( AUTHORS ChangeLog README )
+
+FONT_SUFFIX="pcf.gz"
+
 src_prepare() {
-	sed -i -e "s|$range=shift(ARGV);|$range=shift(@ARGV);|g"  \
-		bdfmerge.pl || die
+	default
+	sed -i -e "s|$range=shift(ARGV);|$range=shift(@ARGV);|g" bdfmerge.pl || die
 }
 
 src_compile() {
diff --git a/media-fonts/wqy-zenhei/Manifest b/media-fonts/wqy-zenhei/Manifest
index cedac973960e..dcc8551aa42e 100644
--- a/media-fonts/wqy-zenhei/Manifest
+++ b/media-fonts/wqy-zenhei/Manifest
@@ -1,4 +1,4 @@
-AUX 44-wqy-zenhei.conf.patch 1909 BLAKE2B a0d5ca675dfa8760c9bf0bac535958fb1fcd8e160d613931c75f75b687079d1969b886d87a47e2ed48e095e9558784b3fb65e59b86e54663ba75bf248f828b4e SHA512 dd1583dc436a2f5f05aa915d76fb2ce13dd09fbe4822df9890e890e4e084699a1c371fe491b612b087a89eb9326d6647966952c736296b84f4e11ad9c71c7839
+AUX 44-wqy-zenhei.conf.patch 1837 BLAKE2B ff744221a614846e63ea3fa5caac11047c8bd9ead2bb46f9d048e69ac26661cd954811eefbc1eaccad8165177915cc34b3ef55869ef5c18c8817d8c892c0dce8 SHA512 0f5bb12f782836b20423515792c14ca9a354b411e33d6c8fd390d0cfc983a734e5426e47d0b0cf063aaba3a92f9b3b48b4bf4498d23662012aa9077b43293c4e
 DIST wqy-zenhei-0.9.46-May.tar.bz2 8665887 BLAKE2B 5cbbaccb155f337dc9187c0c4a8f8f0d2d1c452ab960df7797ecc2b339d5c9f23747e9935db3d190c5eccbc8739888c86c4a7e0a01c7e33b76256dd92c301836 SHA512 ff41473fc9bd69c04cc509d1f8915d5bcf99d175ed9dfd2f9627fd56f6a4e7720e4930d35313d1e89f090b229f2e3f461c948046257fadee192dd618471f7833
-EBUILD wqy-zenhei-0.9.46.ebuild 1178 BLAKE2B b7fa9f705fd0e2bb344781f5168c6c5fc8f531f78418ce575a16d15b428a21f42eec3b8aa1dc167af8fe5de99effd336ce0cd81d84377bc8fe0c3d1cecce1b91 SHA512 26f62c72427177db9ec18abffbf4e9cf6f75e13f098eb9246c114935d874dc92d8dd74def5cde6a7998d706da5f49a09869e896e374d2c84484400ca30a9bb0f
+EBUILD wqy-zenhei-0.9.46.ebuild 1152 BLAKE2B e17eb88510b4488a7b7fe38e72209f41eea3e0decf1c6a9020c56f78c15c6f3ec1e8c94f4dc3affbbcffb2730806338bd1c9f770f78854e49f793a6f9e9f8b8d SHA512 f3fba22baffe4d1b684fc18b996102e12aa378d37e832c790b260df0486d7938c93724e87298b83c8977c7c598bf0ad47e320f104a04fcb6c6caaa1b4877e875
 MISC metadata.xml 311 BLAKE2B 7225a227c3d32a5ac754531f23c069679433f7f04ff2f3ec3bc0352007324deac71c6e3ad1e602320a2f582868e33b903d9f36cb55e985f5cb4869b825fffd00 SHA512 cbe957ce61a145cb171670724027e56e801021deee49eefa2675f199b5a50add88eafe5547b01959bf55b22df4579ff62a1e603cbd24e1ebdfacfd0ce463083d
diff --git a/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
index 6c90475d9e4f..0c77fa737990 100644
--- a/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
+++ b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
@@ -1,5 +1,5 @@
---- 44-wqy-zenhei.conf.old	2014-02-14 00:41:31.277115976 +0100
-+++ 44-wqy-zenhei.conf	2014-02-14 00:43:18.985123207 +0100
+--- a/44-wqy-zenhei.conf
++++ b/44-wqy-zenhei.conf
 @@ -4,9 +4,35 @@
  <fontconfig>
    <!-- modified by Madsen@SMTH -->
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
index 3c6b62a97aa8..956649284083 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
@@ -1,29 +1,29 @@
-# Copyright 2007-2020 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DISABLE_AUTOFORMATTING=true
-inherit font readme.gentoo
+inherit font readme.gentoo-r1
 
 DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font"
 HOMEPAGE="http://wenq.org/wqy2/index.cgi?ZenHei"
 SRC_URI="mirror://sourceforge/project/wqy/${PN}-snapshot/${PV}-May/${P}-May.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2-with-font-exception"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttc"
+# Only installs fonts
+RESTRICT="binchecks strip test"
+
 FONT_CONF=(
 	43-wqy-zenhei-sharp.conf
 	44-wqy-zenhei.conf
 )
-
-# Only installs fonts
-RESTRICT="binchecks strip test"
+FONT_SUFFIX="ttc"
 
 DOC_CONTENTS="This font installs two fontconfig configuration files.
 
@@ -33,9 +33,7 @@ To activate preferred rendering, run:
 To make the font only use embedded bitmap fonts when available, run:
 	eselect fontconfig enable 43-wqy-zenhei-sharp.conf"
 
-src_prepare() {
-	epatch "${FILESDIR}/44-wqy-zenhei.conf.patch"
-}
+PATCHES=( "${FILESDIR}/44-wqy-zenhei.conf.patch" )
 
 src_compile() {
 	:
@@ -49,5 +47,5 @@ src_install() {
 pkg_postinst() {
 	unset FONT_CONF # override default message
 	font_pkg_postinst
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index c134e63d4441..9c5618515b48 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,5 +1,5 @@
 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-r3.ebuild 665 BLAKE2B fe9a6d8de5f17eea74700bc9e0310a0cd3e2da43873300659a381888a5b99c3765135ff34a27d9a02db05f6edc73420b0f25988d575f154cf5415a991f5f41e1 SHA512 7d1c644460da8ebfd9c76a811ba033187267ffbde8a5047009da5060eda015ec975eed2cfbe3f4e063eee96129f835a666374ebde7e16fe4552f0433c4c4df19
-EBUILD x11fonts-jmk-3.0-r4.ebuild 722 BLAKE2B 8e52f4a7285b02b351f5d43605a4f83fc1ff22ec2ef76dc67fb2b40b575ef6bb142c0f0c055495660cd1218dcd563b81fe5ae6e8187dfef317e027717deb5a60 SHA512 ea062253c89094783ffc341e2539ab7ca283fdb3d2b753b131d957386813ba4971cadb9da19a12bdff4558305d08ea9227b729300968527b79c5ab9ed46ccf34
+EBUILD x11fonts-jmk-3.0-r4.ebuild 717 BLAKE2B bd210051dbb25da2b576b9215dbbb0dad63f7aa362f80019ac1fbc66d32e1078a9e8a886825422f576409a4c2be7c0ad817a66e2d081a1770da6c27608b7aa51 SHA512 301ea0d64a55edc38a66fea7e8cf3f4aa54ff5b74eafbeeb333b4987b0ba20b48376689287a539d22da6b8bd89a8741ce44cda8d5c731321d049f40951426207
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index 4f59cf47a978..8c31d829c7ae 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86"
 
 BDEPEND="
 	x11-misc/imake
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
commit	8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree	4d26462d027b14926335894749d2e01d982234d0 /media-fonts
parent	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)