gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-fonts
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
231 files changed, 684 insertions, 527 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index feab4dbd9734..b7600de9e73c 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/aquafont/Manifest b/media-fonts/aquafont/Manifest
index 67d9e55a6810..1b63f3fef3bf 100644
--- a/media-fonts/aquafont/Manifest
+++ b/media-fonts/aquafont/Manifest
@@ -1,4 +1,4 @@
 AUX 60-aquafont.conf 208 BLAKE2B dc83a5958894e5b6db17e8f669cd9d3fde1dccc7c3eb105ec71410eb12e324f01615b30ef858ac5b5095ae989246846b24617f41c430196e65f705b7d409713d SHA512 4384cd9abcd684725336c4d2e867069d4b6602920493e6fc56fcdc13f00201a92338a8a558daf797c639b3a157c448e54fbc21f805ee0ad9ee1cb5cab5c2799f
 DIST aqua2_7.zip 2935520 BLAKE2B 019f2be39c7e2817bde0e2f14c8eb9d313a215548d4b1ff535131956d42332c963bddd7c31f79e600bc34c40d41559e897b43dde677a2489add7b65ff347546f SHA512 e49a96164584ba30681e0cd234a4164a4ee4fc10e430993a46786796cc8c123782a7126285cc6adc7e15b48c4a85b88fbf2de7b67540005c0dc012e1601b5323
-EBUILD aquafont-2.7-r4.ebuild 852 BLAKE2B e8ca14bf6a62821b9f00c4389839395ab0e5f37c92be3adc192751273a4d8ab044d8f6e2aa9fe6e9850686e6928989a12c2c14b966b15d39da85204d44267454 SHA512 5bd08c623daadf8daf13b957be16e667f567d44fa22df0ccd18010f423f1dab39515cb89305df52ff7152c7b18802cdef2ab405511d9395d3892489dc15ec640
+EBUILD aquafont-2.7-r4.ebuild 853 BLAKE2B c72606780187b4c30b1974b9297679a6a09eed41fd3174d342be26d958792d683ce21ecfff8295988df6a0ceb456f828246f06624c8eec3f3b5576d8ca372c0a SHA512 c80a044e147fe6a2d8b01c99a2ebb5e56776de4d80c8ff576e56d9bb4b3b7de3cc6848ac5f31d3941582e5dbe38b4d144a6622f07d79d3a3611a5fb8645aeed5
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index cc2a5116ca42..1f85f7b6a174 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.geocities.jp/teardrops_in_aquablue/fnt/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest
index 5d0773218603..4b15f52671e9 100644
--- a/media-fonts/aquapfont/Manifest
+++ b/media-fonts/aquapfont/Manifest
@@ -1,4 +1,4 @@
 AUX 60-aquapfont.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2
 DIST aquap2_6.zip 2896324 BLAKE2B 4bd7e699c71758117b42538360901b252006af2619ece3294662a49724810c2f0e900ab4529bdf6bff774c9421de1dbe57fc82e91cbfad35615a3b3b271ac086 SHA512 5a46fe428eb81739cd9eda0570350a1a892fb7dd6f4e136f4f1d585837a668ac63d816bfa0f956ac24d945b20e16e7b72274cbf1d21e9f93ca057eee72b6af88
-EBUILD aquapfont-2.6-r2.ebuild 811 BLAKE2B f5531097e976b1c24334c2382fad0aa7d23ba6db69081f1b386dda189201abae3aaefa4c50678e421d0164242b66cdb54e1b40aed50106e621e33bb567470996 SHA512 8bb4e67cd4a3cae0d16a8c6bee6538413e9578a05326d0d5b61f61e8819160deb3193d4b8e7793e620517e0a64b90fb53bfdfb0d947eeff09e63f18b89b7fb5c
+EBUILD aquapfont-2.6-r2.ebuild 812 BLAKE2B 4194e8e3e03ddab0883bf1a53dfa0607699a787dd0a12315128a006807be525ab458769f276324957817cdfed9ac555fb8ed2b22f84c2ec98579571cecd55d5d SHA512 b0b4b293c4a5567627fb647c543a17cd305f16953143eb43a7ca4dd265158a4f5c8fdbac3d0a8ef9d105bfc2f722f5069ceae362ea18bd1c1df36d0c19f3680c
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index a03a0952e0a4..c4f6b055f116 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/arabeyes-fonts/Manifest b/media-fonts/arabeyes-fonts/Manifest
index 1b4936310fcd..3509c74462c2 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 562 BLAKE2B cd67c8f8fdc03c0dfbd22e923406a1dd24a08ab70b7ded9162fbbe60066b69b230d23b9f4be4f93bec0ac645e087651115bbf901c26a03ff984acb48b512f5e8 SHA512 fa6ef5c099496fff4b0dc334eb1dc9897ca263b64fd5c76422cdf953ec75ddcdbaa0fc2b52208b64c98ec3276a52c1c5bfc0e9464b0212ef669f6338b0c8b1f7
+EBUILD arabeyes-fonts-2.0-r1.ebuild 563 BLAKE2B d1ad88532eee18c50170f2476642437fbbbf812b6519d0c66114cbf757267b1e452ce8bd4efe2fe09d152ad6b7031612b2b830051fca58801277ee48360cd741 SHA512 eb2f96fb89f2bde68141f5d0c3a90bde65e9c17fd471adebeba7744a195be456748258583c1a6cbd99887c007947c62de3ed15354e3de306d3024d50a5d1e08a
 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 bf87ffb9f679..5791ca8f0dae 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~s390 sparc x86"
 
 DOCS=( README ChangeLog )
 
diff --git a/media-fonts/arkpandora/Manifest b/media-fonts/arkpandora/Manifest
index 1e6e2455b1aa..cd721631d832 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 529 BLAKE2B 19cd0971f94e3f899f7f1e7357f248276de8cfcbc7e1ca7f8f0601b170a6ead2cceeea02a1e24559799228ebd693ae7cfe4782ba8a3a725f4f2974fd7a0c4d7a SHA512 d97b8817d5acfabd3c2e91af5d10d8bb4c4ba8fdb6262b43b0b47750766b9817d851ba8c8e1d63ae07767bda168b19248cb316b777e3899fcd03a4315a577b7a
+EBUILD arkpandora-2.04.ebuild 530 BLAKE2B 3001560f0629800034d106497b479e1bf8c46fb159fec69b5503873c1f01278fe16283764a6d1f665d73595d4b9da3a873c1c99c0dcf811511fa73cf5fa1038f SHA512 d9387c90cbd3ca514a18d6bd01be6b6ee2d2810c18657bb50cdb954b88d607f68eef4e4e359c640cc00b6e468c9a73933e62f789e6961ef78b1b084b807af614
 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 9d3057e647b8..b8405ba6368d 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BitstreamVera"
 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=""
 
 DOCS=( CHANGELOG.TXT local.conf.arkpandora )
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 4cab80ec4c56..90f1306d96f4 100644
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@@ -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 2095 BLAKE2B 91f42b854d3e6bb0af144b0748c747e30cefb52153ae189b9cbbc2c6d2a2f899539bb5a53dfe2a89429f70c261063405d0438a28c06f4c2f44d84dfb7250d82f SHA512 dfee12d564ba2576153cd92f7e84f6a35838f37bdfd56c32d3ec5274883385dbf27b3d327fbdd39d0dba294049458f9d485ececc9feccb2ef0ac92f62e0ce63b
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2096 BLAKE2B 471c9564dad805661d727d7dc8e96be7c73fd0fbf9c4c17f4c7baa013ab800a0409d70c89ca73cec443578abcc834c725f1559673b12ba3e421e7d332a8e81af SHA512 5a87e8cbcd0575dde249f93acb6af0f36fb8a7ee8b97bcd9d951f56b8c64959474025d0b7e88106f54c0cd8cbf26a98d8b1bc24c58aad40b0b5bbb6c9828cbfb
 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 bd3155d8c0f8..80e59d5e619e 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # No binaries, only fonts
diff --git a/media-fonts/artwiz-aleczapka-en/Manifest b/media-fonts/artwiz-aleczapka-en/Manifest
index 361cf60586ec..cee5bc008c91 100644
--- a/media-fonts/artwiz-aleczapka-en/Manifest
+++ b/media-fonts/artwiz-aleczapka-en/Manifest
@@ -1,3 +1,3 @@
 DIST artwiz-aleczapka-en-1.3.tar.bz2 36849 BLAKE2B e40d7761d2f47cddd364926619722859f1bb2e494b737f9f4853655f08ad6ae20c7c2719772088d977b5a33b8abd6308e57838cda9def7b789c0bfe77135059d SHA512 18f315314f6a03bc94920d7e83958d15ea4d80ab84911317bcec75486f46d07edafda2c58c82fd98b5350e939680d73b9c323843f7eebffdb4d2bbebc311400b
-EBUILD artwiz-aleczapka-en-1.3.ebuild 470 BLAKE2B db2e5099cf9f66d2f1c63001c85d5681d97a9f3d6142c9142b67e67dc27f0c451064094ee7bdf425ea989a8cfe1c3c2803d654d9a9e9f84e866ec5cd318bead8 SHA512 519ba638408a9979918c4fc113363d0455c199e4a45dab8577961ba695448008a78e7276ba67a0be2c066ebf569cd10e5983ec856a94841d6f23b71adbd6dbf9
+EBUILD artwiz-aleczapka-en-1.3.ebuild 471 BLAKE2B fdaaee271ddf64c5db3f1b304c2b4e31f6e483812c22f5c7ee11af5401a8b0636d1b2cd083433c98212c199e5fc3fdaaca26ec4f81e786a010db2110b1863703 SHA512 4c5ba50203cbf5a87a87796118cb2bcfcb42a2aa831cef01403faabc587d8b4e3a1e882c75b7863ea9e6b75cc349e0cacf56d1c44dc3aac789c4cf63fec3164a
 MISC metadata.xml 323 BLAKE2B fceebb758ba933febb56c9a486b5f8867f2cc62831f8d36085d93d48244dbc6f24c294bc178b3482bf1048ccb8ed7f2bb630f62f7e91c9f2d428eadddc4f1afe SHA512 7a1221c23022627670c5d4a68782e94bed6db7634f9728593e6570513e2517e7c1a005993117c4109dfe5f6773e8ba27bcf03aaa51cfda4f4ad8e8a2fd83be99
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index dbf0cfa2b15d..20fa21bab7a7 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwizaleczapka/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DOCS="AUTHORS BUGS ChangeLog NEWS README VERSION"
 FONT_SUFFIX="pcf"
diff --git a/media-fonts/artwiz-latin1/Manifest b/media-fonts/artwiz-latin1/Manifest
index 5214b6f25002..eefe22de6e08 100644
--- a/media-fonts/artwiz-latin1/Manifest
+++ b/media-fonts/artwiz-latin1/Manifest
@@ -1,3 +1,3 @@
 DIST artwiz-latin1-1.1.tgz 113305 BLAKE2B 42d800a3c37018d7cde8ecb2324f44932556c5ecdcbd6a9c72597605b2eb1f81bf10960107b2c43b61e444ad3bcd6b9fb0db9fca099c1c98080d95b2ff99578a SHA512 d22b808c22b0bcd029bc58577833092dc6b9f6d7b8459da2b0128bcc293c64a4466a146879034e0e4ac7ca756e6c4808c04b0224d328186c54604df15ac37854
-EBUILD artwiz-latin1-1.1.ebuild 500 BLAKE2B 1e53adca239ea8a2414410883bea1e9ebb60f65b091ca21c17ff154a09fdfb346d39507c6201143755115ec68194851ce4ee2f952312c03431342bf2140eb9ac SHA512 4667e0f9f043e255c52e1c46be6114c98587b037e0ebde97847ec28b5359d409e90150a58f0b3f4b88ebf072b7cd9ef5ec9372bbd0de14fdab6608e1d06f76b1
+EBUILD artwiz-latin1-1.1.ebuild 501 BLAKE2B 3bb2b3f34aa44a2c6503d91a0cb2c642e8bd6f58b6d73e900b1d337d2086dc9beaa01bb4ca95cf4de499b735af40da6d340cecc29129c0523b8eaee456571774 SHA512 2bfe8e68a4f6a68e981b7368cc762e06be18b608d39f3b3f7f0a73593a7ccf1b6c2b8e9fc7effa3343b5c4948fcfed2781f9b876e1687882fd5a5f035913079a
 MISC metadata.xml 321 BLAKE2B c39514558163939dd4adb8ba211ddccdf166ab0875045d6b0d19293cffaaa6810f09507a31c80486d817cff00742100d347557a4f5e57b64d824b6c736ee2a4c SHA512 df55e6389e5c7fe621c1d0706ca612b257e8283306133054187b4daefb63290fc25c321db080f3b3587110ab5ffd45bb2ad5606d9ee935e554efa440e6b1ffb4
diff --git a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
index 59351d420aff..e5bcdf2df8be 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwiz-latin1/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-fonts/baekmuk-fonts/Manifest b/media-fonts/baekmuk-fonts/Manifest
index 27bd27f34446..291c0374c130 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 6e5f6dd05fc3d6df0f295936dbea38508b2c524fa2e7d10809143057b57f911acda418e5a0f8d91ef8785cb10596b902120239cbe98b1efc40be42480a123353 SHA512 ed427bc2a8b5dc351aa698da70ce949b5dc4cd266a367c5f29bf8218854fca4d0526ab27cee04a59a63a5d10961adb112f57cfc0f0a6cae315f7fb82390e1b59
+EBUILD baekmuk-fonts-2.2-r2.ebuild 1043 BLAKE2B 90d0bec1f99379119f2c62878c5c3cf20ad10205d46ce25dc714b3323f4449000e858776652f0f157559c64e41e0bcfbc405f09e8eb4dbe2ad8f7902ffdc1a95 SHA512 f7dc7ec60c344a8476cc51ad91531a672beab3c9b2d0dc27c3d6eba7de4b5d6aa2da3f2a797cf9161e49d4d2bec76e6e767fba054e20e34c6ac437b90fda6952
 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 93d343aa01f0..ff3f555b193e 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 714e000cfe50..2a94a0505264 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,3 @@
-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.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
-EBUILD cantarell-0.301.ebuild 1058 BLAKE2B a14f99b30ac0902cb6397d5786a145efdfb344e4b3230bea0aacc8a0dfeb7aa8efe4ca1567ff34c7d46455daf0570ed5b62f84ef37a6661a6e742caa4ab15548 SHA512 3a9852e32bfcbebb4cf3614024b1f6bc2a7297d305ae73bea18bff428988c95d4d5344b8077ed3c3b9bb199d2731157839e994a55d0df20d8787b2fdc67357ff
+EBUILD cantarell-0.301.ebuild 1053 BLAKE2B 1d112bfdc81b4bec330dc446227966ecb1193b2f133b2a5d49da6b070a04c6d88d65eb1202992366686a52051fe6c4999606d3d3e53f583ca67539c4da3ad26c SHA512 08d49850b8d2bc09ac227c6371dc6cfbc63cb37fc819b24c4b8ddfe4e8eb7c2efc804f366bdda03027fea4294071100b3e574cc4b6968b8f9c03febc5e96b97e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
deleted file mode 100644
index ff27a99bd655..000000000000
--- a/media-fonts/cantarell/cantarell-0.201.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="
-	>=sys-devel/gettext-0.20
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-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() {
-	font_src_install
-	local DOCS=( NEWS README.md )
-	meson_src_install
-}
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
index 1f8f9dfcb3d9..6b6e1bf355be 100644
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ b/media-fonts/cantarell/cantarell-0.301.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-fonts/cheapskatefonts/Manifest b/media-fonts/cheapskatefonts/Manifest
index 31faaf365773..e983efd8d12d 100644
--- a/media-fonts/cheapskatefonts/Manifest
+++ b/media-fonts/cheapskatefonts/Manifest
@@ -10,5 +10,5 @@ DIST Wargames.zip 32386 BLAKE2B 81019bfe0b1a9b04d1b87bcffb70efc12a3157ab43c3a656
 DIST Winks.zip 19003 BLAKE2B fa913fa32a4942b0af0624b071c9b06d00b4dd8b4c7142e40e0553931799d4dff0bd8a6ffa7eb24e2f9d852002498dd46c436d40cad70b7da8ce385d212029be SHA512 c2e4eac1f7c6bd8f94be5f925b6ccd31c352b3a83b63bb4a7730545eab4eb198b7b9d5f3c84653a0e9cec5cc847d10b905f009d002988f0d58ede46d21affe8d
 DIST balker.zip 20872 BLAKE2B 167b7bce0af3d72909e9cd18e442faaa92faed38e51014417c076c77a112537fa470dc2f582cf25586334911dd70af94883f893b7f882f64389d07c95fc4e37a SHA512 8368e3e57f94fc8b15a8b5460b638cb3c8aa8622fabe0d1e31bc85b166784c7118e7a580f6e3a5f1daf7cf7ef9b3999d16f955c40a96c876de4f822203b22953
 DIST flatline.zip 31411 BLAKE2B da6031cad411157a9e7762fd41cf82b4ae78ef5cdd41a23dce92f1f6ef174b865e9af2ef9768fd6a1bb663e0baf982aeda515d93797eae6abb6485d4d3c51ebc SHA512 460360f3d6d5fb4c19d246842d97ff220a353ba63b1e773ab949e0b2753b199f5e34522f7e98b2715b72a0b2fba7811299940cccad5d8e39fb0d2d16345d71fa
-EBUILD cheapskatefonts-1.0.ebuild 947 BLAKE2B c5a3545aa25227982b8e16b745cee9df38ab1aab9e4b22f543f59c9db6ef68bf93b5751db607d8e5e27ada0425d2397afc9a1cee0177d4dd7c5d6ba0984cd438 SHA512 11aaae5aaaa6a1b571ee93c955bb53413ad689cb6abb91c521b251efacba42204aff22dfa4ed14829dc46539d35276ab9a5c8127b11451f5cbdd76c8c1247126
+EBUILD cheapskatefonts-1.0.ebuild 948 BLAKE2B eb6dbd04bf6ee8c9f81717a80dcdadef5c8189a51f30f16ed4e5310cc76f90bd885ae994d7f1f4f3d43ce6864e88d05181b20d056765a6b2d8d2a50010c4d843 SHA512 0a1422f28c28e2e1b7270d46cea99efa835d9bf8c4b359ef7a1a80f0d39493da92e6e95f401753ef650e0e8d3b86c563bf56d5266aaa706308ce024bab9a8ffc
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index d7cee7c5e455..28a1b84e1d0b 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.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
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index 4a6845aceea6..ca409e7d6577 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,4 +1,4 @@
 DIST xfonts-cronyx_2.3.8-6.diff.gz 14285 BLAKE2B 91021cb3033fb6acd96b2f8fd12f4c621f066aabe7226b90d8a6a8da98fbfbfcb765a8a4cc7397b764b7b4c1f196c6e8a8df8cae1b7ae8c8f8981920f9b8ce42 SHA512 15703eda0e612b2cc29b16a4668fbe3efbfc3ffcea9bfa25ee47c4b3a7e1f0f8f5637b0f3c9b1239ab192f7229d56a433b8ff1b4366131d8d4c722f4451a1288
 DIST xfonts-cronyx_2.3.8.orig.tar.gz 269169 BLAKE2B e867a78511b744ca1b4fd95581c820b8932f8c17b336cc467f894324817b223b94179fe9cd5de46fd85445044e20c78ff067b650495eb0ba6e4781b05484f0bc SHA512 ac6e0d18977fb36ee255c57114f333dc5962c5a3f30dea8a6dccadd3831baa0d1b940c9a2fc40c56c043c8cb276c7a1bc039b555a68dab05e00139884b6b4696
-EBUILD cronyx-fonts-2.3.8.ebuild 718 BLAKE2B c3c4f6b71fda1b6e1b2dbac7251c92c835ba47f92899d810ffcd7ccc365bf928f8382c824d03d512c390e7f66dbce800c35ccdd2f7ff9c7aaff033947864478a SHA512 db0392cb9762b8b67c72a3b609aa1cf8c20662f6f0641b19a3b0366f711b4c9638b33084a89be4c254127e10cfa8805321dfc94953d99f5339c2a3ded1ab319d
+EBUILD cronyx-fonts-2.3.8.ebuild 719 BLAKE2B c297d37bf0184aef34c5b45f9b270a4cd11154648c4ade6194d92ce06ac96395f5f5c29e472ee946b525824783f3b853e6835831f7e0cb1b2069f83dfeac667d SHA512 06d909b0df35b8bd2a79b42576b7b098e28251114d1f1ff3a365dbec52123b301717eb76c3cbfb8a5ef9dc047fc9ab3004764680fbb4410e4f206e992c5a10d2
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index 7a8bfebf7231..4e67ad4061de 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.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
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
 
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index bcf1de3dce03..cd24544b670e 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -9,7 +9,9 @@ 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
@@ -20,5 +22,6 @@ 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.133-r1.ebuild 5146 BLAKE2B bb35d8dfe74cca46b55ab61d11371fe272869e6a2be3e231acc9515046822566270c24c747607c581c611f6392276e44224980121725730cb7dc3b92a8469531 SHA512 394a02e9a91af769aa90ff5734d738bc5661b32b69850c2198d09dff6f50903ce958bd2f6812fea037a7b53a6f500b91decf88d82965cbcf1ea33e1a29649ae8
+EBUILD culmus-0.120-r6.ebuild 4851 BLAKE2B fd7167ffa59f825a9ad190e8c349fa14d01da09b7a4e31bde424f7a21fc04fbe74caf8d08e99346e96e8180b8e1d80d1d2c5df42b8e7f50bd590cefd81f32ce7 SHA512 ca145f3a4c7c705fbf7949ecaa6daa404fc45f2097bf33de15e0b05bdc9e6dedb956219ee7594487db69e70f2fb01e58c8757518d8f9c020e3ef40b12d6231c7
+EBUILD culmus-0.133-r1.ebuild 5077 BLAKE2B cf061ca2c435ae5f37115b3da56f8d609c8bc3945d0645550ea482fa9b233f9b49d0e080edf76f00cf10ffb65d65f5df21210543f499ff04096a2e12b88ad552 SHA512 99fecfd5cb1c8fc5c46021f776cd20d54b5d2e4cbe48f10695a3c2a90bd53550d7a3fc5a0ee3a1b13c03c33382ac37219920d8b77246b986635c758cda76135c
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r6.ebuild b/media-fonts/culmus/culmus-0.120-r6.ebuild
new file mode 100644
index 000000000000..6d0109d856bd
--- /dev/null
+++ b/media-fonts/culmus/culmus-0.120-r6.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}) )"
+S="${WORKDIR}"
+
+# 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"
+
+RDEPEND="!media-fonts/culmus-ancient"
+# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
+BDEPEND="
+	app-arch/unzip
+	>=x11-apps/mkfontscale-1.0.9-r1
+	fontforge? ( media-gfx/fontforge )
+"
+
+FONT_CONF=( "${T}/65-culmus.conf" )
+# 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/* . || die
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			mkdir ${font} || die
+			pushd ${font} || die
+			unpack ${font}.zip
+			popd >/dev/null || die
+		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} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+		rm *.ttf || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-type1-${TYPE1_PV} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-src-${PV} || 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 || die
+
+			export FONTFORGE_LANGUAGE=ff
+
+			emake clean
+			emake all
+
+			mv *.ttf "${FONT_S}" || die
+
+			popd >/dev/null || die
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				rm -rf ${font}/TTF || die
+
+				pushd ${font}/SFD || 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} || die
+
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		pushd ${PN}-type1-${TYPE1_PV} || die
+
+		mv *.afm *.pfa "${FONT_S}" || die
+
+		popd >/dev/null || die
+
+		if use ancient; then
+			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts || die
+
+			mv *.ttf "${FONT_S}" || die
+
+			popd >/dev/null || die
+		fi
+
+		if use taamey; then
+			for font in ${TAAMEY_FONTS}; do
+				pushd ${font}/TTF || die
+
+				mv *.ttf "${FONT_S}" || die
+
+				popd >/dev/null || die
+			done
+		fi
+	fi
+
+	if use fancy; then
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
+	fi
+}
+
+src_install() {
+	einstalldocs
+
+	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
+		font_src_install
+
+	rm -rf "${FONT_S}" || die
+	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
+		while read font; do
+			eqawarn "Missed font file: ${font}"
+		done
+
+	pushd ${PN}$(use fontforge && echo -src)-${PV} || die
+
+	dodoc CHANGES
+
+	popd >/dev/null || die
+
+	if use ancient; then
+		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" || die
+
+		newdoc CHANGES{,.ancient}
+		newdoc README{,.ancient}
+
+		popd >/dev/null || die
+	fi
+
+	if use taamey; then
+		for font in ${TAAMEY_FONTS}; do
+			pushd ${font} || die
+
+			[[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+			newdoc README{,.${font}}
+			docinto ${font}
+			dodoc -r Samples
+
+			popd >/dev/null || die
+		done
+	fi
+}
diff --git a/media-fonts/culmus/culmus-0.133-r1.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild
index 1d3fec0e13b8..1c2c789c19fc 100644
--- a/media-fonts/culmus/culmus-0.133-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
 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}) )"
+S="${WORKDIR}"
 
 # Some fonts are available in otf format too. Do we need them?
 #	http://culmus.sourceforge.net/fancy/anka-otf.zip
@@ -36,11 +37,9 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 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="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
 BDEPEND="
@@ -49,7 +48,7 @@ BDEPEND="
 	fontforge? ( media-gfx/fontforge )
 "
 
-S="${WORKDIR}"
+FONT_CONF=( "${T}"/65-culmus.conf )
 # Put all fonts, generated or not here
 FONT_S="${S}/FONTS"
 
@@ -58,8 +57,8 @@ 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 fontforge && unpack ${PN}-src-${PV}.tar.gz
 	use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz
 
 	if use fancy; then
@@ -71,8 +70,11 @@ src_unpack() {
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
 			mkdir ${font} || die
+
 			pushd ${font} > /dev/null || die
-				unpack ${font}.zip
+
+			unpack ${font}.zip
+
 			popd > /dev/null || die
 		done
 	fi
@@ -85,60 +87,78 @@ src_prepare() {
 
 src_compile() {
 	mkdir -p "${FONT_S}" || die
+
 	if use fontforge; then
 		pushd ${P} > /dev/null || die
-			mv *.afm *.pfa "${FONT_S}" || die
-			rm *.ttf || 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
+
+		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
+
+		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 > /dev/null || die
-				export FONTFORGE_LANGUAGE=ff
-				make clean || die
-				make all || die "Failed to build fonts"
-				mv *.ttf "${FONT_S}" || die
+
+			export FONTFORGE_LANGUAGE=ff
+
+			emake clean
+			emake all
+
+			mv *.ttf "${FONT_S}" || die
+
 			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
 				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
+
+				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} > /dev/null || die
-			mv *.afm *.pfa *.ttf "${FONT_S}" || die
+		mv *.afm *.pfa *.ttf "${FONT_S}" || die
 		popd >/dev/null || die
 
 		pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die
-			mv *.afm *.pfa "${FONT_S}" || die
+		mv *.afm *.pfa "${FONT_S}" || die
 		popd > /dev/null || die
 
 		if use ancient; then
 			pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die
-				mv *.ttf "${FONT_S}" || die
+
+			mv *.ttf "${FONT_S}" || die
+
 			popd > /dev/null || die
 		fi
 
 		if use taamey; then
 			for font in ${TAAMEY_FONTS}; do
 				pushd ${font}/TTF > /dev/null || die
-					mv *.ttf "${FONT_S}" || die
+
+				mv *.ttf "${FONT_S}" || die
+
 				popd > /dev/null || die
 			done
 		fi
@@ -158,27 +178,31 @@ src_install() {
 	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}"
+			eqawarn "Missed font file: ${font}"
 		done
 
 	pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die
-		dodoc CHANGES
+	dodoc CHANGES
 	popd > /dev/null || die
 
 	if use ancient; then
 		pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
+
+		newdoc CHANGES{,.ancient}
+		newdoc README{,.ancient}
+
 		popd > /dev/null || die
 	fi
 
 	if use taamey; then
 		for font in ${TAAMEY_FONTS}; do
 			pushd ${font} > /dev/null || die
-				docinto ${font}
-				[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-				newdoc README{,.${font}} || die
-				dodoc -r Samples
+
+			docinto ${font}
+			[[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}}
+			newdoc README{,.${font}}
+			dodoc -r Samples
+
 			popd > /dev/null || die
 		done
 	fi
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index db6f6169e5e2..7f5ca8114fa0 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 1995 BLAKE2B ea4dd1f90bb3ddafa435c6aa8a2c10eead916e754b0b53eaffebcfc17d192ba186d4207719cb237485bf6b640a5befef4ce64e9db89d1cf293668acbe9af0091 SHA512 2b99bb9ef1cb5698c8286abfac70f1c09e98bf430c0b21764a1a2080974fdc174e260484c005005e061f59ef593135abefd6712a303b95bb9e81a6d475c4207c
+EBUILD dejavu-2.37.ebuild 1996 BLAKE2B 3d854d97ad87aa8c2d3284c5b8bb760875a3ca629e622b9f58874fa3983a10366a197a0155b1d5b91f0e79258c516fd21b3f7b929b74adf4e8a1ede022d15815 SHA512 ce2c7ce52aed47f1435a907b8218315c9f3628b0cdbd777cfb961c30a57e8935af3026e163419247df768a422a09568e60bb91d7a7b3724b70b07bee6d103e61
 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 ee96333abcb1..17d2bac9cd99 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="fontforge"
 
 BDEPEND="
diff --git a/media-fonts/efont-unicode/Manifest b/media-fonts/efont-unicode/Manifest
index 5db981454f99..8529e1737a41 100644
--- a/media-fonts/efont-unicode/Manifest
+++ b/media-fonts/efont-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST efont-unicode-bdf-0.4.2.tar.bz2 23999335 BLAKE2B 3a8b90d0343f5f90bda08003446922f4c994001ecb769b1ec58efbf23cbec93e2d327704d0f04fe01a7456ec0286d1fe318c388f660a7ca2b6fdef3e9ca9f687 SHA512 d19b4827bb473f8e7b0102b3c563e4ce559861220de158486e602aabe71f0abde127e83a46a622fafce797395f6977ad1c61e73e8c4997a4a088158a3b51e41e
-EBUILD efont-unicode-0.4.2-r1.ebuild 635 BLAKE2B e6b4e74ca7dde49e6711dc0b8ecd4d5f4685d51a6e5e6c7ac70a39873b5e5f7964f3824e65c5679a16dfa5086e0cf06df95cd6b723309b6de3f9940793de5e1f SHA512 a279d78c514e658136e2ed8f19e3f42ce9b09331ba6b48d6791b0b684d58f9c46911d9fda92c5fb3a7ada4cb18e7372e62ff73d17c4770b5fea4a246b4a88543
+EBUILD efont-unicode-0.4.2-r1.ebuild 636 BLAKE2B 4e7d94348c2dd7f46286e6bd858ff0dedfea88a3aceb10ef00b558bb155d5d213eea022941229e92742c5448260f1b8287a9a0e7b110bb24e11ed02ae53a482c SHA512 36cbcb02c16ee13d5be559a75a5abdf492e28909caf907f7826dad369c22b694376ebd5e4f92ee04a034e779c3c33ef356a3310419e4d994d40aab118ee6aa95
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
index 3b6c06864858..54496dfc60e9 100644
--- a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
+++ b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
@@ -1,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
@@ -14,7 +14,7 @@ SRC_URI="http://openlab.jp/efont/dist/unicode-bdf/${MY_P}.tar.bz2"
 # naga10 has free-noncomm license
 LICENSE="public-domain BAEKMUK BSD MIT HPND free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 60aeb7bdda4f..982b2e6c033d 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,3 +1,3 @@
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
-EBUILD encodings-1.0.5-r1.ebuild 545 BLAKE2B 1e6c0922823ae82a8417933f5abbe1dd4baf6c283f34deb12cd37e742376341f8db9a83352a4b8a4a04f0df42613dd0d99886b7c5ee8d67f33b98ff1f57c9d40 SHA512 9671feef43b97e7e261d383be7ec4661528e01e9d5b573b8fbce8159de2eecebcd022e8a8d0920e2f0a3dbdf91bdb80c1b812fd813e85784e583f21c1fa2732c
+EBUILD encodings-1.0.5-r1.ebuild 546 BLAKE2B e5bf1e6e898cce4f94e0c03792be201afdaab84a16eef7b2648d7e890919c348a99e119ac34067713e4648e0c7688805046f7f7d48f703e4669104c875cee135 SHA512 4138cac6db78bfdb84344d7ddf962306baa6ddc14eb5587c9ed7253a32efec133080442e3bae0e110e2195a494c3b79b80494f8a41c415b4dc5df4471ff04da3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
index 6ba58462fc85..3e7bceb439af 100644
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/farsi-fonts/Manifest b/media-fonts/farsi-fonts/Manifest
index 8deb4dbfd0fb..8a74ab25c407 100644
--- a/media-fonts/farsi-fonts/Manifest
+++ b/media-fonts/farsi-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST farsifonts-0.4.zip 332472 BLAKE2B b987298d3a531655a36a88402c96769cf6604f74e899cfe75d8f70e25629d79e941a8a92cbe64b611519430029efb2312bfc7facbbeb6b72c61d2b8d4192acb0 SHA512 fbb7c769a7d3c42f42a5f62a323dc983c6d0d0094e97af521356d858697fbdfad6b431808185514de3bf200121c9cda712949fb7221333f1a6dc250a906daccb
-EBUILD farsi-fonts-0.4.ebuild 471 BLAKE2B e7f47211393ffdf811c29b7c9c234cb341b2774edacfb10765db19767394eaa405957b6d66d61cc7499d53f295fc3b0db4e3dc7eb431bd0f0602b61a7d384d1a SHA512 bdbc9a79c98c93fe62efd0478348d772b5817d8c8ebaff88cfa24f27aebd8b52107e75c47bb03c8a12a1efe9d9d6c5e36f59b68f2ad025887983c5f68c718bc9
+EBUILD farsi-fonts-0.4.ebuild 472 BLAKE2B 70a794d9df6da24f045c4ebff1070adab6131484f3a652a81007525807b66e9bee993e8ed5f8caff6860ce22c720c70f3bd7cb54e7a2e1a201a0de1b15dc8e9f SHA512 4e55c58de0154a3af8316e834027f897b3e84a2c89fcca7fc2a7ea76625ea69584858ede2c6f32ad51c8b201cf539c3fc207744fb83e916b2e9d0bd1a9ff376b
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index 8e1db37712b6..39c0e5d1dc9c 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.farsiweb.ir/font/farsifonts-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~ppc-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/fgdc-emergency/Manifest b/media-fonts/fgdc-emergency/Manifest
index ae6fba944596..6818fb8e8b15 100644
--- a/media-fonts/fgdc-emergency/Manifest
+++ b/media-fonts/fgdc-emergency/Manifest
@@ -1,3 +1,3 @@
 DIST ers_v220.zip 684659 BLAKE2B 09add211c9e1377c43b974830744d1caed355c92b23d99d0777ed19789b9dec1ff5c568f2895798dc761737e05010d83c35f96107c56cf86f6264fa484f1a755 SHA512 f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717
-EBUILD fgdc-emergency-2.20.ebuild 554 BLAKE2B ad91d2cd594d6b12b5763dbdd4436f8b9d18ba52329b3d1bef5c2f018d8105e13d6df947f5ad96ba551853f99e1fd459296ac9dc1b5ccdcd624a4b400ccd0434 SHA512 32088a70047dde52fcf935b9cce1c8ab97886a32426d31cf0e9069122862cc2438d67fb27c4851eddc5d9ffbea90d2a11820cd6cbaf1ef3fac905ffcbf265b05
+EBUILD fgdc-emergency-2.20.ebuild 536 BLAKE2B 4197692cf370c6e8c95f4743b7580f12bd1ea39617806ac13be1398994ee33354c1f795a27b4687fb2fa7762be5c44bb9fffd3c3bb51b9ea5d7952f6c75324a3 SHA512 d6a2ef4176d9b61d023f1db6d9825499f88dea7da026707bb8490d4e57e71e352cb094974354ffa8b82384a93583dcc9204f81a0d09c9bc455332b58bc422bbb
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
index 57ec937ae6b4..7fd0ea01eadc 100644
--- a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
+++ b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.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,10 +12,8 @@ SRC_URI="http://www.fgdc.gov/HSWG/symbol_downloads/ers_v${PV//./}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/ersSymbolsVersion0202"
 FONT_S="${S}"
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 09f5c0139957..52ae7d82eadc 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,6 +1,6 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
 DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4aaffac00357bc7ad0ed99436b44220180f9753a0bc6f2fccc5dafe4a47df9cac91dc87fb1441952e1f04eeae SHA512 037698435b3f77f5ad2dcfb6ea6ff3063c50d224c2b95ada472bf9b12a6342e892d60220e1993045858697fff9c4fb5da97b41ac3437c4fa50f48ef1398c9738
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
-EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-EBUILD fira-code-5.2.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
+EBUILD fira-code-4.ebuild 639 BLAKE2B c9cfdd560836b3b43576c86080ad87dab270303b28064997c654f3bacac4798c5c47498bae814273f692829b0f39c140bc777c70103515dda5f9cd926c86a3f5 SHA512 995b9a24dd03c77f5e741947220bd376252121822caabc2ab8a4d09501d8d00bba975d5eb9947ef80dffcebcf5e2aa7ffbf379c27c4ec88e4cc60995560388a5
+EBUILD fira-code-5.2.ebuild 650 BLAKE2B f3e803fe13204705b690e9e11938be0a0a850a965929eb75c2a15fa375425be64e0d7d6d0c2fed2d4cad7f4a0c9a5cc90f82537845860e34481b3eed29eff0b7 SHA512 a89e888aa2c6f6a060c54a8fe8145be4620fbb25eb38c43fc1e6094083c149867ef8312bf00a2742ac5e2d5e94ad05e84d76d867f9b36e39bcfd01ea3dc6d75f
 MISC metadata.xml 426 BLAKE2B 51de3d7964aa09626eafe8df4ccd8f3d14d5014f345a20c138b252a9165a082993c0f71e4c3a7fb69d2a269eb4b5270d364e4fdf70921b6cffe24ac7698f4ada SHA512 7b0f3435a1df7115af80f9484fe11c7cddcaf3e7d287da66aeefd810a5e5a982324c0a6fbc2ad0a817d6fc0b1fdaf7332607b6124043395bdd1a64755065a0cc
diff --git a/media-fonts/fira-code/fira-code-4.ebuild b/media-fonts/fira-code/fira-code-4.ebuild
index c9c8dbb7c8aa..c12ec2c68c1e 100644
--- a/media-fonts/fira-code/fira-code-4.ebuild
+++ b/media-fonts/fira-code/fira-code-4.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
@@ -13,15 +13,14 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
 FONT_S="${S}/distr/ttf"
 FONT_SUFFIX="ttf otf"
 
-DOCS="README.md"
+DOCS=( README.md )
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
diff --git a/media-fonts/fira-code/fira-code-5.2.ebuild b/media-fonts/fira-code/fira-code-5.2.ebuild
index c9c8dbb7c8aa..36371a22ab1d 100644
--- a/media-fonts/fira-code/fira-code-5.2.ebuild
+++ b/media-fonts/fira-code/fira-code-5.2.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+S="${WORKDIR}/FiraCode-${PV}"
+FONT_S="${S}/distr/ttf"
+FONT_SUFFIX="ttf otf"
 inherit font
 
 DESCRIPTION="Monospaced font with programming ligatures"
 HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
+SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/ttf"
-FONT_SUFFIX="ttf otf"
 
-DOCS="README.md"
+DOCS=( README.md )
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 028f81f4cd71..e6e3400e2c35 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
-EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 257 BLAKE2B 7ceb934fdf38f78310e13ee3602bec759504ac604ba5acfb4e089402fe58cb012faa1e3cd297b65bbb562a4489fd8a8ac1c6a0ab70c5babebe8a4753344ba89a SHA512 b197b743dd0ed526d938554fa256fa499395de1b2187114bd019c5e03fdac8f9cc648b45a981908046b6641eb52c320b1c63d26205203cd1b6f94171cca97ef2
+EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 258 BLAKE2B 082134e0be837b08d2e2ef8a9253e09f7fa7da73b8f373bb382d28942fa6a3d79afe5476bbc3ec239c5e07ad200f9949da8427b4740db8798b34c8fbeb9067cc SHA512 a5b735e3c68b3c2c5f5d6baa56b675b2f20842a02f2ce400304d1c1b18edd2dbafc39a3b9de73eacfd765c7c3baa303c743f9d175399608976ce974c417422f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
index 2672ca433a65..9d67d6bf9d5c 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.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
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index e4f4eaec7e4b..345398662f71 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
-EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 263 BLAKE2B fd39523c880df066402ba1c333bd9b7214d274a0ad68612271cb232acc2538c84cb0cf4b75092d5f5477a572d56e72efb25f630913313fb72686dcd62a3dd5ac SHA512 45b494f744adf852f9230bd88d778e00bebf94ddd994420b3c748b2647ff2981c13a3395ec5664d11db687185d63ca40e8a01516c7370c2aea223d89bcb16496
+EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 264 BLAKE2B 8b33fa5128a06ac26a452279b9e757030a6fcb00b20c0c0477e0b8016361ab5d6591e62e90e59726cffdd4a350eabe8fb30db4c8fdac51a690f16b0063002b85 SHA512 eb5a4572baf382a8d292f6eefba52cc87dfe1dcbb7f13691a72af1a67743d08aceb12a6568467d458b92f3b7701692f31172c7d6e84c3a447626c2bc00a31481
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
index 52d39c26c7de..3b22c52fc748 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.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
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 87f47ef0ce7c..c43b46d9d5fb 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
-EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 264 BLAKE2B 34a11a01110012c190eb67f4b55b41eb188917ae2123b882553cd4bd2f06b8e8f39160bf7eb33b22b1ed1bda3d9b4dc2e37fbd6653ae8f8f8bae0337eccce3c4 SHA512 857f02db4178bf852b55f17dbb0f54ed2d9550102378ac0ba6baf2211bac00b93d02ead154bdb9eab9e02903825d595f1cd60a1bbe8d0fc8fb9a1f5158e03ddf
+EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 265 BLAKE2B d5681a2ba8fb70d1ef793e142b9c49b584f642575a98ba6fedd088ddc26627f72dc4365e457b98615cd625cb7def95d9a3fda21c734327d190ddc0609e4737c3 SHA512 065c2dbee3ebd2e524b46162684ac2cdc3496b1f7408c5104c6337c2d557be2958025996bc8d0cd98b3b9606348254faf975532526d9e029c7925b015ca7c92d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
index 8d3898dd1a7b..b0c614fa8753 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.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
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 866677497a6a..fa9bfcc7c259 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
-EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 264 BLAKE2B 34a11a01110012c190eb67f4b55b41eb188917ae2123b882553cd4bd2f06b8e8f39160bf7eb33b22b1ed1bda3d9b4dc2e37fbd6653ae8f8f8bae0337eccce3c4 SHA512 857f02db4178bf852b55f17dbb0f54ed2d9550102378ac0ba6baf2211bac00b93d02ead154bdb9eab9e02903825d595f1cd60a1bbe8d0fc8fb9a1f5158e03ddf
+EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 265 BLAKE2B d5681a2ba8fb70d1ef793e142b9c49b584f642575a98ba6fedd088ddc26627f72dc4365e457b98615cd625cb7def95d9a3fda21c734327d190ddc0609e4737c3 SHA512 065c2dbee3ebd2e524b46162684ac2cdc3496b1f7408c5104c6337c2d557be2958025996bc8d0cd98b3b9606348254faf975532526d9e029c7925b015ca7c92d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
index 8d3898dd1a7b..b0c614fa8753 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.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
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index cce0cdb98f30..c3a1820fb086 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
-EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 253 BLAKE2B c93c2c2075687f68d128da454bdfeb72cbbf57bf7a8a742cef0296ceea49e0468f867bc10e2529c874defdba10e0dc8dafb1a5f4e7503f17b526cdc151ab6a58 SHA512 7c06991e5970a2cd401b054125a7a7e4b1c753c4a3c5eb03b99f69f7798edaf0fb875abfe4a388f2b1972d2cdeb01b217f0f35ed23b74612d1cd818174bbfaea
+EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 254 BLAKE2B 588c08d07499274797443627884081fb307ec27b5d0eb35d144ad6c6c36c0a6d90ca72de5016be2f8b95fbf28edc837ededfaa9aef931221623eea61844df667 SHA512 c2dc8d0643d0e77c54b782def8ae38bebe206c050b3198a898fb82d5e7c500a4a5b1111318358222afeb52dabe2e4a5255b04f37867b3add882a2939b46361e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
index 474bb11c4108..72e630345302 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 79aae166ac4f..af9f0e8fcba1 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,3 +1,3 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
-EBUILD font-alias-1.0.4.ebuild 405 BLAKE2B abd8f7bbdcee070483a1eb4a7897001206ea755ee7801b658eb12b2225567a6ad84e73f0a99966ea732a77afc769dd1579fe61fbe1f1bb6a7fa303d84e53f60d SHA512 75c3d4a416955749a459bd8b6da326e7a5b231f76afe21212e9864f7d245795677fdaf66ad7f227d1f755c8d8872f8c671076b62384e123ed9cfcabacf747b18
+EBUILD font-alias-1.0.4.ebuild 406 BLAKE2B f4a32ddecfc9c38d4c1d505644716f601c4ab78a52ebee9ca1f1247e9360d30c8d869de336fec834bfb1bc57a208c7a63e179a8b2f215a94cf220198ee6426fd SHA512 6d8f5517a9d55a3e4f443533847376fdaa888865514506b5f7eeb4183c08a82e0c2e659085a77115c61a6e7ebea23dbfab8d102df99e12f55b5c3b077d780440
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index f8eb02725890..39335266b553 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 115818d59de7..fcc5c4a08ff6 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
-EBUILD font-arabic-misc-1.0.3-r2.ebuild 247 BLAKE2B 83d9fc2b492f96aa100e856b564b74c33837b5d30c130def8e5895ec64f216d5033576ffb06425c5176ca72d9f4d43395b565f11f9beca7b6645aba61ceab7d2 SHA512 fa4bd9313896663cb581be8f2114c79be237d28eb40fdcabf2a2bbb66176a1844ae9b96f6400f5931bc4677734f530e52e616c0e3f1ef163c006abe015d97959
+EBUILD font-arabic-misc-1.0.3-r2.ebuild 248 BLAKE2B 2d4a10e71b4ff15e8260252accd2603c958bd91e217524f6d196c751b3d1598623670954aed8fe5d53bc566c708abec0ca23bb59260ee2f98fe2a18354c867ad SHA512 ccffc71513b187c5c7a316d318c695cf32f5c46fb1ecb0f32f50932af192005b04177241836bf3ea1bca95a109b63ea26010954516835ecacd47900ba170df8e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
index 6d30209c008f..8e18d5ade230 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index 37cb8e364749..f48aac1324f0 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
-EBUILD font-bh-100dpi-1.0.3-r2.ebuild 325 BLAKE2B 875915a8e944c4534e07b10cd13a9b78386650df23636ee62f1ddc6feb4b9a9c19ca33212bd49819cadc365c7974407468a2138dbf334a9086daaa51a608fa53 SHA512 a1b1743d1d104ab3f29637869e334f4f953eeb023e9b01e1fd1810e358647d2e8d336f1b04e020ed3bad4d1ccf62b7451968e57cb2198b67e6658bdcfcc14736
+EBUILD font-bh-100dpi-1.0.3-r2.ebuild 326 BLAKE2B a1f9b522947bc093a9e05b0ad183803c378dc65732d7e2d0a8a036ea3ef73c957d52cbf91f655ee9112d74041a846bbaffebb823236bc9995f89a4a4766625d0 SHA512 c4a1523c5c9bc2b61375ec35e63a803292d9aef1385acfd114e94470f246d2ece6d4f329b9637ccceaec1a3f5e39e76bcdd511f93dc621b0c6d6e769269d3938
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
index 1c1637dd3e20..0cdbae7c2887 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.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
@@ -7,5 +7,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 6f9ab59ba314..3a201a0db96c 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
-EBUILD font-bh-75dpi-1.0.3-r2.ebuild 325 BLAKE2B 875915a8e944c4534e07b10cd13a9b78386650df23636ee62f1ddc6feb4b9a9c19ca33212bd49819cadc365c7974407468a2138dbf334a9086daaa51a608fa53 SHA512 a1b1743d1d104ab3f29637869e334f4f953eeb023e9b01e1fd1810e358647d2e8d336f1b04e020ed3bad4d1ccf62b7451968e57cb2198b67e6658bdcfcc14736
+EBUILD font-bh-75dpi-1.0.3-r2.ebuild 326 BLAKE2B a1f9b522947bc093a9e05b0ad183803c378dc65732d7e2d0a8a036ea3ef73c957d52cbf91f655ee9112d74041a846bbaffebb823236bc9995f89a4a4766625d0 SHA512 c4a1523c5c9bc2b61375ec35e63a803292d9aef1385acfd114e94470f246d2ece6d4f329b9637ccceaec1a3f5e39e76bcdd511f93dc621b0c6d6e769269d3938
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
index 1c1637dd3e20..0cdbae7c2887 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.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
@@ -7,5 +7,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 93246056ba99..21ac78b6e4a6 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 333 BLAKE2B 8c45b8cc953b37dd9966a7cbc8da078d5a62aaa7747d7e4673d4f3cd43a4ad66029d548329479afe576128bb5ffae307cae102be82d92c89a3f32800ba2ae334 SHA512 ae0fb8524c1e97b1d80ce45158e98416c6f246a20362e94dc570031185f6856943b671bc06fcd3bacf22bb256925b03c772bf8f10cd07b73e9a2c2ecb8fed281
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 334 BLAKE2B fc8d4258da09d43b1ecb9d0419943d40687acae6289247728e8e2f7e1e49a5a401eed9836b597da0b86828afbd39d94816eb25bfbf9a7b4f9f314144ca26d095 SHA512 a0e518e6f629a6aec90b82f9fe290fa05495fb1b3ba8935a082343735136a57369cf084b2133cbbbc605cf25c2bf55f9fb46b4588eacffa9117c4249c70e5baf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
index 21210c2e5da6..7f5550843503 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.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
@@ -7,5 +7,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index c40ba5b5f412..ee0a6db840ca 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 333 BLAKE2B 8c45b8cc953b37dd9966a7cbc8da078d5a62aaa7747d7e4673d4f3cd43a4ad66029d548329479afe576128bb5ffae307cae102be82d92c89a3f32800ba2ae334 SHA512 ae0fb8524c1e97b1d80ce45158e98416c6f246a20362e94dc570031185f6856943b671bc06fcd3bacf22bb256925b03c772bf8f10cd07b73e9a2c2ecb8fed281
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 334 BLAKE2B fc8d4258da09d43b1ecb9d0419943d40687acae6289247728e8e2f7e1e49a5a401eed9836b597da0b86828afbd39d94816eb25bfbf9a7b4f9f314144ca26d095 SHA512 a0e518e6f629a6aec90b82f9fe290fa05495fb1b3ba8935a082343735136a57369cf084b2133cbbbc605cf25c2bf55f9fb46b4588eacffa9117c4249c70e5baf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
index 21210c2e5da6..7f5550843503 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.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
@@ -7,5 +7,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 2cba1d01e659..a41d3ab1abcd 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
-EBUILD font-bh-ttf-1.0.3-r2.ebuild 294 BLAKE2B 9df2142da0c76fdb6be899f2a207d2be396ac80a08f45bc204a656db94faa7749d93fc9b887991061726d9d79d846e4ccf57eb8a144e7b162697f0aee9c015d3 SHA512 8760664ff1bdecfd9d889e4af794c2de43856175c6ff1bbd88776d250520a1172ff3721c89828bc6e1eb77924b84d8bcfb749ea4135fab4293ad03ddb3a407db
+EBUILD font-bh-ttf-1.0.3-r2.ebuild 295 BLAKE2B 713653a75f7e9f1d1e7b177e188082388d97ec1faca660b3111e0b998e71a60d7ec637a3e5f21de394cc9ecb78cc8d80d6cb1a68f5acb8d592e40da4a8792227 SHA512 245b439eeb27c199dafeaa97857c5644e479af73a645d0e349d0e461c9f6fbe5792e1c8485fe2d9b097ee16ff50942141a031aa786c051e3241cf247c4480669
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index 76c1d8e4c597..71265887b679 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.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
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index d30c13a641e7..87dd83ba9b00 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
-EBUILD font-bh-type1-1.0.3-r2.ebuild 286 BLAKE2B f3f8136d7d07761c398fd56f2a2469a882f347c7437f48a511da879ea299645e437cc249c4861df36ccd4e6f67c45c1620c37c340566c91a6694e92df812b858 SHA512 ab7effbffe732a5cc065ad29fefd885e3ceab1f5ea1327b5f2c6adf49aa831d57df70b86ba086dc581f6b4d4fa4d33b960a91c69077a69f472b0855a74dcbe2f
+EBUILD font-bh-type1-1.0.3-r2.ebuild 287 BLAKE2B bbd1165bf1c3b25683e650ece5fab0702236fdebeeda86791256d6b4774145772b227c34eec44bc983e28c18a54c9be800d856e49928362c99ee58bbf7ead3c9 SHA512 319586d84214f1bc757d8a4a51487185135deb06c3daa2dcf7d3fe0614a6fa4b2312a0368b3daf54f6003c816dfe5ebaa4939fda3cc1576afde299bd9741e66e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index 2e4e51fa48ab..6fee2e93fbe7 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.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
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 4c5123fe0679..1311e9bcb64b 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
-EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 250 BLAKE2B c8ee1d44a9f33b3f50722f8653acdfbfccce00274449cbdf414d313d2cac6f427f61f59784756976dd04040b7f1b97e50d31a0d1639f33f33a79c6e466bcfc69 SHA512 b439309aa3060069b65b6976163e73873594b5d66a19a6f81c4d928a1e49daa4a9ae6a5c71be8b9874d63acdf11aebb51908b9b7fab06c3ce80f800665a249d3
+EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 251 BLAKE2B 85532cdd161f9f6f33d807d1a1bf057210b301001685d837261ae45ccc35e24aea03bf1a5293717fdc5d6f2e1f9ed03bf9b0a7752bc61cec6323071a2801470b SHA512 e74039ccc04706c79eb16d752d377f64a7da658d84471883c569d50c59359e6fb3c849c38aefb6ff166686b0b03383622298158ab5978e8606a9ab0641dfbfa2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
index 4a57a66191a1..5848dfb1b92a 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 557395cc8eda..5d47eab8644a 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
-EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 250 BLAKE2B c8ee1d44a9f33b3f50722f8653acdfbfccce00274449cbdf414d313d2cac6f427f61f59784756976dd04040b7f1b97e50d31a0d1639f33f33a79c6e466bcfc69 SHA512 b439309aa3060069b65b6976163e73873594b5d66a19a6f81c4d928a1e49daa4a9ae6a5c71be8b9874d63acdf11aebb51908b9b7fab06c3ce80f800665a249d3
+EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 251 BLAKE2B 85532cdd161f9f6f33d807d1a1bf057210b301001685d837261ae45ccc35e24aea03bf1a5293717fdc5d6f2e1f9ed03bf9b0a7752bc61cec6323071a2801470b SHA512 e74039ccc04706c79eb16d752d377f64a7da658d84471883c569d50c59359e6fb3c849c38aefb6ff166686b0b03383622298158ab5978e8606a9ab0641dfbfa2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
index 4a57a66191a1..5848dfb1b92a 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index 32666d032e76..bbd8cc48a504 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
-EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 244 BLAKE2B e5421448088086a012cac1da6a71a7575fbde8b0d3827f485e0540dfe1758782cf03fb1a023566f2124d593a8083e1f1664d0ee8a67e087875656773046f33f1 SHA512 734ac42a93898ca118882c3f4e7889423064c89122f233a9bcadd35a155244b2269ee1830ea1e8beeeab636652e1d21106ac756a99e880026f9b1c6dda65306b
+EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 245 BLAKE2B 2028bd8fbc9852b0959105f17fde4aa7a79bca89391da540a8c9a9e02eaa24ad091d4f83dffa043d8ff2841bb1e1664e079915a9ea17f5b233613699f980bb77 SHA512 d416ea8427a8f81d41a69dcabd1eb19be0092a22e6756deb5fad929159a3d4e6dc7ae955ddb4485a51ad77b8f0858c96657ad0d335df37bbd260c17a74848653
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
index 2d1c2a853ec4..a0bf00766b09 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="Bitstream Speedo fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 477024b7a953..d9a9fc59dbda 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
-EBUILD font-bitstream-type1-1.0.3-r2.ebuild 256 BLAKE2B 15a71e2a0cb3e1df78ba8db13ed7a85098bd78ce94c1b0f31de6bfd1418a2601998e89fd0c2393cbd198314704fbca4c1e14cce9d5593739cec48f32bed05568 SHA512 9e2e195d55eee8fd6872997321100a9e11a14b487dc32a0f3151be6d367174ea88295f686db1a81668ebfe17b281a6ac9fea574fe489b6f31dfdd0a4029951a1
+EBUILD font-bitstream-type1-1.0.3-r2.ebuild 257 BLAKE2B c761338202f7ecd5850d1d70444261e85d7fcc93964a7ade9142a560160a583fa386ea1e9f85c6dc8fae1ec9d6d3f553b33bf9b2a259c1f6dac824bdb342b34d SHA512 448fbe83d753a265404b7fa39d01d14af57765dab8ff620cf45006225c2f2eeff28f39a656e23c5075eda0f71fca1826574527d455c31e6aeb1b132d315f0ece
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
index e99a081c4475..c6b06c477939 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index e76b3c078c80..031fe01e94ef 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
-EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 249 BLAKE2B a7ec58d168333409a25829444c711cb13635f64cc4fb21d4a6bc571a4b4f1220d8e0869642667fa9c380ffd83fa8d5295b72c875bdfa24bc91a96b92b047e761 SHA512 3591241390e01a4026a18be73ef7dcae9a31bde5b977279d7f215bfde4a8db0180f4ab1231866e2b136141ddcb03acc729523ccae89b718d35826db10c71b121
+EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 250 BLAKE2B cd87adae8aee8b76e1ade40ea27df6573400519c4a5a50581495abe5edfb99f6a19f91bdd85d1dca750fc8aed69bb86f11173a801483783c9afd47bceb8a2b55 SHA512 0b2cdbdd467649d1b5ff8f8ea55b906a4614f1a9dcdaa5c6f554f1cef5b84a50d35eda6dcbbaca5b5792d72a908c4c3b0d275639d0792cb4d205b3d605d11fe1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
index 0ea6344054ad..991244b3dfbe 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index a0c0454f0600..f11e9e5adcf7 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
-EBUILD font-cursor-misc-1.0.3-r2.ebuild 249 BLAKE2B 90424671a4c3b68e28c94df340305bf7a54377ede2ddbd361acf36e4f56f252c10e0305c60d596a0543e3a197ddb5a2c3c2f4069c1b984ac2c78fd7e6618cf2c SHA512 519af22f33deb729c32029bc3ba76f2b13bd4a4a10bf70df6c8e9c728869495eeaedfb03a2effdf51ac14721942c8cf324ca517bb0d3171484b52302b0dece50
+EBUILD font-cursor-misc-1.0.3-r2.ebuild 250 BLAKE2B 19f17d2e1175df5785e5027b3e333c20a0b273340e7f2931819d43b338ad3a91aaa0a3eb673727bf810c692383f04cf8ece9b848d6729e91fcd766becc296376 SHA512 a3dd1df269073a9f98a873f2f4720f510e75ef83549aa4231d04a0802751f4757531cc97a319b185fd9c72697c971bcf93a470582d16a46546316de96d1e981b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
index 97a0ae4517e2..fd023b1399de 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index dbd76458b2c1..2851ca3b7daf 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
-EBUILD font-daewoo-misc-1.0.3-r2.ebuild 240 BLAKE2B 17fe272c1d790014d07a85854042a27c76f2c8d2db547c1299b2e9af0e2a5aaf23d3d6a4ab4bbc913d0edb47936fbe7367355627dce648af6f89c256fae6d8a8 SHA512 6caed4ecd98f5c8010f4d0e3fede5b0f6c55c4e3b6db00030c15e417b6a34da8531704d69c35ca820acafb7dca8fa54165c8ec1f226a0f93ec636dd837f47722
+EBUILD font-daewoo-misc-1.0.3-r2.ebuild 241 BLAKE2B 2178fbca648b3c0c7cc6e2168c0d3c9934166c40f1ca3b3944d283a84766845a7ca6f05a246d78e8bb9114874d65e0e76fba6c9e3f3809e71f554d64dba4f78f SHA512 5b195c34ab630ed2d479df7e96c8f1c937364e7200e92f5647da7f2f63df9bb855c03c1f8048f9a751f900cdd44a59155db10e21745b69fae0585b1bced49738
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
index 1ada6b708c63..76b4878a823c 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index f97abf64b920..d4973ee32954 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
-EBUILD font-dec-misc-1.0.3-r2.ebuild 237 BLAKE2B bb1ebbd164ee75b4641a9b12371e5b1b2f361faf17b9fd033e7fe4281e798c97fea3633d41205deb49feaa7cf581f21320170ecf2cb6ec5573bb29a387db14e1 SHA512 b4ba895e89d919bb129f731d1ed163fd16ca70f14732cef45a68e130d0156d8abc2bccb102fd7b01e8a6b5a2a348eeb320576eb5ca81cb465de20c0dc749dc64
+EBUILD font-dec-misc-1.0.3-r2.ebuild 238 BLAKE2B 57bce8d483a86d2d750b08cf658148bbc0d0a9d77198d47e1319ebf8fc77d159fecb7995bb5b421b71db7912a2462a65c4bcf2556492d8c7e7f36d716169beb5 SHA512 32ccde53509a9561f54e6e410e40f36ea8293ef1ebaa403938616f1267cd9367944fabd90196388616acaa99e1d4339f222e99ec6edcaff824e3149a078976b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
index feaf5b637777..aed6d6503d23 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org DEC fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 994427e7799b..86122874c21b 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
-EBUILD font-ibm-type1-1.0.3-r2.ebuild 244 BLAKE2B bb0da230d58a1b12d4516065697c8cace5e325b8fb70a00f5c49fe97b6a55f4b1cdf58d720dd8d2beeabcdc88a006c321993f60fb00dd369656d72425bea1a5f SHA512 15d71ead2491be78866231a44f191b3701983702f8e979f0e31d70de6dd3735af35452f7595112a96648dcc1556d355ccca381201aaa14a00b10372d3dd03f06
+EBUILD font-ibm-type1-1.0.3-r2.ebuild 245 BLAKE2B d995a7769d9d98e3148ce39b189674ca76542c64802d060bdad757f9b7c18cd88b4e496c974dfb98e40bae096543e45d18199294ea4e1a884afef6d88d25f856 SHA512 302635493a9fc5b9041b8ac2aca3f771ec8cef9afa2e28972b7dfdf39d075498d0e94273ede5dc2c030c56b556e7646535d13a0cd9755ffecbb1009f5eb817bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
index 016d23994a3c..18ed26c1168b 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org IBM Courier font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 24b6176b8b1e..58a6be69050e 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
-EBUILD font-isas-misc-1.0.3-r2.ebuild 286 BLAKE2B 7fdb47e9dc0ce1d9f6a95155f09eab6cd5b8d6ec4d035fb13d0a02cb71cbeac846319307893001fe51dc0fef07a5a5b8d9403900c1851c05e79485aa3f70ce52 SHA512 0fa20089449dd97939d9aa31cd9689816caea6abb110c50469d7c40eca3657fa0842cd06d81d6115783746a3cac3c22e83d29c8b8366752231f551f88bdb54e2
+EBUILD font-isas-misc-1.0.3-r2.ebuild 287 BLAKE2B 5a7adf22e8603e26e97c5c54fe097970e2c01e6ee4582fd71b7b085854553dcf8b5621525d9c0e9792b34cf1aa0e7c57a3f4b8dbe3ed3dd21f12d47579b531ef SHA512 71345ae3d4509b123311eb241d8e125cfd495a1803c77c7c2eee8718d2dde0dfecd3350ffd5f6ebfee0b9d9439e369f0e10259fcf751dfed1d8ffbcfeda3c10c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
index f5420cc188ba..12ef8c613e96 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 6d522a77613e..c9cecf141c54 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
-EBUILD font-jis-misc-1.0.3-r2.ebuild 247 BLAKE2B 068fedd083bdf39703419188763103d586cca0c4b9df113f6a584fa8162307bffb8a76d0c77998670693b175a369e117b4f43a6304b6d26a27e8a851bea3086c SHA512 b46a4b405f491192bb4bbe94ab746811adecc6e2ac2b54217983968e15b836129cf53323ca2f817b1f875a9ef74a78519d4baf6adadc2e25ec7c2dd200638172
+EBUILD font-jis-misc-1.0.3-r2.ebuild 248 BLAKE2B bd18b16812b9ee3b17c61ed7dc81b8256e73d38efc41f80417bdd11d8949319e73493a52067afd108873fb9f3292992f885ecf6a8c18d038d4844da7897c3913 SHA512 907fd2b9cc5c39921ea6f37984a40e8ec3dcbd0db9f21d6c64169f3ed949737e0fd8cd3be9cff56fea946617de5a990dea36d4753bf85ab7b4e5708025c60a5e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
index ff470db33362..86b269579c0d 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 6d0e1590aa8d..a2d0002ae39e 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
-EBUILD font-micro-misc-1.0.3-r2.ebuild 267 BLAKE2B fc7ac7f58629558aff6f4a8c7fb43fe83e0641a2c8da1373526a3652360c1a7342c625e2445280ee72ab56d15ad2be95fe2e97998fc14c648a2c28e4ac7925c9 SHA512 348a3a20fff8981f9cd85336afa02f919997aff93ca8aec752afb9c819d6e0a6a404ced62dbcc84df4234e112f6c96a59ee925d9b32bd0a57307504e611d8ce4
+EBUILD font-micro-misc-1.0.3-r2.ebuild 268 BLAKE2B 28c59ecb3d8cba2368c709c34f40157b07e4de72b003319e3b206e05fc1fdd9f303159aefb8786337a12cdb2410e3d63ae2142d74d3c9422ef1eb71933e26f93 SHA512 fa084499a889304e2f8b90443545ec8547a428e83dcb60e9c95567d2af4236283db02a595bed51904ba8f29338878e1decb794d5e5258800bcfac1b029347c92
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
index 514f54eaa8f0..3288407a72f7 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.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
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 1df1f44001fb..9c80d6052d2d 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
-EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 247 BLAKE2B 16e89e19cf84ea9c4d97e5bde9dcc029317f454f4c45bb4aece70ea6b57e148458dd096d97e4c52143c21251ec64a6060afef3699911815c0041fa32249953c5 SHA512 5875cb985d6a8f1da1b73c75df7bf2b17996ee90aed96f25d85dbf42119e1510d2a6c35b58bfd4a27583b542ef85fa05a6bd82bdca4d3a4f46c172941224ac2e
+EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 248 BLAKE2B 118731bf439cb6127850b53aee07f23aa396874994c1b3e7fd0e573183ccb7056dfbad742d2a945eb83ab0353c3f8ba23f57b94d31644e3712b14bb55618866b SHA512 234fc94e2acd29885737ffa13a18a9fbbe1f979e10be2160daae6f01efa0f015e2f62601db58cd3c56d8ee5d5d6cb17b4101ef5761e9c070e9349bf59ce4109c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
index 85d4228eef0d..155b004dc30b 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index d002f72d6e37..982105996456 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
-EBUILD font-misc-ethiopic-1.0.4.ebuild 696 BLAKE2B 3de45e844155990b2e6bdfc757defdc56fc52209401a502bbffcd4c9752ae7bdf924d226286f30ea4b5d4ab259e410a63cb367c8619388c0ac44d6d800dd982c SHA512 41d08eb6140b97d959eaee6cf45d646e4c8e3927abb957ecebb45cac23201a16ea891c0cf8daa8336cbc699869f0ebaa51df4a425e00e0a76918ca6f24502cb6
+EBUILD font-misc-ethiopic-1.0.4.ebuild 697 BLAKE2B 94dd332e5610f906282eb1bc589d0b9f180fb85b7dde55b049dc0bc1295eb57bba7afa4b8c656bbd8c62cf7c78791b87fb5920000fb4b6ac33053e05baacfac4 SHA512 e2d55949152e7afe166fe7c55b70bc0641e7cb6674e29c56ca90d9c7b85f1a987b6364b7ccb8c5f518110514d8747f36d98e19c06a3bbf904aaa3db96a3b2296
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
index 9c37d377dee9..cc90bec8672c 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.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
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index 6c8cbf0e68c1..0d6755e104c1 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
-EBUILD font-misc-meltho-1.0.3-r2.ebuild 262 BLAKE2B 45bf67593695dcace7be313d32b5821237f29be6d2b2c7da1a33c5d3e39a6645ecf518f5bd0fbd1df60c41e648bfe2b714f37ddca82db750d1388cfe2c80221b SHA512 5662ef52e85902fb43f46e3b68caf79f37642061264ed28b2479fd502fab83e3310bcb0b7cff4e1a1ce3280223d14ad7c03c1492ce62e5d5c875a41fc3d7c926
+EBUILD font-misc-meltho-1.0.3-r2.ebuild 263 BLAKE2B 7a01a552cf369474d63d3ada19f4a953c8d023c5aa7df6d5d3df62feebf2b68e0899fb8bfbe17816caebe1724e3e488898aef74af555a6a9b9065ef274d022ce SHA512 8f4a4fdfde390419309cbcfc897782fbe42fcb19752493750c655be4b0eec7b1fba1ec238ea95669bd4600cde2ee48f1adb90cc9d74e16e5c148f0c891118efd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
index 6b7ef5c84d63..af71d1f13afc 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.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
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 432d49547d27..13420acce73b 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
-EBUILD font-misc-misc-1.1.2-r2.ebuild 351 BLAKE2B cf635a5c1b4ca9ff5a77b80b5119d729be6c3e191a84bf0325f84e3b0ce6feb4e64046f3054f7bca6c2042835cdbff05a7d8959a81378b38c6dac49693144173 SHA512 a19d17b0459c10fd8ad7a66d46a33b537ecc010cabbda14d24b5420db23fa78e11de515275b04b4e558ef5fe47f1b5d368a6c926ed796ec65accc363d297a8cf
+EBUILD font-misc-misc-1.1.2-r2.ebuild 352 BLAKE2B b3a34c6b91e990d1387fb20da5ea077c43646c3ec5613d3dcea9f5413e7cf74778698b79c5f94b879bb2b8bae66daf354fb13d9942c1d31096d28000e7267084 SHA512 9f43b74f53c800909c73e6a2f9189b3224f03c713d55a058c84d6a3e84f0e1be62e6ce57a384152def685b7600ecb973882b1b75dc2532bcef53c42f3f074436
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index ae84191bbd6f..f1bff67b1534 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 2c58977b358e..186449cc3a01 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
-EBUILD font-mutt-misc-1.0.3-r2.ebuild 242 BLAKE2B de3c9ff15ad5ea7eb37fa48af3dbfc5a2c0529de25efed42531bb890c66a37b6ec99ddd8689995440edb283904edcb225277795b32800e85977b583b13c61093 SHA512 5e276f8466518cb8a2791c5e480d0acc97773da0aa18d13a68483770e3ee15feb192d9fa4f30c3821b7286c5bc4648b502160e1081d0d2da3fc6f12388947c06
+EBUILD font-mutt-misc-1.0.3-r2.ebuild 243 BLAKE2B e8705dd513b1b72c8dd3fce73b15ef257dd7e64d8b16946843727569fcd445a990824f7fee8a06a980e66e1ec54e5dcb9f3d1541a1753fd83b7cd5c86f179e82 SHA512 c3918679d61049de50d4ca81bbb9be7c369fb8b14af149125ec7ff45e9bfc8c37fede8043e77c10a6cae16965a0b67d97bb5377ddc505d0ed542c68f2529e6a1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
index c4ad306a5fd8..6b31f60b690e 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index b479e817b238..8cf48a2d628f 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
-EBUILD font-schumacher-misc-1.1.2-r2.ebuild 255 BLAKE2B 9a40022f9d7faa7758a314f6c0f4ba09a86d0706a1f83846542327bba2fc10c0e30d0332af291745cfd9d8bb809eaf79090891c7b6a3af9b6067bd9fea09415a SHA512 99e0d6b115629424d9cfaaf76fed019629a1bfce0915a4115ab3b260e0dcdecaea2950302c6ea9ecdc70c30d0a85635e824f9208739e699dad0acf942696a467
+EBUILD font-schumacher-misc-1.1.2-r2.ebuild 256 BLAKE2B 59281897f9da45782c10db14dbde81fd84417fa8a50e5803ca1e241705cb62336e31d27fbc91fb4dce37c77e229d70d36e8bed15384c701d43aacc465c72ca6b SHA512 8179e7218dc2ca9d433c8c59e5cc3637edc6c8d9fb412de1826273a53c2d9bfa9392d92d5e0a09d19878edc916719333bf74bb862b657c653eb44d08abc1989e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
index f4caf44c0de4..5f5c4d835fc0 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.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
@@ -6,5 +6,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 83ad10d85fee..8791f2eb2078 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
-EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 249 BLAKE2B 4f5f21ca1b3f60bab3bd2181592a0933793510fe9de3cc3946ff01ee46d39278f90cc0805e6e93b7ea2125816d1335db6ad8679a971927e902103c92b1897351 SHA512 79e84115bcecd10f22ace892d2fe4a7afbe650869b88411c5f3037bf3688a4aa4aa3c1eb739db5ab832358f1070fe1b2c4f99d98ab1f7aa10e36baf82ce06b32
+EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 250 BLAKE2B 262be1e67b9fcacbb6088fb816704dbf57065935a321ede60b808eddcdc5ae33252b709efb04be7254f991a28c28ded690e0178cbf471153bc309b67cc0a710e SHA512 cfac1224c25df718c4984418d0552a21803b2c266f758e4b626b9062a6204365305e233a8f0aadbadaabddb4b794914d624fb843974c4876aa3013c69ace5dad
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
index d88de8254a8d..64ce06800d82 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index dbe2d316d189..af5bea13b963 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
-EBUILD font-sony-misc-1.0.3-r2.ebuild 238 BLAKE2B ba39d6bf89c36e2b93653c559aa37624b1e3ec24b7b50afb5adff3c2ad8849aee23aa657cdd55de0442c94aa7ab9958a358625dc43258d0e22aa976e33310117 SHA512 7a425f76774f147d83828348d23623f240c58fe5d4facbb19362ad8c3157730dc69a45edd7e1789d1c5f413d800e1379a9681e998c93b6746c108c7f3bec054f
+EBUILD font-sony-misc-1.0.3-r2.ebuild 239 BLAKE2B 26fbf0cf54e7855ddf4638c436b3fa27c47222157eb5758c1986e05e4968f819000443fadd987d54625b6fa452515b43468d70b886629a619681116fff1f3e72 SHA512 09470cde187793200dd0ba8d9346226a28f41f841cf0a4bb1b34f40023621b337840b8b916b71d13cb1d1f440dbd36ad2d2a069c11eb0433bf377d557c0c59c6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
index 52d135d9c804..ba1cbafde195 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sony fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 23957d1d075c..e58a33df552e 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
-EBUILD font-sun-misc-1.0.3-r2.ebuild 261 BLAKE2B 1f76d32071229ebace884540c9e9bbad6a8a71380e7966cb00d4d8f222647fbdaa1b5001ed8affc0d83ae2cd978306998d9e9c25a1273ad3f014819fe48c8bee SHA512 b254fb6e48242e80924655dfac1f1266319e99c25f6dfc7f412c5ad772bd3fbf4997d908912618c0bd4fe137331e0dbc876c590784243c66801b906c47c1fc99
+EBUILD font-sun-misc-1.0.3-r2.ebuild 262 BLAKE2B d3fc4fd695c4ab4d0df732de1e4b58cf1ec3a4432dca1b94eedd74d0dc15420871267e78bdf7690e35e43a3d417584e1c0fc822dd57413a778aa529adebb939a SHA512 13dd81f8d03051c6ad909a8d301a80cb2fb08dc00c5369a54f382bb901e91c4f48e203029500090432da7ea3b32f37f161fd00f5e20e14985d271d378e09aa6e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
index 8fd3654fdfa4..8b6012366f3a 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 96e335f2123f..8bff33142f53 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
-EBUILD font-util-1.3.2-r1.ebuild 682 BLAKE2B 5a52f1feb9abb241a93a3b5acc71f5cab0316c8433279cab839f316b8e070a4a2651f686cd72f4707c2dc55386a14f99614ebf362c247352c8e109bf9735b98a SHA512 0ab7dec18b00e699e4f57e6d55a3b7e7c33b5b751d48e032c5d5bd517af928e428ed8701a7686f5ed41f363a3f5a28f7b7019f30de992d4f983df771065a823b
+EBUILD font-util-1.3.2-r1.ebuild 683 BLAKE2B 6ff833192927c44c14446704541e34363879c56cffb6c69e61fbb14c9b80da644cfdb81979c25f0c1c2bb6d3f687b5997ecb82a246b91ae2edbe631eaa202323 SHA512 f7447bc5041db31836b08e7ec50ad860d30c47c774b10666a96260e6ebe420a501c70736722835adaafe887c2a7496f21fc945bd19def40acf9ea13c07772d89
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
index 4f18316ba318..ad6cf7ca5cef 100644
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 4135a897f0f0..5895127dad7b 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
-EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 250 BLAKE2B c6201b790a9db346fa6e7dcca47b1617f9b596eefaa281dd91c2a22a1529e1ec0ce5399a4fda464e293aa3f99ac577e0a87d26dd32bb742f8330cd84b1c4b481 SHA512 003c5026047b41c7b304c01cced39131e33a78635d904dbb4e8f29a3c3cb848a1d8894350303350a85d302cb41a3223c5aafa2016536f15b45b8ca1b553bf1d8
+EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 251 BLAKE2B be3b0c828987e61cecc066691093957d2f92cd4a66bdc225f500251efa0b64e5514728e33f4ea06dbbd0e3953891348aef3027a4d423927823acb341a661e68a SHA512 170a6f2cac8493bc7361aa1616b98fd42c397ac95db5cf845ef9af37402f1a73d56aba8e63e08d17d49c0124506045d269ee187b58eb78a27f214df0dd168897
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
index 8729a7de05c5..b76e244b5520 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 61c10e6dcbb4..5d782a987c29 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
-EBUILD font-xfree86-type1-1.0.4-r2.ebuild 247 BLAKE2B 510fa9ea4e3d6f6e5f696bfc4dad61efe9c02190df4f1f44177d64aed6ada36cdc9e3b7dfdda1acdfea0298c4e94f5958dd137af5556a723a2f7b1172f4939d3 SHA512 bf8a521f11ce42016538ae111651433b393deebc5621b6363947b56e3f08cc28783d8ca8e67a015133cf91527a66a12a16a01fc021a6015afd15f0849a01f4b6
+EBUILD font-xfree86-type1-1.0.4-r2.ebuild 248 BLAKE2B e0d7ddb3b30283a32db7be506f35490f3c7cdf378f58adbcab4e5e00e6c5715235b6a639137969a277029644d1955e603c0960ae5b9676fdad0da5d9f1ef2b66 SHA512 a1766bd8edd9b891a7e95cf0d7d67fddfc28d2d0296ec91ff3d137c821c01b3b34f845c321171d84319b69366f7271b2123becb6081112fc7450c01b1d2641d4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
index 471d046c2304..2916ee929121 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.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
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/fonts-meta/Manifest b/media-fonts/fonts-meta/Manifest
new file mode 100644
index 000000000000..45444c741e8c
--- /dev/null
+++ b/media-fonts/fonts-meta/Manifest
@@ -0,0 +1,2 @@
+EBUILD fonts-meta-1-r2.ebuild 2740 BLAKE2B fdbf6db50d590c68e93fd4962d5d38446fb89f773df5b2bc7ac46828556598ed5b6f5cdb291075aca11b268adee882be7e794492489e2df48c8bd1f613ff2cc0 SHA512 fe0c981a8851772602cdbb86e5423a60303f8660113c9dec1fb0dff5985723565e7caecd625eab712aa0cbe08f0d29c3306152f342bd3a29d2f952afd744012a
+MISC metadata.xml 723 BLAKE2B 3bee0c8bfd00bb9e19be028ca5bd936f9309b316af33a6217e8adbf40f04c3b980a529728a3181be3ed818efb9962a9740ba403c0ca6f0684a016a07c78c2215 SHA512 d5d789f26b17c122934050ad0616f85bc9268bfaeb5540b2d7ffa1b9adaca530b612afbdb7674b9e9131924cf44fd88abfedd6613cf27d98ea498aa3e98d5696
diff --git a/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild b/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
new file mode 100644
index 000000000000..42f893a95561
--- /dev/null
+++ b/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for fonts to cover most needs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+free +latin 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 th zh"
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+done
+unset lang LANGS
+
+RDEPEND="media-libs/fontconfig
+	free? (
+		media-fonts/heuristica
+		media-fonts/liberation-fonts
+		media-fonts/noto
+		media-fonts/noto-emoji
+		media-fonts/wqy-microhei
+		latin? (
+			media-fonts/cantarell
+			media-fonts/courier-prime
+			media-fonts/dejavu
+			media-fonts/droid
+			media-fonts/font-bh-ttf
+			media-fonts/font-cursor-misc
+			media-fonts/hack
+			media-fonts/ibm-plex
+			media-fonts/open-sans
+			media-fonts/quivira
+			media-fonts/signika
+			media-fonts/source-pro
+			media-fonts/tex-gyre
+			media-fonts/ubuntu-font-family
+			media-fonts/urw-fonts
+		)
+		l10n_as? ( media-fonts/lohit-assamese )
+		l10n_bn? ( media-fonts/lohit-bengali )
+		l10n_bo? ( media-fonts/tibetan-machine-font )
+		l10n_brx? ( media-fonts/lohit-devanagari )
+		l10n_doi? ( media-fonts/lohit-devanagari )
+		l10n_dz? ( media-fonts/dzongkha-fonts )
+		l10n_gu? ( media-fonts/lohit-gujarati )
+		l10n_hi? ( media-fonts/lohit-devanagari )
+		l10n_ja? (
+			media-fonts/ipaex
+			media-fonts/ja-ipafonts
+			media-fonts/koruri
+			media-fonts/mplus-fonts
+			media-fonts/vlgothic
+		)
+		l10n_km? ( media-fonts/khmer )
+		l10n_kn? ( media-fonts/lohit-kannada )
+		l10n_ko? (
+			media-fonts/nanum
+			media-fonts/unfonts
+		)
+		l10n_kok? ( media-fonts/lohit-devanagari )
+		l10n_ks? ( media-fonts/lohit-devanagari )
+		l10n_mai? ( media-fonts/lohit-devanagari )
+		l10n_ml? ( media-fonts/lohit-malayalam )
+		l10n_mr? (
+			media-fonts/lohit-devanagari
+			media-fonts/lohit-marathi
+		)
+		l10n_ne? (
+			media-fonts/lohit-devanagari
+			media-fonts/lohit-nepali
+		)
+		l10n_or? ( media-fonts/lohit-odia )
+		l10n_pa? ( media-fonts/lohit-gurmukhi )
+		l10n_sa? ( media-fonts/lohit-devanagari )
+		l10n_sat? ( media-fonts/lohit-devanagari )
+		l10n_sd? ( media-fonts/lohit-devanagari )
+		l10n_si? ( media-fonts/lklug )
+		l10n_syc? ( media-fonts/font-misc-meltho )
+		l10n_ta? (
+			media-fonts/lohit-tamil
+			media-fonts/lohit-tamil-classical
+		)
+		l10n_te? ( media-fonts/lohit-telugu )
+		l10n_th? ( media-fonts/thaifonts-scalable )
+		l10n_zh? ( media-fonts/wqy-zenhei )
+	)
+	ms? (
+		media-fonts/corefonts
+		media-fonts/croscorefonts
+		media-fonts/crosextrafonts-caladea
+		media-fonts/crosextrafonts-carlito
+		media-fonts/dejavu
+		media-fonts/droid
+		media-fonts/inconsolata
+		media-fonts/open-sans
+		media-fonts/paratype
+	)"
diff --git a/media-fonts/infinality-ultimate-meta/metadata.xml b/media-fonts/fonts-meta/metadata.xml
index 75a0629ade7a..6adfcf5baf31 100644
--- a/media-fonts/infinality-ultimate-meta/metadata.xml
+++ b/media-fonts/fonts-meta/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>alexey+gentoo@asokolov.org</email>
+    <name>Alexey Sokolov</name>
+  </maintainer>
+  <maintainer type="person" proxied="proxy">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
   <maintainer type="project">
     <email>fonts@gentoo.org</email>
     <name>Fonts</name>
@@ -8,7 +16,6 @@
   <use>
     <flag name="free">Install fonts for the "free" preset</flag>
     <flag name="latin">Install additional latin fonts</flag>
-    <flag name="minimal">Install a minimal set of fonts</flag>
     <flag name="ms">Install (free) fonts for the "ms" preset</flag>
   </use>
 </pkgmetadata>
diff --git a/media-fonts/free-bangla-font/Manifest b/media-fonts/free-bangla-font/Manifest
index ef4851012b02..baaca605cc79 100644
--- a/media-fonts/free-bangla-font/Manifest
+++ b/media-fonts/free-bangla-font/Manifest
@@ -2,5 +2,5 @@ DIST Akaash-0.8.5.tar.gz 260206 BLAKE2B 29db12bcdecd18dc64a33cf6ba396226bdc45c3b
 DIST Ani.tar.gz 129089 BLAKE2B 40f54798406374ffe39c98c2b19bd0c465a41e97fdb20ddea694fe357c63eef74534c1ff413a7234d6879b378369781d1b4f96befcb3546ab47a106f73cb21b3 SHA512 147ad2cb7122a0c64a0cebf15821b2269b9f639615293bd27623b55a1c58b17a848968f9023921a06e5171172587af2eb2c01aa539731416d26ebd00fc77a9ee
 DIST Likhan-0.5.tar.gz 158889 BLAKE2B 4a0889c74227854a8f5ab89bb55adfe063b31c09b3046b7ce056eebd35179c3c8aead0e27a74564b621c6e9c8c3f4e3895d5103d78791b1173e94e7723e3c07e SHA512 c20f4bb17498fcb67afb4e709b7edfbaee20346cd0552ef850fcb8af928c355f4ce7f8c1c92936094e1d23b0d5040340eaf8fe6d2bb6b405c8695dce39fc29eb
 DIST MuktiNarrow-0.94.tar.bz2 116736 BLAKE2B 3b302f7356b22053c11581dff434a5d236861177f40c6fd2c5bcf0e03c4b3ed887e5043e960adc7f01b8a26c93b1e4ff58c7bf430abb00146f0a5db265835a22 SHA512 f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
-EBUILD free-bangla-font-0.2.ebuild 1057 BLAKE2B 01b491be87fb62d69b0f1fa6aded4643843962ffb4f6377bb1354d3d28c1c66283f7074f515191ef73e4590fe1565186782c2bdd8f37183a42ebef29b2bbaf0f SHA512 cf857d8dbff2f13c37dc9c4b2e65d33f417927d399cfd10fd2d1769af3971f455c23bea46ae9c9a6697086ac326348fe54db7ae17614b3969558cf7417750161
+EBUILD free-bangla-font-0.2.ebuild 1058 BLAKE2B ff41968341e981957c20ba7fc72e1d781018b8ce2c2e1ce37db84d08a09aecbe7613e4e1304093b793b8c9e9fca0e921017d9b563f892c1d1c4713609cac5527 SHA512 39e2b082e6cbfb26c7eebe12302f32ae4573ca888549e12a9e4e9b97fb02a4a79946f4c8c3f6468b1787553acd41c3568135bfa0992d3e2c863ebde224e3737f
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
index dfc1cf8bfa72..6508ee993bb0 100644
--- a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
+++ b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
@@ -1,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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 x86"
 
 S="${WORKDIR}"
 FONT_S="${S}"
diff --git a/media-fonts/freefonts/Manifest b/media-fonts/freefonts/Manifest
index 2528ac4f1624..8510e94eb43e 100644
--- a/media-fonts/freefonts/Manifest
+++ b/media-fonts/freefonts/Manifest
@@ -1,3 +1,3 @@
 DIST freefonts-0.10.tar.gz 2422824 BLAKE2B 9ceec3e86786957a2949660528de128a40e5d02dc15d28068d8ac2d8b61633dd8d3060085e2c7b20ff029a0076f789137a28830bf90ca00e15f95ebce01d8015 SHA512 21b911cb574015b6474b125fe20be6670fe32fe40e6534e738f8d0b527d3b7a8000843206343187deb565970e04fa900eeb5eae43e14b19a7acbeacad6b057b5
-EBUILD freefonts-0.10-r4.ebuild 524 BLAKE2B 4a12c38323e237104e9bc3280ec6db603655eca1ce4fd48da9647483ccacb1607789980948c70a9ce9dc7d466f1eef50ec670be9a58130f75910435de791a19c SHA512 bbef5eda4e8fe80ee8525d516a372545ddd9c916dc520e2a54bedfa9c1239bebd156dc00ad4b146d7ab7e811e3ed04434102b5c1f0db26876e8dc2df1dc8d588
+EBUILD freefonts-0.10-r4.ebuild 525 BLAKE2B 61f2933e272a21ffdae319c731fb8740cc8c9b7387762e16e17f0dc22c81f24dc1319e1aaa80dfdffc5681603f7cd15997dfb3a0627324032eb867f8b99a0542 SHA512 d743dd2376c0da8be3e829f2c1e8d4d4db8b92d32be8ea5250450afeec14c37460cfb9382e302c35d681388605440e1d54e35b608b4f6caa419b21407c9b6cb5
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/freefonts/freefonts-0.10-r4.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index e10798ed49fd..11d9ac649d6e 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 
 LICENSE="freedist free-noncomm all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="X"
 RESTRICT="mirror bindist"
 
diff --git a/media-fonts/fs-fonts/Manifest b/media-fonts/fs-fonts/Manifest
index 64ab1e274e4b..d142e1643e9f 100644
--- a/media-fonts/fs-fonts/Manifest
+++ b/media-fonts/fs-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST fs-fonts-0.1test3.tar.gz 7470476 BLAKE2B af3afb48594333b4162f1da70660af443173b2a3274bd238de1fba537f1e788a8e0f36425a038c5272f5e6d421bddc8d2734bbeb2f42170c8e9960604e3d2862 SHA512 d513771f0c9e8a7132b7de806edb52a094201980de324a076c434ec4e609dadbd48aea727c83e4843378fd3d126e11d971557a427dd4c23af4871dddf6369eae
-EBUILD fs-fonts-0.1_alpha3.ebuild 727 BLAKE2B 744bba112c818885908f092316f477e94099dffffeb6149aa84008232a9ff7bbae7bed17f84f50eab39fff529b972d12721f7ed2e77372f336ecd523d52b5c0f SHA512 6871ab948f6b63b28a219c4df1e654900c4ecbd9131df25e7488608366e5ec63c4d8421fcf7609ba283e2447504c4cbb78dcfaf7d2e10ed5d3dc6e52957f04d5
+EBUILD fs-fonts-0.1_alpha3.ebuild 728 BLAKE2B 955ca9e1d7e5b1c7578eed2133ee7c7797d9524a63ebfa7dc18a77ebe3f0fda2d8f8074f441d94501bbf31bcad973c7e7f0ad1413b2e946a9648f2dbe3765ab6 SHA512 2af71ac94269f1c24733ae87da4016be542b2a8c0afcb8ea29311696d96c0d80baaba0a55c22622047dc05705114e820be3d2a3a0e7e8a436e3e75be7adb0a78
 MISC metadata.xml 410 BLAKE2B a1412a8a5cb998f90a31a6c9ab7e69bf02d6b5d258cca02b6c3024e140fbdc6a808adfdd89a02d6a671a649b3c35b858f88fecd09271db057e5ece1d6a92d2e5 SHA512 2aee09db3d528008dbd456fa8b570128ecc0caa6a52089aae5e37821b8c8634941fd3ab26c769c4c6a833790e4443f3cb3929a36d3a4adef4cd4f1833f399359
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index da8d74170273..7f4ec58189b4 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/hunkyfonts/Manifest b/media-fonts/hunkyfonts/Manifest
index efd08fd02d59..097e62db7bda 100644
--- a/media-fonts/hunkyfonts/Manifest
+++ b/media-fonts/hunkyfonts/Manifest
@@ -1,3 +1,3 @@
 DIST hunkyfonts-0.3.1.tar.bz2 452207 BLAKE2B b78ba6839adcb696ace3702588d026618c5d8092b7623174a22062af566e7e0586244314005df36c4881478ce46c7af9aee87e39647e66c8dec1277e603efa64 SHA512 0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375
-EBUILD hunkyfonts-0.3.1.ebuild 490 BLAKE2B 405bceb7268bfbc9704192beb5843d9932abe03ec945729d87666d900c01e1679a5cdca7ef55567259b6e18255c6e7438e5f8fd77d4880a2285dac3e3c4c3a2e SHA512 36a6decf4a6231e9528896c85f028371d341093af2ff97715af6f7c08c531ea6da955ae6a14c59a654124e2ed9009f66028c89e719f9a05331ac0a66e0a40a4c
+EBUILD hunkyfonts-0.3.1.ebuild 491 BLAKE2B d2d1e93ff326da71e8cad9b1397224ea1c9b9ad5010de58384e17c3d0622446a5b38faf2637a6e4088b671723f71900c5dd66b70a6755b9a2402b1ff45513bab SHA512 d3e08efbe8c383b4eac1fc06663cbdbbfc92832310a2292ebeba45110197ce80c40e07c1aa7c5bbe6ed5fc28b5a288fe7bec1590d3879d7bcd43450a0442cef3
 MISC metadata.xml 550 BLAKE2B d909fe6569dac324c05382ee8121c5860e2f4ba18d21b1fc3ea6aad3694d91a34498c0c267bbcf352e4549c0b5844abb57e5cd19916ff8ca787953e9bcdf16ca SHA512 45a95222e1cd82f8ac387078e89ee1fabb548acb45d4dac8b3f2a0c165dc0531efd73581d56a51c346af984d98b4e58576cc6fb98a263e0f7742592a8cc06463
diff --git a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
index d1c616d95bf8..593b007733de 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hunkyfonts/${P}.tar.bz2"
 
 LICENSE="BitstreamVera public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 
 DOCS="ChangeLog README"
 FONT_S="${S}/TTF"
diff --git a/media-fonts/infinality-ultimate-meta/Manifest b/media-fonts/infinality-ultimate-meta/Manifest
deleted file mode 100644
index 600a6a650a37..000000000000
--- a/media-fonts/infinality-ultimate-meta/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index e63f1b5923a8..000000000000
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for infinality-ultimate with fonts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-done
-unset lang LANGS
-
-RDEPEND="
-	media-libs/fontconfig-ultimate
-	free? (
-		media-fonts/noto
-		media-fonts/heuristica
-		media-fonts/liberation-fonts
-		media-fonts/wqy-microhei
-		latin? (
-			media-fonts/courier-prime
-			media-fonts/dejavu
-			media-fonts/signika
-			media-fonts/tex-gyre
-			!minimal? (
-				media-fonts/cantarell
-				media-fonts/droid
-				media-fonts/font-bh-ttf
-				media-fonts/font-cursor-misc
-				media-fonts/open-sans
-				media-fonts/source-pro
-				media-fonts/ubuntu-font-family
-				media-fonts/urw-fonts
-			)
-		)
-		l10n_brx? ( media-fonts/lohit-devanagari )
-		l10n_doi? ( media-fonts/lohit-devanagari )
-		l10n_dz? ( media-fonts/dzongkha-fonts )
-		l10n_hi? ( media-fonts/lohit-devanagari )
-		l10n_ja? ( media-fonts/ja-ipafonts )
-		l10n_km? ( media-fonts/khmer )
-		l10n_ko? ( media-fonts/unfonts )
-		l10n_kok? ( media-fonts/lohit-devanagari )
-		l10n_ks? ( media-fonts/lohit-devanagari )
-		l10n_mai? ( media-fonts/lohit-devanagari )
-		l10n_mr? ( media-fonts/lohit-devanagari )
-		l10n_ne? ( media-fonts/lohit-devanagari )
-		l10n_or? ( media-fonts/lohit-odia )
-		l10n_sa? ( media-fonts/lohit-devanagari )
-		l10n_sat? ( media-fonts/lohit-devanagari )
-		l10n_sd? ( media-fonts/lohit-devanagari )
-		l10n_si? ( media-fonts/lklug )
-		l10n_syc? ( media-fonts/font-misc-meltho )
-		!minimal? (
-			l10n_as? ( media-fonts/lohit-assamese )
-			l10n_bn? ( media-fonts/lohit-bengali )
-			l10n_bo? ( media-fonts/tibetan-machine-font )
-			l10n_gu? ( media-fonts/lohit-gujarati )
-			l10n_ja? (
-				media-fonts/ipaex
-				media-fonts/koruri
-				media-fonts/mplus-fonts
-				media-fonts/vlgothic
-			)
-			l10n_kn? ( media-fonts/lohit-kannada )
-			l10n_ko? ( media-fonts/nanum )
-			l10n_ml? ( media-fonts/lohit-malayalam )
-			l10n_mr? ( media-fonts/lohit-marathi )
-			l10n_ne? ( media-fonts/lohit-nepali )
-			l10n_pa? ( media-fonts/lohit-gurmukhi )
-			l10n_ta? (
-				media-fonts/lohit-tamil
-				media-fonts/lohit-tamil-classical
-			)
-			l10n_te? ( media-fonts/lohit-telugu )
-			l10n_zh? ( media-fonts/wqy-zenhei )
-		)
-	)
-	ms? (
-		media-fonts/corefonts
-		!minimal? (
-			media-fonts/dejavu
-			media-fonts/droid
-			media-fonts/inconsolata
-			media-fonts/open-sans
-			media-fonts/paratype
-		)
-	)"
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 62fbd942ea90..ff0aa93d10ef 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 738 BLAKE2B 67184ba02c9761a9f453d60f089d2245fd1e8e42d2c1d049e9c587f8ef78891673884b253cc1d8fbc57915ebfa28e155380cc6af7ebf97e13af19c11a73e23d1 SHA512 04d24c5bdfde48c58c02658c7bb2c1e4f742b7ccde6a6cdc0eecebb988b9c8b5ecf964f4790cc581674039da0de7a8585a25f45ee5dab56e600bc3675c8885de
+EBUILD intlfonts-1.2.1-r1.ebuild 895 BLAKE2B 5886da28429049b995c5539cc7a9bac851e506c229436cdeb1976c9c55deecff9c851827f8c5d34d47341add7c0b5d2976f40d2d64c9d30f04592d24192e8a1b SHA512 7c95cadc6490a2db89083f299cdb81b8b8ba078e66302fa71e09efe827268d49daf581e106f326ca2741b54a2c4fcea24717c3b515f0d1b918776a3e851989a4
+EBUILD intlfonts-1.4.1.ebuild 738 BLAKE2B 9c867b5cec86692180a1b6a3598a7129fc8be8aa5030e2fcaaff7b7e8e046257b690ad2389b47e3a4dbca781bf7af23e98645d644a5958929cedf1aa70cc2a5e SHA512 9a2e08f3de9c4d1b43eacfcfccb2f84cccd2233007bbd9ea3c9be9190ce54d45097886a9c0b05bc56b26817b6cec397b66e472f372e298853a732aab0abbe46f
 MISC metadata.xml 370 BLAKE2B 7783e99cf31647a374b109157e9df67f528f61cb89d4f7936172a7e001b10e0cfe45a96aead40b4618a987af0f68f44b6cc7ff2536eefdf8ab737ca072daf06c SHA512 c41b35cb543c1756b194ffbcf0c14935ab70b588dbdd4b51615901c5c7244eee2566771b6b070ec13451c0dda638f20303a12f3eab39c17c5dad6a548d7ca83e
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
index c22792604c37..93ee81bfb5c2 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain HPND non-free? ( free-noncomm )"
 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 non-free"
 
 DEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 467fbc94edc9..084c018b002b 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/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index 0beb75a9b26a..7d00b714b5b8 100644
--- a/media-fonts/ipamonafont/Manifest
+++ b/media-fonts/ipamonafont/Manifest
@@ -1,3 +1,3 @@
 DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 BLAKE2B 74d9501a47730ea651d05b6de973926c9c78b3fb61640eeac023a68b99a71684d934a17a54eebb8cb4b19d1c16f8fccb794dbb6f582f9e0853bf6328d3de9ddd SHA512 b46b09bb44497275d8949bcd6d0c472c7bc8a26f20113e97f6379a10e8f4d5d072e4c517aa1c69e24efd980644d8298d220abbcccb6e9af3c65794dc31f7ec7b
-EBUILD ipamonafont-1.0.8.ebuild 675 BLAKE2B f7ffcd4858422114abbd9cd52e8869c712dd59d29b48e1ebdf7e75f60958ee1a10eb4203b9f9edd6c15ab06836681f52bbacd518b5fb2eceff3dfd35aa164cd4 SHA512 56ffb9b72dd130f6dfad90cc6d7b583b6b063df860856595e770d2a31f1d8cf444289c3d31ee3ca5c777bcd1d354be93acac505fafcc30a757694f2cfa7735cc
+EBUILD ipamonafont-1.0.8.ebuild 676 BLAKE2B e46a1d17f18b1f94c2d9f4ea6817f7f840dab309a150c336dca706df77014ea67f34b4545ab0766de1970e141102fadd8e178f75d2ab619202600f5389de381a SHA512 60db9d1ce7d0ccf1162c7979a11dceb888be18cc7b0675bcee3f342b6ce62f633276f43a03cc7eb46701316fb1474c6720ad725391363ac4fbfaeabda5df2aa2
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index bc498dddca88..294fbf88151d 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/h
 
 LICENSE="grass-ipafonts mplus-fonts public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index 48d78acd0fce..d0c815941bbb 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -1,4 +1,4 @@
 AUX 66-ja-ipafonts.conf 800 BLAKE2B fb6de7c153a0560fe601b112ffd2d53ea6b8e528213a57de548c5129e934331299269c5a315071d8dfa6f26ec01264d3fb3b60a3aeb311299c83296d3f333160 SHA512 5fcffa0841412bf6012d36aaf2d3f37fe685da22833344d107b92b133693b9f22cf2a6afa75ad27509a3f26ec6f692f2a4acc04cb8caf089e248b014768a920a
 DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
-EBUILD ja-ipafonts-003.03.ebuild 645 BLAKE2B 448eaaafccd8012019c3b689149e155ca3d3ac7f6d53de5ae8b66b403dff41596412cd3f977d83e88bfedf8b0644d133303d503b2d742eb68ea1e443e36321cf SHA512 4ed20e7877470c8bcac7337a920352829c63fbc4d2bc34ad6184b797de143ba5d9af9b0a6d781bb9c8a9f4f042c13aaa0291dd0f1221c648f1d01cd4c7fc192f
+EBUILD ja-ipafonts-003.03.ebuild 646 BLAKE2B 422ce5c20bea3370620dd54d7b1157d1adb513564b87cffce0eeaececa60cf4e36385dafd91e8156075c16b1d1e67646ff3f09dd3479ca6d82ea60cdc44ed0f0 SHA512 3651ec5c51eebc95659f21dd202cf8f57da04479341b0db193cf3d783f264e6efd7a0f7cb25824c10ed672006a3ed4ecec2502656add0456785be0b3f9620f23
 MISC metadata.xml 357 BLAKE2B c6ad69b457b818fe1a2035085f9105b16ec1c0fdf881a527d30df04f18e3161ecd9003d4e7f9f613f13632676eb2c8fcb0f17929bf71b9d2319f036324b09ce0 SHA512 079b7a4055801cce6d1ab2fd4d4cfcc593b182cb99e3932dbb48745c4eb97610d8ba2c23107b60902442f55b8b211e0368b9a2420a76000729bb8b89a3b885a6
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 485dd301e976..3d8379098fdc 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/jisx0213-fonts/Manifest b/media-fonts/jisx0213-fonts/Manifest
index 825e5d5af0c6..3841da5f008b 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 1195 BLAKE2B f02ab6501f22005e37d24263998149dfcc825db5076a023c39ad2334f4b91f4aaf0870918f8371bde0d1172f627a049409ede31e85588fcf7b55ed15a670d47f SHA512 2fd1b7c7db63475a204cd74abd0601f1b693b9b3fd3e0484f0b1f9ec43678a9151a3087d672ed92cae3598b87b60edb55476285e68692e6dac3e2bc4a1d2cef9
+EBUILD jisx0213-fonts-20040425-r2.ebuild 1196 BLAKE2B 14a569145e18839acf100a655e2fa38ec43eac0f148a22f3b8c79b1818b4c4fe34e400bf15b8398ae30df93bf28094d317ee3b97653d7db6d7658d22e083da39 SHA512 560974de97c1e9578f03d8578c661f43e0fedfb3774f9894b972da6ad744bc5742cba145253eda58aeafe1ac3b3605f16daee6ed6743cc0c44aae511d7c303d5
 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 50c4d231d241..bddc1d5c9c15 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 943e27f85f71..b622cb507f1d 100644
--- a/media-fonts/kochi-substitute/Manifest
+++ b/media-fonts/kochi-substitute/Manifest
@@ -1,3 +1,3 @@
 DIST kochi-substitute-20030809.tar.bz2 8675822 BLAKE2B c825801d5d47ff312338393c09c5d2b03923fe8b6a5434dab36acd855a27a9f167409e8562f701c7da5dd4b313d8f19e18b7ee09c63e9d024cd3a2bade3b47a2 SHA512 24d990383aa1afb32523d05577da48bf07cabe0814af9c2f10c55d1db6dd4fd5e4b9df566431fe25f871f78494e62c07d5082c7596c50c410b45bf33ca9b2105
-EBUILD kochi-substitute-20030809-r3.ebuild 692 BLAKE2B 54d9f38cc9c90a6f35c6a0663178de59a47b80e4cdc6964b5da03b13f5929a88155cd3150067216a26cd3b44b960d544543dbb6367e2606381d35f0f10310ef7 SHA512 f22002df81553be8f36f922ddf0660429841f386416a8b2184d07128c674a6b8da7d80c8134edc2a70e82bf8a9c4dfa5561c242272f3d4d9b74daf64fad8f273
+EBUILD kochi-substitute-20030809-r3.ebuild 693 BLAKE2B 56c717b3c10743a765f0aceaf99d9a0784fcf2b1f197867b0a043a95eb088adf0ac5edf5f4a9462a6aa09770a63ba5fdcd842c0083a2fdbd3ee28c3ed71ec270 SHA512 68f69e790a65ae79ed7ecf2a8dcd7d2106dcccac067a9697e664e8604d5e4cc3c51c9cd694bf336bcadebc7b11424a8a48d7ac7967c61ca0a30140cb06b94958
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 2ffb968c5dbe..90a8a9d7945b 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/konfont/Manifest b/media-fonts/konfont/Manifest
index 5d23de02ac05..211bc7a9d77d 100644
--- a/media-fonts/konfont/Manifest
+++ b/media-fonts/konfont/Manifest
@@ -1,3 +1,3 @@
 DIST konfont_0.1.orig.tar.gz 115551 BLAKE2B b5d986cf1815237528aa2b65695178bc229cfc2a2b74f52f34a4019af347da104ed21d9ddd8438674ebbbb705bceb9a55a70b35b94dbad8731ba077936595856 SHA512 b03460f08899bc00049a6def90125c7ffae596457a93762305c9600221c8f82b6a1f011b52fd434c8a44290f9c9c0b978b6efbdea541ae070fe86528344eae4d
-EBUILD konfont-0.1.ebuild 591 BLAKE2B e1085d1a037e71c8736468bc6a68c95747e07e81210f57f2533f54f36ecb3d3024f81cd11693520c07838a0d77429bd4d84f89e3d1ca27730b6d43591f23019a SHA512 2f91ee92122e06d2dc9ccfa53e9385d5b339b12ab5c16defe3a90d83c4279a5a13cc4d75e4dd3f49a55aef30756e4e9bb5fd857bb83b4664d2032159f681d109
+EBUILD konfont-0.1.ebuild 592 BLAKE2B 3ebd5809df0418d60c47fc03b26a6f0471a751cfbc53ee66045a2fde749b4cfba530a74af1ad542c06f535a942dfad2263e5a1290e29ac2e73d7127ca6beed8b SHA512 450fd160c16892320cb03798fcb502cdfbea0c39bb66d3f0d9e850dc9a81c647939bbd20bcf18fa5038419859f4ad443e68af1117e3b15a2eef1ee39a23c0e7a
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/konfont/konfont-0.1.ebuild b/media-fonts/konfont/konfont-0.1.ebuild
index 63f9462684d0..888c3edff092 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.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="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/lfpfonts-fix/Manifest b/media-fonts/lfpfonts-fix/Manifest
index ed3058b1a094..5c11e1693cb5 100644
--- a/media-fonts/lfpfonts-fix/Manifest
+++ b/media-fonts/lfpfonts-fix/Manifest
@@ -1,4 +1,4 @@
 AUX lfpfonts-fix-0.83-noglyph.patch 446 BLAKE2B cd0681d78f8770afeb5a0cecdd4965ea40587ae849bb3e9d273649c7e77949b3fddce73757dcaa00fe64ab81895b8eeb73df7b5a08e41d485cf93ae5a54add70 SHA512 34ba0f9f9d78bbc55a6d6fae3bc1d3b532e714a2488c019f77d7f6c9f9c70df6b3bb52e344cbec066eaa501bab9e96505033e7eb68212ce3807a5db5d23b5216
 DIST lfpfonts-fix-src-0.83.tar.bz2 172461 BLAKE2B 6d943a96d6dec6290f21b6df8daf7f1305c8f6c9175b544f0c64a7a0e18f671f9e2186f73bfe3ffb092d8adec7350f598d5a159e9ecd06b73e6ffb04d8641860 SHA512 154f36eca48e2869e6e5362c7d8de5511b4b7ab96466f147c21a792016d9065c8216dabfdda0b8763a6119510b3c4eebbe40ceb093ab89a308431b059716a23d
-EBUILD lfpfonts-fix-0.83-r2.ebuild 708 BLAKE2B a5d9ead1599df7be2ce58e36bc350dd401d803efd610b5417cf2079012ae8a9f4359f4015ad5838cf3c0b901594bba9baaf1f8e02b27e1bc454884c242d52aca SHA512 2a78161117e48e77a1978187ef3954ecf664321674f3b83b94b98f1ba879f6c094b12c719d5fdaf7050fa03465d0cbea15a317286e7f81bdb3b7c3316b3532e3
+EBUILD lfpfonts-fix-0.83-r2.ebuild 709 BLAKE2B 6a66583202773bf7f2bc8fe99a6dbe951f90af83db0549e85835d2a30699da8026ff86fb8d67e20491b87f6926451538aecbdeaa1735db7ba2651860ecf20813 SHA512 0ba5a8aba1e6b19595a68a99989c1349bba0e4a851efa59058805b5cb39882c08759017a12c112829d27b87c5ccf7360f804b76355e048827ee01f462eed169b
 MISC metadata.xml 314 BLAKE2B bd7daeb4ad582f34beb7287a62ed5ea91737dd33bbc3af7e06a91fe8804fc1e8099d6492f7b54fe19f3ad3943c90afc66531b68f9a6e3c8b7f6fa86a45f60231 SHA512 2932237b59ba528da0dcbc4083b633e5abbcce3ae633b9115f3dc2c8f022e7d348254104215023b432accdfc646b9cd98d53eb89967bfa7522664ee68f31b498
diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
index 0ca9ecfb3c00..c63a906d7f0f 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/lfpfonts-var/Manifest b/media-fonts/lfpfonts-var/Manifest
index 0f42e7d4a691..bd5853616d3a 100644
--- a/media-fonts/lfpfonts-var/Manifest
+++ b/media-fonts/lfpfonts-var/Manifest
@@ -1,3 +1,3 @@
 DIST lfpfonts-var-src-0.84.tar.bz2 99445 BLAKE2B 9861bc41422d1513cc484ff875557e5e95991ac355d24d24bef213f0c80ef7edf7e0be32bc1c8de0d96bccd6ef9a110fbdc3218b262199522bc915d2e13d38bf SHA512 8ab814acb962760a2ab01ba1d604a3f77754587809cea8dd8f36dbc14eb654882d0cbf0ef4568f60d5e68a258494547e1278a392b79fdccf1d3ef4e105b87ab2
-EBUILD lfpfonts-var-0.84.ebuild 519 BLAKE2B 5327a0dfa002b406ceca21ab6b070cffbb884b8344f54bf13e0aa28e22a5641577903000da53ba608b8703792e65ef42ac2273db8034db376bac1ccbf4b958e7 SHA512 e8d3a8d75f99e22a09f91aa09c1ce73be2a399f716288f6698f9ad08547a05e0202879bf93e7b22430bce15c42ed1d76aa39a82f858c54cb91c136f26c1f0973
+EBUILD lfpfonts-var-0.84.ebuild 520 BLAKE2B cb7534f4d188a3d3c0ab34b9a4793f4f7b0be32877201b5160cbf36123913b0b4568fe5c6b95cdac87e0149222ca4592e789f0fe707ff0385a2eae41071ad02c SHA512 d39720aa71e705f89cbe7c04b83055789b208641955992e6b6261bd953c40d1a35f96022311d5d4d6d9b3f12f2b1bf19d278757177c7dfc7fd3456234bdff95a
 MISC metadata.xml 310 BLAKE2B c731690860442f554b77377aaedc27943b2be18ce867991d900795ce57ed1f7370d487e4975153a517053f44826fd0cf9ae47537d7842d02bba7990f613632bf SHA512 9cd2540f5a870b6d00e48c1ee2bc7f452e90af020c21f796afe14326ee0d10293ba90eb44380f0c3c3eb9cfdc3ab35b3cbf6fab94c36fa2fa969ff23d72600cb
diff --git a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
index 51a641d3a3c1..19ed0e03a331 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/lohit-assamese/Manifest b/media-fonts/lohit-assamese/Manifest
index 531ef65275fd..9d85707a7a1e 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 596 BLAKE2B 487188907285165d3fc63457952dff8891062497a8212a86ff5e78768bcc973588bdfe0260ecbe94c05164d25619418f7c88614780248b90929d10a3b4122de1 SHA512 4e4c8eeaf175e79125a59a73d317fb57f5d8fc1e4d60d6132bce6f954d2d733443f14828be862c1a48394f7a6b2e031b17a8cce432620b68a8c092d3a6c43e5b
+EBUILD lohit-assamese-2.91.5.ebuild 597 BLAKE2B 9f551ca7fc5f95f9ac3f79a9a683f50953277d90f4d246c72491452fcbe845e2950ede76361ded3ad9e1bf02a02d6ae5a356636424b75ede78b276aef5fe6994 SHA512 7981c5700443a44e0c7769fa96ff8f340335862f7a02b905a8ea0496a90841356eb78d42bb36a241e6b3f759c2312beb51f30875f5721b48577acbdb072f705d
 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 f23786e39c09..10b7d1a0de6d 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-bengali/Manifest b/media-fonts/lohit-bengali/Manifest
index 329b0d7a7791..43e6b40e2466 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 593 BLAKE2B 0c47576751ba231d40869489e0fab39081122d41d96a80c922864c5e34bce6a3f0005ea3515707e69d1a50baebbe0f7b5a3cb0101d8f738ab2d534ba1388f9bf SHA512 7f3f5856f3bd94e939d5c6a29f0b76d98046fefa935a3086e9a18a3d6af12c2dae8d8b0d6a2d6a4675347b11d03be5484ed19f7c404895d2051f3a98fa18a740
+EBUILD lohit-bengali-2.91.5.ebuild 594 BLAKE2B c21e4d88576fe8ab023502989eae80f607b2bd1d4c276111c49a4a0784fa151c345a3ab159e9b021f521fcc4bade98c042a7f10a26cc1d1fdea401b059bbe38e SHA512 566eb2fd65fc088672b66b1c39cb63c5a78ae6f33b7964f519a2c0a6e67823be9a0281e51b5f29901e9b29e1c4c3d0464eae6e242d20e064542b3ecb097cbc3e
 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 0df85af8cac6..ce13de591d79 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-devanagari/Manifest b/media-fonts/lohit-devanagari/Manifest
index dc821d362b5b..9dbb89cc239d 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 598 BLAKE2B 55bb0957d3a3bafcc167b1af9570cdeeafaed42921b7a41e0999a280ed8108fc8ff416df907192037dc56f0c0ef52eb22feea0665df2253727d864cdf349de52 SHA512 69ce41cd67367dbdb83176d8f5db8e233fbd75ef0e31b228a11e79d4854fa4f064441ddfc3a082687fdf1e6ff408933ada784907ea9dde549dbe08da8131e992
+EBUILD lohit-devanagari-2.95.4.ebuild 599 BLAKE2B bd130bf22d5fc34130d6ccae3d9308c138b266cc59e911863dc3518ad06f3aa272d79e23cdf195a96e0d7b68f3c5b6b8895c408ec420fa3a037e562f473416c7 SHA512 39e9b65f0e8a9ec8856fde340e69261edda4e37a347a0c979de83a1f370be0ce1bdc24fb2dc6c809d303c8116d09185ada7e85de2a0f3afb8df935d84004c662
 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 eb1c8d02d618..7da3d3f14295 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-fonts/Manifest b/media-fonts/lohit-fonts/Manifest
index da0fe029baf9..e66289a9a9cd 100644
--- a/media-fonts/lohit-fonts/Manifest
+++ b/media-fonts/lohit-fonts/Manifest
@@ -1,2 +1,2 @@
-EBUILD lohit-fonts-2.20150220.ebuild 749 BLAKE2B 9d90c8b6fe7dd9cf4e12a3e64b3cb93bb3d593ab3250f4a12c1df024d876e0870ffd5faf438c44319705757ec298ddf341455799d3cfab28a7628a3d0e91219b SHA512 02f88da1a8173c4fb0d76a8d572d410cdd28a9439f0509c2dcd636939c9ee1e3698ac00eae0b12f7117c51db1e1f1f3406f560edb723606797d5894be8263c33
+EBUILD lohit-fonts-2.20150220.ebuild 750 BLAKE2B e62d9539b83cb66fa9114faf2d0cf34ed08f6e4342a651ac78c35f189bb5a508be7d3605aad0d70d69a83c086ae347bc9a534102af56922627ab98ca5dd12ff2 SHA512 fe5afa0bffb6cc751f50740b00aadde4fd1c4ff2b9b9e7e001fce4c6199fe5cbe2f70fe2105b3152e8bd65c48c43b6c37b84b64fbec87657b6b6180ba3d2f46b
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index c1300771e5d2..35ead3b019cb 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://pagure.io/lohit"
 LICENSE="OFL-1.1"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-fonts/lohit-gujarati/Manifest b/media-fonts/lohit-gujarati/Manifest
index 197d2c1ffba5..47195995e9ad 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 596 BLAKE2B 979ad74068e38ac50b95d7f31c869336e90a5442d6b894052665e1f903ac739b00aa986ba6b417b55f4fad90e8543bbcabfdb379f14256a9d0ab459f8578625f SHA512 44f91639a4d627cf96a654dceadb1c552a0d78b447599053df9c1438dfe9c5c54082c46ca20617633043138871001570197130d2e11e99d124b7388f023e5860
+EBUILD lohit-gujarati-2.92.4.ebuild 597 BLAKE2B 6eef96dbbba4c2337d5dee1a5f4aad59a7c16f532a114ba2e28c51d83fa0dc8d133a40d8be16e84d0cc3624cf1c0c0427e41e86fd81bf201c43e898643caae46 SHA512 1a3d4b45dfbaae6a38c06f4a98f045c581e4ebcf9d013c1d0ed9e34d605c56253c0457a1cb2708d83cc37ed19a31ad5a538b574f47a0a052184f2d506d950975
 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 4e34613223c5..10e584ffc135 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-gurmukhi/Manifest b/media-fonts/lohit-gurmukhi/Manifest
index ec16f6c16c0e..7f37de20cf32 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 596 BLAKE2B d9423a217cdd24c558669b554809888ded960ad6c36ebfa8346708d4b5506dbe02ddf9f934d0f5781fb1829be8938e9991a72dd7ecec65505b9e4f64cd1f29c2 SHA512 a2daa606209ff490a81656dc10780ef6dea47ca1e5947f7a1042734c9fc2702a93ea85fe9fa0fbe25abcb47366c05ccbfc09e3f768b3dc7d1547950a09a9ee2e
+EBUILD lohit-gurmukhi-2.91.2.ebuild 597 BLAKE2B 69030c8d22ee1cea5f19852d5b747b12bbde5a0ef688901b702d23c9a8af55864759bd0d8f004e46bdf799d269b2908fd3772f152c19b04fe66f2de94a238b17 SHA512 66d10b8dc4451c9927afa020e9028a9e2104ade925d3129fcdb2009a4e7e570efd8e3f75c20a338c35045ef9a3a03780de5ad2d98076bd58424c43520a14bca7
 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 aa1fcb2af67b..fca948b40ba7 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-kannada/Manifest b/media-fonts/lohit-kannada/Manifest
index bc5f89e96f95..db7b0436a2f2 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 595 BLAKE2B 9593cb3bc94b7ccf8873e0f544ad8975d85888c6b4e6d476f23813aebefc60d0a379aeb40f6b0d1e39e618763e2d2fd5e62930621c2be53d8d4ae76aea0ac4eb SHA512 2a272b340ccacb7b535d2e9cd2e16ad2cd1d6d35168db7195d46d5429682adb1c70118b815afd39a0950c0468cd1a6b6e80d98d80b49d563042179d81f617153
+EBUILD lohit-kannada-2.5.4.ebuild 596 BLAKE2B 6fc11548d964cb75b5786e54249a245ce93d1da6f128d5de4a2804b089f01a4dc3c43376aead064f51263edc902db4b26f4f249a0692f3c1aaafd09f7a8c931f SHA512 718e81ab709acd8dc9d79978b5deb58430f8201d628ad48551569079da52a2fbb1eca1db13fb70e33f3f8d0d5e68e1baec0f2f956b2963d35aa39813e7dd94b4
 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 763fcd28d068..3121fb2f5999 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-malayalam/Manifest b/media-fonts/lohit-malayalam/Manifest
index 1be85fe1fd4f..c251a1eb90ce 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 597 BLAKE2B 8603343d8736066130afb52ba76fc175936966ce031a5552ce875437fa59341b43ba2cd8575a403b50d58e2ceac7a87525e59e50080953cc67f8d3fce5ddf137 SHA512 6fae1cc982d35d249f069bcce978bd44364816816cc6adb447ebf6b854c5cfb2247d6293d5b7503ba99ca4c53a3c68188b45b1b55e3f46d38133f07198982f83
+EBUILD lohit-malayalam-2.92.2.ebuild 598 BLAKE2B ff5ca0c43bb7a6bbb8ad0ce4084cea9c9feb423c3137249d881244f041a73ffabbb0c7baae22426a6fb9f83ed331eec623c77663adbd14a1a08391101abb9b28 SHA512 fa5e409441f7497c9aef456ea87ded1aba0f0554a4e0336e3b46599f549d15953d312b9f18d54896905467057d4d6ca0d9a86db6977bab8d84300b447276a4d1
 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 813129c4b5e6..3a42dfcaaa96 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-marathi/Manifest b/media-fonts/lohit-marathi/Manifest
index 907c687de2d3..01efa0b96f8c 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 589 BLAKE2B 9ccda46e34a3874b23193cf2a7abef2e83ab334a965ef1e21d83c6f03aaef1420fdf81900875bfb46318b1a16fd3b4dd902615e18ac03b097524b4dc8ffcbaf6 SHA512 392f8a2f02cec5e7b5fb175aa44aafb8fc20b6dfa80ee97f934ac6548282ee0a1684e1e0aefc2b40da5736b33e6c6cd6afbbb593ec7bb09da1cb597dc1f6c275
+EBUILD lohit-marathi-2.94.2.ebuild 590 BLAKE2B bf1483d80f1379592839fddf32ecd4d9507c0d16bfd8b1131626d5fada11ce1a521ec7de60a4fa73b35f4f5bcf69c97d76179b2dae68fe291046f0f84f4201c1 SHA512 11b1a3321150075fcbb3cdd676fb59f8d68707f3b230d395c7a6f2534a5f7b431f549540116f8187deb80cdaeabc38c4438b583ea99c1c616364550f319e6205
 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 bbcc675ce363..91a79b43c823 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 
 RESTRICT="test binchecks"
 
diff --git a/media-fonts/lohit-nepali/Manifest b/media-fonts/lohit-nepali/Manifest
index bb2db4f832a0..568568fcd8fd 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 596 BLAKE2B 657818cf77f1b8f9ef273e59d56ddb60f198278746388f7f1c87f644d2751392cb0f1a099f3f49096afecc6601823e431413832f4975cc435aee134635f384e3 SHA512 e7239c546b7786390a44f89cb8dd06eec8ee9af921e90dfd69814ebce1eb91655e68537b574fd512e282df36ac16ef078bad7474ec22fcbe65d89cda5ff93ffc
+EBUILD lohit-nepali-2.94.2.ebuild 597 BLAKE2B 7110089b41a31ff48ab92408ad50f46489cbe27c21b87caa2ce4b9ce322ea35f47d3e2162af8a73ea975fc0e9e708e3934f52ece6a9f81c21c6a23d23721d8a4 SHA512 67cf47dceafef4b311572777f342804dde35056e82491737830fdd858f14ae1f31208325629c623f5b4abf1e5d60a2076f1c14d593e1334928587c96d4228ae4
 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 37829854b4fd..97fbbcf1990d 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-odia/Manifest b/media-fonts/lohit-odia/Manifest
index 3c0a7444d3a7..a2fa428a87eb 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 592 BLAKE2B 94c821c8e22e203054af4dd052d7c2c8c1333d38d4c3fd1d83572984b95877d556ca0044f15391cea6d907babf44abd230968119bc495ebddd34da317ca7d83e SHA512 6caaee644deca01c4433dd939f74a19bf0f0b545e537adbf06eed4533338af69c4b84389b5e5190cb488b03ff53c38d892b90f37a4e5e9887c5bdd32ba8f164b
+EBUILD lohit-odia-2.91.2.ebuild 593 BLAKE2B 9bde515f516a81d5d6825b9990a14f80eaf5b67cfa97f5c4eb2d3d0f304fa6578f0fa4295b20683b8beb5ae2935f1e300a2dbe178d7b5979a3e23c60dba12b04 SHA512 b53973235a919eb23b2df8e8521e886703b6a2e747ecda0b35dd5b2b422022491c830d098dd600ed3cfd76099fd2e4be767c0018f1682ca979bd4731cbc582bf
 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 7773d8429957..802e5e4b9daf 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-tamil-classical/Manifest b/media-fonts/lohit-tamil-classical/Manifest
index 16402d9d5d35..2b1cb29ee74e 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 603 BLAKE2B 46eb1c760f2410f04321eaaff85b9422431f2434bfada84e7b2ebc823148bc2d894c501e1d3077a07c7678367c55dc36eb0f6711f179e19bcb7f3e8c208f28c1 SHA512 e95adfb4194f56c54a22884cc979997045a9edef00f050e723ab41455e87a57de21a41e8bc9319d619b4c309786e1e953030d74d11f930210aba286881cf779f
+EBUILD lohit-tamil-classical-2.5.4.ebuild 604 BLAKE2B e511437741ebc7a900be5245618f4084929467be8f6e6d7fab317091da3fd0d0774dcde05a4fd82f35b000913caebd94955244db480c4f111ad62db4eae8305c SHA512 3ffcf96cf0f892a2e026623c784e261730c6f775692c4bd3566d89df83aa780662114a4e2f0b8c7d87eb894e7b5dc7a9e5e70fbbb8218a17b36b988ba8af14e0
 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 51748719214f..dc6d9b3252ba 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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-tamil/Manifest b/media-fonts/lohit-tamil/Manifest
index 0dd725d03b1a..33ccae1e5203 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 593 BLAKE2B 26eb31af9ac8dce5189f54dd9bcfb28f094db7cbe502880f8e6ed33223860356b4b89c6fb9b13ac2cd70cc1ac24c314df5e208752a823d09983e4a4b23c6d148 SHA512 eb98e4bb5b11ce0103a52f074f4ef0c88e07c9d958c35e42f6a50eccac5de1cbec192dba31930955886016ab5707204122a88752cb670e87606d28e6c315e0ef
+EBUILD lohit-tamil-2.91.3.ebuild 594 BLAKE2B a5cffdf5e10901c17272158d3858fa5d9df03644fb3dd7128f5f2325d1dd45bce5daa25f846d37e7503466f3a86758d8a54ed05e07ead3a85d56a955c1f377ef SHA512 c051e3523584aa72ace174bd9043cc9e600f2d15670dfdfd8533013cec07b73adf6db7c4cf8cdcdb97c987bbdb96b4ee8567dd37c08328a9eb6146d4544bc8f0
 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 2371e0cbfdfd..58c60bd359c6 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-telugu/Manifest b/media-fonts/lohit-telugu/Manifest
index 24e54b06e381..c9158f2f9f67 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 594 BLAKE2B 86e32d3d6d83b08b250b223843904961bb8128696ceb12246f23cdbf85d63cd91281a9a1f02595611cd59f1ae87b34e675c4acc9168515a6f8ca2c6b891fdb77 SHA512 31bb7f613474b447c71966d38953dcbdf1cbf69b7a27476ebd10f5aae54e679a7fb26ed256ccb339661a2373ab67db28ee681d6debfbe876db4f85e8ea081016
+EBUILD lohit-telugu-2.5.5.ebuild 595 BLAKE2B 220249fcda4c05efb2a9ccc9f832ac86598ecce49c8b6cf2b5875f864400d5c7343a3bb2d4bbe922c6f2e4fd4e9c0da72e04ea1f226d9b4a2cf132d148ba33ba SHA512 65acfc7a6bee0392124c428b1bfc50f9b1ed38e360f3f6c613059290315f9bc6fe899f5526699b7e3997510055ddb86fb571718416aa9b4e342b3e7ae7c0399c
 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 432ae239c39f..eb050ad6dc5b 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 RESTRICT="test binchecks"
diff --git a/media-fonts/mikachan-font-otf/Manifest b/media-fonts/mikachan-font-otf/Manifest
index 09784608996a..8ed9a36f3799 100644
--- a/media-fonts/mikachan-font-otf/Manifest
+++ b/media-fonts/mikachan-font-otf/Manifest
@@ -1,4 +1,4 @@
 AUX 60-mikachan_o.conf 451 BLAKE2B 435a16b9dc29a642ff006bea4cf0bf274c0544e51bbbc0a201f8f3a33643ddcb516b57b253b5eba8e8c87ad3caacc15f8e038f0178fb95d31cd8448385388e1f SHA512 9bf5dc2944a8e34bc5e6343e75b76a424e586cea27f64ca3a1ba0b155b423b83e33990547df72a0bcea0b38271a28d32e710a345dae16b49b2da6e333d8b44f1
 DIST mikachan-font-otf-9.1.tar.bz2 8702143 BLAKE2B b08dd4394b1ae54448d712573cd9d157516a7bdf377d31103133749365ae6313005d1045dd407e1eeae4aefb054a210c104360a3707669dbc57f17ba12fef79d SHA512 e012ea28cb935347876628a82779b259bccc35e608478a5d00ce6aec89e97cf26dc33f8e4a9f69028e8ed3f52cbd9284a0fa08983e1a25fb7b82b50d47f06d83
-EBUILD mikachan-font-otf-9.1-r1.ebuild 561 BLAKE2B c0a9ca7a9879b713f3f84c75a1d56ec0b61b05126f964cff57b0293bf1e7932f643f20ed1e0a5335ba1b87d506f1d63e57d29800a5da464787d529e2d39c4012 SHA512 ab2a1720352fedad017d7ff870d0911a19c0b47f3784034965b57a051be6761c2bedda425c4bc1079cf8af34537d0b9a81df8a499d4be73d0a735328b117d69e
+EBUILD mikachan-font-otf-9.1-r1.ebuild 562 BLAKE2B 194e07710afbce3f2aebc4d6906eb1bd0503f66cf3800d47532171bf7abec50fb22c742373720d09a9e7770eaaaad67ed079352bf019344ecd2695348064e01d SHA512 709976636810a096c3b5ee7849e0d32ddbd08e0c8432eea848335348adcae659cef4e7cfb4ac4be2285cc6b85bbf50280bdc7515ea6422e1eb58184cc9d0e329
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
index eff41885b6c0..7d5a9676fe9b 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
@@ -1,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="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="free-noncomm"
 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=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttc/Manifest b/media-fonts/mikachan-font-ttc/Manifest
index 62d962ab9ce7..cf33bf0a74e0 100644
--- a/media-fonts/mikachan-font-ttc/Manifest
+++ b/media-fonts/mikachan-font-ttc/Manifest
@@ -1,3 +1,3 @@
 DIST mikachan-font-9.1.tar.bz2 12247325 BLAKE2B 8530626a8aaa0e0626d4fd91b3fe3aeefe1ecf067d3cf19b5b90bff10c38ed4bac740087c466b0b2127185420c7385923faadf722ec3a419fca1ae198858a58a SHA512 df629ca4c79ab4b6cfae68769aabca8c1c57cb62708d1d9903fdb54601cbac3a49f94eafa21e43cb9c6573e7d874729b9f0ccecf296537bc8bcd16b5ab99abf0
-EBUILD mikachan-font-ttc-9.1.ebuild 642 BLAKE2B 4e719531c75b9a0c915d1b12679589ade2a476c11085cd292d09aae9258565fb358b7641d90656f05fad548ac9fd458b36736daaec944386ec7d76326cee418e SHA512 56f85bfc0ef60cdc242c0a76cd6f503cc581329991a6342b93b387c6e0c353d3f937d8f6d66dd620925f82e0018aa0d6bb2eaa73f68dc934c0e29f9565568aec
+EBUILD mikachan-font-ttc-9.1.ebuild 643 BLAKE2B 40f6560fde9cd6cbea19022a2f6ff8b19b2dc290fb2c44557f6d4370855493d7e5ce06153e4c5e4bd9fbbd2a97ddec13179b019d15f8b945f8696b279a621b8b SHA512 da4738eb0d266d539db4651cd089b43271e9da5843ec1fa9c808f5e263aab98929fd1f502d0e5ce46f69fb91a2ff5eadc4f7e7bdc8f10d2236d39c3c7abc705e
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index 373b73b4a539..f380eda5d593 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -1,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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P/-ttc/}.tar.bz2
 
 LICENSE="free-noncomm"
 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=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttf/Manifest b/media-fonts/mikachan-font-ttf/Manifest
index aa9dbb3be2d9..990e204f6481 100644
--- a/media-fonts/mikachan-font-ttf/Manifest
+++ b/media-fonts/mikachan-font-ttf/Manifest
@@ -3,5 +3,5 @@ DIST mikachanfont-8.9.tar.bz2 2086087 BLAKE2B 7b99cd22d961697e916d7546ff4f568927
 DIST mikachanfontP-8.9.tar.bz2 2099227 BLAKE2B e7aa5859337ba4e69cd5b83ef3583b0477712702968e5edc44b37d736e33ba62a0da7e1c41bd3b5c4c71e16ddfa0e08a2ecc05e869342e771dbe3849dddac74c SHA512 7aab79c8b3ffcbd25304a5fa4ebc94be8b2d8e305c61fa73ac3cbe612f0ecc22e6a0a6539798fcae4630685b0b2c280e1b808c744f491895d7292cad3e03f986
 DIST mikachanfontPB-8.9.tar.bz2 2138026 BLAKE2B 75ce6a618865c0d8164e213b1ed4b4ecd3e1e785156b8bf95c9729be05ae54af7249d3ed4a72674f54b7d7f7e2ea1c8e5c04aadd5a83aaea90f277991749e59c SHA512 9c2bd190a9e7d4621cfb461979bee7686e2d58d48d7ba7f2f4ddf262d11cc791fac06c30b25f5133f7e59185af3600e8d7dd10f8dddf5b64aac76045371ffafb
 DIST mikachanfontPS-8.9.tar.bz2 2102476 BLAKE2B e510552b874eb725abd145f2d550505c83b59e55cffdeb37fd95e7929c0d83f719285ce99f5340d966baea0c217211bdbcffd699e10e43997bf7a36a82978aee SHA512 2615b71b0c0e32459150355a89ff7877c1eda8d246137022f99261ea5604e9df801797fd6ff8975bbfc5c5920170f3bdfc9e050e7180518b1bca7f4ed5b01de3
-EBUILD mikachan-font-ttf-8.9-r2.ebuild 1021 BLAKE2B a841c160a37270b2fe2b5bd384c6fb228e2e996a2151e1f852bac1544847e8ad12c5843f61e9ac091d6ed62d930b827a5e8a11d8c5514f6590b7e3cb7cab3b6e SHA512 6f03060ba9b71262f77bf031225bc13f06a02c77f2dffd4a52cf23ad15f2f703a6a9f0be1ad9267747b4b496b2c421502ca44d686f1f884b828eba8407dbf865
+EBUILD mikachan-font-ttf-8.9-r2.ebuild 1022 BLAKE2B 2cdcc18e5e8806ad8d0578f090d8f2a073a85bc802c0bfc3d8ff3844147ca508fe9bd65494ce180d877a64f4e062f4ef5e82b534016f7f88a1618a3a0448c3ad SHA512 36d78d2d544dcb8d816b385bd232eed277cd487aa94d97253ae7d9f7d540b77dde2ab818b218616c209970d951edc0abded86f830e5e5b0e749b606e815c71f8
 MISC metadata.xml 414 BLAKE2B dfcceac5bef0da178b6edc05fb4d0cf8c2b36ac526be3a42c2d66ef2df79bc47951d0769feae31ad23638ab2343dbcf32a0784625c526fdc66b2e87b32360828 SHA512 733c65aaf57d8df7fdf5783ca2e67d0a7ebe5b194f97ba3b3218b65fa5236c3c1e9f853d09e3f36852f0dcf28df28000d35f60278d4d7fe6c86c1e02fd7f83c9
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 3efd878526fb..cb5f1c11dbea 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -1,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
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/mikachan/5513/${MY_PN}-${PV}.tar.bz2
 
 LICENSE="free-noncomm"
 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=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index 5fd52dc0c8c8..e2e57860eb67 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 1451 BLAKE2B 3c4bc458782bd00cd19e359caa51ec954ea06647a3cf5ba1e45f041949518150c17357e50568bebf16a2c53e39dc20a15c7463e5623487ba4a97a95c42857ad1 SHA512 a11f0f84f281d3e7bf6226b095df5910301407898d2a8293df0f9346b608b99b802d6b69bf1af79f5603a88429a382b7e20758fbe595e2cc3f9512e23f0b4593
+EBUILD monafont-2.90-r2.ebuild 1452 BLAKE2B 51c351543e920b7eab634f9ccf80dd6e5918d2c8060f45cd8f70891abf81d0c13a26484bc131360d7cee4fa4d05120aeaab69e57d232f0e3e662dc3f8f2f46b2 SHA512 abcea733e208db3637903f8ea74c6f86c387bcb6d93390489b2d1e0a01805baa7715535a69aa2099fa8fb0cf37f9afec6b6a6c9e046041ae47954dd09e0d8df2
 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 3450333bdb20..23269cffe90b 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 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="truetype"
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index 47a86109269c..7b436c8314fe 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 670 BLAKE2B 908f42aa369d56bac34fe3a24ffd243447a2680b761b993160f8c14aaa9ef2ae9d1079d7f12bf002e395579e1e4e3d5a0708e6a18c5e1cd23438667b1c448059 SHA512 169133e00c2bd90371f3c0686b86f54a441e151529fb6b991d06c860737f51a39d47be605997397e99776815da28c76692ff5a9aaa84f26101d29239cc96ed08
+EBUILD mplus-fonts-2.2.4-r1.ebuild 671 BLAKE2B 485b8325c276a95f2fa49d3f2205823abf86b4503137547f1374349050b654c78f97e452bcf809308e115bf6501f5752a05ae342ba6847799afccc4725626f2d SHA512 724cde7fc4db35480e129ba486b0c15f3edbfe4803af4237eb984a02b41e92a2c9a31aa7a0f2ab3b34e5444c17dee36f7225359e51bf9ecbfa8331ec57fa075d
 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 2faea35b0f11..7df74fe1160e 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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="mplus-fonts"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="X"
 
 # Only installs fonts
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 1fa30657441c..889c4dc0932b 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -4,5 +4,5 @@ AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312
 DIST noto-20200521.tar.gz 861394318 BLAKE2B e30f7ec58130786414f2dd33acaf9c75f403718612270e346fe51df0cb74088ddc34b699d4af9a494446940aa58a4c2cd043f46208aa7a3004a194703efb464a SHA512 d1090eae56c74237da4e35989d3518dfcb163deee1eb4df64a6be0ccb7e6f2a2207f0602ee5f0156efa2bdb3d105073d2e9a65c8841dbab34207c89c05aeb8bc
 DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
 EBUILD noto-20200521.ebuild 1383 BLAKE2B fd4a16466e669785442414f634a05ae060cf42f9fbbb5cf9e791ece64f14bc4fc23c629891f7379012fc91f79cbeabde9c818c1889d64134ce92fb1bd7a75a8c SHA512 f08ca325dd93bec505da040743caf5b4d89d0d9109b823ee0c3ec0495d5fe780a4707a146b8f933becc3b3e486d91e041ec3a1518659e9a48ecaa46484daaca9
-EBUILD noto-20201226.ebuild 1415 BLAKE2B 24f9921db05642dd46ff9f4e107901837119a6817c14d1c58d1b5c714390f99a635f662cb9b4ae79d69e88d783d4db6fdad4c4db64dbfea6775c473758d45738 SHA512 9076f863cb865b309d23b0a1c69125cace7a7a9cf5ecb98170b4724f486acddadc8d8c474bee692d468ae01736e8a9b966bb5c1b87fd3ea70dff3aa6a11dfe61
+EBUILD noto-20201226.ebuild 1414 BLAKE2B 6d218a53f46c293c61ed5d4600a5dbd1d73f28de4c5efef316fa531585dea1e57924acd519d23c934a48b41b376dbc292646d96b91da3c13c9a3ad33a1234c81 SHA512 01ad9189633fdfe528aff1ce1b96d31870fca7908f98e77b8b06f52fe4e5ef845cfed2c4ce7edc01d5e5f42c3ad9671605bbff44079d96a90f3f0f0ed259210d
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20201226.ebuild b/media-fonts/noto/noto-20201226.ebuild
index 28988b60d1cc..3de653965aab 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/oldstandard/Manifest b/media-fonts/oldstandard/Manifest
index 35e89dfd9564..9790ca1111d7 100644
--- a/media-fonts/oldstandard/Manifest
+++ b/media-fonts/oldstandard/Manifest
@@ -1,4 +1,4 @@
 DIST oldstandard-2.2.otf.zip 398951 BLAKE2B bd379fd16421aeef4cffcc3c6023d884498c02e031ff3f4061cc220d52483076adeb5e5fdfe9a89fe9c035cc64e52bbd48638cb562146c7f72086a45ee678f49 SHA512 f270b295b7fde03efcffeae2b78a107e6c746a569208bb2f3e08537d954e0f5654851cce5510ec8200e1e860ef5629c6c371705fa1fbc36919e2d07c325f6e7c
 DIST oldstandard-2.2.ttf.zip 844435 BLAKE2B 5782fb6b7f6e941d14df52156f2b6bf19f65f7c51ac8ca46f1d74129937b997811c81f30b7d5c0d7814b9cb54effc8371a732b766ce601bf65d67f2b754ff60b SHA512 1d889cea0f29bb5bb446e1aab3635cb6d9c3489965fca0e08f3f601e492fe709f7b5d0479ce12a3e211e73c4b0f8bfb09832d2af5b5332ddf6c32cabfa4e550d
-EBUILD oldstandard-2.2.ebuild 576 BLAKE2B 5728a62acd702619eb136a4ac95edb17ce172f1a5a2db768d9bcf5505c9e9d638ed032dafe54ac0dfb3563b1d3e62ad77c29b084cc2bb3a71a87823e67eb0c83 SHA512 4df2269bb712ee8832aeb4f76a0ed4c287696770e6158c544a2b0e1f4720fb689bf0584f8bf2eb16570d80d0f67e2dcc4f211de42184277d0fd5a8bf83b11da3
+EBUILD oldstandard-2.2.ebuild 562 BLAKE2B f4ff7e4f33d763ce493f483fcf2cc58425724a7b3f9d9fdde54de5c0c599879683ab29fc31ae8c32d36b7b5edcb2ae314359cab610ef5c68266bef748f2d2f50 SHA512 5d5fa8667634876a5740de7e79dccb5c0076f08c973446ea1dd8ca0773adb63f1ac66a7da3cb5cffa4c83d2321e2e8f1b806afda53caa0bcedfcb04173acc09e
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/oldstandard/oldstandard-2.2.ebuild b/media-fonts/oldstandard/oldstandard-2.2.ebuild
index ece12183130a..1d5406fbce48 100644
--- a/media-fonts/oldstandard/oldstandard-2.2.ebuild
+++ b/media-fonts/oldstandard/oldstandard-2.2.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+FONT_S="${WORKDIR}"
+FONT_SUFFIX="otf ttf"
 inherit font
 
 DESCRIPTION="Old Standard - font with wide range of Latin, Greek and Cyrillic characters"
 HOMEPAGE="http://www.thessalonica.org.ru/en/fonts.html"
 SRC_URI="http://www.thessalonica.org.ru/downloads/${P}.otf.zip
 	http://www.thessalonica.org.ru/downloads/${P}.ttf.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="otf ttf"
 DOCS=( OFL.txt OFL-FAQ.txt FONTLOG.txt )
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index 2ae78db2eaa5..40ca98ba0353 100644
--- a/media-fonts/opendesktop-fonts/Manifest
+++ b/media-fonts/opendesktop-fonts/Manifest
@@ -1,4 +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 673 BLAKE2B 0c3767dbbd0d9e81be9a41580a44a852cf2f4289e3b058269c408893dadee8db0617bc095fb049bbda4f78b979473df7c761d08ba898181ce7e6cb1a61e30548 SHA512 f6075494108a7a8a7cf5be4f6ea48eda30882f346b9f2cf2b812a7e2fbe4656c42b3c27aa70c409c008f13e8c0bb4c12a7d2381627fef9cb0f8ad52cb9adb93c
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 674 BLAKE2B 80bd7937755b28633b2b3b9c9d36e5e532679ae9e66850f041ff55e419ade3d3e7d62bc176cf9c2d7048598c3e8ce69584d4b3045f0cb9494cee09fa3a5d7a00 SHA512 b513548d9ce3907911392101cb0754d426879e8a933057a9cadd99ddeedb80559d1073baed95ffe2d514e8139a3f2760a86c7ac67f65d515e54b655f633aeb2a
 MISC metadata.xml 357 BLAKE2B c6ad69b457b818fe1a2035085f9105b16ec1c0fdf881a527d30df04f18e3161ecd9003d4e7f9f613f13632676eb2c8fcb0f17929bf71b9d2319f036324b09ce0 SHA512 079b7a4055801cce6d1ab2fd4d4cfcc593b182cb99e3932dbb48745c4eb97610d8ba2c23107b60902442f55b8b211e0368b9a2420a76000729bb8b89a3b885a6
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 d6ba66c64cff..95ca8328ef39 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/pcf2bdf/Manifest b/media-fonts/pcf2bdf/Manifest
index 14781ee4b91f..df972f18bf76 100644
--- a/media-fonts/pcf2bdf/Manifest
+++ b/media-fonts/pcf2bdf/Manifest
@@ -1,5 +1,5 @@
 AUX pcf2bdf-1.04-64bit.patch 8844 BLAKE2B d183800ae3a24d886dfa0f722dcf03e1d56b5fea720ebc30a21f47a87250fdb5a3ae9f0207a152d65e1152842d288647067d8ffd4495b4ac4da63f26f9474055 SHA512 4bb7241e52a0de3445aa2ce08529e9954cfefcbe5edd41d6331a7e2ce86667bd3d4afdae7f346e3d877665a19385783810668f986546a27fd343bb6ec6be1ce6
 AUX pcf2bdf-1.04-gzip.patch 419 BLAKE2B be124f814fb80b82c41cb09869ec7a32699d74941ccbcb28788b7382054ac748b2d48e105d4972be07cbdec5ab58518e589b56536d0aa61aeb63910235f60c2b SHA512 91b7ae36113fe8c9d637137d06ee657074aa9e7dc8cc07676f7286a7d4b7679b4cb5d0a4de8b48a943e82806c201564724c276df0ee3e08ed4c231faf12c2a53
 DIST pcf2bdf-1.04.tgz 9686 BLAKE2B 8c264357859a8e88165711e5fb11cb36acdd15d51f986cae96fb6e818f630805105df68e2743c3a6a4484eb35f7de700e374207d6699b7ad22cd579da1c671db SHA512 dc8329047ec8529410fdb4e15cbf409293b31ed7d50a2f6771a17c0abef3c393f2566590eca133856abefd03b09247859c4e055368e9c19e20972ab2e30991b5
-EBUILD pcf2bdf-1.04-r1.ebuild 666 BLAKE2B dd8e9c931f137e7d2fa51ac293d2d2cf5d7fd27177c6203cbd13326d4b91ce76c2bdecb11b75f1bed278aafd4f2e56cda51ef88bdb7ddf3b48d863640eaebaf8 SHA512 278b8dd18ff135f20b3f042cf94d87add16903d22da1eb4e99c38ab254c412b9613b3fe48dc026841112a02aba785bfcd35063222e7618261014daf8b18ed115
+EBUILD pcf2bdf-1.04-r1.ebuild 667 BLAKE2B 02f368e3223db7c2bb14b9220623f223135f3d5f0e7f03a46f6a3fd08df1da653ef3bc88b6bed98feab7dcc987838d858173b7210900d5f3ffbdfee9cbe179a4 SHA512 317f7a7c9dea131428831a555319d044bdea15fca521a02e27ace6dc9c4c25a4079989ab168d0ecd976254b6df7b6b2dd73afdb4fc0826c66b0f01f197f5e5fb
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index 7eab5517e193..492fe348bc17 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.tsg.ne.jp/GANA/S/pcf2bdf/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/media-fonts/pothana2k/Manifest b/media-fonts/pothana2k/Manifest
index e61de0c81e39..7d9ac7818261 100644
--- a/media-fonts/pothana2k/Manifest
+++ b/media-fonts/pothana2k/Manifest
@@ -1,4 +1,4 @@
 AUX 65-pothana2k.conf 744 BLAKE2B de23abcc8777bc2f820c3a3bbbbf874594bb2970ff2492dc5eff84c42e0c4e0e8a7084d5feeb5989e9c23564875893230b773331bca952a5d8adbd8becdbeb5c SHA512 426f5c64f0919f01f285ae0e54af30d1ef6ebd451909cec6d1de832edbb1cf10264541f6ca73546142be7132cf61e32036c262fa1261c98513cc59f87fbf0ed7
 DIST pothana2k-2006.zip 1068921 BLAKE2B d4db59628fd7d32f87f56d7472454daf47c157c3529b39c44369e80ef7be3680b7278bfe9376d37e11261666ddf617bfe9c3bd730b39f7358feecf06ff6aa89c SHA512 4a43203c794582b15779874b08cc5125d35c4d11a57dd3859e1b90c6201038617b1172ce3adf8a8a432c2f56b3149d622a8d3f853b9df7c3d9a1eeab87621423
-EBUILD pothana2k-2006-r1.ebuild 541 BLAKE2B fdbb2bd090a424438b0d1ca386b191ed49e6af0262ee0318fdba75adcaf0966258445f17f9ec8e147d5c5285d98553bc9f9d7c685616de5ed812c10312e19f0b SHA512 4fb110cd3f1263fe5ed559c55b704ffbacd637bcf301561183cc0eb8f1f86926c3af9fa42130c20dfd452ddb59023c2881cd79a9abdb845b0697bfabd42fd514
+EBUILD pothana2k-2006-r1.ebuild 531 BLAKE2B 3dc65d9b305b7c15ac526708a28fcbc0640f4711a1e7cb03f02756a8f5d6d03a1bd9a556c8d7c03d7b6cc464465db843ac705690ed4ded77d466d5ef9590b2ee SHA512 6a6562f05dacf641d0a71142cac7af313f42af61abf3df38abd4870db1c49b7e0920ceda351a2c859f34136e4ffac620a16ba9130e9ea997ef36359358d7d500
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
index 535d0df3faed..bdc339020b7a 100644
--- a/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
+++ b/media-fonts/pothana2k/pothana2k-2006-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 FONT_S="${WORKDIR}"
diff --git a/media-fonts/roboto/Manifest b/media-fonts/roboto/Manifest
index d715085bb5e6..6792aa92c80b 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 554 BLAKE2B 668da029f3482bd02d6b221d3ed1a20aca2ecc35894fbca397a2ba945d98382e0cefc8522cb404a38bfd7f6613bf23dc2121fed44d3993d1cc4b094f42a87a99 SHA512 b98663521069f2065d56bc260fd40d80b7c3daf15e3d6d6fd1022b4a3b8e991e83687b48bec159e70d1c7a5ae68e9d6b9ffbb390240a626c691fca929a9196a1
+EBUILD roboto-2.138.ebuild 554 BLAKE2B 7b08694b10ccf07e34eacddce956f14011df593cb857aa04aef73e53e879085da7cd3f9838193ed520a3f40af9c728072c7b016df2ac17e19a1a35c14d3abdb2 SHA512 850b4c3e95eb96fccbe52a03632dda1e52cf1fc961bd14c081794f5f4c36f33cf58a5bed7af6832c8df16a1b943b503f38715f300fb689aa644252a7fc0bc568
 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 2bd9ec25fb65..ec3c6d3efcb5 100644
--- a/media-fonts/roboto/roboto-2.138.ebuild
+++ b/media-fonts/roboto/roboto-2.138.ebuild
@@ -12,9 +12,9 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 FONT_CONF=( "${FILESDIR}"/90-roboto-regular.conf )
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sazanami/Manifest b/media-fonts/sazanami/Manifest
index 854a72a9cc61..4e6dc7823191 100644
--- a/media-fonts/sazanami/Manifest
+++ b/media-fonts/sazanami/Manifest
@@ -1,3 +1,3 @@
 DIST sazanami-20040629.tar.bz2 8622710 BLAKE2B 385144c6d10a20853d6db3db5ef8eeca9ea73e588d087d28fee0655ff89d5024542a47d59e00adac86aca01645e95afdfe72354ff060905903f501fa5027b4e8 SHA512 53ad198ecce7580da9d3e50a6313910d689061d9f85fa6b2f66bebe765295635ca24431c27a750254b86d6c1a697133144b0dd4aa8bf645125a1fbf76049c813
-EBUILD sazanami-20040629.ebuild 604 BLAKE2B 2de9baee8a5c80f7bddc93ba1624d1f3bdcdd350846c21ea11f345e7483c42ac85b48d47b6a61be1a4793935d43b8b8e24cd9145c5ced0d2fd04154f13c29bb9 SHA512 71bc12fa68f801d21c271278109e600501ec16bbb997b13a2216a2ed07c5176e1f8ced258ad7dd9e1ec28a70649950d9b57cd335d439e04e7096533cebea3e60
+EBUILD sazanami-20040629.ebuild 605 BLAKE2B 406e500062a91bfb1ac53260d7802df114cd47f3da099a1a1f4dfc467bafccf6864ffd1fcfd2d27395f69719e11a0ec82afbbdfe52f83431fd032c40d132fc2c SHA512 907d06aa0879f8d1a6a31951d879228fb52976a5b9962053ba7a686d520e7d90ad441ae3c15885b018e59e2f374d29fd950b6ddca75bbb5ba4e612c015a2c4d9
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 8a554d86bc52..6e8ea002c816 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
 
 LICENSE="mplus-fonts public-domain" #446166
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/sgi-fonts/Manifest b/media-fonts/sgi-fonts/Manifest
index f486c414eee6..243e0f87f0b6 100644
--- a/media-fonts/sgi-fonts/Manifest
+++ b/media-fonts/sgi-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST sgi-fonts-1.0-705.noarch.rpm 163657 BLAKE2B 8deef97d74d795e13c68240e1a1ffd893f3a876f948c9e0c35dbc022995a272964c983891579e23b1bcdd687056a806cfaeea7d88cfdb70d7c577524855fd3ed SHA512 72db00629180896501eefd8ef46f79439dbf4714cc3716c92a61986f82f42dd5e8a0b0b0afc2aeb1a064a0c0d554c776c46832ac96063f1d1949cdd9725ff9ca
-EBUILD sgi-fonts-1.0.ebuild 483 BLAKE2B 696b682e2cb62eb6227e0aec9967e57663904dd7795e6762502e132113f2bc5b3ad691e1c82096781b787488d749f7c2721d121ea82a644267fabadf9130e373 SHA512 8f66f04cbb1cb5c8920b5401b7b2f98e483937b2de16065c25aab9b0f846e9805129f33def895fc461942851474b77b3f9e5a0678a8bd3533e36618701520c08
+EBUILD sgi-fonts-1.0.ebuild 484 BLAKE2B ae968cc48d0f11e157a419e5dc093277f80891342d3963477eb7938b87b03ee3564d3ebf45b4690aa15f38bb41889b9369932d851e5385a7f519a93ad1c1050f SHA512 dff23d13c6a8f07cfbb6ccb09f7853a912c213c5e6b104d86cc36fb4118f0d51d4e9ad3ef4a674e2f0fc9d8b8d83244a50cb1eb5d8e9e5dc63312573a5c82b29
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index 901d78e55e58..e4de15ecba43 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.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
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 ~s390 sparc x86"
 
 S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
 
diff --git a/media-fonts/shinonome/Manifest b/media-fonts/shinonome/Manifest
index 98a796afb4e4..8dab2bead2db 100644
--- a/media-fonts/shinonome/Manifest
+++ b/media-fonts/shinonome/Manifest
@@ -1,3 +1,3 @@
 DIST shinonome-0.9.11.tar.bz2 4943752 BLAKE2B 0cb04d55f89f60b01ed72e07ce9e27e0044ca5e16aab06556c01cf4afbaa288bdeaeff5a8956f76bbc51540d92a748c54ad8561c109677834c0580a98855c21b SHA512 9defcec9b02fa9f71b0ddf0ce544f2f49361697a45c2c6063cfa32f0b45db6c16f4ee7fc575a270aa64c0051859f01549dd773d1eb72695d93b9305a9b9d0a62
-EBUILD shinonome-0.9.11.ebuild 699 BLAKE2B c3ae1e726d3e2b4d137ca91a7e3da4ebe3a0b419e91f8f2f4fe6f08a0147197cfd6a90478065ab99cb5a246633c33646358d6feec7eb9797aa2bd058ac0f414f SHA512 6af6b18a88be42d32894e3209aaa0f78a94a18262977fcadd088c91fb3cff4b36af647ed6db6aea9dc8f1027478ad592b4d395ee76c55769a037860f61f026e9
+EBUILD shinonome-0.9.11.ebuild 700 BLAKE2B 7a262d8592a7fcb618808d32800588b6d6061c5c94a75bab552c48571d05f07926b5727cb67c833bc5a431ab952fb746dd57fbf513fd9ef67e79f9e762def8f7 SHA512 cb2c2594e7bc8d15392e52ee3818bf43b61f3b0f138efe04543b6ae583135576e09ed0d3cfd4e4f7c9420d290ae4f1dbc2e5876582b3feef7e914b68b8861fd1
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index 487effcd21cc..a3f0cbe7a044 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.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
@@ -11,7 +11,7 @@ SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index 746362356bfb..919274285573 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 774 BLAKE2B 04ce68b57c10359bd03686fc37055c172dddc3996c2b044b1a583d460b226b9e125c7f5910a51ea636ac9556c69d7534ae2a4e893595d1f24a712c8452e63236 SHA512 ee4067af96d55efb50d05321cf3bf87246219de9f662a7f7fcce5476803204b925e60ccf80638d653a6e3216ae8532c8e249736c868a98139f4e1d4e9c9aff07
+EBUILD sil-charis-5.000-r1.ebuild 775 BLAKE2B 0a94e453886230c983d928feb6e0afb55ec65d3e228db78cd0ea3df648f0366156db8e6fb947b8e40632601d7e41018a26327aeb1c0c92669bdf047e31794057 SHA512 4df05e54cb4ddcb57184d04b707c6fa3c4aa0dc42ead1defc3f7b83a114b28675c907c8fadf1641376e9a9c6b64a9fc70f4e4f3e36075255ffc6c7b2406c79bb
 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 da202e039d6c..9515389b71b7 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="compact"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index f03a61470f64..7f749adac76b 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 576 BLAKE2B c09844a14127a93ac4877fea8815decfe49f13e0a3b4d223a9bc1e76af0bbfb827a4e5a3e5c12bc1b07d6ff763f74d9c06438df19f8dd85c27d3cf5ab0018d26 SHA512 973023ec29845d769b2d35a6263ff73206611c11032acbcc25d9061dd71849a3fc102682a9a7d64b8fc29f1ac922e4fcbb1607fd1b1a4b5dc568c54479cbe49a
+EBUILD sil-doulos-5.000-r1.ebuild 577 BLAKE2B 435b298306ef29edb32d640f0ebd6f7eddfac4d1b1746edeb4872102d795b5458f339ca68940c27766e1253665a935787f748fa4d0eda122f952a3af5c75cfef SHA512 ecaedab4313eb0e90ff90b3ccdf8e60f8f4258a09bb87bdf34543511d481e6f825c45bc493b2dec0328279a21ce9a95a319b2d3d010b10e14cbf48c523124d84
 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 3d81a974858d..0156d6f2205e 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 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=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-ezra/Manifest b/media-fonts/sil-ezra/Manifest
index 5cdd2ad204c5..49d9e78da91a 100644
--- a/media-fonts/sil-ezra/Manifest
+++ b/media-fonts/sil-ezra/Manifest
@@ -1,3 +1,3 @@
 DIST EzraSIL251.zip 634131 BLAKE2B 25c80feeebe6fedf0680bf6568097cac0a4cb5acc7f80b20cef4e67ac43a1ce7e929a89b4f6f3e6cc3767a8fd443325bbc1b9e68500c9e06d8ecce333e4c33bb SHA512 ef907ab9397c64a3a6f0638eb49d79b8386e6f84b52e6b94cbea22b5dc6011005acb7ac27fbdf3f84e85439a61c2a9ea52e4bafc8daf3cbb15149b2a90db5fdf
-EBUILD sil-ezra-2.51.ebuild 570 BLAKE2B 5e91b61d818e75120a39cba54f74d55b2462a84b97b26c87c8a67340de7fe990cb3ef933221b15153e0d8c7fc0f22e56881b9fee1db9f164210018c74f3f36fa SHA512 c05f8ece15ae91b6c9ad1a937804f68ee21d5c0262bfb1de342fca1db95034163f37b8bdd9f0b17777bbdbce227e261fa412eababbb45bd913fbeb8f8a5bebe6
+EBUILD sil-ezra-2.51.ebuild 571 BLAKE2B 71dc0c6a6104a0576940b62513fc1b995cad087918869ab504cb994523210e9fad880e07ad67b82ead59701ac84fa8ceb40c055af0ff29337484e67acf38c578 SHA512 2213667e731ebdafba35477708868e4cba498e5fd6aa287069ae0734305449b63f78cc8d2d98234a826f24ab236c34c30b1e4328caf9f51c7c5c536719ad5249
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
index 359947c1b384..ff554a8a6006 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~s390 sparc x86"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/Manifest b/media-fonts/sil-galatia/Manifest
index 58f34ee5a477..1e4578ccd230 100644
--- a/media-fonts/sil-galatia/Manifest
+++ b/media-fonts/sil-galatia/Manifest
@@ -1,3 +1,3 @@
 DIST GalSIL21.zip 158917 BLAKE2B 24939c3d482c5103b117490a6e496669e39865797cd9c8d93fd4fbacdb992e64aebee6f59b70fceca2f0ae92e08ee45004ea98d7b9e7f50edf9d58b23117beab SHA512 ff408660ab892d04e81db24f4395ffb1e3732921a2277173dfcc1b080338c68d22aa004f3838959ece724114ff0e5cf3be101c41341ec5ba22a1736458e25672
-EBUILD sil-galatia-2.1.ebuild 479 BLAKE2B 0335904cc9c12e0d9afbcf40a77ce729e8601866bd100e2a4ea34cbb47736bbf708a9c2153fd84315c4d51082708f4f038341eb28af5a900ce5d4ce8317a10ec SHA512 8c142c212c05f09b254db8d0cbc47994bc83e2045876447a84e08fba45181371a868ca921f884423b9d8cf8ba1f37d54e55fb892713c4cb9e5612647d1ab35d2
+EBUILD sil-galatia-2.1.ebuild 480 BLAKE2B 243b958e37997f2c1549a7ce4934635b1f1772816c26788fe9f8d41a56ff80e407663777482a1ebdef79fed068695eec50753c7b49e72a8e13321b85b8edb149 SHA512 7314b1246a05a6f3b9ed3a0ed46db50eca08591d3cd0f93866b6105e7bb8032f901b4cc72bc406f0d0d80770015ff9abd4aa0db9de0663554e07d84fa41a1551
 MISC metadata.xml 743 BLAKE2B c4f224a328166bcd66e7f4c6942c686350beff6abd290801095bc5fe8a446f9df18945a9e2eec68deb4ce7fcb6e52ac76959d73a5b844597a9c2382941423144 SHA512 963c0e56645d8a6da8bd1949e1c4fe61aca109f4b878cdc665beb319adafa157ead40ef0f4c3df3c743fe63b73766ef8334932b90ec20469581aa12b35cab512
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index bf80fdc8930c..a1ac4c2e9e26 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index 609f4e16732f..f466e20c584a 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 910 BLAKE2B 90fff229735f82bc46a13f927604ab376db9c49654d870bd2c138a9e7dcfb45ca8cb05e9694a76916799f1d0500f17e58962ac9e7e6d6b6bf7ec12344b623627 SHA512 a1827f782917c198f66a7750093ae3ccd77610193905938ee884702d0f0d66f065f377cf53082c7130ab9aefffd9420fe315685ae59ee1c0253e616ccb518575
+EBUILD sil-gentium-5.000-r1.ebuild 911 BLAKE2B a1bc3a198c7d53422ed06e816ccc8070a9bfdc6fdfc51c9329031668419cc45273261628c3c27d884d1c4c00a5df646fb91f0d968afc7e3cbc23d2d5fdecd04e SHA512 cb5916eca08f4c4516885ab35be04b73d668be15873a668948de7c46942685301792e6d938c00176bd9eb3bf9618b31799c840aba36e90abee702a19fa582076
 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 fb7bf477d703..8f3216b13978 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="compact doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 701cd65d25df..2a46ad38e898 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,5 +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 442 BLAKE2B 02df9ce281984f213c211e5d45c8e513ec05382f3a63417ef9688b9fd7aa0970ae7430eba8c58e892e20d78cc1e28b30e4c447671cc8f847f34bbdf99d27dcc1 SHA512 9d56ed3aed58444b9ae87cfbf10aaa1747fd1d999681210f8b3a23d2e08845cbd88de1d2d9b53d7456378f0831dc47d6a544aa303dc8cbd863c1b240ed6df897
+EBUILD sil-padauk-2.8-r1.ebuild 443 BLAKE2B af48aedb8448a695795818e75e2b190f5f4733bd0c652007fdeccae732d940a26d65ef0b32148936e1bdf1b2f5a403d635a6c32c2d42439a281696decfc652fc SHA512 6094589ef8560a3ce475f0284a18e3e09033c763da544c8d3f03816655f88cea4ad34a469348350a4011fa55163791f3a6309098f9700a9bf3f2fc44508792f5
 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 2fc416dc3a24..a8facac41705 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}-2.80"
 
 LICENSE="OFL"
 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=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/tengwar-fonts/Manifest b/media-fonts/tengwar-fonts/Manifest
index 589dfc1ef3ed..4bc13752aefb 100644
--- a/media-fonts/tengwar-fonts/Manifest
+++ b/media-fonts/tengwar-fonts/Manifest
@@ -3,5 +3,5 @@ DIST tcurs100.zip 13296 BLAKE2B d046f1bf70380b9ed3d8447e091e8f5f0b478302b9d5a9bc
 DIST tengn19d.zip 120028 BLAKE2B 3281d2902125ab2d369290a52f94868f5dece7ab5fe36fbaa896d4a0921b0356189b89a3f72e50cabff2c43f34405eb484034f42cb4d7d8511282b14d1ccb652 SHA512 4a0cfbe9718999b0556d4ccaa1f66dbcef09a0c1861d6c977264b0d840ed5afa3bee043fc49fe1811f92f6b46245d017035c11fdb5f222b34feacbb40e4ebf07
 DIST tengq19d.zip 185778 BLAKE2B 4090dbc00984a82f324d1806c214512e11310f4f1b5bc3f31bb63124af888f7a1b9e0254df2b59bf3d578632fca9419b9e6f17b9003025be46913c0df4f3407c SHA512 9e15591bcf9286ee2d1062e0202f2de9cd2ad088446624ff7a1a90c2e76249f90dbd6491aacaccb65491566d62a0d96d5bf6d6a379fb7b8ece5750be849298d4
 DIST tengs19d.zip 228717 BLAKE2B b53ad1926f1bbb0307d6df721acda796007d010308c5f01428ec87f684e9ed7274d1a1385a84f88fd7af89e02810bacced9e31416bd3bb6e21d76eda89fe823b SHA512 d8f809056b9c5930420ad610f50d9dc8336341246b79a33e6f32a8ed023f28275808bc25ee158f9528d7d345456eeb38f03fef3a741f823d538eb78e7cc000eb
-EBUILD tengwar-fonts-1.9d.ebuild 714 BLAKE2B dad6e26f501802e3965b8e46991eb55b059cf01d3591f468747f9e80e54c8a0abfb0ddffe47a8456dd4628d6073ef70c2e820a94e0c561ea29a6d4a0a9758c70 SHA512 2d1543a49aa99bc1c1a8167d0db255dc1dd414c147797a208d9a704ac65427d223407b872bf8e0ce20ab56685cd32e1b7cb34c8c9781dd79df4623b38d0541dd
+EBUILD tengwar-fonts-1.9d.ebuild 715 BLAKE2B ae771481dd7ffc0376db6fadfc14f8d0952ef8ec1dcadecd060f4aee4cb3d69708c2a82c712d2129f53478c2184cf2db831163e463eebff3ecba00104422f3f5 SHA512 c9b4b4f2111984c924f538c5ff472bf8e3889337c8316e62413463094d5db28910461be44ca7943e55d524a5597c58cc485cc0d6397648044e8ac2ac7738602c
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
index f3d8c4b99344..452aeec74670 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.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
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/texcm-ttf/Manifest b/media-fonts/texcm-ttf/Manifest
index 31e903e43cda..77cc7f5322fe 100644
--- a/media-fonts/texcm-ttf/Manifest
+++ b/media-fonts/texcm-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST texcm-ttf-1.0.zip 75261 BLAKE2B d212682074cd379a90be1b585d64ef62248999dfa71fff4c5e858ce927893301ac651d0716b9f588f31b266ed9fbd03a8898b21d26a03abf3bfe2a78a64ef63d SHA512 5dfa793a632d427635f1f38f1b57974dec2d24cd6848565893b821489bf8c5ccad544d6aaddf05e85cc9e77bf800a8f1a1d8f40b57d9d004e47824f78371d34c
-EBUILD texcm-ttf-1.0.ebuild 524 BLAKE2B 7a72679f007e4182ab49b0977c9eb8da169e4414ded498e3e77df4ba2724fa74797234bd736e9dc774e387d5783f57bfdd989471981768ee37725039f66799ff SHA512 e37512ac5ecb8e229805e8d324f473411bc2c3f03e4205b2af8fc8996a4fa87860e5bd7513f3bf4ca3279c13c4d8ee9c6a6e9978ce6d5e737a345a906335af72
+EBUILD texcm-ttf-1.0.ebuild 525 BLAKE2B c93bcca3b8c3d4d7e05ada173a07635752b3bf8a5ca57950cad644194eafafebb761125263a82d8e57dd69fb40c17835a8132a447cde2cfed44c470ea0f3d72b SHA512 0354203962d6f95bc433decb4807f4a8333c16b1bab2e377b31e1c2cbd895c86f76af1555bd62fd4f14691128639d13435064e7228b4e5767612c2df93ca6b9f
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index f2d54be2cd99..6a3557a63634 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 
 LICENSE="bakoma"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/ttf-bitstream-vera/Manifest b/media-fonts/ttf-bitstream-vera/Manifest
index 4e413b4d23f0..e32660a7bd1f 100644
--- a/media-fonts/ttf-bitstream-vera/Manifest
+++ b/media-fonts/ttf-bitstream-vera/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-bitstream-vera-1.10.tar.bz2 264276 BLAKE2B 3715109947cb534094d5a5bde49e46ff342eb5ef7a6ee348ad391e1b480fdb97724bfdb539653516fe571536b732c7f0d1bf31ff48c443f8921b6517573ac703 SHA512 75b481553dbe27711ff779c13990397f76d59de819085e55092fb2ee86d2780232512487a5dce33b29e38edfcc73e34efbba07f7016e7ff4e59bb35301e7a392
-EBUILD ttf-bitstream-vera-1.10-r3.ebuild 537 BLAKE2B 142d59a29cabb593e7fe61c2b46bf447c24c6ecf2efff305f230cc0501d3c357ca48ff9376a1f35acc6e0727a10700ed0fd9bc3d910a44a8ff41fb989ae01610 SHA512 1cabc5616d274554dfd5b5ee202a95a7ea61df12a33f13276d581c600eba8cc37e7e4cf72dfc8a8091dc9bda22960984756c78c7b940e4ce4df4c45e58487c7f
+EBUILD ttf-bitstream-vera-1.10-r3.ebuild 522 BLAKE2B 24860e6a836c4b2ed09b270e99073a2af6a7df0aa6b1ae285b06f7c779ed68ff33dbcbb5c55134b25b1e78391eb000438906bff0957d911ebfb7946d994eb047 SHA512 4929615af015b6c35c5bea2bc0f45d7927cbbd824995320248224586453076462a49b0527c9a447ad986246a018dbdccd006b0c40f930e0f5bafede0affdca64
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index aa4bbb816780..944334b2f1f2 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -7,11 +7,11 @@ inherit font
 
 DESCRIPTION="Bitstream Vera font family"
 HOMEPAGE="https://www.gnome.org/fonts/"
-SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2
+SRC_URI="mirror://gnome/sources/ttf-bitstream-vera/${PV}/${P}.tar.bz2"
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts-extra/Manifest b/media-fonts/unfonts-extra/Manifest
index bd832a84a114..ace8dc390e91 100644
--- a/media-fonts/unfonts-extra/Manifest
+++ b/media-fonts/unfonts-extra/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-extra-1.0.2-080608-r1.tar.gz 11375538 BLAKE2B d6075e5ac0de7b6d72df02a6dd9bd5bc4df59b7cf6bdec48472cb69a719e2639e21873f7df68017063cba678bacb6d71136d78deca885759c854c7260e47cc26 SHA512 9ae5e8b933680b9422aa96cd0151359d228c1324b430e5f2bd1f7e3e0b26d81902b1b3ab99ef6d1fdd08b88c35d791af982618a9a56188af60b5e9679bd0316d
-EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 519 BLAKE2B eda8ce1d9444e79292ea59ac6f235b5781fcfe2cfcff0883e52ac0c38cc47fd9beea3697869936b320e1b684ee0a5b99bb6646cadddd8af7f520ef3c72b7c63f SHA512 a09a00ef366a05ed6d2189a6450fb5483bbbf843224bc74f13efc8d63b62bb38141bb29efe8aa177f6abeed52f343d8d69e445e9a44df2b35f40ff0433e682b7
+EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 520 BLAKE2B 6b1bd4617fd64905d4f5c211e18dfea6608ae38a270b728de055dbe09cf6b26fbfe78e1c88e9c27acaad4679711b6b6ed690efd907b87e0a4a021d2f759f40b3 SHA512 be551c39c81f8673bc987df85a4f61658b704258e7ce5fab4a9d10feb00032278b113905c2270a25a173b980d9fa6145ebcc3622266617ccbcb0bd0ee17c877b
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
index 7f99a77338ce..7ef7e6e8e4da 100644
--- a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
@@ -1,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
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-extra-${MY_PV}-r1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/unfonts/Manifest b/media-fonts/unfonts/Manifest
index 6d2a5746a75e..1efaf7c3b9f9 100644
--- a/media-fonts/unfonts/Manifest
+++ b/media-fonts/unfonts/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-core-1.0.2-080608-r1.tar.gz 20117428 BLAKE2B 9b14a194e71aab389b7f72819238398df672fb457420db7dbea9214324b1286a5be44f7f8cdbd67dd9de93f77d350fd6ed2146d4471e0c761a1476d114f97024 SHA512 ab7c394931b5dcc6a7f6db89b69928ee769cffcca08e1266ecf4864bfea06d9dacc45c4d821786de8dad04b84b0de78a9db84bfcbb0ec506999dbb791570d941
-EBUILD unfonts-1.0.2_pre080608-r1.ebuild 511 BLAKE2B 9e192962df688cfda440a2786dca646a44d593f70997bc35c3d624540fe28d0f0c62e3c4ee7cb9e17e336b73a2d8ac3cce1e810c80b010a699784d9ac5283162 SHA512 cf9fe9c3d0aa06ad71d955bb165023a1e07a49d6ffa1d9c3500a5b0b8e544b8f6a086cb94f61cb2b60d34f2285db654be04412e99ddf20f4df0f5cfd8350170c
+EBUILD unfonts-1.0.2_pre080608-r1.ebuild 512 BLAKE2B 095b7b985199e5b4d7d058b58925382c96afff2e85d942b9b8d97f7daf32f3a7c14104d92f7b03a1ccfb04611dc9f1378c10eb519f92ba028f4edbd08ed8b909 SHA512 13f9f0bcddc31e106c9157e700e2449411608f9ad90335f3abc3e085e205db332563d95554685b86d6220eacebcf6e8fa2acfe42fd1c104136f9ea8c7e93b096
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index 4f0ea6480ecb..25a45f071002 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-core-${MY_PV}-r1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index 6a3498fd8805..b26152e37fc2 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 BLAKE2B 9f4c026af2ee6b472454be43b4e1d11616770cb63841fe022762f18a7c71abc37e442102a3d54b880a6a34117442cf45b2d65133ef9cca564e55a26ac1179824 SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b
-EBUILD urw-fonts-2.4.9.ebuild 1907 BLAKE2B b037e9501c9d17211f805d9e60245d08bd003a446eb6db198c8b752c3e285fe7590bc3103417d2025a0d7db5055fa38988e9fc2869fa92da14ecc2f730d0a0fe SHA512 2af49b88485b3a11089f5956e2704559310b639414cf29178b3d31cd84754d8b7c090e4bc5a7b57c53d74105f4de981edf1b1bd9b95d9e614fc55ce3e4f0cc08
+EBUILD urw-fonts-2.4.9.ebuild 1908 BLAKE2B 89a11d05ed31e023bc38577805f5ac46b371a4e761516ba30d6d91476af537a42b6edf874663757cd57007584d354852bc5fb8ea3fc3f13f678ca3b228c47250 SHA512 a5cf6ef0112e16828264f31a1ddc4302fd667bf77691f3ac943e5d75a0e14cde23c7f0a5c97ecb486b16eb23668008a4d1af2f5876f7604b3da79315a205d57d
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index e67e08a79ea7..4f5f95202bb8 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!media-fonts/gnu-gs-fonts-std
diff --git a/media-fonts/urwvn-fonts/Manifest b/media-fonts/urwvn-fonts/Manifest
index 896c958d4fe6..df3702eb9d5d 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 910 BLAKE2B 771825560c37d986d470c3520bdd8bb3e1b064dbab418d91dc5b9d362473850f7dc3b61fcc926062df896e330894db1898c32a9a2e3acad4ce104514ff864974 SHA512 bfd9e7b5b1e9485e36233bba9e8785c546331e3994877a55d409a27894f4782d176856c4353e574519c65a7e55f17a7f069119f2708c5b4d9f61be4bd5db79b4
+EBUILD urwvn-fonts-3.05.ebuild 911 BLAKE2B c8e94f44f14f04c7d931338709f8e2eabe22119db5934f7923607a9a01ad0a91e587166bef966338c6fe9a61e12b47b39027f6a4f4ad5c2e88f78ddbb67318e3 SHA512 f8c5274724f7840aec469f41abf6b2d04a611b66cbd1e1bfaa6490ad54f4859a4b0e2d8c62ae9623fb1f61111bbca8eadf4a70f11a4cc98a6f5d63c61a937aba
 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 2eb40386ed5c..748a963d2100 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-ttf"
 
 LICENSE="GPL-2 Aladdin" # bug #434262
 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=( "${FILESDIR}/65-urwvn.conf" )
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 9c5618515b48..b7dc74087ce7 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,5 +1,4 @@
 AUX gzip.patch 472 BLAKE2B 3804de127898501b76be41a8bf016bc1eb224b19a1d56ee1dbe6345352de5f6634692d2c45c1747bf38bb9a90fdaa42cb359e711b7591398576e51e624940099 SHA512 b3ba5684c9d60435032f69e22f74feda6d4a49689db9ef28acd5ca8fbc8190c344e8cb7991ea707f21317f55dd2edaaf12b6e0bb14d70d204d252a63b184a280
 DIST jmk-x11-fonts-3.0.tar.gz 624357 BLAKE2B 5513e46116cb7ac63e69d4d0fe03f627e437a11ea378c4213b1cbf13035a5e1c14dc4c1bf230e6490829b4cafc2ba3dd1b733f8549d28aeaa1e7389e527e8b85 SHA512 7a99689be59eaf50742932ce27c8b41a99d10076adf9c2990e11745a873eec610257d50e844f8380658d340cf821724d459dc9b6b189666180596f2bf255957f
-EBUILD x11fonts-jmk-3.0-r3.ebuild 665 BLAKE2B fe9a6d8de5f17eea74700bc9e0310a0cd3e2da43873300659a381888a5b99c3765135ff34a27d9a02db05f6edc73420b0f25988d575f154cf5415a991f5f41e1 SHA512 7d1c644460da8ebfd9c76a811ba033187267ffbde8a5047009da5060eda015ec975eed2cfbe3f4e063eee96129f835a666374ebde7e16fe4552f0433c4c4df19
-EBUILD x11fonts-jmk-3.0-r4.ebuild 717 BLAKE2B bd210051dbb25da2b576b9215dbbb0dad63f7aa362f80019ac1fbc66d32e1078a9e8a886825422f576409a4c2be7c0ad817a66e2d081a1770da6c27608b7aa51 SHA512 301ea0d64a55edc38a66fea7e8cf3f4aa54ff5b74eafbeeb333b4987b0ba20b48376689287a539d22da6b8bd89a8741ce44cda8d5c731321d049f40951426207
+EBUILD x11fonts-jmk-3.0-r4.ebuild 818 BLAKE2B 16ffe6214ab38e3b5dfaae4f771120e4602d0f1ad7dea79e6f4b93f6e38c18ce90a4efdfb6131a175ddf3635d68bcf33d7d12968329b6c506e56ceee6a0ae8c6 SHA512 975046d54f92f5583e38cbd797c71594eeac413659031eecf5e99f33d2701b5e36f3122b64a3e9eb3fb1627c5da637e51e3ae8076466e000faf8533fe292e730
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
deleted file mode 100644
index 3e27e1485653..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="jmk-x11-fonts-${PV}"
-
-DESCRIPTION="This package contains character-cell fonts for use with X"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
-
-BDEPEND="
-	x11-misc/imake
-	>=x11-apps/mkfontscale-1.2.0
-	x11-apps/bdftopcf"
-
-PATCHES=( "${FILESDIR}"/gzip.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	xmkmf || die
-	default
-}
-
-src_install() {
-	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
-	einstalldocs
-}
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 8c31d829c7ae..0673462a08fd 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit font
+inherit font toolchain-funcs
 
 MY_P="jmk-x11-fonts-${PV}"
 
@@ -12,10 +12,10 @@ 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
+	>=x11-misc/imake-1.0.8-r1
 	>=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
 
@@ -25,9 +25,9 @@ PATCHES=( "${FILESDIR}"/gzip.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	xmkmf || die
-	default
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_install() {
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index 9589852c55de..7e5166bb1dcb 100644
--- a/media-fonts/zh-kcfonts/Manifest
+++ b/media-fonts/zh-kcfonts/Manifest
@@ -2,5 +2,5 @@ AUX kcfonts-1.05-code-fixups.patch 4629 BLAKE2B 26135dad3608b8161d39491576c42ef8
 AUX kcfonts-1.05-parallel-make.patch 289 BLAKE2B 8f23ea32c830425ecaa45b01713d2c85e073a66f4fd0edd9c3ee48d31119da012428031e5e978266c0f4a16d75a9b161bea282b6af8a2f4bb8347bfbe38e2710 SHA512 8e00add5e6ace48ec8de7e6960f50f634317c7e9f0b57c723b9b6ec8b8f0e8d92f81b5339302284d839a3b8af79880e0de0208473fcc3e4eab500cb47aa72964
 DIST kcfonts-1.05.tar.gz 903701 BLAKE2B 344017187fb5ff1a13cb9e05e84a56d38a7b7d14865ec471bf9c36c383f1681b1944346af2d3b1f67ba340b8101a968ef527f0a27ee7e5ac3837f1c67da33325 SHA512 a8b94e8f8095a8578ff340637bf4a197db56948d0d7ecda0d4f17da51bafc09080761f32894f88a54c88945f72b10a11dcb04e5841c19c4eb6852e263fb64209
 DIST zh-kcfonts-1.05-freebsd-aa_ad.patch.gz 4749 BLAKE2B 3d488977e76ae71587ced990816a85173b5a3196df3803ba517d99b8ad4244d59355a0b9c34d683c7cdf8b5660a0f411c9d544379caf0ddca1f8bef35eb7028b SHA512 2881c31ffc5b8fbc2e27edd6f139436da89bd3db3a654bbcb4b8f037db0388bf592b83014b750057264694040c8f2c3d28718f46ad3cf1fe5e13256df7666fae
-EBUILD zh-kcfonts-1.05-r3.ebuild 953 BLAKE2B dfb041d96b98ab99c5e86675d4f372359944dadf1a593938999a2588ed45d2b575bdfc1a351871798e7bd1aae524aa81f676121be637a2c023c4987ed6c81806 SHA512 f581b574807abfd7c79d87d5b46661c6b9d245e09ea9e2a86d71c194e9cb3d5acc19ae46322da8512406b71725889deb56346228d016deeee133a1efac7a25dc
+EBUILD zh-kcfonts-1.05-r3.ebuild 954 BLAKE2B 35855cfecd8a9593259fa0a813ea3862f8d6cc22e23aa8e024633468867a13544af6529bdd77b452543fd4c1701c7700faea682126b08dc1bbfed13af49da0a1 SHA512 6043459a2dbac5e95597f91b9f331b41fd9c40c7bd23e60d64caf9ab3ff5c4575d5a44e42670d79827e99d33b6d7ed6574cd81c54d6b4a6e9c9871546199ef5e
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index 69688882626e..d76445218ae6 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.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
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-fonts
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)