gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-fonts
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
316 files changed, 476 insertions, 935 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 8c2430ad1e0f..71270de1b3d1 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/alee-fonts/Manifest b/media-fonts/alee-fonts/Manifest
index 94f86ce2c4d8..2af79ac4e3ec 100644
--- a/media-fonts/alee-fonts/Manifest
+++ b/media-fonts/alee-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-alee_13.tar.gz 702378 BLAKE2B 3a99b6832dc0216bd86065257b30bafff281aacbdc48d16bed843d134d2176b5d96b9a9aa242caaafe4581a90627cfd56dce6815e701148e85b6f89f43fb12e7 SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c
-EBUILD alee-fonts-13-r1.ebuild 524 BLAKE2B b1db2f444537a7273490f499140cd1399edd324f43348649832b26ca98af0c0a1982ea0ac2549786258862461034486b4fc474381edbd37910599a3cca398a15 SHA512 75342d638f1cee081b8893eb98faf8022478704cf22cf07ee2b3d8cb1ecab186a6e817ff3d4d3ed65fb1759905a40e2819927d90bb05bb68f59a28857866578b
+EBUILD alee-fonts-13-r1.ebuild 521 BLAKE2B fac606aa9deb0c1e1727d51f689daf2a56a039f44f65b087e0c90e9bcead376f0e38aa22d70c71d61c2ba9d857141824a6863250f9ff01841d0d8885c39e0fdf SHA512 1a11edf8a87524c9208f9e0369c6f9b8d2e5aea348ac98a29579d176ff701a9fa5c7bd0593061630bb71541be7ca95529d07ed3175e2a655288c775b6d63e296
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 4212b45d5b31..bbaa2034bf47 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/aquafont/Manifest b/media-fonts/aquafont/Manifest
index eb29fcfdaeaf..8d419a1bb38f 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 865 BLAKE2B 47a0ffcd54066237bab2604ecd7c82c801899b7d719a9df5c785275fb94cc4d45321bb6bc77e8cea654a2391882b65801c8d4f92e07c60a6bb52cb9501be957a SHA512 49c346e6f8157560844cb2e745dc559df0bc6b7775d3862d4102aed6cbdea80a5cd80a61c5ba69362eb06d93c22581f8061d7e68cb35b5273a87fc794f80ed77
+EBUILD aquafont-2.7-r4.ebuild 863 BLAKE2B 99e8980685c511dbd4d3f8478e8b435a9aee034490e1588aeb750450e2fa1df6970498008df47b6a90bf08107c448f0806be4818c02da3541c9bd71334851b1b SHA512 dc99b9c7212d0f7261a8b5d4498996a956741913009fc7e9576f207963963497956bc56ed90c444ef9453b9a2e5e2c1205c2511b11dc70a690237a91df9c962a
 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 5c424393ef97..4b074d09c5a5 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest
index 95427bfa5078..7169bc8331fd 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 824 BLAKE2B 0042a0842965434233f4ae947780422417b6e922d8bf101bdf949eddd36f29d1d37a5d44c616851be917fb577446046196c1255ce04975f10422b473a60a334e SHA512 c41ea1083d81cf2114e87b66798b46b8ee3536c409f788defe153b959bee095f650a6bbdc95451d47778c7e546b7b4535304dcfdfd0f32516d0f96c697cf0707
+EBUILD aquapfont-2.6-r2.ebuild 822 BLAKE2B 4173cf6cd6bde2f698c034d6600cead5637b7d731b3375454a98df21e86604a7b4cdb01ffa1d9d45a8cd97fc128736592e717dd3ec711d4de602a7e7dc6d51b6 SHA512 bf45cc499b6ca904f7da0b96c99a0f92a86e17bfc9d333fd4633e4adc7a691e7b16c02fe7f047d4bb048cf3dbf40050c428f6c14925714ee47f68ef9dfb05083
 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 ffa9f3119b10..d1bf5ef1d270 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/arabeyes-fonts/Manifest b/media-fonts/arabeyes-fonts/Manifest
index eb2a3c194e8f..919e1c021503 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 563 BLAKE2B 4166ea0ef5448c21bc32abd0e7b534f99463e939c428047bfc7d1d01508e63545a8561265b7fb61f9d8e39c0873c4d62668edd7921b59397377e14e76a724981 SHA512 432e9f180205d292d2055f265ea6a481b7d31bb7c51afa34962410d9676036219b9617713ee0a6c5217d4504861864a2b74d87076f0b6b5a1ea20456fac04301
+EBUILD arabeyes-fonts-2.0-r1.ebuild 561 BLAKE2B 2adc7ed1589af1b7b58dbc15537eb3eddebb76fc67846a658de2eeeb87a114982e061615b8adefa4e72a8e5dd4da346362d6e89d962d3b2efa708fc701acda08 SHA512 3debdfa16e717244aa0d4675b7aa42aed5b5ae973fe1f3af046c9efa33b309115631144c3f6c7ef89d667d1a8487dff4fccc8b578e926491f963a34f105f0f05
 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 297eb3d825ab..817c60059d81 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm ~ia64 ppc s390 sparc x86"
 
 FONT_SUFFIX="ttf"
 
diff --git a/media-fonts/arkpandora/Manifest b/media-fonts/arkpandora/Manifest
index 2facb8b30c11..d755ea045451 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 515 BLAKE2B e0e68b7fbe810b892fb87d3d919f04f589c586728b40b9f04751c2a64fc0ebe69ea25db3db150be6746f89a138239e9a40ee56de538839946552778cd2f85976 SHA512 40dc781c9344b28000d07160c9935ea06760deb78beaeca134ef15680527f848c1a975d73e5c2b874883a6e6beabccb4bbf601885aadbd294359b670ed125e69
+EBUILD arkpandora-2.04.ebuild 513 BLAKE2B 3a8077ebcdfd56cb6fbb812280cc7ccf893aa585a4b72f87dc98f5e0d373710d48b534c1a9ca9ed5281b1b7851701dd0a0d8a606fbb01af9da405061b1857f22 SHA512 40e9dec621fedcbc39a566837d18fc9490922ef05916ea0a57606e09a08d65ff4cb88e51c9b87820620e09355b7b6afc8211f71da41b3a6de98fcaff18c006fd
 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 3fc30bf81ef8..2f6cb46e9972 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 4b5511870d8d..b350a9d19585 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 2251 BLAKE2B 0eb6e9174c4017a1059dcba417dc3b9a23bcd749e3bfee98f9a1c66824779ebc5832b3ce9767426f11ad8b521017ffd68bdbec60f958c9c4f9e12c8523cb2b59 SHA512 fc5b767d23338f8d05f5112e7d1bf9588c65b6dc8de060977a5211842aea701c842ae5b597d342289b26b1f2dc6d4986008d1ebb3aaab0fa478ef64a8744e7cd
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2248 BLAKE2B 50738472f7e06f17e018b8cf5abfedbb2db956f4eec6398ec2fa1ca1bc709544b98ffbeb3bac3226baabcbffa94763457a46b6d6d6cc46e2c082358d46a23867 SHA512 610ff030636877ae5b650c84c426c544b0bc21f4ee93f7f289c52c18d2731461b3f82e7c1a0587e50a080f835e3744923f24d196128b0d561e66cba5198df2c4
 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 848374dd9291..9060a5145d52 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="media-gfx/fontforge"
diff --git a/media-fonts/artwiz-aleczapka-en/Manifest b/media-fonts/artwiz-aleczapka-en/Manifest
index cb62c5abf395..2c205d9496a5 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 482 BLAKE2B d0ed59612f095a1436cd2311b85e4f3be11f4bf12e176f2d2d404bcc08c71ab74a4012f69610196e16974829cb036c9ca6a2fb3b643dd791703dd2cbc9afd090 SHA512 66caa206a11c4c86c1fea893f8f22f72533fae0360680cffb516bbcb4c5633919699f1fe50e01bdffe260c2c061322e37e1213169a9ccda0d5ef573393a91956
+EBUILD artwiz-aleczapka-en-1.3.ebuild 480 BLAKE2B 5fb74e5810351dbdaeee9daa1c80c80ccddf8382938cfc28d78246493999a5229592fb2558b664035ad0c16d19ff1d7db18cf8c37f0a79dc2339b386525f3179 SHA512 6b0585e82cdf9fee54559ab4c8354d0f95ced0101442e5aaf4d50a3b43be9f78406bdee010e20bef197f2324d0989e0d7039b20627a7b1018251f05470f30b9a
 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 d18010ce4905..1f88384e0b95 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 6cf49fdcc6c9..4c72463dba32 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 501 BLAKE2B 992a803f3efae73fe15b53fe0fe966a6fbbf4299cec42585399857cb727bfd83d21c44e36976e1f1a51edcecad34628b6ddf27a3727b6f6fd5300ea0a06d36ae SHA512 92408b7e5d8b0de169a13a41931b729a276a34ac89f3b683cd9db34bff1f2ec041686bda881af5d8edc8fbade4a2eb4ca330cb2e22b7de88f014690d39d69496
+EBUILD artwiz-latin1-1.1.ebuild 499 BLAKE2B f3ce4dfb1f4128d805f70861d84d3053061e0701fdea07c1d9e7abef8cda6df5f2fb7049d73ed855ced77bb6557e24c505d761f4202de26274307ddae8744843 SHA512 9ad9569e7297c846f60fa03bbbb26bf09df87948c4cd77859c853b3396122262919db8c0cad45db7703ea85596eb76636f663c0b69a6f09be5a7491a96f52e52
 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 1e8b9627b657..3b1a6a3447a1 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -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 sh 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 d77e3dec3a68..38416ed37734 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 1047 BLAKE2B 1aef6d0bc53fd916590e6c17cbb871932183a89d913161b7f7c2cfd134e43cbf0231d900151920fe7ab49b56e6342ad1e8233d0679e2af57e85297d7ce67894d SHA512 e835b3938bf1aeffd3998687acaefeadf7bd316541bfa30ae71eb2a85cd0a15dabba43753505d1f05dab6b4b946c647aca155be63de51febe06d78c18a82202d
+EBUILD baekmuk-fonts-2.2-r2.ebuild 1045 BLAKE2B 9dd2c52d2292fbac8fbf964734cdcb700e17ba7bbd8957c161b0bef6e0387a9462107ac13e61432967e496deafe2841ab101545cd037947be9cc3160df3e6242 SHA512 81d7414d7048f8f36d97c8305a399db2bcb4b81e8ea19e8083ae573a774c28ed74dc68f2247d6f525ac916ff4f284a1dc0089a2e2f61013edbcac50aa0f8dd33
 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 be77c78d727c..cf2cd4c814bb 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 @@ SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/bitstream-cyberbit/Manifest b/media-fonts/bitstream-cyberbit/Manifest
index 774a61563b67..dc063a88c6b4 100644
--- a/media-fonts/bitstream-cyberbit/Manifest
+++ b/media-fonts/bitstream-cyberbit/Manifest
@@ -1,3 +1,3 @@
 DIST bitstream-cyberbit-2.0.zip 6427108 BLAKE2B 4d79ea91f478df159ad230300bf94e42d57148cac22d01b2eea653e12651dfc71b667fdfdb92da282bdaf281d45dfb9fbc04eeee806a82b6741a313872a3375d SHA512 39af2720123e7d732e3dffffab37d949221211748594a66ecbd41bafcd387e4582433ece802e42f3d1f0728da9ed0c5bb00465f20fa2ff3687018ed94edf25a1
-EBUILD bitstream-cyberbit-2.0-r2.ebuild 641 BLAKE2B d96b10e137066dbc503fc2dc7c6453a2d196a319b5fdfd4bbdfd2e3b7556e5fd1cd645c336e0da96189d7e6b462bd5014ac64208ec2058d350cb85a86a9657fc SHA512 8559ce90e222351f84649d369c92248b6b60d936a55eb145e848d4f2588be6f8a897b32e8d4f183e4e4c51f9ac1feef8a1bd4e34335dd7313f12f01149eb66b9
+EBUILD bitstream-cyberbit-2.0-r2.ebuild 627 BLAKE2B 72dd6539f16091833ee7330615058653912810635af4fe52cff3009fab2a836c77e0d67b63f2f01bc54edba7dfde2ad6e38816a1b76bca8c254dc3a6d63d5152 SHA512 32e1d3156b3bdd1f419d8429be7a0e5c88d62931194c549a169be0e6b443bd407c5c9aa9ef4938a43c7fb25deae36ccdd5274252e1bffee025041e0b39d20d64
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
index 38bae1895faa..dd46e6e5976d 100644
--- a/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
+++ b/media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,5 +19,4 @@ RDEPEND=""
 RESTRICT="bindist mirror"
 
 S="${WORKDIR}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index e75a5cbe9dae..da3c50b582d9 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,3 +1,3 @@
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
-EBUILD cantarell-0.111.ebuild 1271 BLAKE2B 0e9ee5346b2df37571c435f9375c80ad048d18c8608b30b3a85896057851afdbc367d9a210d5cca465566d506488188ed9c9ecd97c8dd9725236b54080c060c8 SHA512 5d8342eaf4f5df3fcd1e2a77907acf85d73ebe814c78c11543de4f90cf6a6fd6632c536b94c23c5be363d1a9d6748eb299928c3dab86d9b51be8ba1500faaf6e
+EBUILD cantarell-0.111.ebuild 1268 BLAKE2B 5422c6790d42f2f71805859910b0c7197a4d7a02e042537cc80f421ec6f321f50b7631ff19fdb6db2844a80836b94f897f68fa5fed3b04f92acc8431526ea825 SHA512 945c7dace2e99d4e71f0d586e57887d3c2c9d29479cf6ad4ab306d239ee038a35edf28eb621f7b97187f3cf2ff2453103639eec95a44ab8ed5b1253e78af546d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 87d88c1d9a8e..679547213b63 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cheapskatefonts/Manifest b/media-fonts/cheapskatefonts/Manifest
index a952128227d7..b3d7277f2797 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 948 BLAKE2B 5257b21a59689dd6c249bc55976521bd3d4c2e31d0b9b7bcf73c21aa714a11809bb83b070de5b8805fd666347d49c7dfe351a28027b634bb9385051e41869f1a SHA512 a1b03d0d284aa7e081582a005760bce7a92c57a40a7949dcb836088d81605a3cc345f166670d818731ca8b3e3276cb4e2c810656261553ba4c8f151af6dece5e
+EBUILD cheapskatefonts-1.0.ebuild 946 BLAKE2B 3b6c3455340c0e5c8ef2e1e70c9ac1414c35cdf58c5b2bfdd275627ecc354e9f8d91840acaaeab87484fc1601ca924d4a051502d3a2c79592263214c5b4db3a5 SHA512 446b20893f40d12588cdff940e725f13956f3465558cd59470b4d062cb7dd784118f36d70a89b88c6944e4716b63a144a2db3b9f0c20f9105f65c5ac2742acf5
 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 823323dbd41e..49aa5a15a740 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/comic-neue/Manifest b/media-fonts/comic-neue/Manifest
index 537acedbe0b2..862de8d2630b 100644
--- a/media-fonts/comic-neue/Manifest
+++ b/media-fonts/comic-neue/Manifest
@@ -1,5 +1,5 @@
 DIST comic-neue-2.2.zip 1547231 BLAKE2B 3c28d2ada0c9c634084b67694b83ae765594d7e732c870bf6db538967b922146863b023e5bf1407b08f8e9f77b264d867175fe5dbfe1f6a7e53a6fcc2e83f16d SHA512 4c13a764a8a5f1fb23bfb47b1840249286fded918d243227d360ae8005165de2e0e02cafca59a82a306129689d67347950d47ad5d8ae49bb165c0d4a18bd2d91
 DIST comic-neue-2.3.zip 2093174 BLAKE2B 80b345e3c61839d1abb803cc8a97d3b03bdf906408a9eb96aafed9e67d3b0f4a99ed82adef528b7fa4eecf9e1c2443efbedc32ba8c08e5731cd3ad180bdf3aa7 SHA512 37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5
-EBUILD comic-neue-2.2.ebuild 420 BLAKE2B 3e5f73d6251e17446836635f460c41a12924ce40cd1941dd4ed72dad1066c1c7813f21664f944557a2c0eee21e514c4b4ee89b1577501953b058bccce5f06cfe SHA512 d8fd8c8fd3e7ee31177ee163a43be1a4b1f7a11edf7f67cdec6ada1d796d5b33a05d3a3d196d6d0a5a113781ada777f5d8f70a6f91cc95f9c38eecf021b3e777
-EBUILD comic-neue-2.3.ebuild 534 BLAKE2B f93c093a7feca997300b1657231fe687fba96cdea7fcf4072bd4308f03cc0c4b7299efe4ac0ee2579ba0be07650c283db50a6f97e9bf904409330fa4a79c3739 SHA512 c04d6793b047a4c705ce5274538fdad0ff7adfd6dab569ac6421f834ad434bf51af64a22d5780ee2acb471f99337359038972ba8b0335618229f7589f332ce6a
+EBUILD comic-neue-2.2.ebuild 417 BLAKE2B b905ac5ad67baec1a8da1994657884e3fcba39bb05fb902a8418b7f5e4166c8fb15273b41805528f6c2b68157ebeea51b0aab889aa17df09143e168b11a38bae SHA512 175da55776705db0312e3728182aa40085c76a66ee2cc6ce384e91f924b0d3b822d5916c3c1aaa64d654491ddfd82fc9da9225669553c0cba696a120e6fbd8bb
+EBUILD comic-neue-2.3.ebuild 527 BLAKE2B f2de6057e8954654804151cf5da3d08995cffd1b8fdc7f3456fc4d57a164d2f68a7ab61971ed3be89098123be2ace851354f859bd51de69f7a003e8e4dcdf36f SHA512 4dd26c3b43c586eeb1d45442f228b33415a2acf0d34f982841dd0949c91499357970d29d5fcb3e50cacccb97695347defb5c16977cd53cf7aa9e003e06197bb8
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/comic-neue/comic-neue-2.2.ebuild b/media-fonts/comic-neue/comic-neue-2.2.ebuild
index c985a6016ae3..ae600aedd432 100644
--- a/media-fonts/comic-neue/comic-neue-2.2.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com/"
 SRC_URI="http://comicneue.com/${P}.zip"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 071c18c9c424..53923fadf87d 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com"
 SRC_URI="http://comicneue.com/${P}.zip"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/corefonts/Manifest b/media-fonts/corefonts/Manifest
index a00c5991deb4..faac0b95b282 100644
--- a/media-fonts/corefonts/Manifest
+++ b/media-fonts/corefonts/Manifest
@@ -7,5 +7,5 @@ DIST georgi32.exe 392440 BLAKE2B 1418400dc123717ed0ee2e7c7de5fcde4084b2d8446a664
 DIST impact32.exe 173288 BLAKE2B ed52e2933dffe7764bd466ecbe3f4af89f2a2386d9db05f4d19039fd4576e1aa8aeaf8a0b463b3c7ea7327cdd7bc17a05f900faa186c7a8c1ce9c619f2406b48 SHA512 6f9318806efbd3b3727e71170cc3ab378d6151887abcb7fad01bd4cb45c2e127f8aea81a3a99bc77c2ce2424fb1acbc230ffc6c23e390c8800710b45b1367c3b
 DIST wd97vwr32.exe 3953640 BLAKE2B 0b9ec865af5c906b692497a5f497c026e486d198cec810e12a13442d4f7c301bda7c74ef0a7b822a23013eaedd295bc5f16c92509a59755aefdad4aeea1b4018 SHA512 e5db496471970e358af5fdb6d02853fd45bfca1aa89d49ba8644622c28610f09a4b85c2387407b9d33a4055965e0b5e184704c161741ac69250327449da12122
 DIST webdin32.exe 185072 BLAKE2B 18369790ea9ac982606c5e79b204f02887e0d379ed47661b8f80edc1d6f9c0e484b8f7e8a72f8ff1800acbcf2d69b4d5583f18affde2b333170fa77d8c42a70e SHA512 2784ce1cee66f0f00f77d84d7aaa52a44d017245e0269558729003205c10a5e5368f9909beee733e77e202730b3cee2b2357fdbdb597a0023c6412e050b3a3ad
-EBUILD corefonts-1-r7.ebuild 1451 BLAKE2B afdbb2cdac01e98b6ddea5e99d0283c2c9cb86e67828a8f458f20adf1677a193883a9335b910b271abacc5aeba5c2f0488fc77939cb56eafdbf12b933f91dac4 SHA512 a3d7777951e51fc9ab7802c6b7a676bf32648d6f17fef1bbc1d33a13e62a1dcc33ae20b4b58f01fcc8c5cbf4adfb132273e24b02cac06b8359ccc397c8d26494
+EBUILD corefonts-1-r7.ebuild 1448 BLAKE2B dad5a7d8c99f073fbc46e472cd4f37b58a5b3664a3bf9f08ac6710bf230a472a8881f15b1920cd9c716e169c6f250440f24b988b945d1f8a047d2b8eaf442214 SHA512 248b4308b41f81fc247c06f2f1fb7b042f8161d3c89566fbbdda0ec808b031c146b8075ed5aa92299dec18c6376246da7398f9f94ae675c59e0ecdee7e80042d
 MISC metadata.xml 490 BLAKE2B 63c426cef580c3be01a7289436651f77ba42493dabcf56d0e6905cfd55f35cf7fb30e11415105ee1bcd1a1e79993c4bb10ce8004c918f21688be95050dbe375d SHA512 ebd56a5d9640f4629939d1e10d980f3043eed52cf389373288b1e489abf35d2b5106942cffaa90b4ab0bbdd5040a515f55b690a12e7ab1ae1776769b33ab89e9
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 8f8dcaa9a9f7..e73392df8432 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
 
 LICENSE="MSttfEULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X tahoma"
 
 DEPEND="app-arch/cabextract"
diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index bd6d58e9a97f..4a6845aceea6 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 712 BLAKE2B 79ac4cf69371db07f7437cd9657bfdd12e07b9725762a585a97e38937c9025def0426a0899e77e5be845a0a6b3be680619b4abd4fb91cdb025034a2bc63309aa SHA512 9959f9390a0831c857cd37dd88332cb5599f54ef4868d7e8faf127afe80248e2a906768ba35173ac7ce9a708b8ac9cb81d37eadeb9985de6de857ada487784d0
+EBUILD cronyx-fonts-2.3.8.ebuild 718 BLAKE2B c3c4f6b71fda1b6e1b2dbac7251c92c835ba47f92899d810ffcd7ccc365bf928f8382c824d03d512c390e7f66dbce800c35ccdd2f7ff9c7aaff033947864478a SHA512 db0392cb9762b8b67c72a3b609aa1cf8c20662f6f0641b19a3b0366f711b4c9638b33084a89be4c254127e10cfa8805321dfc94953d99f5339c2a3ded1ab319d
 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 c553ee263617..7a8bfebf7231 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
 
@@ -23,5 +23,5 @@ PATCHES=( "${WORKDIR}"/${MY_P}-6.diff )
 
 DOCS="Changelog.en xcyr.README.* xrus.README"
 FONT_PN="cronyx"
-FONT_S="${S}/75dpi ${S}/100dpi ${S}/misc"
+FONT_S=( "${S}"/75dpi "${S}"/100dpi "${S}"/misc )
 FONTDIR="/usr/share/fonts/cronyx"
diff --git a/media-fonts/crosextrafonts-caladea/Manifest b/media-fonts/crosextrafonts-caladea/Manifest
index 06c8d18862f9..ea0f90046403 100644
--- a/media-fonts/crosextrafonts-caladea/Manifest
+++ b/media-fonts/crosextrafonts-caladea/Manifest
@@ -1,4 +1,4 @@
 AUX 62-crosextra-caladea.conf 470 BLAKE2B 0aa0519e9609bab2ba1e961f811a253bdd2c9b2a02d296380b8da4b15441937fcf5790e7b29163e48f1276ee5dc47d86bcec4d9ca04c5c614c8da2b2d7623d6a SHA512 5b48988b7dbf3dade207233a365c5c0c06f398a28e5e8606383ca9371559d9c8c6b00aacf1f1506831149315907279897c04f1a020c6af6f45721702f3defdfe
 DIST crosextrafonts-20130214.tar.gz 112756 BLAKE2B db2872ff3f587519a82062812838b12f8667b96e6ff2883f9441a87aeba3fa8c20798c3a64213a9196b302d09e7e8f2cc230602a898124d554900d67be085032 SHA512 71f3cfcfbec33d8526184dce32f244f13b29f97aff31c0609487f27135adc0a4d5950e068f8be101e4fd06498cf103be68d781fc611142f060bbc9cb0b81273e
-EBUILD crosextrafonts-caladea-20130214.ebuild 594 BLAKE2B 386500ae11eeb14a6b32f77b471b5377dca8abaaf9dc6bfd9b5b2e66ed638b8ad6789f357cf20378eea190e3c7143b747a14ea0fc46105a7cde10cdd87790e28 SHA512 4f4c9e8aca51bc6d4ef7447c053a613763f48b4fab5eb7ad529ff5a9f3951fdba1ed06b77e48ce8586074829a775788683e90e5679752a3da85f0197dc10baeb
+EBUILD crosextrafonts-caladea-20130214.ebuild 580 BLAKE2B 40cbc434e3e7e859d2a48589728a40168646cfb2d20be0a1456cd648f7c4d0dae7410a759a99d287d63f907500969fb86d0de574037b51bae7735c3ecd4690d4 SHA512 95ac85693dbca31b7ac60dceb3530f6cd0c4a34cd4fd3259908bcc0bb161fd00716a92ca6d4b2331ee04f063a34fd33499b9112c39f8f09970abe2daf5ea314f
 MISC metadata.xml 259 BLAKE2B 46523dd0c4d37cc8de2ae4a7cc88ae579064a3843997c11d00953f29a4e0b63ef1a3ea769ab417f9938a5cf1cb12966e984006aca981fd50131a20ec9bce8c0e SHA512 42777fc28db6d4eaa1c7b9269f3d7c97fbea301460356a5c478940e6fd15d9ee8b67231740d716d52e9782a0122ebb539cb6ea829d7e7a64429c2c0984f92921
diff --git a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
index 024b99d79adf..14028bd0bb99 100644
--- a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
+++ b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,5 @@ IUSE=""
 RESTRICT="binchecks strip test"
 
 S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
 FONT_CONF=( "${FILESDIR}"/62-crosextra-caladea.conf )
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 883db5126832..e1be899aacbc 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -21,6 +21,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.120-r5.ebuild 4619 BLAKE2B 292b35645df2b5fa1221fecfb931a69d67de6aec93188199d177affc1a27ed598d88a6f50df2449f7b4ff9c793cb382b645a6abd3859fa5b1b9926f842277338 SHA512 78e7054df378cc9c7a871323c230cd6656af43ba5dce544d26c4a684f02426ee3200e70a60bd58b8aca2e08c75cde21683fbcaf6fc336337bcfaea21ec0e8919
-EBUILD culmus-0.133.ebuild 4627 BLAKE2B fbba0f0f0fd3723f10858e622305d62b351a0cd535c7dadca7994a1e2c766aa44dceadc6e451e6e65fefd131d74ef135b985f6dae94fc711c7b4cd960b79084c SHA512 4ad6c945ad51e8e1e1246b1ce41980714da122b167885e5d643b0b066ecef6f6a89892b46561ba094539882b85e999186b836628e2699cca8a7787628c886393
+EBUILD culmus-0.120-r5.ebuild 4616 BLAKE2B a0c96d78a6bf289946bedf206e2f47a474e82aaadd51c27186772d10665c1f3eb8d0aeff180bf0be85ebd2e79b0619f7eeea9df18c1403fa73eba065510ec063 SHA512 536da7d52ec4831dc8b1c0a0c1dae7838d86a850c524bf76a8c23d3491429e24b1f3dddb658200c27f3b3e02709df85a2c735ebcb0d36dbf5816cc8ba4560979
+EBUILD culmus-0.133.ebuild 4623 BLAKE2B 1786ff454a51017f5887b0136faa6678c66fabb7a2f81b9c41f0056c498a20251e99a8f9daba1d7755890fb690f6933e173bd0053680e3e698c0bd2d5a5e8e3f SHA512 0258c97d4f508c07cc98a61e8cd63641c06b45e5353f67d19b7e294f639c2089bb991e4052c8271003c73edbff45eec956a922d820d67e1eba0063d77558530b
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index cd519cacdbcd..6c737c0f48d3 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -36,7 +36,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
index d21d6b87d735..a66e3311e3c8 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -36,7 +36,7 @@ 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index bdb67941a1db..47b1ba760ae1 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -2,6 +2,6 @@ DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
 DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.35.ebuild 2063 BLAKE2B ec877a974b0e9bfcc749ffd341ab524f6427f05e52cad9dd7debb499964acff7fd2d66b692ddee5563ae67ddd3e95e5562ff34377bb8b390607f205377924a45 SHA512 f4a7d646d5c504e0d9060fee903cc8ae05bf0826eb040a28333b084e536ebc298c9ab994ec933d85e047402a96db7b307ed03d50d3d912c0772101097f9e548e
-EBUILD dejavu-2.37.ebuild 2128 BLAKE2B 885dadb05cafe8eaa0a28f9fd3ccd213069a4700008f6401e02d153245d3dbf9695f6aed310fcffb13183ae2848da63351a8f136495046cf3e09c18064ecf077 SHA512 0c11bc7b4f89e9f46b9a8a43bcb5828471b16622ab7841c1f943c071ff936b3ee8e2e56e72db80e1d5b7a684729808d6c8ef76128d170134ed7fd640dc714c48
+EBUILD dejavu-2.35.ebuild 2060 BLAKE2B 94019a9d465b045a4634c398c116c65812eed475906ddccd0a6b8a6623538a7c0c79232c82685b652bf2c11999721307600b9649ff0eb7f2b4daa4d1d1918d30 SHA512 dab6983e2dbde0652f2b63941889c288133aec5c51f6ec84720e6f2099ab6b5abbc02f4ca8a61e7f11468ea0ec1571924bf12725c15c4388aee4f9e9abbcfbec
+EBUILD dejavu-2.37.ebuild 2125 BLAKE2B c194ffaba555f0ca393ad1d48e726f904b74eee1a018ec7ea83781c350b90e1b6c4dca33d5ee7f6bd0d9ac229cf15e4da547781482f87008b1d163c3fd7c1ed4 SHA512 2b5b1e0bb0783ce116bddb5077d21ed10e20f18ad688d34b5aeafabf1782f9242eb9cd9083339fd124660867a2c1e907823c848490908cdc1f2fb287bb5c7f0d
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 2d00daeacf1e..b64b372d0320 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index c5773e6f23e6..1240a38b519d 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/efont-unicode/Manifest b/media-fonts/efont-unicode/Manifest
index 43d5c59f431f..5db981454f99 100644
--- a/media-fonts/efont-unicode/Manifest
+++ b/media-fonts/efont-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST efont-unicode-bdf-0.4.2.tar.bz2 23999335 BLAKE2B 3a8b90d0343f5f90bda08003446922f4c994001ecb769b1ec58efbf23cbec93e2d327704d0f04fe01a7456ec0286d1fe318c388f660a7ca2b6fdef3e9ca9f687 SHA512 d19b4827bb473f8e7b0102b3c563e4ce559861220de158486e602aabe71f0abde127e83a46a622fafce797395f6977ad1c61e73e8c4997a4a088158a3b51e41e
-EBUILD efont-unicode-0.4.2-r1.ebuild 637 BLAKE2B 46bb422db970a51e7ee537a5edf8bf18ba42d7e853f4cc000df5c68164820040c2722bc945f9549413a5fcbc1c44bc75e7b28531ef4a325d049e349a01f81d9e SHA512 b7f3c1ff4b61fd0fc1a0af572d864af925c30e63ee90247e47e9d42fc29673d2ddd25d9d53f5d604fb007f554102a4fdd8ae073931510c5432655da7c735a14c
+EBUILD efont-unicode-0.4.2-r1.ebuild 635 BLAKE2B e6b4e74ca7dde49e6711dc0b8ecd4d5f4685d51a6e5e6c7ac70a39873b5e5f7964f3824e65c5679a16dfa5086e0cf06df95cd6b723309b6de3f9940793de5e1f SHA512 a279d78c514e658136e2ed8f19e3f42ce9b09331ba6b48d6791b0b684d58f9c46911d9fda92c5fb3a7ada4cb18e7372e62ff73d17c4770b5fea4a246b4a88543
 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 72b6aa977034..3b6c06864858 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
@@ -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 sh 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 bd7366ac9607..b924a1a042c8 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.ebuild 672 BLAKE2B 68c1aa6e1e9b4be82f39aae0458ca344338a975f47173cc1b02e7c74473fc132088d365d695f777367a3556083c88ddf2d4fd474e028a565c538da6c5192ebdb SHA512 d13db4aef4fb8a4f7343f0ee5c4339e02fa5d89f7efa5a20f96115485bb373355cb6ca609a3eecb6428fff34a345d183dbafd729ee30596ca01631af95793ec7
+EBUILD encodings-1.0.5.ebuild 669 BLAKE2B bc2d5db13539e8a6c07864e6f5d48316d41503de9d46ff4da400fa8343d2bdd6f4952e4ab7753843bc3fdbd439e561b22adb5604219843506f6315287e999be4 SHA512 b439c884299a301c1efa3e7e9d2a70d78093de60d01dd151f99241b022cd3859afffb3cdf7215f6185863455cedc27f9c4c468f087e1fb7f860c298ce928f232
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.5.ebuild b/media-fonts/encodings/encodings-1.0.5.ebuild
index b3d246cc6ee3..7cb140ff36a4 100644
--- a/media-fonts/encodings/encodings-1.0.5.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-2
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-apps/mkfontscale
diff --git a/media-fonts/essays1743/Manifest b/media-fonts/essays1743/Manifest
index 4e52dd12f17a..85aa93322e02 100644
--- a/media-fonts/essays1743/Manifest
+++ b/media-fonts/essays1743/Manifest
@@ -1,3 +1,3 @@
 DIST essays1743-2.100-1-ttf.tar.gz 3107168 BLAKE2B b8c9b55b3bf0178bdcd4fd25e0fc151ecf5666052530b596bf22f6ae362464b5f9947a8e8e877dfa775acb9898a180b3dafb2fdbf4a5724a266088321a72b1ec SHA512 31885e430713e6931b1bf2f7ce307e964576f1f2909a60c4a0a9adfa6293fd1c02200155d3bd56d0714210c7e653ee1980425539a554b304c3a3c6fb6121bd2e
-EBUILD essays1743-2.100.ebuild 497 BLAKE2B 5d3be1806a797ebd6fceb20eca0ccfebc0beb719d4b00c67f1f90be657b1913041d0b7d3361998cf55a00f22fef8df87e4a02d5c90a9a094bd7984230cda28d7 SHA512 dfeaf897dc5231a690856335b5343fbf4ac719a967057c887a2f5ac4ffbc1752b93c1520512c038ef5f71a97823e5a4a49537aa0d08ef16d225040d9e5632e67
+EBUILD essays1743-2.100.ebuild 493 BLAKE2B 00923ad74b1dca8dd89d8ff3a59e061583e943fe0e672ef0a3f39dbeb946ce7d5c89e952d9967f46823d069affa350ca7a69e57e4dffb61f1343a8db6bdda7d5 SHA512 3f4e6e9a6c567c2814f4fe4189f8d99ce1ab4803eca16759c7d6d318ef26bacf263d0327501d8804156da85ddcd2941ff7145d3ce7dfa210db0c69df74969821
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/essays1743/essays1743-2.100.ebuild b/media-fonts/essays1743/essays1743-2.100.ebuild
index fd5e6cac081c..962931d7eb9e 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/farsi-fonts/Manifest b/media-fonts/farsi-fonts/Manifest
index 60b7d2f324a6..30e5722527c7 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 483 BLAKE2B 4423e3606a51d14d48d60ac68047ae1ae9d5fef72a624a868b3b613929fdf64324acb1d798313213b70547576a0d871a6c293b932e3e9dd0d32796853b1c4f6e SHA512 c2d54f0a99be9cdbac7c1870f8d5d39b19970f9198e1a904c05142588ca815919e6e2adf486d5c0a3e1373cdd760e846f0888647aa69ccdb23af87ad9c9f071b
+EBUILD farsi-fonts-0.4.ebuild 481 BLAKE2B 43922460c6763f897a935bdd48bd7ce0e088b3ee77d6dc02089e98568f33ffdc34d3aacf48ef07833a4090334f41ef80d24a4f2d8074819898635da30c72e017 SHA512 75096b2b10db918a3088eb32bea2a9f4b5ddfb8e483789c4a76efec721f8f831ecfb575c993338f50b7466cc169821d37e0517eaaf2d82782c4688020e09f0c4
 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 3001623d133f..19a09e53130e 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 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc s390 sparc x86 ~ppc-macos ~x86-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index e8fa1bb77b9b..08447600dbca 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-r1.ebuild 283 BLAKE2B 8087319c8be7ec5951bb802effdfee17710de17fd70bc8ee08f95eae9aaff64f13fab38c876f8c102f8bc7a7f370b53abe8320a8721679cf924c6c2e0042497b SHA512 91953b39b072f069e33a152822f9188f59f1a73abdb1ca069373a687898aaade1a41dcbf5b75c6bc338cc3c58fcfa80152dc2d871a3a2dcd9b9324ae6b0c3f8f
+EBUILD font-adobe-100dpi-1.0.3-r1.ebuild 281 BLAKE2B 1f8aaf3ac825469b383374fdf0654696ff2fef1fad6802e20c402fa28f93963acd0eaba28298b90abf3f4f791c57c17593d79e1b022fa237bf5f0ea201fea2bc SHA512 a7baeca6bcc4aa4e7d65a2de56c2148ba63eab255e29282484483c94ed3436bd90925a42dd70d1c1fdf7b0d5d9ebb026f8b5c4cfe0e3cecfd15074a490155d0b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
index e69a4d8b6a77..4527e822d4c4 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index f616b0796363..88dea3ef96c7 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-r1.ebuild 283 BLAKE2B 8087319c8be7ec5951bb802effdfee17710de17fd70bc8ee08f95eae9aaff64f13fab38c876f8c102f8bc7a7f370b53abe8320a8721679cf924c6c2e0042497b SHA512 91953b39b072f069e33a152822f9188f59f1a73abdb1ca069373a687898aaade1a41dcbf5b75c6bc338cc3c58fcfa80152dc2d871a3a2dcd9b9324ae6b0c3f8f
+EBUILD font-adobe-75dpi-1.0.3-r1.ebuild 281 BLAKE2B 1f8aaf3ac825469b383374fdf0654696ff2fef1fad6802e20c402fa28f93963acd0eaba28298b90abf3f4f791c57c17593d79e1b022fa237bf5f0ea201fea2bc SHA512 a7baeca6bcc4aa4e7d65a2de56c2148ba63eab255e29282484483c94ed3436bd90925a42dd70d1c1fdf7b0d5d9ebb026f8b5c4cfe0e3cecfd15074a490155d0b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
index e69a4d8b6a77..4527e822d4c4 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 6edc4ca6ddda..88aec2a363d1 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-r1.ebuild 290 BLAKE2B e0afbeb65edd1369d85d6babc4363c7bdbcdb3fc381adafe292ea7f25212b5806a5142b795c0cb01f184bdc58bf4aa4e713bd96d0619aa64da7b9bcdb6f327fb SHA512 c14e00a3046e2c34855bebb7e18ab6d7bc7b8e2b5772affeb6c9a9688ce18a99324fb8472b380259bea2e63fd386f557979480cb5dc3e5c0de474469ebf3e1aa
+EBUILD font-adobe-utopia-100dpi-1.0.4-r1.ebuild 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
index 85c01f486382..199434c3ce9f 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index a18103175f39..e0e90ed9928c 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-r1.ebuild 290 BLAKE2B e0afbeb65edd1369d85d6babc4363c7bdbcdb3fc381adafe292ea7f25212b5806a5142b795c0cb01f184bdc58bf4aa4e713bd96d0619aa64da7b9bcdb6f327fb SHA512 c14e00a3046e2c34855bebb7e18ab6d7bc7b8e2b5772affeb6c9a9688ce18a99324fb8472b380259bea2e63fd386f557979480cb5dc3e5c0de474469ebf3e1aa
+EBUILD font-adobe-utopia-75dpi-1.0.4-r1.ebuild 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
index 85c01f486382..199434c3ce9f 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 7a4a05a4c9e2..6f01ea306308 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-r1.ebuild 262 BLAKE2B 2e962d130f2f4ffa458279be5599e4e9c07c8990e9d27dd9c2b4abdf66c966373de04ecf0c6b1e58232a9acf10a55b87a93fc902dee2f7638c98d6cda3a55225 SHA512 a2048813d4e85e5814ba597b956ee39606f4fbebd64e7555d5b662430eb8deab5569ed425a05f6c29ced8e0ad44db8c7ff3941acdc5f24f97d98b9d093a13563
+EBUILD font-adobe-utopia-type1-1.0.4-r1.ebuild 260 BLAKE2B c2e871f984175ea867422fc907805a8227e52360377bd65fb73e1c39f62c18c03ee9c15e9853420dddc8e2288bd056d67c34b791f37eae2930380b023364db58 SHA512 90c9b3f33c6b4b4d9954981a6fb24709f528b6cddf338bb6c1cff77e3e073d2a6b463fdabaee60eb7ccf6243b833f01107bd045e6c6f9ee92c34ff25c151ae88
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
index 079710a71813..18252d694fdc 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 301a1c8fee26..e63c22a2a722 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,4 +1,4 @@
 AUX font-alias-1.0.3-cvs-tags.patch 1240 BLAKE2B 6bed61707b1d6dceb6c6b89679b0714b9c02659db08efa004b2fdb8f56fa18b817fb509f5f8f8576329d35e221b489886835c86f683c913f025e87927cb932c3 SHA512 dc8beffe37539162a71d2a2635955d3e7c348406c14baf874448af8bc3a21495b27d1797e08153b40bb8e44c6af69137e7a754456e5bfa2f040f4a5c08ce99f1
 DIST font-alias-1.0.3.tar.bz2 102537 BLAKE2B a4a92e147a7c106c6feac39d7b2eaa5785bc4c086d2cf204587ed5b22b1633238b8ddfb8ef212ae84cfa0a61d018fec79cbf9c83b102c8073d3978dfa66fd007 SHA512 05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552
-EBUILD font-alias-1.0.3-r1.ebuild 495 BLAKE2B b7868ffa89153c3952c34e69c274bbaf2a90326bb35ee9914f67ffa65aa6f61ba30742074fea60fba94ba0c04c5c95d9201f94f70754ad560731f157fb06359f SHA512 974696aaf8f77fba4001616cbe04198f98dc1f865a618be52cd0c8f5f1e27b795b233a3fb442cd5a2d1d04edfe4ee8bde9b867cee03aabf720429ab3a3474f02
+EBUILD font-alias-1.0.3-r1.ebuild 492 BLAKE2B beb34bf956e1564345b8f665ce35c30d6612df2802d4d9c9d9ce4e5afbdaada3c4d92eaa677c24a73912fa45bcc8ef2285807099225a1f7683f26e50977e4935 SHA512 7a689754264076cd8fd4df7d848271b6217373586b7fdb41e5d764dd39b83e7134e058f0d8348a6d43504cba15fb44a7cfb5277f3b96b563c99b42bf0d6588b7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
index 22010fc2e871..3f5063665f05 100644
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index d08955bd816a..87f53209637c 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-r1.ebuild 284 BLAKE2B 6c6ae7de8adb10fcdcad36a37ba8361b169ff8f95a5fbde230a75d4db740d9e8fabe69966e60e9e9ed7f0ada9206f29c13f7d15954d7d47e646253bb48005f05 SHA512 6247c54751f2c6227035eb068a1db15f0075abfd53f12c90259a4b8debb454541c3a5b68092bed65174b6f4fc57b0d6f9b64934bb12bfe3b39a3225bfeb8a1f2
+EBUILD font-arabic-misc-1.0.3-r1.ebuild 282 BLAKE2B 781ed3bf88b0e6e5667991f73d707fd4594cf9171bf448dac6c16c2e741e1919f6f53a6bb1deb36a8036ef153ec58e2e95f05b402eb344aed65f0319823522b0 SHA512 76ed85aa445ebd9864ca8e1424a318db9b707c0060b07751be9df92982626b253af8c722990742af0cc6d7de4eb874631764b8df3bd31210884bd5247b5d4a85
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
index 18b03b807556..da2fb66c3495 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index f6827ccb3286..d585d00cb5ba 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-r1.ebuild 351 BLAKE2B 80f462e6a174a93a542201d97d124baddcfcb3d7666e133d039aeafe91bc07539b4edcdaea07f8a33f1af3376d314e5fa91d6c9793535e9a7c249fe5b6d6a989 SHA512 f6795842172fe857f756d5c4c109153ef418dbb72fdb73a2746d8eef010e80dcaca442a6823e29c477bd9c8b4f0e88a9993dcd567abce8cc58e08e38f94989be
+EBUILD font-bh-100dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
index 7d363c459d76..e3deecf7029c 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 967701403616..495f096952d5 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-r1.ebuild 351 BLAKE2B 80f462e6a174a93a542201d97d124baddcfcb3d7666e133d039aeafe91bc07539b4edcdaea07f8a33f1af3376d314e5fa91d6c9793535e9a7c249fe5b6d6a989 SHA512 f6795842172fe857f756d5c4c109153ef418dbb72fdb73a2746d8eef010e80dcaca442a6823e29c477bd9c8b4f0e88a9993dcd567abce8cc58e08e38f94989be
+EBUILD font-bh-75dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
index 7d363c459d76..e3deecf7029c 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index b64cfb8b9eb0..95d2abe329f0 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-r1.ebuild 359 BLAKE2B aec142f8f6ac9daac1f7f949ecf9145c6b0b40db22a8b44d8efdff03ace3c950e61bc8a6dbcfeb510e466cfd6b5d19928a442fa4f53c0c10797aa2465cd92bbd SHA512 ea6ccf2d80d0a4c96b7909af2d18a849a7e0151aa3f765aa6ab6948de9f198dc62602d819691a47f97721b51556ad016a3da65d12058610eaef0982df51900d6
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
index 5047fd00d3c1..a9111bd527eb 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index cba41a5e5bc1..ab486043371b 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-r1.ebuild 359 BLAKE2B aec142f8f6ac9daac1f7f949ecf9145c6b0b40db22a8b44d8efdff03ace3c950e61bc8a6dbcfeb510e466cfd6b5d19928a442fa4f53c0c10797aa2465cd92bbd SHA512 ea6ccf2d80d0a4c96b7909af2d18a849a7e0151aa3f765aa6ab6948de9f198dc62602d819691a47f97721b51556ad016a3da65d12058610eaef0982df51900d6
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
index 5047fd00d3c1..a9111bd527eb 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 5dc16a84cce3..76a9b94c8b76 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-r1.ebuild 302 BLAKE2B d8d2c50c713491cf4d5af74a1e70dad7307eca2d8ce6024a94353cb62de3953db65c6a8a8bae027bb67260a70b9c838eb4dec15c42b12995418f7961cb4d93aa SHA512 f1cf4ac47d0d70302f6d4f91d616fd59ced904dedacd938d959d4ead889c19239778c16944abf7add842009d55a354d9aa3b7157195cbe05171b973b661431e7
+EBUILD font-bh-ttf-1.0.3-r1.ebuild 300 BLAKE2B d7831e6d41ff6385d41dc2c02aac159a4688eab49eac631ae33b778771d76d2dead1ef636a78d2441ec76ec3150a2b99a38f79df54272f816e498d3d694ea86a SHA512 f8d43f383853bacf5a974ae3592ec797de8c9a10c6141205a8675fb1c04eb015aeccb0e72198f1fc8f95542cd29a0cbcadb52c01ed0334f93e7664575016ae27
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
index 9f51b9472077..f19dc16c9176 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 88a5afb42eb8..1bfa4a72bb1c 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-r1.ebuild 295 BLAKE2B 6b3a0489d0d359028ebb72b85e2ebc9ec7848d3226251afacd248bee284c630c7bafa3eaeae3cf93ccf1315d0f6d0763ccbfd9cf53e710095e4ba64d98f515f3 SHA512 a12f91701d7c1238878441d59de89a08d9b7fb0ec5989d0fe0170d6922bd7811e17c1254d7633794e6555fda494a973680d5fd69e4c784b6d02b5db0d8bb8d43
+EBUILD font-bh-type1-1.0.3-r1.ebuild 293 BLAKE2B fe164422178125e17beb9998894dd69ee010230ca9805508dafe14954bbb8711cc6147d3657bb095dea77395aa9f885b70095c49c40a35bf338572c72a1f693c SHA512 8fdfd94b4058032351b433fada7869d8a39b24fed0e0815b9bcc35f81f9a32ffd23ecff71de2fac69141108e5a973afd6b83ffa9ed1bbe304d53af8474cd7ebd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
index f702b8a60868..124572fd44cd 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 2106f7ea64c1..7e6b1354f126 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-r1.ebuild 287 BLAKE2B 3efd3c8d4f364a0e276e35b75daa83dd0b3085f13fbbabf460971a601296f8f629f7ec3e04761c0d33b2fd87818091abe21e2441962e548259176a06b8bc126a SHA512 cf35c41763f473992f0c7b317ef5a8a092f012db2b5e7945f7eec61f1dc2ba55b7af05c8da097dbcce6a882ef4e893f11a8916b5879f1a2ce6839dee8912c741
+EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
index efb47f4f83ad..36b5b965bd57 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 2070f39950eb..dcf7ed275bb8 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-r1.ebuild 287 BLAKE2B 3efd3c8d4f364a0e276e35b75daa83dd0b3085f13fbbabf460971a601296f8f629f7ec3e04761c0d33b2fd87818091abe21e2441962e548259176a06b8bc126a SHA512 cf35c41763f473992f0c7b317ef5a8a092f012db2b5e7945f7eec61f1dc2ba55b7af05c8da097dbcce6a882ef4e893f11a8916b5879f1a2ce6839dee8912c741
+EBUILD font-bitstream-75dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
index efb47f4f83ad..36b5b965bd57 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index 6ee779ce869c..b81657bf7f3f 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-r1.ebuild 253 BLAKE2B 316068e69c53e63f5e3d17be4f5be4bf196f785b5f3d932ed9e8226d044a8de29d10250fe98d3fcef2cd7b9a1277ab7ea4c23aaac24c038270623c0f7af1be75 SHA512 8e2b2a6ad4384daadc38b3a25eb6bde09fa12efb4844147ad1c112f6f5d50b0b9dae21d9c9d6f6700da4dbff9c2e045ef29d497eda95aaa286438eacf8277470
+EBUILD font-bitstream-speedo-1.0.2-r1.ebuild 251 BLAKE2B 85d1294df0dd493ebc244db975b0e1c82307cf25bad4469dc0e320972a4c9b181b655c26b7f027edd916b488f73a7a9aab301a2bdc3fa3ebd9a6521e09a35fc6 SHA512 e407b81a15f1d87b1be07de2345116883852cd578c38c8ed14abf74d92fa1ec7058bde44d8c37ba6ff8fa971f2a3c2ae678e67c205391a725623e577da6d2ef0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
index 40d7bbc55290..b2ce9f25a146 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="Bitstream Speedo fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 920e122ea736..d7c5e04535f6 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-r1.ebuild 264 BLAKE2B 62efe0143808098300accaf18c88e84901a4a7234fcf24aed3f7306e475daeb7b332cb23ac4fdf8646795d64bc8587ad8772cb139b9c2334ca575c0a202d101a SHA512 a68db7880421bf5aee9123263a821ba048c0d974c491dcac01eb02f721699ba0e6e56bc618244acf6afd3383fd98f5ecaff39cd68a94edef4d959281bdbfc593
+EBUILD font-bitstream-type1-1.0.3-r1.ebuild 262 BLAKE2B 636c7780dbb9c47842ad2888097377eaaca4e567335ea99b7b2be13057882c0a851a060c0a05af7a7cc4a4c52883696dbb3444bb2036f5bbe6dcbdb335f00244 SHA512 437b9073ce2101824ee2671f7d396387de34cc1555d8013e896c4a71f21a66b3379b7ad2d9910b5fba0f2b111f06c3d51964167025d80e560fdf2bcb70230f5f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
index 4513dbbd7f63..b82f6bce4263 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index e8e8a5af0e56..7b2231aac6d9 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-r1.ebuild 286 BLAKE2B f7d8167cb1d63eb038cc120da652fab979bb192db5ab3bdea59e013ccbdd6a85aedbd2655fd98d1a5262082e69ce7881f56693ef98fa56e5411201f9e861e842 SHA512 b84bb611ed29f48d94daac80efe40debe8991d85cded7cedc6665eb06f028d59a956926424ae703274a580f71c57c30a0da3396536e2fd2325833ce862b2ef43
+EBUILD font-cronyx-cyrillic-1.0.3-r1.ebuild 284 BLAKE2B e1663f2e0ca8aa05d79caddf5e94b47d147d8133d94aea1d441d73f6ccbf01be037d52780f33c4fbb8a279aee87bb2936e0bb1243fac8cdd4c478d494c44a003 SHA512 5605b110f9cd23e72da8f73a942469af64338a13b6259a2abe29bd6a5de7c7eefd93560395a6a513f454e376faa75dfd839ff3b139b29fca5e73b8328e2a88cd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
index 1397e21e136d..6e8f450d3c69 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 3dc99afa20eb..bad5ea29cef9 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-r1.ebuild 286 BLAKE2B accc2ad7940fbf07fbd8478822d74290898cbfa0bd2a45887108ea656e9ade218bc77db18b65ad07901e81fa21c992426e8a18e20746d8c076add632577b2e68 SHA512 75526babffbbc101b6e5c3fd97c56bc5c34bd20f4137d65005d4110b600a39565975bf2a75b043d369e29587863126fb22bc8aafd6697022dfabb75ae4b55cac
+EBUILD font-cursor-misc-1.0.3-r1.ebuild 284 BLAKE2B fd99aade2b4a710db593aecd46cc3a55173e943f5f4cf2d3e99a6736ddeb6e91ea72025ed44f328acb8e50cfca0de91b9033b9f0cf59d96299d7ac38d8ea900c SHA512 e2e690f6200c3e981e9b1c3a8876f25b7082e0d20e79b57e57d1311bb967b8375389f4630254ad1bffe88ecce359db9119f3aae468bbcda7e8df4e72a82f7b75
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
index d28c91234d49..2255e6c642ae 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 26e0d351fac8..a49ffed6d110 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-r1.ebuild 277 BLAKE2B 2e90a6c03ade50622bcfdaca60e55c53798530c30f139cdd794e91c72f3000d8dce00c714797ad318fbc1167fee9424a9c64a7e57aef0c025cd367d1ea098069 SHA512 caa3b6ac26f10c6d46690927df32f2ed72998dde103257746ad81a771880607cc61b7ae4c8ae44e1912063218c7db5add2b743a5366bd729f4a76ac8f6a10f67
+EBUILD font-daewoo-misc-1.0.3-r1.ebuild 275 BLAKE2B 548fef0c634ff5254092b7d21fa957e93e1180a30f210dd164977843344f0607eb391a30c6d28bcd908f6f9e1ca6b17c53346b58b76c7e3dc5b4ed11880f0220 SHA512 2c43be4ea2fedb5c3250f65da14fb2ef8937ba54b3620bb1a044c439ff83425fa03159dc237903751b4d75c0f8f9b47a6a705e9094382c0f2047db6b519ccd29
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
index 13798f0c6777..6b29e2bc2ea3 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 5e0488d48fc0..2f2dcc334281 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-r1.ebuild 274 BLAKE2B 06c01585cdfa41bbb6b68029875936a5b7cd0a6b5854b7b414924b22174e265af2f09b80a4af545617fb83bb87f7ee194e555298736ed87db5386bc768cc7847 SHA512 eea3060d5c6f206d0c0c46d1a3ef08b08ec72e58b7b9927dbd147c76d2b8346e6a55737691fce23b1cc097b93427fb891a5d89e7259ab90585de7eecf1f744c7
+EBUILD font-dec-misc-1.0.3-r1.ebuild 272 BLAKE2B 6b3fb65f1ab4ea177b9252b43e02f4787aac9c59d2c01708280cd15b59b4755c4951e38d08dbed5d58d0c7d8503eae9c5b2a841fd92ff0e510a8129789d892c8 SHA512 8f30287dd6c66e1a2a969170731ee1c3171fcc690092a402930e34ffaf56347248df67e0a4c8d5af5ada28c19123e6960c622963c7fed9db8abc4c12d650f979
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
index 9e1fd5718e59..63a366f1d9ea 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org DEC fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 5f9a0cafb5e4..9c312344291e 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-r1.ebuild 253 BLAKE2B eea141336351a78ee9adb59b66ee9e9f68e514b70959a5702f934edaaf5be63561e425439c0acff116e5dc18fcc42aae5f617bcf4d3938e35b0b9f273bf48534 SHA512 c0847e899df4faf2f334f3f92cbe87f1669cc0bfbc65028884ab5fc33ab665194b0b9bae6062b76c33049855211dedb705a5461efc24340a73bcb30c4b7d7afb
+EBUILD font-ibm-type1-1.0.3-r1.ebuild 251 BLAKE2B ac514852141075e07dfbb30426266dcb21ff5bac16ea9f9881a0ea8b6ed2a3e68be838dc5b7b06cac9204985dad82274b2dce2df5936fd0dff178dac121c3253 SHA512 5d7934aecd9ab81bef0b8252ae271db2fff855a0ac8662871848a8c440a2457dc5c9a551671f926c7e03591bb776496afcd6c773f369560092fe79b700bcd32b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
index 2019f54ae246..4232ad2b7c3b 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org IBM Courier font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index e49a30185643..1ccfce4159c1 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-r1.ebuild 323 BLAKE2B a5aa810c20d88149d0a9289ba8e848e435ddff02c8568e85b007cb737a085141b91cbef7eb8b8f4b073ca74e6e57fe608896b81d8a0cbe5a7feb0298074bbf7f SHA512 4a8d37c4583fcc86032b1c7091190eaca1c632d9bea7723d635a819104ce4770865829c27bdbf9efb7e2e52156783fb24c38a426653ba695aa4a89d745e98543
+EBUILD font-isas-misc-1.0.3-r1.ebuild 321 BLAKE2B a677034f13bd2a1ab0a847f84162a452f9591a1639379f8e3af62abdeadc28d3d51e0fcf9fc0d1d7488555ed9717935a2c10618a1cccadc0a0aff2b29086dd9e SHA512 5197468316cc24f096a7c3b7bd9112b32786a6b6fb518e886353838e0f581ae9479782cd248dd7cf96211dad97d913a8c304d42d36ca606573c63dc504f18dbc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
index 4e94f1680ee8..9ae45b44828b 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 13a284cce3f2..01c543dd82fe 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-r1.ebuild 284 BLAKE2B 15c186634054a68ffb5f905deaba77301d57df12aa8789c5f45ddfb17b89e091a2b23fadb01ffe1db2324a5417f544114f4a2138065eea1a9b439af53cc42b65 SHA512 78e51430c50f8d2e58205d7be173d93bbc3afdd19ba50467d15d4ec06e9232d3437fb16be0602a93ca3453d3b71f0303c635456c28dd5e68543588218c1f7d52
+EBUILD font-jis-misc-1.0.3-r1.ebuild 282 BLAKE2B 6e30825501c3d12c7df39bb2a4620fa3a92afb5ab49479b689308356a0cc7e3f4c96f2b0975a4dbdcade76c8dadae438f7508452bbd8170bec1ad38f9e5e490d SHA512 47c044c5dc3cdc053cb82c45d21024cfc398f26f91f33798b43e3bdcf73aea2f5b1f2fc89b0e056c15a836481f55201b744b660790b607d7fcaabd1cc7cfd67b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
index db24585a93e8..5ce84d1f1e73 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 67ac6c3b3e01..6ca26b36d3b5 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-r1.ebuild 304 BLAKE2B e269240b799f0f2e380179d5634dbce13a1db0f5d78c4299fb79bf0962c347b4712dc6c6b9945e52276e5492064a601b2d02eade0940770d0dc2667d9e533550 SHA512 350a6ac3cc8e8c212c5eeb9cbc5c2af9865beb14bcf51ada8901c5834977962240e65cbe797a34b5493539f7bbccc2604c2154216ea470c0882266ecebbc07b7
+EBUILD font-micro-misc-1.0.3-r1.ebuild 302 BLAKE2B effcdfc209571156442dec3418172eaada20e20c0ee8f9e1b339c0ce715ca46579f2a89e57582f0643ef2fcf66fd70e301d11be438475afced58611c993a42ee SHA512 3d17cbfd5049406c6ff10cd32f09b6d75ecaa2cab2279aa32dc5e6bf0f84e51d82486056c36fbbaf685aaafc8d3c93f83cf5c114f5aceafe8fa993d44902f050
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
index cbf3888c38cc..bca8cf083766 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 2ad725caf17d..114716850b75 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-r1.ebuild 284 BLAKE2B 2f24fdea7f48728d102d837fea83080ffa28e2a35f092ef6ae203d0d4914f99653840fcd8d14f6666d60b5f023ee564ce9b02d3a4ce2cc1581fa79ba79a307f1 SHA512 3b464a5d0994cdc7099134be316dda80f5c2a266e571d9c093bd8e9cb4d981782fdbd1df4c0d93a76660c4d4f814178c5073b3ebb1a116d38c0beabde62515e9
+EBUILD font-misc-cyrillic-1.0.3-r1.ebuild 282 BLAKE2B e2798f1337303fe93729f191b3d8b7e171cf70a8f9f1969e7f2563b0e29855485e1be99a0675e9342ab9614809f7e750b5982d3a7405e98fd480812e1b286189 SHA512 728f7f4cbc3ee78e47a99e41224db9fbc4ccfcb7b4dd911dbd3907f19edbc8d8f0a275f48176c28e76608a6a30b58470f9665a9ddd7275fcdf86b814e456149b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
index 64e73de1f467..1ead1caba9e5 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index f37effdd3bd0..1106906ac9dd 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.3.tar.bz2 245606 BLAKE2B e0cf89f4500226b7213d6f3f88b3bf575501140d8742fe5e30b07eefd2c1fe2fc9bfe941639032d3b5ce45eb7e6f352af7b6468e7f8b0fc941ed9cee8d531f96 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
-EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 520 BLAKE2B 6ee0cf385ab00a68e4cac473d54b55bde507da720c74db78e2f571dc9527f829aac99d24267449cf042d1907593e8d51e6eaf1061a2dd9d87ee13f6e702b9fa9 SHA512 9128a1e7f82cd455588378b36c70bc5ab3ea271514ce0a96124dae06a7d682711a9860f01ba30bc9ad7c56fc0fb1f1b6c961503ce112ee4bbdd246e63c3830e4
+EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 518 BLAKE2B 2c6d5cd8a93665082eecf9fb6beeb6c5465fc00be9d7dbd8e40587a274273b7a35128cc10583cdb9e77c70fbba60ef0515378ce245b84c549a86e0ae0c0c6f5a SHA512 1fae5a73c91aa1e7cace8a82891267c759498088a2b0696e490c5bcefc4b9951762989d4c051f536fc75c3155c62acc3c3852e369b81b8953a46f5d064bce564
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
index 123b7cb666e1..8d5c20f78c21 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index 435d3b4bf466..355c50838d1d 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-r1.ebuild 270 BLAKE2B bd40fd488eaf5ff5fb1bfaddae0983a1cda7d4b498b7ac266938b37fc67bcbb38865e34a3d64ec1954b20475bab7ea0a11c52bfb8308d79974fcedad31b9a59e SHA512 eb3d447bf728ddf2a3ce34de8acec1f44c3a9fe5398e19e4330143a40bb10abf78d94e143d6aa192d35d82874b31234339ce4f252a7b28b6202fb14e0cdb51af
+EBUILD font-misc-meltho-1.0.3-r1.ebuild 268 BLAKE2B 4a8b880a7f8466e58a0ff7b10d0bb7dd478f60e687a44130dbcedfc3d89f078995663f8f5048b4985225bea2bb1ed941849313cc72d56eaf832774665018ea4e SHA512 eeae643bbabdc6944c84293b273116e16bbf1be067f41c6022e3f28d887c4652f2cd985447b3251a0badef58db20187282c71818e74d5291fc9f475770c80cb9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
index 9d4d0a65d220..197e5de5fb43 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 7bf659bbb25d..bbbf2ec433ec 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-r1.ebuild 381 BLAKE2B 76d4a0b6f9f61a33f6f6bb657f33759bd6471b0c42ad641055740c916317b6c8776941b7540aa939de734782b34b655ad483627ba70fc881f98367407ccdc3b4 SHA512 b0caee7177a5fd6f4fbbfa061dcfdcae2974b06d483b0c1d8d4703a0f5b68561e60308f895c0e5f21b0c0fedb0bae0cbeb3d40bd204f2124237abb7c61118d92
+EBUILD font-misc-misc-1.1.2-r1.ebuild 379 BLAKE2B 07bf96100d6f700e666136a076cf86ee5261fd7728d5beb7acaa2e962f250adcdbca2def46f71717d86cf485d28cff6e843cc7a8f85f0349397f0d7d6ed801c1 SHA512 d478a512c869975a5d44c086f9bd2c6467fc8c712bc07cb39df52e0e56c54f0c02787d865c44cf2d55b10ba47c174d2bc296c93c3afe605a57c8905d9f6a927d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
index a0a27ed3584a..11e36a75fa49 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index aabad430a42a..d5ac540b8f21 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-r1.ebuild 279 BLAKE2B 94e850b56fb575d770a1ab03857557023b485568bf3358cf7db38042634ad9ec8e5515fbbb1e634068a056a168717f64fe3b2bc47671e0419805829c5487fc17 SHA512 7da65179bc9ef1ffd9d8551e777ff6910aa243d29abd7ce292b36abbbef5cc9351c28b0913501f6b327184509818644b10c192fd247a69c641cf5e854a34159a
+EBUILD font-mutt-misc-1.0.3-r1.ebuild 277 BLAKE2B 861cf124886bc44c544af6f2c110948c35111f3091d55eeafa680920604aab131db11f741c96ef89288f3e51af7cd3054e5b87aec7cc7c481b5275d57050f2fe SHA512 5ceb952a4642d77eb75f4c8074279581f7afa087b62642258816d41878a453250668346b3ef925af9ffc99b32922e2aab5132f62cdda9681cbf3316a7f10d95e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
index d51e89c6ad8a..ee3b047a0cde 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index a195aab0e7e5..374b12bdffbc 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-r1.ebuild 281 BLAKE2B 6887a92d19345fe64bab63f5774b8cff01c31ad6a14de9f9cd52f39fa3b68c4f0a5a4cd9732a0744ba80fdbd6dd203f80a9b9734ef5a2b40eaf51297f2b1408d SHA512 3b4e88ea802e99f07081b3abfd314b534eef549abdb5211393ba7dd807fa1670a3bf2baaca23edf16bd876c56a8441670bad3cb348ca43340ecd78e0d0fa7706
+EBUILD font-schumacher-misc-1.1.2-r1.ebuild 279 BLAKE2B d86e0feb6b8249f0ed4c4dcfc2dc713f244cf8d7353b9a07392866294da689e199eb9e12c7f1326353849c48e618d626990c1d330f568adbfdbbf73da8e9a098 SHA512 9fcfe4da7ff75bb24adb3688afdf5b4aea1a60aaae9cc0cd29274c9a54d83b92d2140d589d623d55e7547c36e8b7be0b6669482b45b1e6017cf1bc76267c31bb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
index 56ca8fd79090..95f9abb9e415 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 317e2fde5e60..2790e319fa13 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-r1.ebuild 286 BLAKE2B ac03bcb3cc94cb01f22651adc88c2879aae64ae6c0e414478d7253836f7bbbae9ac670436a1dfec3fa01ad897a36a6eb34610cd15788e937bcb33806d8d06123 SHA512 528354493bc71a432fb098d115e615a437b7e62dd79754ca8563cf87ff6906b7616b7017db047ada059ef61d1bdc6359cd765ce76db1f808333755746f24165b
+EBUILD font-screen-cyrillic-1.0.4-r1.ebuild 284 BLAKE2B 47f98258d2d3581d589c69653333215854df254943e9dfcbbccc96071ad36eef854aa7efeb6dc82dcf92f48b88ed506b2eedf46c0d29f7f4f0166d4855a2ee19 SHA512 5c299bb33f443300ac098feaebe426544f6e33f965d27361e6a4544bbf5f4933d3a1381e9659324f4e8b9794d2fb269bfed53fc192eb309c9d86b746b045d8fa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
index 8540ac34467e..223347046404 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index be1f2d8a523c..9849ca252aaa 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-r1.ebuild 275 BLAKE2B 925e5531027021a29eae0ed318c580940bc9142f4a213a9f5662f4ea0d43d7fff73869d55e76446df0bdc471d0f43bd0224c8a243f6521113dc36a76564698a9 SHA512 b232223deb566a0ca6a82dd675b9474c77f32f0d2efdd83d4704b624b94e8560620ec8f6eba853f9218fd51f0a68638a0fb7acc0f7e10fb3a1e41b27646252e4
+EBUILD font-sony-misc-1.0.3-r1.ebuild 273 BLAKE2B 28c65fd2a605c6ab90c410b9bfa9013f96215949491673e557c016996e79a55b85935e98c819cfb78bd1a7ad00628cf21a1f1fbe0113b5bbbee0449dc7c42ea7 SHA512 990bf5b685fb36317daa73cc3a2127698f466b41adf84750d0240503d63d2e93fb96a064cd9137e2aeb431169f8f5bb322e8834e82ddaca3508dd93ce24900ec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
index 9913f4b0d0c5..3369d48770df 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Sony fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index fd800147e201..1457971018f5 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-r1.ebuild 298 BLAKE2B 1eecba8f093a5a1fc06dcbed1726aeecb3aa4aba2ed3958f245809231c1910e9f1f5d0a324222e70b35792d681c9f9f69e6120851f839972ee43e3d1c608212c SHA512 f3ebe3e48d64482176e188e0d9825d22cea840745fb26b1e875f211341247a7dfad968ffc7c4323a5f483210b1e9c5f245c78f2820d270857ecb562db04737a8
+EBUILD font-sun-misc-1.0.3-r1.ebuild 296 BLAKE2B 1cac9a9e00ad6a050a630077295e9ce41d70004bb0a557bec2edea4efdb9ce036a90c77e441ff16987d641f67bddfe4bfff95742c0a225875469016f121b395c SHA512 7d921c4403d8ee304b5f789949e5ca26ce807024a0eb021bde8d1c47abeb8d52ecb81591157eebddac3246d388a5378449fd023ec3293c646520aaa390f4358b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
index dc3acb5b96b6..6425d8621816 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index f49c88632de4..bfebe76a9838 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 616 BLAKE2B 86d0b8130c22e104a9da0b0f73abc37342b1d90e79f5cda7dcfab41eedf82bea01711e7265050ae15d96cb917e25b807cdbc57c25a65bd964139816c5d93ff15 SHA512 8edad5c2b5607ef90bc360295d35956dfa2963833e7db9221e09669776a954d9ea3923d5b48586cb6bfcdf4ad871ecda55e69dd5026fbaf06455e0af56372223
+EBUILD font-util-1.3.2-r1.ebuild 613 BLAKE2B ed8cacd6dc940b62507a27ccdc8588e32348e36e9edc45b45246c7846403b1dccd38d6c4a1fa8b292d3aac8bbb23b879babc53d4d5fc88f80fe5a88956d1d3e4 SHA512 1355fc1a0d9321eb3fba56cec86a6c40f693504cbe3bbb8bf09b84c475c0747cf77f247bcd25512cfb5b98cbd834b7def3cd1a5f0a26ba17a97ecc73dd7b902d
 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 307652e88e94..0411a45aca11 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
@@ -7,7 +7,7 @@ inherit xorg-3
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 b8052561b55c..0cd85a8933c3 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-r1.ebuild 287 BLAKE2B 0ddb9e44ef864c7557ca50f2bf1bcad33ae9106dc81c3cd17dd603186ce3b3f257e489b88e87436876ae572fdb103bb46ca3b25ea0fbfb84a654cf6b851c076c SHA512 503044a5fd898c05c64f61aa4deaab58a25ead9ec153a7d209baaec76e273effafa52201803ca4183f409e401d6a109e673b48dfc6ffbc748366dd129b9d1cfd
+EBUILD font-winitzki-cyrillic-1.0.3-r1.ebuild 285 BLAKE2B 9076b0d1d6c9339cbc09e328edb2da63d7129d9cd0ce37e58c044d1e204b31e49661b6e655b9a42324c6e259c2fdf247cae223308ab6b597b155e87a472f831b SHA512 9b9eab6a13bd3e772c45481562ffa9c042dae8dc3d46f294383a35cc3bd2f0b8c5a99ff6a0dbc725d046e89532e2c5a9f681db9c9da0a69af7ca4af72649f2ae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
index 36542358b68a..8ea828112311 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 665f9d216b6a..7ddeafc48e50 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-r1.ebuild 256 BLAKE2B 171deb2bd7377f8f4a0ce7ff5cac29542cf9699078c3d0eedbe9cea63ac49e69766a368f3a5a8eb094ccc61d7b7fa14a3eb399634c5e04f27e5b1a189c3df5d7 SHA512 2fb599496c5289899f44639b50fc9f85a4027c3bc74fe70f292fb0f3a67cc5ff96f93330062bbbdb374ab28f6084e546236d6a4188278740754dd57549484c19
+EBUILD font-xfree86-type1-1.0.4-r1.ebuild 254 BLAKE2B 842b95e9f2fed6602fc5a105bc161682c7371474e49503a07d66f596bf21ce88055165f9f59a3dc1e284460a827f3cd49eec3f926022a5338e6644c093d028e4 SHA512 e2b6d513be157675cdc8c8b76450893c4fc069e09051702e8633138975f8e73bbf817486786ef9c137e340ae519b37d4a7f7982397d9ec688e66112f731a7dea
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
index 4ee0ea2dcae2..8f6d3f7e84f4 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/free-bangla-font/Manifest b/media-fonts/free-bangla-font/Manifest
index e47907fc30b0..ef4851012b02 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 1059 BLAKE2B 7b6fbfb2603ac7d331471e491f41f6625467f892531bf9696a1d2769cf5d620923c2e26d31b56e81beae881699256086c7f4eceea46acd4830223977ffb04a01 SHA512 29cc239e6ffa8621da85fa8fc00bbc36eeefb53cf3f50096cfb058c3abfa667201a46cc7a6de89d7f77def2e8aace24c6b85f3ddf69ffbf08f25f775382b66be
+EBUILD free-bangla-font-0.2.ebuild 1057 BLAKE2B 01b491be87fb62d69b0f1fa6aded4643843962ffb4f6377bb1354d3d28c1c66283f7074f515191ef73e4590fe1565186782c2bdd8f37183a42ebef29b2bbaf0f SHA512 cf857d8dbff2f13c37dc9c4b2e65d33f417927d399cfd10fd2d1769af3971f455c23bea46ae9c9a6697086ac326348fe54db7ae17614b3969558cf7417750161
 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 338db6c78dbd..dfc1cf8bfa72 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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 x86"
 
 S="${WORKDIR}"
 FONT_S="${S}"
diff --git a/media-fonts/freefont/Manifest b/media-fonts/freefont/Manifest
index aa02a85cb58a..b92ce07e844f 100644
--- a/media-fonts/freefont/Manifest
+++ b/media-fonts/freefont/Manifest
@@ -1,4 +1,4 @@
 DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd
 DIST freefont-ttf-20120503.zip 6076197 BLAKE2B 949140181561e89bbf0487f1523a433ec0e3cbb7548a2168be6e1720d7e132fb2250acd025ab57b1ba4b295ed4021eb52de2e8f672c9767f63b06269cd6cb3c4 SHA512 dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e
-EBUILD freefont-20120503.ebuild 630 BLAKE2B cd5b6766ea38989f1a0a2eae9b9d070e51c7871e0336ea77ea1974553a03a6f2f4b69727ad8604ec26df3961bbaac0f7282461fbae80ebf4baf619f2a7ee9c0b SHA512 c30b4d974944bd0765399830dc852826ac3c86586a10b08213c984081c92dfcabb1de681f4302c4c6e56595b313b60138daf9c1a6f9af646e52e3c0a03255080
+EBUILD freefont-20120503.ebuild 627 BLAKE2B 3c4b423ba045a3cb409d23af34a5a73c3c4865ee5aafc3c11d9f7a1d6970ba9b148cf8ca584de30ba15988b5df476f643b5f807e313548c33b801e5663ea79e0 SHA512 71d718d37c124e16c3ed2215de51b29323dfc347bdcf247ad160ec897386f7d60a0b09a856bb788cbb631ae94caf2aa38a323606dbc8ba7cd3d04fe1f561f347
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index f248f287f33e..84f3a2fe234e 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/freefont/${PN}-ttf-${PV}.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/freefonts/Manifest b/media-fonts/freefonts/Manifest
index 862e256402e8..2528ac4f1624 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 526 BLAKE2B fbd376a3902b5ec3b8076913561c294d1b27aacb8dcf3bf8444208f98e9f08ac9b210312f23736cd3abab13dbff6fdf8161159d06f159d7d9b5c373fa0d60d2e SHA512 67770206edcf6e2df4c4d0aeed0bacd2f920e4e9221e3089e2b220c73df3440f866cadee97da9501d230ec77880c7c2d415158c5ca1ec7f34f970f19336b8711
+EBUILD freefonts-0.10-r4.ebuild 524 BLAKE2B 4a12c38323e237104e9bc3280ec6db603655eca1ce4fd48da9647483ccacb1607789980948c70a9ce9dc7d466f1eef50ec670be9a58130f75910435de791a19c SHA512 bbef5eda4e8fe80ee8525d516a372545ddd9c916dc520e2a54bedfa9c1239bebd156dc00ad4b146d7ab7e811e3ed04434102b5c1f0db26876e8dc2df1dc8d588
 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 9977f28424dc..e10798ed49fd 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -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 sh 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 9a532804dac8..74256b48a420 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 739 BLAKE2B 318e55dd55a1184e8584aa5d2be97c483fc20dea59e7319c213023d09af6b652fb0d774d51c9b60ab51d1b7a8201edc5b9c43560d0aa45761f2b5e3642bdb0ef SHA512 e9d0c337e97a8efee90c8348aacb2e86d28b1748a4da6d1843fd83465ea6fe98b4b67deaad85c19fb759d1fa26fbe3dea2c0f9139f2f22dda96ec773fa06833f
+EBUILD fs-fonts-0.1_alpha3.ebuild 737 BLAKE2B 1c47f331823693c950253a16b375e7ef33fb69405c881198d5f11da9fe991895754ca5a4db53ce8c46dd2ba2949757cdc2de226ec124990eebc4047c361b435c SHA512 b85cd00466aae571f788e1bb56909306ae10f6546a5c088a02e188a314efec249036f2a773c76c61bbe7a0ef2008b598be73fdf776d8f1d3dff36620b682b01d
 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 915847fa7917..728f3d7d1394 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/gidole/Manifest b/media-fonts/gidole/Manifest
index ca9cc9471cab..642677986d5b 100644
--- a/media-fonts/gidole/Manifest
+++ b/media-fonts/gidole/Manifest
@@ -1,3 +1,3 @@
 DIST gidole-2.0.2.zip 141610 BLAKE2B b29db824167a9000084de9486910bf627b5fea1a750508ee3c2de899d8907e0911aaa3be80aa2dd2ea6e721c47f87637a6f00b578cbc5fe77e98d2b5fbcc5813 SHA512 adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727
-EBUILD gidole-2.0.2.ebuild 408 BLAKE2B 957fe81ec6634d27d19271b59fa1a7c16603888ea71ea77b616add2a8bdb5c20ee219852b4e38898900d473e27b5f75c5a07e2a43fe8a4b70f1498a09facd655 SHA512 65a17e42b334bba1ed8a3d655c069c46abc76256b77f7d2afe3f43e10875f5d45103f10707f985526100f263936eb9ef10da059dcff0d1f3a7cfdf5191f1d861
+EBUILD gidole-2.0.2.ebuild 394 BLAKE2B d7bbefa47f9d1ac949394cde3720258698de98d61c94e566605b3279e50f3468f2e89466b38573d3c841a15f1e31762dd66cdc954783ca67187d246deb777645 SHA512 132f0ee5370ea5d4d6445e54b45d2758ee537f0956611bc9580530f5a411d8d166c34949d514f84e84f4da2b88d66a07ccdd02da7f543eb507808224701ab4f5
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/gidole/gidole-2.0.2.ebuild b/media-fonts/gidole/gidole-2.0.2.ebuild
index a419df0f38ac..0e02ce58ec52 100644
--- a/media-fonts/gidole/gidole-2.0.2.ebuild
+++ b/media-fonts/gidole/gidole-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,5 +15,4 @@ IUSE=""
 
 DEPEND="app-arch/unzip"
 S="${WORKDIR}/GidoleFont"
-FONT_S="${S}"
 FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/hermit/Manifest b/media-fonts/hermit/Manifest
index a54e220b0064..9590a323fff6 100644
--- a/media-fonts/hermit/Manifest
+++ b/media-fonts/hermit/Manifest
@@ -1,5 +1,5 @@
 DIST otf-hermit-1.1.tar.gz 15077 BLAKE2B 1435e521e2e6c50f910fe6eb7cf29513bc665766478a4584ea06455d64a70dfd81c80447eb2d282a511f13bd24fc6d119e0e57f0a4469dcd355a13e0920b76cb SHA512 ef87f69bfbdb0f84b16e42e06a950a351fb1203fe599dfb7cf6b0c69fb260d99e24b67c741d738f9250fcd1f14aa162c8f285fed7e6481ffd55e78a1f1617d58
 DIST otf-hermit-1.21.tar.gz 42646 BLAKE2B c67dcaa34a5fc5f8280547107a817deb4a40db7c6b3a0b2edf8d92c2dc230576bd7fd194bff1943fe481a143a027eb56484fae30ebeab5c6a563d9bdb07011ac SHA512 5b980068d349e67d78a33a100d9b38eb24c374d0cf6ac69676df0e8dd441451acc0112089634c4b408f1afcb49501bb9f5940ec6c18910b5c11f7f7f31c739ac
-EBUILD hermit-1.1.ebuild 390 BLAKE2B e3712f2ca15e01570a010c04c705271576dfaeb30a84644e78141b20b3cdb24aaa9cc5ca8106fdc3699bf6aef32f411532ea2f35a5166c10ea5c762204449b45 SHA512 57e33e9b476d6d23090a2bbe80742500803657d2756c1a28f1c3092994f96ff997974b40adbf80f4a6c2d86769c12986454996886f0bbb76e062f4b12a080f71
-EBUILD hermit-1.21.ebuild 390 BLAKE2B e3712f2ca15e01570a010c04c705271576dfaeb30a84644e78141b20b3cdb24aaa9cc5ca8106fdc3699bf6aef32f411532ea2f35a5166c10ea5c762204449b45 SHA512 57e33e9b476d6d23090a2bbe80742500803657d2756c1a28f1c3092994f96ff997974b40adbf80f4a6c2d86769c12986454996886f0bbb76e062f4b12a080f71
+EBUILD hermit-1.1.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
+EBUILD hermit-1.21.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/hermit/hermit-1.1.ebuild b/media-fonts/hermit/hermit-1.1.ebuild
index 73233bd3b52f..dffd2a5cc5d3 100644
--- a/media-fonts/hermit/hermit-1.1.ebuild
+++ b/media-fonts/hermit/hermit-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,5 +14,4 @@ KEYWORDS="~amd64"
 IUSE=""
 
 S=${WORKDIR}
-FONT_S="${S}"
 FONT_SUFFIX="otf"
diff --git a/media-fonts/hermit/hermit-1.21.ebuild b/media-fonts/hermit/hermit-1.21.ebuild
index 73233bd3b52f..dffd2a5cc5d3 100644
--- a/media-fonts/hermit/hermit-1.21.ebuild
+++ b/media-fonts/hermit/hermit-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,5 +14,4 @@ KEYWORDS="~amd64"
 IUSE=""
 
 S=${WORKDIR}
-FONT_S="${S}"
 FONT_SUFFIX="otf"
diff --git a/media-fonts/hunkyfonts/Manifest b/media-fonts/hunkyfonts/Manifest
index 526fd1200c62..efd08fd02d59 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 492 BLAKE2B 8c495c8d2ad77db129946cf75425e67398ad0bb72cc96695957d6e8b6587bf7130d2c1f946321f3eb7bee7f8d86174a9efdcd6b23e190e0e257a62ccdc9f0fe7 SHA512 2e9665858d07450927e223f237367adda157d8f986dd97f59197acb0766f4f77cd7d246996913fe0934f6c4b614f418b98ae3e440f0fdb43291678a439b02b1b
+EBUILD hunkyfonts-0.3.1.ebuild 490 BLAKE2B 405bceb7268bfbc9704192beb5843d9932abe03ec945729d87666d900c01e1679a5cdca7ef55567259b6e18255c6e7438e5f8fd77d4880a2285dac3e3c4c3a2e SHA512 36a6decf4a6231e9528896c85f028371d341093af2ff97715af6f7c08c531ea6da955ae6a14c59a654124e2ed9009f66028c89e719f9a05331ac0a66e0a40a4c
 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 3f08b83d3902..d1c616d95bf8 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -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 sh 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
index cfbc49115129..afb2b221a535 100644
--- a/media-fonts/infinality-ultimate-meta/Manifest
+++ b/media-fonts/infinality-ultimate-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD infinality-ultimate-meta-1.ebuild 2666 BLAKE2B d979bb0ceeec7053f8b4346eee3b5817e49f5493ce5baa61705db90fa2924f7f696a5144ab85fa14d1c5fdbf696b0419bbbc0cf7cf1b4d90b0bd87058c0d453b SHA512 b9208add796168a99896428488833776bf07d7f79e33705a5fbaed5a980bccd49ad374c80fc5ea6ab71206d5072089a0f6568082b3a13c26b62513ef442dc95f
+EBUILD infinality-ultimate-meta-1.ebuild 2643 BLAKE2B 5a4845862544fee8919cc9960297d4223307df0379dafec35073fc9d7aa2077a52adacd6d24b27e36087a3cdd6a827edf1be53cc2f2df9b2e5dd79285d6d4631 SHA512 62c6fa807a6191fde3b11f99a5f86d7050ad79bc75e7abd5cd59a4ff9482ef1e85791e7e77f5e511dbb3bc628eb017ec97057ff182ff688c64aa973e41442014
 MISC metadata.xml 518 BLAKE2B 9e70f848f87be0f892ac460247c39dee68918bf382bebc70c497754979ceffabeae811c1fecfe61d075832f492683742124626fedbf50fabdb2a09df773682c1 SHA512 405d34014a1578cf3ae30ff5bf42a51cd28309ef080781d193a66082c1d6689155f0592e4663bb83ea6aaecfe9e6b2f33a0a744f7a72273d46fef0167361a08d
diff --git a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
index 260c7b033417..c5e567197427 100644
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="media-libs/fontconfig-ultimate
 			media-fonts/courier-prime
 			media-fonts/dejavu
 			media-fonts/signika
-			media-fonts/symbola
 			media-fonts/tex-gyre
 			!minimal? (
 				media-fonts/cantarell
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 6962ad247e03..84c194842139 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,3 +1,3 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
-EBUILD intlfonts-1.2.1-r1.ebuild 895 BLAKE2B b1c55443b7674b89a1ff51ec9991a5f10317d7eb35bbb2802ad892814bf54aa9ac7171cc6d741a0b9da5bac2684a84b3908be16ace9c58a0629f4b32e29a5431 SHA512 670bd44472691ec8b823a781148c5e9d08aa5c8d2d68446562b1b935566b7f4a39783aa5ace5bb668484ded16ae82e1ca43670afd0ac681613b51f56571ef183
+EBUILD intlfonts-1.2.1-r1.ebuild 893 BLAKE2B bf71d0d095405f1037298a27a67e7861f160a1b68c0b48225ef36c0b711c34c0986dd55dcb08ba09c6a25e4932e5641112bd3e21e85746bbbe69ee8e3f8689ae SHA512 243dd3403504731be588b384b149449e086931d5e50a39fdf75e3c7cf9b98cdd413bab7921977e8e73d90306295ea439af0e8e613a3f9a0cf245f458dd452e83
 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 13fa5330bfff..d2e1d6984c5f 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -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 sh 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/ipaex/Manifest b/media-fonts/ipaex/Manifest
index eb9b95b1343a..44e176d30cf8 100644
--- a/media-fonts/ipaex/Manifest
+++ b/media-fonts/ipaex/Manifest
@@ -1,4 +1,4 @@
 AUX 66-ipaex.conf 688 BLAKE2B 5cf4e28254e7134f837dd6a702c40b0d8885ce3df760c46d552146d946a3fb58df3a61da21dc53c0eaa4fc8c25725b4fb6e218a215f2e984e5069f86b9833688 SHA512 8e3de87f7ce44c10e2e0a1989613c6fc4fecfafb85ba4a4efb2f71e906bf9f7750f04fabfae71196b8b69b55da7ebec0d89ad5d7b8141e9f584b8ff20309a743
 DIST IPAexfont00201.zip 9764230 BLAKE2B ca059ee52fdacc444a971ed63371a03af98ae37210b2a46f4055abed49b27ca61f4c617098bfeb902426a7b51551dd92d8e864bae251fd047089b1f3abffc8cb SHA512 d23c4d320b0d69067f65054d8e14f8b65dc06f545d1c021f6146f34d980c1e655ed070d4d520ed810272fc7f7f6dd906b3e0da4d89514d8f3fcd2be83a3961d7
-EBUILD ipaex-002.01.ebuild 639 BLAKE2B 044c6af1665d82860700a29fa09e4ab119eb32ac6b64188774290bc101bf1ea61051acaa5b0df17108d2e5fbfdce72be630ad4f5fa92dec33acaead9a1724115 SHA512 abd5f219682564698390a632381aa113e8590c1c246be3710a2491239de82add8cb79808b79ab4332f9dd952ab67d06010139ae74c2e5156a8967e9eb4f5c4b0
+EBUILD ipaex-002.01.ebuild 636 BLAKE2B 552ed11b85503e6fea22dd9332feaa147765274d15a75283540599c24e7dec87d62069094b8163ad5857ecfaa1b0ef98f7279edcb5f6c64cbbd2a3632ebb94f5 SHA512 762bde7b485b3703087e5e9788d8a17f72224acd7c18907a36b57d6c1c17f660df7a55523cd52a782886eb167cac2f3415457a5e1cb20d08c05b55cc835d8335
 MISC metadata.xml 343 BLAKE2B 932f0c95bb5ff89be5a954ddac3c6356abaeebd086c7ea4c72bc888b8b418271c3116b95732794ed513d698da08b6b16db2c2b4cf88dac7d01b4e62b4ced6489 SHA512 1b5513ce33b0003d72a55482d3600e5c3c365e9babfd5f4ef18b7d7eb7e94735c0c3d1b8fd08c55b8f8e30429671b3732217453288c03b90130c801fb78cfb4c
diff --git a/media-fonts/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
index 33d238b34032..237a274be72a 100644
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ b/media-fonts/ipaex/ipaex-002.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAexfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip test"
 
diff --git a/media-fonts/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index babeac2fe10f..7777d4885702 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 669 BLAKE2B d96d6b4e98e538fbb135a5cc9fddcfae03360ae4a7b1ba6ef74668876c6f1edc0dde0edcffe9cccb3f18185e5477c3938a9793b3925a2be4ec8189c85cbb2c65 SHA512 bc9e7de926e918bc7f839cd7b367cf0c88814a5853283c4f94bc3716b7d5c2dca84480fcabbcd7b4214aa2299891064a6bed596b30df965b84464646a39ebce1
+EBUILD ipamonafont-1.0.8.ebuild 667 BLAKE2B 7ba11abc3aa9aa280078e2c4f3eb5c4b7963d7568d73b2715a8c84e6f2a3352cc0e239ac8aff47150bf489e08bc7c71beda71ff12d3ba7d250d25063ddd1be4a SHA512 6050f596b07eb0731560375aba5fb0ec4ae95467b9e436a4b793cd215e3858053a550250d3e42ad6c02d18f23d1111a4de225437b682a749fc29d898a68f3637
 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 70d90eb586a7..ab00e09deccb 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -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 hppa ia64 ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm 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 2474b53524c4..33dcde8d7483 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -1,6 +1,6 @@
 AUX 66-ja-ipafonts.conf 800 BLAKE2B fb6de7c153a0560fe601b112ffd2d53ea6b8e528213a57de548c5129e934331299269c5a315071d8dfa6f26ec01264d3fb3b60a3aeb311299c83296d3f333160 SHA512 5fcffa0841412bf6012d36aaf2d3f37fe685da22833344d107b92b133693b9f22cf2a6afa75ad27509a3f26ec6f692f2a4acc04cb8caf089e248b014768a920a
 DIST IPAfont00302.zip 20113208 BLAKE2B 25c6e483b08350347dd8ecceaa1ec04cd1e39d9aeaf988e9d4bfdd60614dbcb3b275ee07da1eb26699499b1e9ad661114cd0222fcb32ed183218b30024b212d4 SHA512 58dfbb6b7ae5114aed28588d05d48649a2f216011d7bd2798a62558f1f55c9b998ad510f7b7a0ab9d272f75bdc69de1110bd67205ac61d221b0ce8fd71583685
 DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
-EBUILD ja-ipafonts-003.02-r1.ebuild 672 BLAKE2B ae967ee2007e9c60933a4153578a2b49e61c0889ea8448b9b24df6695f40fe2c346ed9873d59f2f461b5a64977007e29bc23620a65e3ed29a272afbe4df895c0 SHA512 e5fc88030df6765588f841f994133592d62f991f5b5b1c79b5de11830bc7adcbdbaf38a8775c06be2b8522eaf8b76b843f53e1ce64504b1cfa1b8d89fdc769db
-EBUILD ja-ipafonts-003.03.ebuild 691 BLAKE2B e16ceca7f1455a83e2cdfd568c91e7a444510f682543744386af55e8bf60c288b728854a028667a61a545bf3cc0cae054fdb47b5f9625fc709479001314582cb SHA512 6bd23d1d6a4ac8ae6400bc0434a103ec35b3a652add46d9f36f8922341aea738d5e3fa8797a0cccb685878d16f1863f04735c2a4e0a407ac4e17ff41720f1c3e
+EBUILD ja-ipafonts-003.02-r1.ebuild 670 BLAKE2B e5b401c017449fae104b6c635e4fa403c7424e3ebb0c69825947e1f965e16255a45cad1b874b33fa0bd5ee08f0706f248095246367980a9f1103a827310d3e05 SHA512 4167a01ce4f2fc9191b32db116fa233aaa0a44f3f945f1411bd3729af4ddc73632d630f181c34912e96cb62fe309a0d24a11655e651024fb0311a1cf46deeb7b
+EBUILD ja-ipafonts-003.03.ebuild 684 BLAKE2B a75abbc21ab383a3d51ed6a1d3e8b0ea658b56aa5c4ab307fa9027c6f587e941ed2e68324a539c3cdc9c70595703a84f65e7a391cc4ac2b779e5dc5ca1a2901f SHA512 7b2b4c52306a60285f07ff7719b8fc95e550a4d17b787f82c57210c5b93f4b77c0df555708cfd64288684837dc24b9cb0bd1df1e10ce66e457b9280614892444
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
index 3324379b3975..8ac00493e3b6 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 0fd0be000a1e..a6da02dbf0ee 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index 375eb86793ec..b3c0226dff79 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,5 +1,7 @@
 DIST jetbrains-mono-1.0.0.zip 514933 BLAKE2B 66067752bdabd173dbc3e0143483948ae94a4e67ec93579588f555c9e36fbdf6dfd6627fba8c8acdd976e76c4d23d0760953ed33ab4d6ba9d497aa06de70173b SHA512 7fd953f65951448bb358b3ade3b5be68b9994527781ee1059dc2e36e3b4042aa879472dadc37b13791c908238eb793bcfa06c4b3aedb4472943cd3852f512c30
 DIST jetbrains-mono-1.0.3.zip 1918755 BLAKE2B 9f8d8784936cb5f41d82b8b2aaa916a386d31d0830e743918142a97a1deef7a32d254a1617ef41a7c29e89c58bad2eb9fc7db129945982d37c4f6d179ed7cf9f SHA512 81852f330387084ed6df8eece6389c8683a416bcd3e5db51b572962ae57310725214448ddcf2617c5aff899e6825c26e068adccd16578123f03f4b2083b7c7b0
-EBUILD jetbrains-mono-1.0.0.ebuild 440 BLAKE2B 9c886d6b3d850735d6de95fb2641219910f1d79bd78597f0cc39a3b4de6e3d7abf0295b8c731efa171b4e0991c589d4f7efe0bcf6594ec50f61e89979fca15f1 SHA512 f3fc38984efc4861d7cef648d6822931dd64190ef28fa94bdd5fee42fa46c7f8c35ca4c3a23124ed4d444e16f875861dc6237e8111de1e3e442c8102404e2f3c
-EBUILD jetbrains-mono-1.0.3.ebuild 464 BLAKE2B 4f09f98356db57fbda8ee39264447e106ac2381c50324d7be42b146c70cd52dad523a740ad31d0cb0e54fd1959f91cfe6907ce9cfd14a6628ffba21739d8209e SHA512 36908efdbc6dfc9c8f3bc6b7b4c550f82faa7868d807df701d526539131d5c84432922571cca669f2e7f188980003c5c4f590354bf58b8cedfb1b318f7c43bec
+DIST jetbrains-mono-1.0.4.zip 2884915 BLAKE2B 0874cb4a15d5c549659d0f485edb4bcc46b6d8de43d9968be871b2e31212c6855fb4099fc6b38147d454891223537a5b21b9be47070788d6c002b1f23a1fdc5f SHA512 ea7ba810192c0ae3f98921747d0601b2489387953675de649f1fe1c690dfeb9138d678643fc05c65b31776a90094280934ece3cecba997af38b465a68919a126
+EBUILD jetbrains-mono-1.0.0.ebuild 427 BLAKE2B a01ea42a187ee780d3049fa7eb6745108d02929cfb25b9a06e182f303e256c5d9e0424d5fd3bc06bb1b1c919d1409c39d4775416dcebb2c81daa710700bae29d SHA512 a2ec4da63c39e1105f7c1b06506c3a85368def3859a9e6e7afff6de1d92f95834124567a672a024d56d33269ee40d99839e7cf9c2ed7162e1544c45acbb44f94
+EBUILD jetbrains-mono-1.0.3.ebuild 450 BLAKE2B 465ea9f8af803385b9fe3575d609a2327354294c676d93053ff59795999a40a044a063e1e32e004788623072ddd8ef9a8042d9037ed7cf742cdd28deb2a0f69d SHA512 6ea29af3e934192ae34b97bedfcc9f74081a7ace59e711325dbdf71643af9011a576e78d406342c9eb95e46fe35504979d607b1abcf2aaab72ac052e3596e029
+EBUILD jetbrains-mono-1.0.4.ebuild 481 BLAKE2B 51f587c0ac48af9070c090e497420dba53eb685f08b176d69b996c87573e3696a4270c316bb0d61ec59785351f2c1c8f1f849fb2b3a3ffa3520d5ee07fbd849a SHA512 fc38299ce2e3aec4f14b559e366dd3075ddb6902347b92313f69973c706862ee741392a84113fadb11ebc036eca0b9acdf2628e43f11d273cd2bef9c8cb00969
 MISC metadata.xml 446 BLAKE2B 616fbc05a7e6130dacb8ba06191f0cbced65910683bd67e581dbbce48fb7db68de84460a1a1a2b246c96436dc7347b3bb33c91a4dd46fad1aa52001d406bd33d SHA512 04d88a4c4d059801e7acf933d3217b3552dbaa99b08d1319e0593e5e3b6cc93eac491dd5fa17620ff30f3606f9a9ddcd27907fec564e361dfd184692f1e70dd1
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.0.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.0.ebuild
index e107d624f974..be5ad1a80a95 100644
--- a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.0.ebuild
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.0.ebuild
@@ -16,5 +16,5 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
-FONT_S="${S}"
+
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.3.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.3.ebuild
index 2fdea097b771..7dae4d1eab0c 100644
--- a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.3.ebuild
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.3.ebuild
@@ -15,6 +15,5 @@ KEYWORDS="~amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/JetBrainsMono-${PV}"
-FONT_S="${S}/ttf"
+S="${WORKDIR}/JetBrainsMono-${PV}/ttf"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.4.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.4.ebuild
new file mode 100644
index 000000000000..75b662ef7cc1
--- /dev/null
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="A free and open-source typeface for developers"
+HOMEPAGE="https://www.jetbrains.com/lp/mono/"
+SRC_URI="https://github.com/JetBrains/JetBrainsMono/releases/download/v${PV}/JetBrainsMono-${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/JetBrainsMono-${PV}/ttf"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/jisx0213-fonts/Manifest b/media-fonts/jisx0213-fonts/Manifest
index 3bafcfcc38ca..860dac8cfa23 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 1196 BLAKE2B 204c904d25d26dac6d8c66c73de730a22ab584fc42449218d174cfee343e65a66a56a71e1fa7e603a8db57ec459d24cb1777c35b66f20c42b6400ba12995e775 SHA512 f2c42fb73e7711efd6076b88ba22326eca88d34a3a79efa599c051ba3cef8dafeb93990b9396b3e5b5cce7576c6afb405514a38364d9e56f354a8d3f8e5c8602
+EBUILD jisx0213-fonts-20040425-r2.ebuild 1194 BLAKE2B 020a3d3a22aa432bca8f0dc6801f0d0e261acb298d96634b1226d7b423ce40d4a95107fe8b22054ccd8464b0aced00a99d16b5814097e380fd2bb280862a4384 SHA512 3238aa46f255a307d12fce1b8714d993607e6d42082b9f48216860d3d858bd42cf7490dc02a48e3aebac8de87893c422146b0965e4d729cdfa1c66796aa360b5
 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 190882bba47a..59d1cc30fc7b 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kacst-fonts/Manifest b/media-fonts/kacst-fonts/Manifest
index d108b511b8a3..3f2e400ed894 100644
--- a/media-fonts/kacst-fonts/Manifest
+++ b/media-fonts/kacst-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST kacst_fonts_2.01.tar.bz2 323467 BLAKE2B eaccbff16567fd7dcf2473f8215a94bb46a5ac8d78457411e45ad1df9fa135102c33a9bcb64b9c90e4ab77f97951add5343b3a91e1843292d7ceb492430321e1 SHA512 4d79ff0d95830e3b5fdb69dc95e40b9070346ce8529686af4469442fe7ec54abed5e6836f27698728f9cb12c2bf5d56797c1b9592ee548a237ada419eb8b3b59
-EBUILD kacst-fonts-2.01.ebuild 467 BLAKE2B c150031507b6f17341d20c408b4ce99641955708916089288cc09b8dc262a0b2792724f20ed974716f4a1e7d3c504b104beb9dcfe553e611ca69b29f65133d65 SHA512 f931b25ec00e56d807418499de8caed3fad54278c428159ec0f322aa2adb8df7d96c2f8bcbb69c92bdf7ad58c6ca34ee7cdd221f445f8ce9cc261d1d756de5df
+EBUILD kacst-fonts-2.01.ebuild 463 BLAKE2B 4290fd1d340165b5b2f19116ae4977016a323e1a100d8149f215bd8d57a3e6f19ad75efa82826b1b4ca97e1b964b7b7e0cff8b86382ebe3b7cfb95b1d70ec0fd SHA512 17eefb7ff4515ff7d0b3a36bba62b60e7095de0e3c79abff37356e78fbaee12fd59b37c1433f56409c25a200f0ae617f6bacde63066524bc095e81fac00effc1
 MISC metadata.xml 316 BLAKE2B 723c24d6f84b81214862b9b87b53411988f5c8301c69cd4f6bd891221c166d2bd19e2ca003b5ff63bd292cd4ead03782e606c2a221ec427ca68f1a89eb5342a8 SHA512 d4e5a2e1470726810dfa15fc49144adc9caa1664fde1314a38c40a29b7d24e6c7dfd7c8f7eadf9ea8a07d12b3a7c3fb1b9f78f3530fa5ec5d67188f577942255
diff --git a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
index b81857a9a458..914b89f5e706 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${P//-/_}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 5a770f40c62b..92a563d16a5b 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 717 BLAKE2B 67e2f68b98929b7ba1d235d99c5628da3741106c456ef6bd7502e98e56827f69ff1e5801b88d83f80b50ad5f3a0f9f6191d2bd4e6da757ee1e8b5d7cad7cbbdc SHA512 1135000ccd724e9aa0ebea7b189a1512d22e299558f218f06218923819cd4b54b17a5fd3e7e2b5169462eadbb4e9f85cdbb8dda2ae7d24ef189f614cabc41a7d
+EBUILD kochi-substitute-20030809-r3.ebuild 701 BLAKE2B 30bc97d91f37e26307943e91977cba3b6e6ceb9f179cb50d7ce8be1e509d10568d6f8e2a5582fdbff2aa0b09cc9c9197dd5ab3e55b91f3f62af23c2852a09ded SHA512 d5e97376d06be21b9655bde1b85d6a4cb956389599a52ebb5e5bc0e9697b48e0bd19677078a954a9b191a79dc17bb501290c2960b42d13b17f27806bd3efc39d
 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 6d6792469e4e..91f5776530b9 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,12 +11,11 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
 S="${WORKDIR}/${PN}-${PV:0:8}"
-FONT_S="${S}"
 
 DOCS="README.ja Changelog"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/konfont/Manifest b/media-fonts/konfont/Manifest
index 9480fb3f79e0..8bfbeeb260a8 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 592 BLAKE2B 08817299c162295ef64203bab8e79f69dd66618b937b0613a4dc141470d1841ed258e6897c61c783eb239495c677e395bcfbc0627e16792d904fab82bf2715a8 SHA512 e887cee15abdca21aa38232181f69998ee6a11c503023701c71805f0979aa26a55e518bea6ab47c7ef08486db11183794252b52c7f04174045e0fe2628c70f0e
+EBUILD konfont-0.1.ebuild 590 BLAKE2B 52b940211b3d246fdf3455f51246beb94d13811feca1904cbb80e8df98c4b89bafcde6154f99938c80e7920a608e7a041df467cc67f073ab858283b854e8d2ad SHA512 7c7062c8ef68392493e05cb708db6071a41dfd9bbfc6d792d87999ed089c2e5bd061d16d6b903a5178bcc8d6af95ae111032e8d6a63699f9e420efaa5f82cec6
 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 43867cd5d5a0..53b1a0cdd85c 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -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 sh 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 f3391f4bcca9..ed3058b1a094 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 710 BLAKE2B 971eb4cb0f9f3f8e9f7bb0120c824ac023bb20bdd84635d2752f5c7d4e3f8f8601506361ed75adac8d4c595e242d9f8d5f36dc9aa988bbdd45e9672ca5b2e592 SHA512 91f4197233052b0232e647e67c9f7dc541c0d8d59ca789671fa8ac3b0f963f971f9ee37fa9a45ec28ddf3d9ffadc46764f499a97d937f6fa4a48eda4bacb5d53
+EBUILD lfpfonts-fix-0.83-r2.ebuild 708 BLAKE2B a5d9ead1599df7be2ce58e36bc350dd401d803efd610b5417cf2079012ae8a9f4359f4015ad5838cf3c0b901594bba9baaf1f8e02b27e1bc454884c242d52aca SHA512 2a78161117e48e77a1978187ef3954ecf664321674f3b83b94b98f1ba879f6c094b12c719d5fdaf7050fa03465d0cbea15a317286e7f81bdb3b7c3316b3532e3
 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 570cd429b98f..0ca9ecfb3c00 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh 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 2897544be1c5..0f42e7d4a691 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 521 BLAKE2B 686d13151c716a5faf5dda3f03e54bebe25d231339f3914080c5c350c827ee3080840c974f25111ef9f2e6eb35766d8dc0820d8477f6d74a9af7791c7446e671 SHA512 badb4779125fb3e40d7c342b60ac15065c9a550a3bc65a9bf185f07613eb9b0fb4761ed5c6700c7cdebd5220d1864206ffcfd64a267904b6f50727d16f4fb657
+EBUILD lfpfonts-var-0.84.ebuild 519 BLAKE2B 5327a0dfa002b406ceca21ab6b070cffbb884b8344f54bf13e0aa28e22a5641577903000da53ba608b8703792e65ef42ac2273db8034db376bac1ccbf4b958e7 SHA512 e8d3a8d75f99e22a09f91aa09c1ce73be2a399f716288f6698f9ad08547a05e0202879bf93e7b22430bce15c42ed1d76aa39a82f858c54cb91c136f26c1f0973
 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 17e56a4787f3..51a641d3a3c1 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 5a9c7747d730..8600eec9a2a9 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,11 +1,5 @@
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
-DIST liberation-fonts-2.00.1.tar.gz 4842687 BLAKE2B c38635a3bfdddbf5ef3f2ed2a1f78d47ef7e384625606f47f94aacf1b07c805307a0e1fc3dea52b1dee823f66934f6ce767496f830fdd50c9a5efb073802b173 SHA512 8cfc1fa8f36e9f1c622879a822614b851b8339673ed6d2736937c483d85764ef12cc0d8a308f6c50e4877c2ab9b83ca2ea748b1458aa02cc840251e400285362
-DIST liberation-fonts-2.00.5.tar.gz 4935865 BLAKE2B 059adc20217238a0783ea669d7e7b15673791e5f4d6769d091e4a6aabb8ced47e21c71ad19505f2215d4377d01ddae5c671304cb1ebb8430f60f44a5bd19ea5b SHA512 47e15ec1695a9576163f7378dc263d51c09956c73031f4a30abc7be10ccac9e0af69965c2f00b97509f6456e2e6ae09b49be17049cf2e54a27bdbd3b001a2a39
 DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
-DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
-DIST liberation-fonts-ttf-2.00.5.tar.gz 2355722 BLAKE2B a782ab6668168b85cbfdba85df99a4ed4e6c173db7c47a2a2b0d67a1484bab70648b7b950fbb51448dd3cd31f68c3ea68a977966f0cf3cfd0aed903b8922c29b SHA512 fc00494842475d040c01029b6fb134fec9a37516a5e8e1b9ba945a2b38fe2ef3df6a0acfc00dc024cf2019f1106092d063c8322eece1be1cf8690db4ed8a653f
 DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
-EBUILD liberation-fonts-2.00.1-r3.ebuild 1182 BLAKE2B d7cf47235a8d7dd561e03bb7ec90893f0b7bba0f463ebd75e0f782cc5a7f1f8389fb7d4e40acff440b00823c843ed95e5136fc17bda97612af34d3c7671ea72d SHA512 8269d7be665c36e8d89e44831900f40faa4c808561cbf9b0fded379ade68e05a7584e4e01182e3b653206c35c475ef34a9468b042453345a97800cc4386cb882
-EBUILD liberation-fonts-2.00.5.ebuild 1263 BLAKE2B 4c9fb2788134978fbffb89c5abf9640f802605ddbaae161ccb96cd3e39963d5282148a58edcecee51bf065e215c25b65692671b2abb89eb0bccc47086724a5df SHA512 1617f4abf9a798196a33a51e760732586a3b12f56af4ce2c229a50d0949929a09e3e86e7247ff98fca418339af5bb2d1788c845485e1998d649a43cd19f32f02
-EBUILD liberation-fonts-2.1.0.ebuild 1263 BLAKE2B 2b43e1c197fe46faa60a58781b28d7c94493a56bb5537e2af9725c8b53b06fbb4f7f0a034d063d2e4945b7ac2d6a9e6cc9b020655e7a0fe84f666715567fcf79 SHA512 418b7cfa71e4836ed997df81932dcdc7a464066a1e22caa7f56c06b5e57d08b1e9ddf9d7c78f6fd3b4d8289e569a469cd4a57d6df081fc7bd4b52cb7929c65f9
+EBUILD liberation-fonts-2.1.0.ebuild 1257 BLAKE2B a565c54a62c022e20bc220703302be1071f9538074f0209c5ba00db903ff160841d3cec309512913c22af2e9e0cb81f0963d9024c812f5b52fd8f7577f1a5d79 SHA512 9f459a12be08c3ede8a074825ef3a8518cfad02163d1f590b39314536285d7f6a6f14de5009f2ca0bcb15bd310a245bcbc51710a9f42752f8cb6dd1ade9f21ca
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
deleted file mode 100644
index 559ab02fa55e..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/${PN}/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://releases.pagure.org/${PN}/${P}.tar.gz )"
-
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-DEPEND="
-	fontforge? (
-		${PYTHON_DEPS}
-		media-gfx/fontforge
-		$(python_gen_any_dep '<dev-python/fonttools-4.0[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=""
-
-python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if use fontforge ; then
-		sed -i "s/= python/= ${EPYTHON}/" Makefile || die
-	fi
-}
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-		python-any-r1_pkg_setup
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
deleted file mode 100644
index 464b2a00d2af..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/2926169/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/2926167/${P}.tar.gz )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-BDEPEND="
-	fontforge? (
-		${PYTHON_DEPS}
-		media-gfx/fontforge
-		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
-	)"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	if use fontforge ; then
-		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
-	fi
-}
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-		python-any-r1_pkg_setup
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
index e0f40b4b583d..16fa20dac742 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
 SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178407/${PN}-ttf-${PV}.tar.gz )
 fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178448/${P}.tar.gz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/libertine/Manifest b/media-fonts/libertine/Manifest
index b75b34f687fe..9bd5f456220d 100644
--- a/media-fonts/libertine/Manifest
+++ b/media-fonts/libertine/Manifest
@@ -1,5 +1,5 @@
 DIST LinLibertineOTF_5.3.0_2012_07_02.tgz 3001259 BLAKE2B b585611591674d2dbbc616a572afee7d89e3ba7244a3b19abee2e99937da1db8047739a79ada23f2d0ef5febe39970e08b907e347994996da922a5131a3669fe SHA512 a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7
 DIST LinLibertineTTF_5.3.0_2012_07_02.tgz 3673659 BLAKE2B 46107c8521a5cd680fa7b2ebc7dec969c0bf326f7598dfe850570771ec79b10cc472953be045a539a4fc414c1612f6865e1b6b86f390514ae14ed601854384c8 SHA512 ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273
-EBUILD libertine-5.3.0.20120702-r2.ebuild 728 BLAKE2B 338badb3aca98cdde36ed1a8e9bed5bf7ef1a9e7a6ea7339a55b56483cbeaa03ed58439ae5326cd238de941953f0b78446ffec75205c2365471c0da50dd8c3de SHA512 822dd4c160bf19f03deb79ba47ddb3dddca696d20a4904822ee917e084fc66040a764a77327ef329fb109652a582d0fce42a428a3c4537ccc5d4ac897d442ffc
-EBUILD libertine-5.3.0.20120702-r3.ebuild 779 BLAKE2B 890f893ad965c3ef304176af2d9794a57c89371c0ec84c627e44914fc4f6a9ce60a1d2ca4e04ecbecb200a507aebe60777e9ad06b03e3735200a09db37f2aeef SHA512 f13716ba87f58a80b8dfc63de9527a3ce0189f660d8233c9eff4a236df697bd5d6296dcd64972167ce136a9199a46e63789fc7ad300d02b6af0a0838ed260ab1
+EBUILD libertine-5.3.0.20120702-r2.ebuild 729 BLAKE2B 6e81ba3cf6b06464cd3f8e14ac290af5fce8ad127413bcd58be2b2e47b981196731273026ba0b02222e86b7f5a3056c263f08caae842f439a2605bf658a62cb3 SHA512 acce326da070b0b061050070ce298147de580763f54d5e479a65f2d2ac597deabf779d5d55c55e8f67c981e3f6b6a53fa0a6d8c20ccdbc3d4630b291289adeaa
+EBUILD libertine-5.3.0.20120702-r3.ebuild 780 BLAKE2B 2d53ff3cc413520dc06df3750db98997e6c3ec3aa50efea050e71f14842ebc39dce8d82afaca74d5cdd4ef628885d82e3da5b91fcd32e9332d9219e873cc4230 SHA512 26c27c833ae19325c2216c01c1969dd3713ec0dcb08d0783bf7269bab50d6448e6939aa274b55b7f8eca98809bac4f7104e1686e1e7ba1c77ea4834ecd225387
 MISC metadata.xml 332 BLAKE2B 04e9e26384b60d2cd97873cd832ef6d71cff61e3c3465b3927de2d34b5473b6f921750be6f2c0eaa9b3e87ed7eea9a9388e3775713153617152bc75a8d323179 SHA512 494bd65f738485e4876e0309f61515f6b42a61d3ace6a403af533d268e80db72833387731656e6c14ed7faf73e2f06288f31c46c81eca174338d1f817cd2d961
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
index 6810259955f1..44f9d6c23dd0 100644
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
+++ b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz"
 
 LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<x11-libs/pango-1.20.4"
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
index 1cc512242fd1..a8f4468ac7dd 100644
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
+++ b/media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz
 
 LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<x11-libs/pango-1.20.4"
diff --git a/media-fonts/lohit-assamese/Manifest b/media-fonts/lohit-assamese/Manifest
index 69f52c2517ed..13d39ffd4589 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 636 BLAKE2B 020fb4a005bb8e5e525457b774487a7edcf1a757309d0fb3cf941968bcb56a07d1acf2f4cb486d74caa8826cb98778f39434b9be2eaff6a1a9dcc9700f8acbf8 SHA512 49ab09acdbb8a9d932f497f7222f54c964c3ea0a0283465ddaf02bf683d31d00c92d0751b9e3ffb7d13d5bacf2b266c13006759ecd985bdfa89a759640daba3e
+EBUILD lohit-assamese-2.91.5.ebuild 634 BLAKE2B d3342ef5d6844be328e9b1ec017dd8d7725e29d6314efc0677c69e46631b151391668765b2044d85af6cd4fd4e13dbf637861557fb13a7d12b483e1915980f1d SHA512 5f73257a133dfda8aacc44946027836fad1769c4413ee3a6cc420058575492be516220c02201ebcbc63674b26cc498584ab39baa12437ce0aea2faf4d0facf55
 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 432a4906091f..a085ccd6cd62 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-bengali/Manifest b/media-fonts/lohit-bengali/Manifest
index a8f998f540bd..b45c33622a73 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 635 BLAKE2B 3a5d237a452507a6c1f2886ba3e4ca5e006a977f09a8ce54a39ea8ed0509906bdb53523d626120553429cd2c06ddbd3f1c1bd16e6698a73b9c325ebd39f30b31 SHA512 48801f8aa04487ef6022148fa7aeffd2544fda286f09ec9e6b2416cd0f897530389af631c0ae2713f3dbe111a2ccf9af25042a3e8c130ff66e6788fc395333ac
+EBUILD lohit-bengali-2.91.5.ebuild 633 BLAKE2B 35face1201bb4d0552d5f8a92db688798fd22720696e8dcf1f0278d000adc850fd8520b54bbc971732d8db45d92846a3f4384c138d84b6859ee490d08b04a475 SHA512 8e7aad50d85b1de489faf5b484cd6ca690b05b8ab263bcddc80c0f822c7a41f1bc899e41cbe5dc5babf4ea9e9d76cfae114ca6aa55f2cd7493153918e4dd4363
 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 b560d7b03f97..3fe843eb7605 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-devanagari/Manifest b/media-fonts/lohit-devanagari/Manifest
index 4c63faab2d5f..fcc6a213c2cc 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 638 BLAKE2B c4fc9de462713b9fd48c74dc814fc9d16ff2eaaa790361927c7089a09c44841f378f43285d74b2fd866fdb7a1f08ce99ff4984c04beedae33e68b0dee35b646c SHA512 2f0419166ec53fd855272b004cf07609caf62a3474ee70150ec390d7ea5763699d2d8d75128ff59fdbf0be3fade695f105426b9d3b680c63f415993f28fe046e
+EBUILD lohit-devanagari-2.95.4.ebuild 636 BLAKE2B 17c589a4a7f303aa8bd92047c38b5bf8b77f1589c24168fcdd4f869a418c2beeaf381380b8641a7adaed0c038ecb959aa4ba465f2a7723801c8fd43c86f6aa20 SHA512 fe513016bd5babaaec156b955cf0a8c443263aefc85f4eafb2d49a621cabb4e1aaffeb5236bcde42e3e76a2886bb6970e910d9b0779ef6c8154bbfa1e334f394
 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 f7f87104b2fc..b8b5d3a5e1b2 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-fonts/Manifest b/media-fonts/lohit-fonts/Manifest
index e40b46967b61..c2ec3fbdf6cb 100644
--- a/media-fonts/lohit-fonts/Manifest
+++ b/media-fonts/lohit-fonts/Manifest
@@ -1,2 +1,2 @@
-EBUILD lohit-fonts-2.20150220.ebuild 762 BLAKE2B 984d37c8e777b8d47ae22b4a8e927d94dc228a81f2aab4b587f0682f2e8ddc620758259584a355b4fdc90f3438030f9e69c80da6e61d62916e8ebf9ad4ac1eb3 SHA512 35c57c7d8c9294fa6ed74a48cf62142e2c5113320642228c3510f3275d8570b4645f7bf1dbfde15441f2b426f38517651f8963d377348d8df5c1c7a7196d9619
+EBUILD lohit-fonts-2.20150220.ebuild 760 BLAKE2B 9c8c0418dd4fb1e0b5b22b2f2833e90c59ce023e44031545ab431d84addd13a11a6f0a65da88bcee9af35306bd5c75beb4d356023b49bd462642a7f8259c644d SHA512 cf8fb8cc133b760ad60a6d0502a57cac72f8e411d2624aef9a2a35d941911c860469bbc302307eaa9e3843a339bde7ec905e9044e3a92c864a6e8d20d40a0121
 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 bb9d8b322339..16ec60e4a44e 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 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-fonts/lohit-gujarati/Manifest b/media-fonts/lohit-gujarati/Manifest
index 0b3f8360c520..8e76708546ec 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 636 BLAKE2B eab765813053756b3e0e57a5110208d634b0a7e8d546c92dfaad231ef4465e28d17d6d3758a8e8d434fd7aa592f81f2011cbf11ece0e6ae4fccd093755afa7ba SHA512 b2e25cec3e4860030d83d68c683aef811172931aa6a0de3ce238e82a35ef7b48538b5da3f4dae26f9e78c0a97e762228d4cb33cb2aeb2a56ca46a1df0c52a6c2
+EBUILD lohit-gujarati-2.92.4.ebuild 634 BLAKE2B 2b490d4d0dd01ec499b1038534a43f055d14e0000a76c2c21fc73b9aff607366e9e2549547e1bd85f431d70d1944fc033e24bafc92364e13b39baf05a64aa9a9 SHA512 464dd8cc87f54ad61ef99bab4e4a5c0625bbc629d448122ce35105c61ad17e5c919108f2fa431ca5c41077bcbdc4b609fc22d6464f2cce6b16efe00a474bcc07
 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 99808457541d..450359774d52 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-gurmukhi/Manifest b/media-fonts/lohit-gurmukhi/Manifest
index 1fdc2c7ea466..14f6ae2960de 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 636 BLAKE2B 27947fdab07cdf864d95f73ed4dc6ad0ede9698aa8244f9c337bc4422cf6cf90a8cb8dfe556cdfec38d86dbc0e4892f2a9c975019108744a10f75035f275cf66 SHA512 aecf41c4e24b8d7723dabd0c4b05af00a7b85e2d995328c020e0983cf9efe12eeff0c8a415ea62bd2b0a563a8fe54a07b443a4aa9d358b49f9fcfd27335a87e2
+EBUILD lohit-gurmukhi-2.91.2.ebuild 634 BLAKE2B 0eed1d613e1d253fe0c354c744a8c6702d28a35a1fd2f4e130de540649edc4cd8e859a971b2ce0f456ce56274b4f454464e904d22f3e5835bc8c8608dbf7e47e SHA512 be19d1ed9443acd32bff7b6dc9557fb7523bcf88d65e0338c140742fdebeb27b59baa80e19d0bef34c173c25eac7c26502d25eb1c7f018d0cbc3267a6f58721c
 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 af8c775de193..35778fa608cd 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-kannada/Manifest b/media-fonts/lohit-kannada/Manifest
index 5df7cb2a3146..342eb4714504 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 635 BLAKE2B bfcbc6b064e530bea8b958118c03c79b0fdaebbbcf509be16ebb481cdacba59be3bf03f137f68a55497d46c5ace148a44fe000ae0447d5a2e3c2fcb214338c4b SHA512 0d5fa5e45b8940f19976f16cac654a9feaabed33f137276adf0e6fbba795d6b5a0b690c26b39480fda68eed689e9de399e754aeace49d3c78a7db88d52e33118
+EBUILD lohit-kannada-2.5.4.ebuild 633 BLAKE2B 65e0a1c37140c2a04f7920f8c88fb45726c113179dd9796e521194a54a5b20f6272abaad46308509356bf6faff7df594d9d30f6ffeaec4a12f6867337a37b16a SHA512 1d7ad2e8dd4f19c816ccb29905efb6414f899aafea94ba1c35bec3ec78629324459ace1676dfcc3ea5ef8a9e6a18a5aefb79c92de02fc21f2c3ee7787a7af8e4
 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 6c98034bcc32..da46e9e41c53 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-malayalam/Manifest b/media-fonts/lohit-malayalam/Manifest
index 984063422ba7..4585b752ff8e 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 637 BLAKE2B f771b17ef42625d8feba99f9a64d4cc1f7ede86d4aa41566cd285fedbafd3b3865b89a11540b3bf6abc83cbdb4e5a61046d6e89714d6541a219c7298637337f7 SHA512 0bfcfaf5c4e4e1aa9b6a27d216f794d7a78f0216644ce2b1b14844dfb77c7ab2cfab2443dbcf266604c4e455184180197217d96951c5e793bf9967e96ec307be
+EBUILD lohit-malayalam-2.92.2.ebuild 635 BLAKE2B 1b08bd331f03498551c3ff6e9cc36a2f28b0782ba387f80781190d1d133cb17fac4f0f3e92caa995fadefbdb11d9c8b7b20ecdd02e2936fddbea688ff8d1b4be SHA512 146554acb59e279132b0832d38d17288def63c20b474732df858e7071c90a03b31e200b11f76e07733e79b4e6261823daf5edd3dba842263e0386df55c834393
 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 6e186b0038c0..a830587bfe2f 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-marathi/Manifest b/media-fonts/lohit-marathi/Manifest
index 733578579839..88429a238b3d 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 637 BLAKE2B e3cd08f5a1a8b84afebaa20cc35dddd5a2c17bacbdf8a88c88dc735709884f23120e722285f0e889d1a1bb1943723908f92ff01242700675f2bda083c66cfa4b SHA512 6365690453f42c7a7f9586177770a6ce26b252b37235441eda64afdffa71d6871251bfd7a8eecdaafd8046a36f34e97b3fab32c3a8aea793f6bb868ed86b33d4
+EBUILD lohit-marathi-2.94.2.ebuild 635 BLAKE2B f9d4d9589a54c0b6490489b0124fa5c1b10b097ab9a7df54bc2ea29cddfd3b7c8b0dfb6bdc15b5a490aab933e316b6b74cf4850e4ff4ad023f28ddbd4f6117eb SHA512 a852ff513117c08b56b89d9c3b3101d0b811fbbfd980a9c2b50dd695b7c1fe291812c0a99e70919302ad2445375e8a654dfae5621a96de4c409dc027b50f5b29
 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 34b72b40e054..41e33ad63fa9 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-nepali/Manifest b/media-fonts/lohit-nepali/Manifest
index c04a9af5a57c..591f3b843c03 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 636 BLAKE2B 644a3a19b6ec15bd7ea9c256ee780a3bda7da7e8261dfcadf2ad4e07e55dbf035b7cd7a0e8747dc53dc88dcca685b67a75f836e9ca2cce2589de06b38b7c21dd SHA512 8e57beeb3e279115808fc0bef944a8835ba3e288001c98e6dae39e03f0fead53a38ea1448abf082eccb3d2cdf1eec2d7b9c05a459164d048639ef95e470a646d
+EBUILD lohit-nepali-2.94.2.ebuild 634 BLAKE2B 974a0427df70af0890190807f30eccccda7ce1cc2b21064f8f6dcedbb6c2c08b6d70caadd57da74a7d4891c7ee5dd3f92481134e3ce97d4c59b3c89236785db1 SHA512 064b40f5dc068dfd780425003ca18fb2b3e99d316c302b35b4e9d2931931342a40272e7b201caf7a5dcd5a770bea13c04289922a34fe9b85d1862765c5f48ab9
 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 82beacaac27d..83578bcf0d2a 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-odia/Manifest b/media-fonts/lohit-odia/Manifest
index c0727dfa6f0f..08be9804c940 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 632 BLAKE2B f61666777c0517fda28ce4945585e805fc54a74097aa3a1e34109f26e00b23acf32457743ea6a9a3fce16776ce7a61edcf984affe879b8060b6a68304a06099f SHA512 7f1030d195c298dfb599f47c87d20fa4d12f056eac52f35df95a7b1ba33da3536d2555286a110faa40a7f67f5423128ab34f64a3b32e2cc4f2fa1f62bc93af29
+EBUILD lohit-odia-2.91.2.ebuild 630 BLAKE2B f2236501f0b854a2852d7874c7906c44898b96448091f880b5d6ea77864726c940ead74826505b6d02193e8f374825c0d9c9d66a39a8b310f93082930bd6f571 SHA512 b57caf93a4fa3b62eea7adc52a493f39006b434627e1860cadb7d8fa239b488c67e312807446b9430b2ff9eb9619ec3716e5c5d9f9658613847a3f7efe0aaaf3
 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 235e6c07ad5e..91753adab50c 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil-classical/Manifest b/media-fonts/lohit-tamil-classical/Manifest
index 543460e82ac8..75549b161ab9 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 643 BLAKE2B 4414e240fbfc904c2557f5d23a76658fae677942aca77bd29e6b7134db01cc9727bb98a39b1779266f11b2682047d474540ce5d577c5c184aeb3f7b4895320e9 SHA512 01404df4ae6b021713a37eebc3c5d37f55dfe4267e2acc3aa9f7f2b1eb072ca7a0734fb08ec4a081eb2eb14b2f775c6a9d3fddf0bda569d303a119100fd13a3c
+EBUILD lohit-tamil-classical-2.5.4.ebuild 641 BLAKE2B 656d0e7dc1ddc6d851070ed1921d258d7c1f7816d36c4f9f517066f3df3e7dd38d232f872b23376bf8347eb89dc9ca59caa6431e737cd8ce9d521ac53b1133cb SHA512 78238398c35e89df743df231c6ff0591892a525942cf64694faa84fe56d436f809412e429b92afb55dbbee605d049ef460f5aa157c8c39f5a01e0aedacb71fa4
 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 36cf3b4a6c9f..d530068c7c71 100644
--- a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
+++ b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil/Manifest b/media-fonts/lohit-tamil/Manifest
index 3a186cbce6aa..b2c62e01e34c 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 633 BLAKE2B e7f655bff1aefe648eca41d1e0bfa6b911e24014e90ace07ed6c740583f6dbedcbf49bd05ce910b7a9d831de81cfe6e1de8c4eae4a82a054b9262fab76369dda SHA512 488ec0cd3ee6f9d98000f7fced10a62dd5cb4c055a820eb38d62a209593ede5d4f73783218ac8f65b740dc9bbd3624bc16194dc6d8afb41bf0bc2e9f93db25c4
+EBUILD lohit-tamil-2.91.3.ebuild 631 BLAKE2B 99f5e61501e443719b4f0b2ae1f4751becc834bb1d9cb29b6002da1d7fffd108b1d115adce4069cc9ddffb43c9424e3e46e85452163cefcd6a32368de24abbe1 SHA512 8d2b83a680cd2d0a8bf913be932ea6e20d68c36a2471b5d447b35765ba99a2a13095d8910ca1fded99208f2a0f57998c4112f683a64bcf9e8b900fafd9ec9b85
 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 ce9e9f5b1d59..4e6dd2ef957a 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-telugu/Manifest b/media-fonts/lohit-telugu/Manifest
index 4bd1dfa5a35c..e4aaad18bce1 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 634 BLAKE2B a684eb8a36fe68e7acaf09ed15bc6dfd8b33fca5550d40c4ad0bd8186d04487bdb6b5bc27624ae1dea622ed012fcff49e1dfaa92cb342793974bb4e7723d9177 SHA512 3c2d503417c4cda07d39cdaad962f39532288e476dbabcdfd5fb0c1a73af1774a7abcc7f544b176b74fc88960932b1639b7a71bd033f09fa06deda907b031c7b
+EBUILD lohit-telugu-2.5.5.ebuild 632 BLAKE2B 849cdd8bacaf849d642658e1136650acd9017dbe769dda96365b1b34b4517e44b5b2deeb36aec083e5f96105864d192c44d50e737626ea6969558ede15e7b2e2 SHA512 2bd4fd9ab95efadca45c5d9eff2e88d545fbc73c326ed57a60c0964c8bb508c9088c153077d7cec9599b304a04395e25542b38233c62e1af1f9a3e9bfd14dbbb
 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 52d4b5ad6553..8d5d9b693700 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/mikachan-font-otf/Manifest b/media-fonts/mikachan-font-otf/Manifest
index aa7fe61abe67..107106aaa317 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 562 BLAKE2B f1c450e5542898accf1d7f21e88a81cbfc0e6937474c2bca8c0794dc8b3872ce69b062bd7502ba98ab3d7b35cdb197f417fc634bfb2781a66753ff65fabf0ac0 SHA512 d10efb2f82bd1d11df3e2d1c1d209223eab80137e24a2f4fce52f4018615580ae507647d2c050cfabf36cc388b08ccb68356a0f191cfae0239741eaa832acb70
+EBUILD mikachan-font-otf-9.1-r1.ebuild 560 BLAKE2B 084d526c508a7e141e146b729603a55016f1fa35305ddac3af23182b7d27bbb58ce17dcc87e64d3b81d857bf32934caf804d81bc87f2f89e1dab5b4549941965 SHA512 8fc97c1b629a6b26c3dd7dd0facebe81832179f8e3b9069107661ad30750ebc0728684c04f6f14a112354baa109abbefd28ff3833dc3b0588d15aee82dc5067e
 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 5b0aa333e1a3..c67c24e7772b 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
@@ -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 sh 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 a51ffc450b3f..376662da1c01 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 643 BLAKE2B f744a87a998ebc636e4a8047e0b3534ac0a7635d72df706fc9a62f0ed083c51fa7236c7af40701131e11518796c6dd8e750d75a6151017310fde7438cd356b4e SHA512 1c2d4a7074cfffbf20ce77e1c3bc5ad5cc20a91c2bc52b5bc804a1e1c1edcb49e09688d7480cc896ed0ebb9c1927bd1dd76fa24538b3badb386e864dbe6e99ff
+EBUILD mikachan-font-ttc-9.1.ebuild 641 BLAKE2B c5d538bd2564d1209a31d5b1a696c49dcda29bf3ce40ccc3ffd1842df931448ccb4898f07732c0672d68aa9c7abdd0d40361ff8e71c8f0e486bdffa680d27731 SHA512 7c5519a07329d1065f6356771336534022029daa7bf4413532013d50baff60237a32b2345a6e73431df9dcb0e80eb0684c8486af3d2ed8840808589317d29842
 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 6646e5f2d931..9c75b8f508bd 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
@@ -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 sh 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 047ed5def428..b1939cef7935 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 1022 BLAKE2B 89fc6438a99104daa35f7827c65c175da45ee00ec0bdc7aabd18578690d1577b2fcac19fead99be890bf87cf22d2e94f6b854c682500f2034d24231200e33cb5 SHA512 da4d273626c4f762a080e8e57b24b1d3c710041c53b46891d5bfcab6536705df4896d7879844e25bf2a3702d23efbe35eb7fecd1e5f86ddfff9142447e0dad22
+EBUILD mikachan-font-ttf-8.9-r2.ebuild 1020 BLAKE2B 28df7d5d730838374de9e7e175e087311d640c54d1e70cbb4dd5a41b86be4157d97226b8533a0c1774600ac118f41eb71fcb928a897de370bb159d1cce690bde SHA512 36ddf091ef0a679fbc2b2567e4c562cf145bec510c76cc5b507f8bed2daaee8de8870ff086cfe30f351672e6fbd5138ba44ed0c2d4a3d16cbe047d57ac287aaa
 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 401e8006b9b1..1a4aac01855a 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
@@ -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 sh 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 bca596af1fe1..286afbaf99aa 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 1414 BLAKE2B 43551ee5720206a921f5907983be05aaab7ef6d00f59a9bd908f94516e286f58dbc9ebefcd4cadea4939b0994ded8151859bc211ef24bf7633bfeb2b8cfc0768 SHA512 73ee56e27813357e192e4d7ea46c94d2b197a10b4d43f6e4c7473d16c990f0eca16e61801fb6646e04b0faa4c341cf0e0389b8b5a779bf5044f03b703aedf791
+EBUILD monafont-2.90-r2.ebuild 1412 BLAKE2B 07886d2a7419bd412870560484d04de86d8be80f39cd82fb010c0ad57e637d8b04878016ea0a038d43d8270c988cc8649ded6b0f015b0440fcba3dea6623957a SHA512 df202c3c4c1926c7733bbec40a2fbc59c507b920224e2e98c09b75a8dedcc9f7455fac4b8cecba9ebe13be816280172a0db62577f2b4e5a9301a0d97b395404c
 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 a23d7b889422..452e84027cf7 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 43fd07bae7bc..7ba56a50f022 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 674 BLAKE2B f8029e58dc1043057aa5bb78745a99ecdcfcc592dbfdba11b897be367f7a1bfcc2405e5e8a1782fe13e2b7319027ea70d8a8bf652c480d00457dd517b818fc14 SHA512 ce9355ea62950be51b22ebb9c83cce23731c4242340baeeff9e5415fd30baf8cf5087e4d5bc6abc4c53bc97e414526db612f0d0bc4bce8928e5f3ef09326ea8b
+EBUILD mplus-fonts-2.2.4-r1.ebuild 671 BLAKE2B 97767ae3a9e137fc67a9829544215feb5236c3a9e482180047a21595dc0cd7f8c0d5d9ff13de2659a6f2a9b3746f6bb2e82db8ffe17ec3b9a68cbc6b6d39ed8e SHA512 2dc08504223c6880a66ca6206724e04bb49731488061a030505667bf5d855a9499d97b71004afbc931de61dd9b73d44a473a54b6681a6196b0ebbc9d495317eb
 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 adf9498b1bc8..53fcbc132d88 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 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
 
 LICENSE="mplus-fonts"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="X"
 
 DEPEND=">=x11-apps/mkfontscale-1.2.0
diff --git a/media-fonts/mplus-outline-fonts/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index 7dbbb12cf32c..8930f33dd7af 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -1,5 +1,5 @@
 DIST mplus-TESTFLIGHT-063.tar.xz 10346584 BLAKE2B d053992dc6b1220361f91d9482eeea11bc32ec1989ef9b99e178f3f229c84f1d232111b7a97df195473bd957eccc973a0233da5263038e6beaf4a9ff64ff0cd7 SHA512 477b9669c14dfb10321b5986dece72fb44a2554ff6c9239ccfadf21643714984ee7fd1e42c9c7982fa17417dee0e7ef6b5d66fc7cceec05298add4ae3d9502fa
 DIST mplus-TESTFLIGHT-063a.tar.xz 10371708 BLAKE2B 0821600576564bbbd5b49ac0a268502e8ab77fc11d2a37c00d1ca75097c9385c340e8aceb14633aee759a608740cd02b6eba6892cb607f464703dba7dfcd3312 SHA512 bd491a71c63679977e09cbc3aef6035022299c4330b7799a879029d4c9d3ba9fed91e8bacc0aab190035fa288173e1a056dadec001b515bb3e47e77f9ece6002
-EBUILD mplus-outline-fonts-0_pre063.ebuild 923 BLAKE2B 5f6231dcbaf687c25729fb4f8f8eedef32bd1499f2c7835c32ff6045cc5cf9cc18d1eb79a00a7d4d16404df5e27dd721bbf536635212d02ce896ef3934ea7059 SHA512 328a3a9d037ca9b6ac1bcfa5cb05f8cc73517e3632ec37db2099d1e0538835515cb649073e262259c29baa9df8f309e8ec807bf9ba134e8a50adebf89d71c2e8
+EBUILD mplus-outline-fonts-0_pre063.ebuild 924 BLAKE2B aaf9dd368df395ea464cc33d39f0436fa5d7cc30237c87a0509980b449474bc9ab48905cf0c9315e785d593574f1db7ae85d0dc0e741148bbd854059662104f3 SHA512 014dea89aff118d9a36acd3fe2a2b3135cad8fe4bf50c479625a558748e9155f540a6b4b572d17f902bd5e4d2d9e9c404356f76aea9845b31ea56f29b91f9216
 EBUILD mplus-outline-fonts-0_pre063_p1.ebuild 946 BLAKE2B 6a3b0ad6914d858a911d12b22c67f40fdd0f2c0b3765d06d702804b6255b5fb4de21aebe364efd5a6a8fb7ec352e4ffc4068b645fed27afd3350521bee2c9729 SHA512 dd3b2f5b49cfbd3c68cda5a00facdf217632c9d91efb33bb153b034c3a57d65ba0ef6afc432959e7cccbfbc1edf39d3d248dbf3c12cbee2ec25e5910f445b066
 MISC metadata.xml 549 BLAKE2B 9522a58a4c3feceab34c6aa60c8c34f514bdc9be12239b5b5337b305ef1bbfcaf8f57fe49aaf1ab05763a8ba2643bc2a4e8d37ce3bdbd12f5dca2a86de159def SHA512 280d7cad69c36ac0d3501c24e6790322d584782bcd33e44600c09de00673715c7b1315993ea1544a9533bfe41a8bef0aad3e73398469dfac62bee746b0eae1c2
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
index dc6b6682bbcd..189d577a3590 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre063.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
 
 LICENSE="mplus-fonts ipafont? ( IPAfont )"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ~ia64 ppc x86 ~ppc-macos ~x86-macos"
 IUSE="ipafont"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index dcb9aaf5bc17..4c6e295dded3 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,8 +1,4 @@
 AUX 70-noto-cjk.conf 3815 BLAKE2B 84c477a84c117fa7fef4922e6b289c4eab4147a291b447a3b6d90a01d513f1f0c64dcd341bdda7b9b9f8efe339ab6781dde49189e84640ff781091f630b4296c SHA512 8f45cd10f17b4cfc2b5d7d253e7ca1dba20eaff206f479377c25ef54f469aaa3346d1ceb422086d7b25bc3ce6b3cf0a43b5967affd1126c020059a4e319e0337
-DIST noto-cjk-20150615.tar.xz 390518224 BLAKE2B 273018f6d0792ae90bc0d9f44a43f300a7fbd2ca2cbdbf71af911e1cfc0d4f0bb30b5d1f2b15d9bf4df279266921d46987f166dd4559ea15e747db7a22494145 SHA512 738bd840d14c3fc3665b9c6e50b1b2d5981ccdc5e660a6498b4611b8019208f0880df062741d9dec8bdcd54234eed46655e1c739cf872d9dfa5fa0523954a7d3
-DIST noto-cjk-20170602.tar.gz 1667938394 BLAKE2B 51ed7c48bccef0dff75ddc5ec108b61f0f5ceedc41608919dc1071a2308f96c3d2883af932935c32db6dd017e067079d45776eb865200560f2f9c6b89e57dd8c SHA512 861431e1eb0c21b8b7b03f9a97ae61c59a2e513314a24f0c50e2953daac3cba78fa418af32cf66ec100a26c88f5e07bd33eb3ed80b533d97a452fefa5a06b4dc
 DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af53928658c9f74ed3dac34955f5597e7cb14cdacc517c8b7bffe203d73e03a2c2d4013d3cfc47ce13ae3aa497c6547cd8dcce430 SHA512 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da
-EBUILD noto-cjk-20150615.ebuild 754 BLAKE2B 6324520ae3a81495b19deb1c23d02b285cd481590bfa64a819e1b6c7c7a3ed0e6ed7fa1b32dbf191e44c9dec4dc39d20374f4b974f768430aebdd4b8817ba821 SHA512 b70eead05ee0394054bbc484fb96ad2e3e7a425278d2fb2374547c4a84e55477ec98fd42df802fb110a4ccf50af54856c01f1e144df3b9f06ae099d025f9f0f2
-EBUILD noto-cjk-20170602.ebuild 645 BLAKE2B 9b34a69072fd81d8805495ff370ba0671e528f76f93f90cc7a63e749bdccdbd78a3d853e8f5c157156d82fbeeb48d6bde88bfe0bbe290001789f151b83ecb937 SHA512 32a89c7522d60aaa3c74748a415c4309ff60be628bdcf2ff2426f4ed60cff253fb3c1087f4cc72c8ac86a3ba2ba1d95ea3dd8f0904d058da945fee04414fe9ab
 EBUILD noto-cjk-20190416.ebuild 641 BLAKE2B 1b917df5476387202b44d086bbccda512fac14bf526955492276841f4bf336a392a5bcff1833f7307f58dc6a023895f946155a4ba9b8e1b1b5c6a48d0c097895 SHA512 073199a618f4d37b0d3abf4b1eee814d9d6448d392b78de5e8a1d1c9f4d5ec5ae7bfc17fdf50bb53dfad7457ad96adff7a2f66628700a06a218faa4464e226f3
 MISC metadata.xml 342 BLAKE2B b70890cc8753ce153715ae8ed4d1dc70c6abf23d96b99a915c211f2a044a59459bd228cbe6dd98202162723bcbc3b4bfa4608a26b793ff0670b1c9a85b521088 SHA512 81acab13745f9873e4dbe6371ce372b59ad3c4ac2c35a0cdd49dc25a639ea796180fa1d3b3e818c2a710b59921221b38a95dbde0576233636a9a560148b6673e
diff --git a/media-fonts/noto-cjk/noto-cjk-20150615.ebuild b/media-fonts/noto-cjk/noto-cjk-20150615.ebuild
deleted file mode 100644
index 0b50d93b9e29..000000000000
--- a/media-fonts/noto-cjk/noto-cjk-20150615.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/"
-
-# https://noto-website.storage.googleapis.com/pkgs/Noto-hinted.zip
-# Version number based on the timestamp of most recently updated font in the zip.
-# When bumping, remove all but *CJK* and create a tarball.
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="OFL-1.1" # https://github.com/googlei18n/noto-fonts/blob/master/NEWS
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
deleted file mode 100644
index 2a2c8b22dcaa..000000000000
--- a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-DESCRIPTION="Google's CJK font family"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk"
-
-COMMIT="32a5844539f2e348ed36b44e990f9b06d7fb89fe"
-SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttc otf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/70-noto-cjk.conf"
-)
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 47b6d07569ce..195fe6bbb9dc 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,10 +1,8 @@
 AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58759d9ac265a3dfd7854fc6ba0466ace3c5ce9794c9c6493d08a89d29d4e9a5fa99d1553be13c49fc9f09fb82a82b6b61531f6 SHA512 544acdfd0f2dc0dcfc75b4081f7e1518ab914d02801bf7b38f31af9a0d55ed516a2f53e963606232a8742819b3005f8e9660c8a61257d0583bfee8f095d4e341
 AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
-AUX noto-emoji-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8
-AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807
-DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf
-DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98
-EBUILD noto-emoji-20180823.ebuild 1433 BLAKE2B a4df6d3336659a33bc91ddcb21b6b786110fbee82250f56ae449ed9407f7257006be5d36603b5e04220f18bed146346a15ee1a9f1a67bc3b115f641796e6aa79 SHA512 dc11f315255040b361e3a861ff172522eb5b31860e5ffa7cdb2ccf733fd7f374e497c7ab5115efaf7a7f75d7fa2f0a9a311ba7dd7c412d96e298bc3a243c017b
-EBUILD noto-emoji-20190328.ebuild 1352 BLAKE2B 1373d589e510c430f5ae2163795d0a95e7cc33aeb2b83b160323295e3e192dddb4db6e395b27b17ea8866226df0a32668d4cac734aea43ef47c2974f6ab249eb SHA512 e473fa45303799b00129def4420ca5d3a5784b24477b691fddd61700c35f42e618c3ef6e8750e0f6716b4df73205a8ab635dbab75bfdb7fd5fd9edbb77a81d31
+DIST noto-emoji-20200311.tar.gz 58539077 BLAKE2B 837ae7ef6a571e40b4ed83a0aa1edfd13404c3ca65e671cdc86f650e63cf77179ef283e6dc032fb93f5107411565f980e594be8880626417fa89c67347e6fe62 SHA512 cfafe9c06ccbf888eb1309dc2090abef2f92c0592460693cb45db8ab147311fdd63655d8df182043f05cf503bdfbe16563bc8cea0bddcd830fe193ca86f7fcfb
+DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e SHA512 958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb
+EBUILD noto-emoji-20200311.ebuild 1575 BLAKE2B 4cee9e26fd338b995de949adaa03cfa8a8faea83f072f37c1347e9e3b913a57d5ce55787ee88e6cfed6dbaf13a47fdcf954c98cebd3673cdce7c629f2674482c SHA512 7d02c408f9066446612b8e608e8d6c11310cad63d952daf5269f5dc7bb4a0359adca233380861ffba54d528fd4dc997adc993bc20893e9cb97a826c2eb2cf270
+EBUILD noto-emoji-20200317.ebuild 1576 BLAKE2B 5da2fc4108966de298c3efc792f5dc7135f098b31a2dff8c95690257e135f30c96a1ff122ea6d575d2444844f32f67c6a058b61ed23096820e0880d189d12554 SHA512 7b68bc1f0b32c94150b96f709ca592a9e21c9308341c1b25ec483827b5778602a0cf51e8abaa4244eb766e3423968f07f310970117099edcda06e21aec91ed09
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
deleted file mode 100644
index 5710fd53dc5c..000000000000
--- a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
-===================================================================
---- noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf.orig/Makefile
-+++ noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
-@@ -20,7 +20,8 @@ LDFLAGS = -lm `pkg-config --libs cairo`
- PNGQUANT = pngquant
- PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
- BODY_DIMENSIONS = 136x128
--IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-+#IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-+IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
- 
- # zopflipng is better (about 5-10%) but much slower.  it will be used if
- # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
-@@ -172,13 +173,13 @@ waveflag: waveflag.c
- # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
- 
- $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR)
- 	@./waveflag $(FLAGS_DIR)/ "$<"
- 
- $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
- 	@$(subst ^, ,                                  \
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
deleted file mode 100644
index ddc6ff881ce1..000000000000
--- a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile
---- noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile	2018-03-07 09:22:49.670696985 +0100
-+++ noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile	2018-03-07 09:23:06.824506178 +0100
-@@ -15,10 +15,9 @@
- EMOJI = NotoColorEmoji
- font: $(EMOJI).ttf
- 
--CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
-+CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo`
- LDFLAGS = -lm `pkg-config --libs cairo`
--PNGQUANTDIR := third_party/pngquant
--PNGQUANT := $(PNGQUANTDIR)/pngquant
-+PNGQUANT = pngquant
- PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
- BODY_DIMENSIONS = 136x128
- IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-@@ -97,6 +96,12 @@
- ALL_COMPRESSED_FILES = $(addprefix $(COMPRESSED_DIR)/, $(ALL_NAMES))
- 
- # tool checks
-+ifeq (,$(shell which $(PNGQUANT)))
-+  ifeq (,$(wildcard $(PNGQUANT)))
-+    MISSING_PNGQUANT = fail
-+  endif
-+endif
-+
- ifeq (,$(shell which $(ZOPFLIPNG)))
-   ifeq (,$(wildcard $(ZOPFLIPNG)))
-     MISSING_ZOPFLI = fail
-@@ -126,6 +131,11 @@
- 
- compressed: $(ALL_COMPRESSED_FILES)
- 
-+check_quantization_tool:
-+ifdef MISSING_PNGQUANT
-+	$(error "$(PNGQUANT) is not available")
-+endif
-+
- check_compress_tool:
- ifdef MISSING_ZOPFLI
-   ifdef MISSING_OPTIPNG
-@@ -146,8 +156,7 @@
- $(EMOJI_DIR) $(FLAGS_DIR) $(RESIZED_FLAGS_DIR) $(RENAMED_FLAGS_DIR) $(QUANTIZED_DIR) $(COMPRESSED_DIR):
- 	mkdir -p "$@"
- 
--$(PNGQUANT):
--	$(MAKE) -C $(PNGQUANTDIR)
-+$(PNGQUANT): check_quantization_tool
- 
- waveflag: waveflag.c
- 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
-@@ -227,5 +236,5 @@
- .SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \
-   $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)
- 
--.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool
-+.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool check_quantization_tool
- 
-noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/ のみに存在: Makefile.orig
diff --git a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
index 994ee91ee97a..8c9d46ac17e5 100644
--- a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit font python-any-r1
 
 DESCRIPTION="Google Noto Emoji fonts"
 HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
 
-COMMIT="e7490e1841094da518f4672398bdd74ee3c5fcac"
+COMMIT="4325631b45027a3d4da9a0f08f829e790f86ff4d"
 SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
-	dev-python/fonttools
-	dev-python/nototools
+	$(python_gen_any_dep '
+		dev-python/fonttools[${PYTHON_USEDEP}]
+		dev-python/nototools[${PYTHON_USEDEP}]
+	')
 	media-gfx/pngquant
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
@@ -34,6 +36,11 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
+        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
 PATCHES=(
 	# From Fedora
 	"${FILESDIR}/${PN}-build-all-flags.patch"
diff --git a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
index c41d698b3996..4006861c9605 100644
--- a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit font python-any-r1
 
 DESCRIPTION="Google Noto Emoji fonts"
 HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
 
-COMMIT="07ad7f0f4dc1bfb03221c2004c7cc60c6b79b25e"
+COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
 SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
-	dev-python/fonttools
-	dev-python/nototools
+	$(python_gen_any_dep '
+		dev-python/fonttools[${PYTHON_USEDEP}]
+		dev-python/nototools[${PYTHON_USEDEP}]
+	')
 	media-gfx/pngquant
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
@@ -34,9 +36,13 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
+        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
 PATCHES=(
 	# From Fedora
-	"${FILESDIR}/${PN}-use-system-pngquant.patch"
 	"${FILESDIR}/${PN}-build-all-flags.patch"
 
 	# https://github.com/googlei18n/noto-emoji/issues/240
@@ -45,12 +51,10 @@ PATCHES=(
 
 src_prepare() {
 	default
-	# Use system pngquant
-	rm -rf third_party/pngquant
 
-	# Fedora patch to allow graphicsmagick usage
+	# Based on Fedora patch to allow graphicsmagick usage
 	if has_version media-gfx/graphicsmagick; then
-		eapply "${FILESDIR}/${PN}-use-gm.patch"
+		eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
 	fi
 }
 
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index f4975f166fbd..653b579f3058 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,10 +1,8 @@
 AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
-DIST noto-20170403.tar.xz 11083152 BLAKE2B 8281cc19a100d1cbf7f57fba9cba077bb0005f7296f58d48247bef6c804b53597ff359dfab7b7d851e42c0294c757f311979b98dc9f1c22e2d3f3fabe4db77e7 SHA512 f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81557da4a555cdb6524c79be3e4c167f7d5aac102c38d64926f3b1887ca7f3
-DIST noto-20181024.tar.gz 726721580 BLAKE2B d19d32d98419395df1bb3ca360bd67a50487d499aa3ea1612355b2f0fef09fe8236583fedc6d528668048ccbeee7139df704fc8e125c5eec7215708838aa09f4 SHA512 5df8266fab59a9ad5e6de6971c69d2761864c29e8d0e79e16a44177327b73527a37a9d148b63c862bfb5f7507793aab5c4319603f3b8b80e18eb9f203d7a7334
 DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
-EBUILD noto-20170403.ebuild 817 BLAKE2B 835f9f1e7dbaa79267896798513072b7900787116ef5b483bcfb4183fe65dd741c20ecb25eb8de7c65ce96fec28c2b74825ca570973456dac749b228be9dbc38 SHA512 76d2a1859732900dc699b37414a7f1b7b8460b33d6de0bc22d4e901a9fee490008972271f5d19bba1ade1571bdbe5d22fa59e6da341cc229392b184862576fb9
-EBUILD noto-20181024.ebuild 929 BLAKE2B 9b333d7c56c5d7d150eccca5c9cf3ab0dab9bab730028471c5735d9ea6d3c083cf402bbfe74f0bdc59fe9c5c3a3092f2706a7eea996411152db0b22d7bb0fe86 SHA512 ce8b50fdfa0d22949d749db66cc78fe9cd98dded617565299e8ea73608bac98984fff2b13749234cd3f92f9586fb99a5950435dd1bf5d1eca0f2fc7ef3f16e80
+DIST noto-20200308.tar.gz 853685953 BLAKE2B 1f25bf1b763161fc246b0a1ed532d4755e4ef441055d92a8a17a05331bbbe47b4f604492e0403088d5aac9a86e42b27354eb7d4c9bc6286853ce1562b7940344 SHA512 9afec0c150beeb2bb27af58b9118da4bf86a21f25b573be3a01186c0295b9d5f51918d9237fafc76a0388c87a2b8fd780ba450fb8b4c3e65addad729e8f56a9f
 EBUILD noto-20190524.ebuild 1274 BLAKE2B c5b3e243a4200f8904b79670e61fa6b867bc17da95930b12b9b7cb5e52207a40828267772abd7ce1f128d8283cce59f4c2b7e0adc6f286b380390e8fcad74bc3 SHA512 1fbb07f9edacd6d6bf70df4d949068a780c2a51db2434ed0797e70e3516bdc8c82c6aa41fba2f2dfb57aab8e91f231e2f50868f27dd4e15d95044746280e73c3
+EBUILD noto-20200308.ebuild 1390 BLAKE2B 6ca78a4d10745bd033ba6bcd0a1dac2d0f31b0cc49b67200645be7831992aa75b89202911466e4c9644973b19e8aad1e0f42625e22a39708185c055c4d026ca8 SHA512 01853ea7224c78bf3bba6b19236fa4c072064dab1f4cc8b9fa9e1f24274ad1e2c286b56b5828aad65886b322826ed09056b6ec509b8c3fc454cb853a49a6c1a5
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20170403.ebuild b/media-fonts/noto/noto-20170403.ebuild
deleted file mode 100644
index 0e10bdbab90f..000000000000
--- a/media-fonts/noto/noto-20170403.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/"
-
-# https://noto-website.storage.googleapis.com/pkgs/Noto-hinted.zip
-# Version number based on the timestamp of most recently updated font in the zip.
-# When bumping, remove *CJK* and create a tarball (xz -9 gives the most
-# compressed tarball)
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="OFL-1.1" # https://github.com/googlei18n/noto-fonts/blob/master/NEWS
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE="cjk"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-RESTRICT="binchecks strip"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/noto/noto-20181024.ebuild b/media-fonts/noto/noto-20181024.ebuild
deleted file mode 100644
index 9be721fb5390..000000000000
--- a/media-fonts/noto/noto-20181024.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="d7af81e614086435102cca95961b141b3530a027"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-IUSE="cjk"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	# Don't install in separate subdirs
-	FONT_S="${S}/unhinted/" font_src_install
-	FONT_S="${S}/hinted/" font_src_install
-}
diff --git a/media-fonts/noto/noto-20200308.ebuild b/media-fonts/noto/noto-20200308.ebuild
new file mode 100644
index 000000000000..4100a27916bc
--- /dev/null
+++ b/media-fonts/noto/noto-20200308.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
+
+COMMIT="1c9f53362889d4468fd1193b76c397c208d81da8"
+SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# Extra allows to optionally reduce disk usage even returning to tofu
+# issue as described in https://www.google.com/get/noto/
+IUSE="cjk +extra"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-fonts-${COMMIT}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	mkdir install-unhinted install-hinted || die
+	mv unhinted/*/* install-unhinted/. ||  die
+	mv hinted/*/* install-hinted/. || die
+
+	FONT_S="${S}/install-unhinted/" font_src_install
+	FONT_S="${S}/install-hinted/" font_src_install
+
+	# Allow to drop some fonts optionally for people that want to save
+	# disk space. Following ArchLinux options.
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
+}
diff --git a/media-fonts/office-code-pro/Manifest b/media-fonts/office-code-pro/Manifest
index d9689c672ec2..9daa82c7e7d4 100644
--- a/media-fonts/office-code-pro/Manifest
+++ b/media-fonts/office-code-pro/Manifest
@@ -1,3 +1,3 @@
 DIST office-code-pro-1.004.tar.gz 2910992 BLAKE2B 06d070cfdfa88a1cb62bbf59259c8e783ea9bdfe3903c637c9161b6e476d5cea42fd88625a69a13ae474bc5f31ae40862d7c072b13f100f90955c1ca2c9570d8 SHA512 fc621d281712ef034168b63d853234ab311476d60ff20086f7eba5081292418715e4660e460ce7b6b6f5652d8f52bbd0282dddae419a39f0ba1b9273bbc9f72d
-EBUILD office-code-pro-1.004.ebuild 525 BLAKE2B eed9e731a287ee07403a8b8d75f2ddfdb50ad81521c2aba4caa67275a33dcb8d5487ca06affa18800e2bf87c64f49bf6def0bcb301fdd80b8b63a5d1393fc21a SHA512 6b1bf1f1387190abc13a452f08cd26fea52ebe5a451e86b60dee0f28d95f00d0a8b5c9021569d2a3b4530e51524f1e829f3bea5b98ac860d12f21378dd4435b7
+EBUILD office-code-pro-1.004.ebuild 511 BLAKE2B 889dea861d7236bf4e5764a13a0f4bada1678071cc187832ceb94817b4e2b9d277149d6c17f731737d135217e79eb6fd6580d701632d208fe2934b746f0ca8c3 SHA512 49f7e1b76722e49bbb63efd72cc434ce6f28d3ae726222d559cd77d2d780bea804124c1436143c1f6fc0d09bf7e62b813cd7a49560ac1c2e78c905c45f70ebcb
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-fonts/office-code-pro/office-code-pro-1.004.ebuild b/media-fonts/office-code-pro/office-code-pro-1.004.ebuild
index 23be1877518b..b3f28ac79d78 100644
--- a/media-fonts/office-code-pro/office-code-pro-1.004.ebuild
+++ b/media-fonts/office-code-pro/office-code-pro-1.004.ebuild
@@ -15,7 +15,6 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/Office-Code-Pro-${PV}"
 
-FONT_S="${S}"
 FONT_SUFFIX="otf"
 
 src_prepare() {
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index a60b453ca0e8..95c6b3f7b8ac 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,4 +1,4 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1-r1.ebuild 545 BLAKE2B 9836f592d4a2db4843e1f39abac73d0172cf9dff2716bb2423894accdee678bdca813ee509966e18cad99d5310b9f644a122069630eac9e25b31642c69af2346 SHA512 b834ad18771f0c6de4a8c45837fae2fb1b31d3bc93f5e0e428bbc9c474865cb96e20124fc5b5e8a53b4eefa50e4ee21550c3c64ceb71fb6e867385a46882076f
-EBUILD open-sans-1.ebuild 482 BLAKE2B be2cc866d370d8c1d8d393be9b5ef112b0c51f0bed92b1c08e169308ea73abd04eb4f4913b97ab8428d0245d3762d9187b1c82e71547c54357420a2cf7100356 SHA512 38501509a61e361b77992271e840c8ab8ffe152340eed5db6f2e4c8a6072617e17028dc40bf0beac57deea2871993b6022e60a45f1a163bc1dcc504722662ed6
+EBUILD open-sans-1-r1.ebuild 527 BLAKE2B d0183e66409ff2960d8343a760cd3f9995ff670dcd75233e9196e079041ded39c767ff5e38a2d54df0aea641fc830b95f7232c0f25f8e7c078d4342df95227c7 SHA512 2ef04c1aca7532c9a444149b1a7aee554e31d9a5266ebc4425de0bdec32190bad60969b2604301774fb05aa2bbe7a0e5766fcfb725d8d60494af94a2367ae105
+EBUILD open-sans-1.ebuild 468 BLAKE2B 839eb5013da44afa024711b44ea8daee3cb03dc4cad90fbab2ba95e46eebde50c2e1929e36c143a2ac67437cd9381924ebd58460dc13c823e87d7b1ca681fdb8 SHA512 53036282bb001fdbe4cdcddf4e1a4fd426c4b9714d23774d28b074d235553f289a837727ad903971b75ff1f87d5ea2add114c9ed5bfe226a4f6ec611c6ea4851
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index 5bb2cb9d0533..3a0d0f0111ce 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -11,10 +11,9 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
 S=${WORKDIR}
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/open-sans-1.ebuild b/media-fonts/open-sans/open-sans-1.ebuild
index 5491aab1ab1e..2508f76ec952 100644
--- a/media-fonts/open-sans/open-sans-1.ebuild
+++ b/media-fonts/open-sans/open-sans-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,5 +16,4 @@ IUSE=""
 
 DEPEND="app-arch/unzip"
 S=${WORKDIR}
-FONT_S="${S}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index ef2b3eeea246..74c88b2cdaee 100644
--- a/media-fonts/opendesktop-fonts/Manifest
+++ b/media-fonts/opendesktop-fonts/Manifest
@@ -1,5 +1,5 @@
 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 699 BLAKE2B c852382c485b7124b427d903e35c6110bbdc7b06468fb51faa0e418eeb138e8acdbd6d01f911f66d3b1fe4fc4045b2fae8ed7dedf63735ef13482265200fd4ea SHA512 e377210d1c532b2fb2a917ba2ca6bab85e194fc5e0cf6c88b57f2603d9a3670b4904da76b1c1b65d99bced9ba8d404f4da9e10c39fac6fb3ffb143a53f16de14
-EBUILD opendesktop-fonts-1.4.2.ebuild 623 BLAKE2B 79a7e5c355c925611365246aef6a4b50b05ade3dec00c3befb1cfd3e9b5aecef6c543b6ef554687920ab8a2781b98a823074dab0683c80094c2d747e48f4a02a SHA512 6fe1d1909a7253a3aa288a5554ae842808b9c4da7c420cdbc83b814ae8de190dd014d1f0b9b379e61173aefe3de46c74efb87e33997c8fea35a5f607e6546076
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 695 BLAKE2B 95b5d154aee23863cfc3f3177955ab368538427fc0b6644aed87b7f28a719c3a459463c933d3663e584f64d7c8373a07320782697c24aa4ea29c76dadc3a546c SHA512 91e646a25bec73ae7aa891e890c13adfaf6a8f3adf49a3409e6f16b7680e746934e2043ab91ecc8d894fb0d88cec44ca2de6f3d37010f96936575e2998d64e6c
+EBUILD opendesktop-fonts-1.4.2.ebuild 621 BLAKE2B dc16628b220d3d5bee26a6cfa0663b6adb2c0f5a1794fe4b52ed988f75f02e8df84b578ae8aafb0a6127afa3cd6fb2e2ddd5207673529665b19a3ce4fb1cea5b SHA512 1e4c17e6f909209ca933a479c5a92c506bef9f6c26cdf6bf35e5cdf4aa8b6128786b1e130d0241d071a88afc4a9c30ee2988baebf55368e501d97973c61f2b44
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
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 26357de82656..235577e63fa4 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE=""
 
 FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
index ed8a4255853a..a66d09ea96ad 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/oto/Manifest b/media-fonts/oto/Manifest
index e81431bd1fd9..2c7d9af369de 100644
--- a/media-fonts/oto/Manifest
+++ b/media-fonts/oto/Manifest
@@ -1,3 +1,3 @@
 DIST oto-0.5.tar.gz 588248 BLAKE2B 1ca216eb5adbb97fab875fae6656122ff82bc4750f2d69030a42bcb286faa97dd00fb21561062e2d1ec2ac86a108aafba43c24305deb93284dcbe4a95a814ce6 SHA512 cfcc00f666517618ce7fda5d5ab9dc97f3df4cc7aa5ea5a3172fb3d94748a2096d662df056ebb51effad8513c7bf8b191728f9cead4d28d87959ec637bb4cd28
-EBUILD oto-0.5.ebuild 327 BLAKE2B 3e2864b43a4da17a59f74022461ac0055ddaca6fc647c2f44285b87c5595d3c543261bf1fab652535910b5c1f6ca7da391d65ee424b7aee635bbf402b55df410 SHA512 ec8321e0f12ac5e89c65bc2ccee1574b13c939a788627313acb1d491458e439259aa7f66891c024dbb22105df808df0c596478e580e120ffc876864fdb876856
+EBUILD oto-0.5.ebuild 324 BLAKE2B 6728726f682f8d94e24cf82719820465fcd635eb92faca89e2d37fb6f945b3d5066f2241d5ee7ab3475f2e4e0449b3876f9ccd8db645eec859505f6acbdac087 SHA512 af9616711e00b591e60b91e4aa021015f50500b9c7f688963a59abe0aaafcdba9e67d1ae96db118b29d96763289120c43eac7b5b2e2053dd197168007ea68c3a
 MISC metadata.xml 311 BLAKE2B c017b3612d45397a188ffb4ad12164fc74996494b54b44b17134e68097d4a1e32d7a32ce4b1592ec5db2a3bc3fe5b675ac592f6f66072c8e2e3229b96b157075 SHA512 2c08ef5b5092eb843dddedd5c5b0cd6b9dbac42dc3315fa63f78d7e4554d44c6c964ab0556fd072b31370a9918bfbddc1a0970bdc432e936a13d0e70462d354a
diff --git a/media-fonts/oto/oto-0.5.ebuild b/media-fonts/oto/oto-0.5.ebuild
index f6f1b6bcc23d..b557b16a952f 100644
--- a/media-fonts/oto/oto-0.5.ebuild
+++ b/media-fonts/oto/oto-0.5.ebuild
@@ -9,4 +9,4 @@ SRC_URI="mirror://sourceforge/oto/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~ppc ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~s390 sparc x86"
diff --git a/media-fonts/pcf2bdf/Manifest b/media-fonts/pcf2bdf/Manifest
index 507528552f5c..cd21dbbb3de0 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 667 BLAKE2B bf050a81deb87e7150761d882476d92337b36b770085c057269bcb072b17aa0d41bfa5b1800bdd9c21c007fb4292e83414b9b191a5a764f1d70f17789531d812 SHA512 ecd1bcd80b3b2cbbfc61d24b36f8ab1cf197678a7dbda012f0ab222483d6649b24108abe73fb07b8b89fb951f279507a05fd63717f288a1db4df58edc8ceb653
+EBUILD pcf2bdf-1.04-r1.ebuild 665 BLAKE2B 5c5d9bdde389533e782ebfeea28033e010b3317787412c1660d544be44eacec7293fee4ddaba1ffd186e36abd4fedef9051a0792f17dbf2810105269de2866ca SHA512 8dad72fd331f209c1baa343e88f627f5edbcda6fbc17c64559f59dafb32ee4825200028119a7e3d918b36ad7a4d7f8bc0498a9c6cde87d532e90e56f1ccdf928
 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 03352f559d81..0750ffb35a07 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/media-fonts/proggy-fonts/Manifest b/media-fonts/proggy-fonts/Manifest
index 4c80622db30f..859f954c8ae1 100644
--- a/media-fonts/proggy-fonts/Manifest
+++ b/media-fonts/proggy-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST proggy-fonts-1.tar.bz2 46338 BLAKE2B 4ac61bc492443be4fbb7bf8a8e4ca90f3e028753406b2fe99bfd27a5cd4e53cfc3426fc2789f75cbb7693278dd53d5e8886993018d5baa967162c4529291a362 SHA512 b0641fb416b582b1a8164630de176f2412063c78723f57ff307a41d54e95b00291975dfe13b518dd848f7902ca5c9cc19b5674036505f5a1f3015b9ae1208ba9
-EBUILD proggy-fonts-1.ebuild 436 BLAKE2B d6e302cb2224389e094cb8447efe6416fe8744111f0ee453a07055d6e0d6b925f2a9e337169c6be0a1f087ae777a6749d0a131eb85044a537f040ba439ea972c SHA512 ee847d6afb90a9011e7eef1c30f890339506fb9bb63bf6a46375d39ec12c9ef5bc90d01cbe2c9a54dfa5102b000aa5e45ebf15bfad68e98f1d13f2663084b6e3
+EBUILD proggy-fonts-1.ebuild 437 BLAKE2B 3797b2eebbdf66b77d16804b0a3fc851f78bf128a645ba215b761e495f8859282944146d6312ebff142548288192d0ab53ac8c0beb655a445635161534e13cbb SHA512 f629a907b6867ef14761b762739640ad50ab4c1598f4950f62937249e6b480f5faeb1585c7574116a7aebd8ed1c67f4274a9a2274331f0bcb6a92d96a0e8fed7
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
index 37fea5674a80..7765e17625fa 100644
--- a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
+++ b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index e8fd129f4347..9f5e0e786a0e 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -8,6 +8,6 @@ DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06
 DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
 DIST quivira-4.1.otf 1549016 BLAKE2B ec99585e4998c0411d4d5fb364d97ab479069549be475cb195b0b1512ac94c66ba5beeb7d07dc26cbe130ab44090f189e20d71a794334831808ddf58d05b63c1 SHA512 8f76c0e05aae7db9f4a155725f024dd019500bcb14fb1398182f897798128dd2ccf13840446382780b0c4873e6f8dc2d8a2e1c49e9bf17266b52248beb919c65
 DIST quivira-4.1.pdf 1632238 BLAKE2B 755dfd91812cc7c49875f9ccaadff9934dc5d7f86ce4cd2a1473d7c43aeb83f54dabf67985cbe14690ec4655b847c78bd9a92dc277520c63964ac548990f6a9e SHA512 7863b8c4aebbf9e1c8ef6033b6eacb9bceb9d52502ba90c87924809485c3071931a6f1382072bbe5ba1e39aa844d2e9551fefd746929040230ea6ae32b2ac748
-EBUILD quivira-4.0.ebuild 1204 BLAKE2B efba759a2689487ac1dfa592635fbdc8f0880d5548c30b2cefdbea33d617a40f7e47cf27f7177b952238e67a41403d6ddca06f7d65dafccce272a9a9bc17ee05 SHA512 ebdf3fab7a957eacb2357a63f1ef1f002c5d69b6a96c711b917b05b3f43b3cc65c38e186d2743e683c3f76b8ba21715c82334b72616fdd12bb7067a6c34d8322
-EBUILD quivira-4.1.ebuild 1204 BLAKE2B efba759a2689487ac1dfa592635fbdc8f0880d5548c30b2cefdbea33d617a40f7e47cf27f7177b952238e67a41403d6ddca06f7d65dafccce272a9a9bc17ee05 SHA512 ebdf3fab7a957eacb2357a63f1ef1f002c5d69b6a96c711b917b05b3f43b3cc65c38e186d2743e683c3f76b8ba21715c82334b72616fdd12bb7067a6c34d8322
+EBUILD quivira-4.0.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
+EBUILD quivira-4.1.ebuild 1186 BLAKE2B 2402c0c4d7489c6453f0239eec1fe729e5e829e18b0156d07a90f651df491d304e75e6148d977622f1028a16431ec9074af0c9815c162aa1c4b51be7fe54d0aa SHA512 3aa6517ca57e3db28de074907039bdd295b651612993d25b4191c0341f43b1504d67c3eaac20ad51fad780785808a08d3676ad8f5d6430a86cf54c94860804f4
 MISC metadata.xml 584 BLAKE2B 24a5dcc1462e9cd796888fffc048851540811d9e75cdf5b804832e4f29f9fe4cafbaed037872c251839182b9f48e56a9b2a655089f72d45583a44c708e50e47e SHA512 bc10043cd40ac32b7d4309fbec2d702ed02b56d8cd822ed324c39e925c66c3bd070f3472d605c0c28e6ab64f8c401e1f87ec7977142a29c98d4484a7c1010c7d
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
index 7db92ab3a705..edea0e21cfbc 100644
--- a/media-fonts/quivira/quivira-4.0.ebuild
+++ b/media-fonts/quivira/quivira-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,6 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="doc"
 
 S="${WORKDIR}"
-FONT_S="${S}"
 FONT_SUFFIX="otf"
 
 src_prepare() {
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 7db92ab3a705..8ae94696b6bd 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -17,11 +17,10 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
 
 S="${WORKDIR}"
-FONT_S="${S}"
 FONT_SUFFIX="otf"
 
 src_prepare() {
diff --git a/media-fonts/sazanami/Manifest b/media-fonts/sazanami/Manifest
index edbd0f37f57c..73aad12a55fc 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 617 BLAKE2B c67b642599768d3aa2145214f30a8478e94a3f7ecc766928551e17d2a21ebc6f42a5ffdb38abea2cad893f778d9f3fd55cb5301faefdb89cb64a46d727eb21e8 SHA512 bc4ab05c4084a896669079cbb9fa92b01eb8af4f0880130b6971389a72eff3dc73e9b78daef37684cd09bca58415c3a319fc54a599e330b5b441f500e6002fef
+EBUILD sazanami-20040629.ebuild 615 BLAKE2B ec8bc5f2c045ecdcb63fe6b9311d53ab75e6ebe9f20a8628889299a3c619cc3b070fcb1dc5a7f5874a0ccb1a8118436d37a0038e97dcaa3c63431de621e20776 SHA512 1382a57a1ab0fce87599218aadcf265b9cd42992da39a6c26f505c0d4dde403b72f52b26cdc15f1db67915a418d3b7cf561909e65ba7a4cdc61e3de5bbabae00
 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 a76819ddc07f..db7fb6070c86 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/sgi-fonts/Manifest b/media-fonts/sgi-fonts/Manifest
index 03a2fbfe08dd..f486c414eee6 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 485 BLAKE2B c8cd8258d0df1937237d9a809ee3e6de47dadcc0d65779bf97d4ee930eb209954e16fdc40a812b63966224c48d17a332af96e23a8acced0ad7a9419c256009fe SHA512 c14d1daa028eb3b02fa6ac5795f7aa281290fb1ca489dd58142766a8f2849c69fe23a7c2b80f8ae5bf66cb0846ba8f190290672194304016953111f91bb1866f
+EBUILD sgi-fonts-1.0.ebuild 483 BLAKE2B 696b682e2cb62eb6227e0aec9967e57663904dd7795e6762502e132113f2bc5b3ad691e1c82096781b787488d749f7c2721d121ea82a644267fabadf9130e373 SHA512 8f66f04cbb1cb5c8920b5401b7b2f98e483937b2de16065c25aab9b0f846e9805129f33def895fc461942851474b77b3f9e5a0678a8bd3533e36618701520c08
 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 4a3f9206a72f..901d78e55e58 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -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 sh 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 273f5d2dcfd8..98a796afb4e4 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 701 BLAKE2B fd22dcc66e21bd2c9800fcaa076af4554b5a17872aea971751aa14a835f80499bf911a40013bf0853787ba5ed89d1b9ebdba43126002e80c4b5c256b7d6a636d SHA512 5e775e43d65a35a1a014c910831d482b222e8146fce8dcac3ab5eaa9339410448a70561b3973c37c858e4fbb8b4ae88510cb9c0593ff1a60dea00698e131c3ee
+EBUILD shinonome-0.9.11.ebuild 699 BLAKE2B c3ae1e726d3e2b4d137ca91a7e3da4ebe3a0b419e91f8f2f4fe6f08a0147197cfd6a90478065ab99cb5a246633c33646358d6feec7eb9797aa2bd058ac0f414f SHA512 6af6b18a88be42d32894e3209aaa0f78a94a18262977fcadd088c91fb3cff4b36af647ed6db6aea9dc8f1027478ad592b4d395ee76c55769a037860f61f026e9
 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 182a015894a6..487effcd21cc 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index 58fc157a64e6..e539473a51eb 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -1,3 +1,3 @@
 DIST AbyssinicaSIL-1.500.zip 1852827 BLAKE2B 59b29242f39fba70b60ca23363e82d093354deef9f8e46386fc5408994b9629b10b0400bdb860e5482a79cddd1ffa8b5057da62cafebfc128a49057abf195462 SHA512 56cfed3d41ea0a16d041b29f417296f4cc89f3fa8e718b3e352690a954168b018a5da68745f61db77395c292e92f8964d868c8824be5edfb24fb7539dcc62c59
-EBUILD sil-abyssinica-1.500.ebuild 685 BLAKE2B 9fccced059679199a021f07d245652777037bcad906f2dd85982bba56e0644d4993625bc6695a0b1cde34429f50f9d0bc474bc9d53075a8f40581ceb9673f16b SHA512 df18a11b80912b72923d82105edd622febce585970f86ab989cc4f0fea308003d4c45af21c67ae8555b388cf149a423095b742686907e5ab8654b916122999c5
+EBUILD sil-abyssinica-1.500.ebuild 682 BLAKE2B b7e53e91eacddf4fad9ec677c8ccb5ec04944f425b55f832e1c1357c150cedd61acf67e0aa2bd09319213ef9dd5b0529ac7b86901028fbc2ee9f840dceffd482 SHA512 9db096b643fd6d0b6e8bb4c7e139f7dc6a58bb0bb4660f033c7a85f46e45f4d443934f87bc2ba0e93acae6cd19e9f77cb8a444891c489ea3f34dcb769f9a0aeb
 MISC metadata.xml 1078 BLAKE2B 77b83a9768d6536a29bb8aa73031b25c456faa20276c5e1e54de18b7fbebb6931e6be6a53b7cee0901f5dbd2ee48f9ca7b62d5e75b472805e76d3baf309684b5 SHA512 77da0918b61ce3649d2b7b25c336443e056f11915f8d757a20cb6527f7fcffd6152b9fbb15796e557d40fa8af65332622f71284000adfd356043d1edcabf64d1
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index 1ab0cef9d1e3..74239de2c460 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index daa6f5674be8..089d6a30d37e 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -1,4 +1,4 @@
 DIST LateefGR-1.200.zip 727815 BLAKE2B e236126d08c729fedf5ea3fe7abecdbec1c91c1c350465a555ddf72c83b74145734379394647e9b2527558fe408a871afa0dcc6d386adc32ec3bcaed1221be9e SHA512 12c506516987782d3b3e07ba2cd9773a4e057d358250e9a4cc299287d751f82843d4e6969c714f5321531ac7897448b624dd8a2d1cf3bf213c39f90aae2f01a3
 DIST Scheherazade-2.100.zip 1114645 BLAKE2B 27743054c58afc93c79765abf6ac0698b394e1480e28fe59006da8a369d61a26fe3e0a2deec2df298fca6ee1f31185d3d0a0429b74803f049ae8e384735920a0 SHA512 53a6b684a9c6a6f136da28cc2f663fca9e22d1951203587394ff979c4769e4beb898ab73a7cabedf5ed6eaa2775d10c7281439f10331b203f0e03bd434aa2fb2
-EBUILD sil-arabicfonts-2.100.ebuild 728 BLAKE2B 29c0927f481363332bdafc0c59fb8867dcf796d36621bd789098e76935bbf1ea38bee4a14df494b9159c5d1eb4493f177ee6b8ae80573b5f7bf17293acdbc9dc SHA512 e48b7b6ee02f9abc738852b45ac114706fa02baf69fcf03b604f553d97d359f6729d68e1f89f62ba63446f4e9c1e6b946709d9388cffc72501c60890a3c3849e
+EBUILD sil-arabicfonts-2.100.ebuild 725 BLAKE2B f828f3638c265c366ce04679e9d101df99380d037ffe2b11d4f9e33d67d30043f2207851767f9673bdcba90ad608fc56fa8ec667e5d87452c5da68d2a8088472 SHA512 fad895cce9f165d22915b44c8a99861df70d0b8da1d3de02f5ad33eca1376f67cb6ec690503a865e41dd484902280b2dca8960e19245edac358edd15a673d9fe
 MISC metadata.xml 1185 BLAKE2B 0632c1af557645a51a58bb7e3859a0897c39f4145c5a65c9f4316e1573811991b18e3e29ec55c38444471a6533d4770a2c80414c8ec2382839359ad5d46afbe1 SHA512 0fa80c2a6452c1da5049fef563358571259f73b0cf8bb65c17710a37760fd0643ee3bab66ea399531c8e7d190c46d7d1ea9a953a3a572c41c342babda2d73eee
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
index bc679a508a73..0b6689c03dbd 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index cd596a27b3fb..f0fb7946cecb 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 965 BLAKE2B 36bee7d7b14803610bb66b7f2aa64e246030831a99adbed6d479ea5c2dc92cec3990657b1236af88920b062524c0457a35a3be7b1988e31df59d5ea0e794af45 SHA512 a49245adcce336b050a0dfa9948edc5d0892eca0f46d87fef822027da6423e214c62c363682bafbaa594eea31918c02ad380710b56f228801ec13fe2d913b0f0
+EBUILD sil-charis-5.000-r1.ebuild 963 BLAKE2B e8357527c76517daa69234c64f723c2f9b22ec3d22975e5cefbf0dc00b134ffa996a33be329dad2bb76ef266cffd8742a57b91c6bfbc731a9e75a1426ba9dfca SHA512 51b4fa195c3cb49ca261407c0921a70125aa407c121bb662037fc24f3e497c689b8ffbe194eadcaf3b44331609b3f951f8207fb68765465de1cd85c0014db411
 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 e5e2f589b209..f30aa6c54cb7 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="compact"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index a9588fe098b8..9716b069aaf4 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 617 BLAKE2B e4adc91eae1d672c211be6ef36cc3be1ba82351902de40e5607e1dbf9f495326c9ccd6ca4c1fc757ac4b274b460fe9ef441de4438ab4c2c43c6456b84cd4e369 SHA512 130c1d4494129908aa4727c8b57d92f4e986cd7c7a44eff59c17ebdc1be74beb23a3af48217fcdaacae388809c7d2cde5aa4525c97f5a083137d01101c34b8a5
+EBUILD sil-doulos-5.000-r1.ebuild 615 BLAKE2B 1852d9854b81803f72618ac5813c943c08f81e37753cbf8ae8c60de6f29c9219fe4ccf7790c17140bb0b068c092ae8bcc5cfe40a73ca5118c245ab3e1b999444 SHA512 7579e15edc39dab0f3504747312c12181a04add3e5380e404d459f84fefbae8455c1914297e4558d3d58f23de01341f78725d6280817b06ffe2b59508c3618cd
 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 978ec8df6108..bf1362ed9a8a 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 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-ezra/Manifest b/media-fonts/sil-ezra/Manifest
index a119c176a2fe..5cdd2ad204c5 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 572 BLAKE2B 93f0c9a76252d82f7de2c6193de27198b0614bc48a51097619ef4ee5dcccb990fabfd59ff38e13689d6654cadfb01e22b33fdff9ad6a0201b608d2b709016536 SHA512 a67e07c4d2503a50f6ec2bae24dc9f92aa72d862a0b3b03e0309b5d5045bead9278603a322a54d7373334e18d97fcae4e0e688832b248fb55907858f431381f1
+EBUILD sil-ezra-2.51.ebuild 570 BLAKE2B 5e91b61d818e75120a39cba54f74d55b2462a84b97b26c87c8a67340de7fe990cb3ef933221b15153e0d8c7fc0f22e56881b9fee1db9f164210018c74f3f36fa SHA512 c05f8ece15ae91b6c9ad1a937804f68ee21d5c0262bfb1de342fca1db95034163f37b8bdd9f0b17777bbdbce227e261fa412eababbb45bd913fbeb8f8a5bebe6
 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 b2159a85a40e..359947c1b384 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -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 sh 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 2368c7be7391..37a642765f88 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 480 BLAKE2B 1eb7df08bcbd75082d927742512a95fb0cc09ccc44ca61140fef65df7c5e772a8c4a96d445fa8b9b7764e931f7df57c910a51426913fb91ed2b9032ddc41c49e SHA512 f735cf18354283e320e3a2625d732cbb60fe62e30d6aba7f6d76e2d4c71263951a1857bcfca84e8f86acd89315bbf0bbcc0d5efe254c96fe9b77982917f55f3c
+EBUILD sil-galatia-2.1.ebuild 478 BLAKE2B 62423ab311d56e477dee4e5eba109d0d319cee6be39a2eab188b058f4481f24aa96e94ef662b92abea45bdc21a7f082466de15b847fca1311dbc97807c6cae6f SHA512 a13583dc0f43f91b18dabd0f6eacd51fde1a6dde162df1f14a4bf455b25a0c8ed6dd3f57b7fcae497483bad07d0ee11459d6a731e61b3c4056a238f106b6fa96
 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 67961dfe5d2d..e75c7d202412 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -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 sh 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 71baab57b947..52e7c85f38a7 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 1093 BLAKE2B dbac1b0296c07c9ca08443ce3d76b4b02b6f2968d1b4b0f98ad2b5c949c6b89056ce9d529ac96c0da5e9ff4252c78b45804b25e185d355660c027f05733decdc SHA512 6eedb5257961c7fd79162b056da3b265d5530f6b3af7dd3e8e0de10654ebfa45715a01f3b4b0d16cb083ab1b74d2f668d023802aa385712f195d475a12b5b4e3
+EBUILD sil-gentium-5.000-r1.ebuild 1091 BLAKE2B 994f83edbff8ca632b6e957d54c21ed9cb3e70d8760b73013da6d84e3530b34ee1115f42ff7fe213a5d171535eb57e3aa33a5dec5e247568ce63464e87036126 SHA512 e2ea797fda22ee75f5cd88ac423c1bf40db2c02e0ac4e7a8e4a37658888abc2deb7d4c51f42b61e838015f9a09035f6f039d614cce129857cdaecfcc4893a177
 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 f88105d33a54..fb97e389ee8a 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="compact doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index c54e741b394a..7115905f60ed 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,3 +1,3 @@
 DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
-EBUILD sil-padauk-2.8-r1.ebuild 474 BLAKE2B ef1fd1e19c1d3d7691a51ca7576fada4eef3057502586aa6221ff49fecfc6adf057ce2942736417688508c52cab3fa7cd1e7383d6d6773aa05fbe44c574dd8b3 SHA512 d3003ae5fd7bb8633408c30c564de9ae682c7c25cbd8668854066a64eac889f576ce44c546a8be0feba0fdda4e9d47eca12f6ac8f50ac523d57bfdfb6af82460
+EBUILD sil-padauk-2.8-r1.ebuild 472 BLAKE2B 9d78331eb7dbe3ab59185ed82e2e5df44b77251c125f12307a88907b5e005734e5d03857e0d380a7848189d567205332bb353e13906a25053b650a3c52447750 SHA512 2038acc502c71cbf0f4b75f75cd40ce962b0a3793732befe421fd79955ddb4871b71b468948822a4aca157d74895c98f7cbdb5b5c8e4bb484e24dbf77442eb50
 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 e8350b2a1d3e..1842a67544ac 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 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index b3b538bd09a4..2db108d80a77 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -6,6 +6,6 @@ DIST source-han-sans-zh_CN-1.001.tar.xz 41018072 BLAKE2B 65bed1b889545ff7474b670
 DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3b60a235f9bfe171f143b2b1dc3658abdc4731a5478f2edb8d0931b4df13d60f7fc77601078386ab5c4ec2d9e97a4217e11c385 SHA512 9a38ea7907fdc118e4fa420c976e255120a2f9176c33ea8ce06dbc09f46f95224675178e45c854b674f4a46642123e41a3f3f8f6e9f043e8dcc0322e05a70282
 DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
-EBUILD source-han-sans-1.001.ebuild 1182 BLAKE2B 16bf54cebbe350e7194f655c40516c9d38e25c91ae4e1ba40fcae7c38b31f666a9dd33d7aee29b2931973801a5b9fd2997d15ab51e7369860cde4db6a2edd990 SHA512 1244436f9478939be43a6502ab47aec35fc8adc1b5e3df5eb541d692a7921421051a22a95f103c2824ad149daefd07f6d350805c466024619def0b83ace869a8
-EBUILD source-han-sans-1.004.ebuild 1421 BLAKE2B 7dabd05766862fd41c93b2d8854d3bf14bb80ff0645f2a272f3323271ad156adba1c8173f55766deb430103794edb311617f09b3f80c9bbbd1af5c38640a00a0 SHA512 7e8d5381d93e2087b7ad9a031a3e865b73a454da1fc229c52bcae5634028adb457f5425b963c3a57ebafa06a71ef3fbacb3adbaa0f3e0f0e83f94fb9ae3e4c45
+EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
+EBUILD source-han-sans-1.004.ebuild 1414 BLAKE2B 4af12e604bb2cbfc97596b89534ecf33aa49b0c16fe0f2109e268f91132e2202ee619ff39a8906a7541566181f267187a41b9703905ea6ba1a2d78ccf1485956 SHA512 e5c99d625ff89bc615308d50f1514f7fc85f62988ebdf9a0f9ef45b34d5f6b5625630fb275ff8287b9798d6366ca4ce761215bde775d62bcdc8b03fa901a140f
 MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
index 16744de4633c..02d0d4834be5 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
@@ -17,7 +17,7 @@ SRC_URI="l10n_ja? ( https://dev.gentoo.org/~jstein/dist/${PN}-ja-${PV}.tar.xz )
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index a24712f8e941..6ab8669f1653 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index ebc8b1494266..1423dc1cd7ab 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -8,7 +8,7 @@ DIST source-sans-pro-20170111.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124
 DIST source-serif-pro-20141211.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
 DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
-EBUILD source-pro-20141211.ebuild 1255 BLAKE2B 1c115680189289807590d040baf2baaf853eadf05e86670d9bd01bf760fc777d754ce1f030b54946a1aa4e9f852f774533765677f224b0df40207bfd0f123415 SHA512 14f7aaf470bb2a3d309cec05260d7fab68d220c7bf4afb0557710983877384200f3233eb3bff32bde4a0e0767d05c8c757bf12dbc3cf16b479ab2eb3bc24633c
-EBUILD source-pro-20160608.ebuild 1310 BLAKE2B 81c73db02f2b9903e607dcebad3b505c61965a71f10c92dbe5faec5adb553c7bd7cae5ed7255c7879be50581c5340c7f96681555098bd8a885000e958f5d997b SHA512 4566a8e10000492d43c7b52223b880afb57a7a266bd009a70dbddb294c84c0dc96988b55a9b4d9e47f8f9ee45266dfaba88f2e4f353142a0e9aec65c1ae85b70
-EBUILD source-pro-20170111.ebuild 1300 BLAKE2B bf512a5cf56a71c336e3be80c187424e39cd894b37821d5bc44138e2f6fc7dc8a6db25a0a8ad03d5d9f9ececf5d18d2528c1f3fe5ab9075881c2964a3930e85e SHA512 ee28a25bdf677d487bb6c52bc0023a6d3ce3838b632a2e15a5619b2d3951c70e920ba03b1d6ef89f8af76b71ee3600c4129e747cfee2cf3ad16d2aa59796c7e3
+EBUILD source-pro-20141211.ebuild 1252 BLAKE2B 2c40005ac4e80b34c9915084743bc34319f19467b838d5dc931021e1ff8e0be59fe3d5269a27df5b02a92141f76817e6c764e8e10de73fd05ae7d26510013a70 SHA512 cfbf1921737ae9e300086c8b5b10a7ebd97753916e0b7b844dc7882eaf98bc010b330a11c0e9faf0c52690a6852d40274a4820439abb839096a2fd24944f47b0
+EBUILD source-pro-20160608.ebuild 1303 BLAKE2B b12cd8d108ae7b8de8db1e593ba82eb7e5b418799bad9f6ffbe8a0cf70586a75305c655ae9145b8ff9f2ce97cb4fbd6de195ee1b82123c2929bccd9038606cf7 SHA512 c5065fb83a0e46ebd3d1dc61786a5349f5a6c81859167098020c539920f678be4bca96759885b8abb9edfd99d78ba887085d981603e38642cf171a26368c725b
+EBUILD source-pro-20170111.ebuild 1297 BLAKE2B f7a03099bcdc5d2dffbacbad00fafac6a228a15878bf9f5f03fa7c0d6c5f3e23c9ebfe144f4b5977ed08c2ee372617d87058421176b061ce79b74ac7d2b1ee80 SHA512 a6e998ad0bf11495bf3a8086c6bea76f0ce56ecde76df6d10550e8fabbf386818f516acc385d8f778e5fac674f54a779cd606b3c36d2334f5375f38e28078208
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
index c8295a89ecfc..9169bb303bb6 100644
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ b/media-fonts/source-pro/source-pro-20141211.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
index 998049146066..d6fd64638e62 100644
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ b/media-fonts/source-pro/source-pro-20160608.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index db747fe5040f..d26340e29e18 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index e484bedbecc8..261596b6da7b 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,6 +1,6 @@
 AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
 DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
 DIST STIXv2.0.0.zip 3921396 BLAKE2B 3188b28e6f21df0bd3283cacac071399afb325cad3c36387e47448ee9bffcd452b59e4381663d06fbbb93d704a3510c23c31a88e832e75fbd7be85a179761553 SHA512 b5d1a98be67fb548d8898cee207b429a6b53617c0ee33b798273e4626e287af9404acf85e702c7fc6cd0b27da379a03013f77caeb57b957d7633efa722f69ae0
-EBUILD stix-fonts-1.1.1.ebuild 789 BLAKE2B 96b3987bceeb63ebb2403bce9b51369b30c17db207668aa40e3677d247d3fb65b50b9ce778a91f408aa3b6230055c5ea139a2908dfab72bd27cfdcab87ebe669 SHA512 1ca9bca012de4b9e1f12e999a965472bea20054f8418b072d8ac9107ba07b43215bd36c7afa18ba9d8ac5a1836b0456b55db7667c6cef798b61dd34d47c204be
-EBUILD stix-fonts-2.0.0.ebuild 708 BLAKE2B ef726c6fa2823c9ced48129d3a741087ea18904dfc8f6f73fb98a9cd8590b86ac818c506be2da353d24ad721b015f60043a239b2c7a396abf1b6db516d9a6776 SHA512 520e8f1e73fba6afdd95d1ec17960401d3651a0f9a855d2b5d7c4ae8439e0980ee26576cfb07d4337ab7ce1fb4cfa6796fa5921fd89274a4718b727ccab4ff8c
+EBUILD stix-fonts-1.1.1.ebuild 785 BLAKE2B f9674101a164168e085da8424946e67dfa4e45d619531a58e622918a293a2955136ca1fb70729815025d11c3498c5e32abc18ed75eaf2ceb6b790dde11013f5f SHA512 a1429b3804aae1122acf10f887aeadf3d7cfb837e6d9851c2d46af92f7a5ccca2f87c22e33522e1ce7c9230bf1fc3f2fc52c2f4af09838f153f9eed55781ab2b
+EBUILD stix-fonts-2.0.0.ebuild 701 BLAKE2B 6b0bcbd0a6118134277503c8704413512d789217d46b0fe80ad49435b474c7d743254221c2117d8de080afc89b3bd50ca71631f36dbcecdbd60c35cf942ba829 SHA512 c84ef4cd8f60b989a73cc622555de799dad7307286af40cb1e4d8d78ba5bf02b334f43b89a6f8a0c976be4a06c19986db791568476ce78a88777c19df957a2d6
 MISC metadata.xml 317 BLAKE2B 503285934782ce57ede0881674e286d015803dd09480ada7e3fffc9fffe82160bde205b2141f448f814c06fcb16066b32624d74c2c4f0a694c31bb6472d4c5ae SHA512 7e384d1a8a6b0cb9cba64e52c57cb6d762218f1032f0680c2e35efd00d1e4c92444fc1ab8e7782d6a85b1cbc7835faada3d2e89c9692383f54035bf7676e2af9
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index 2510c026c408..398b713a3908 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
index 56967a0726d3..4fca51144ee3 100644
--- a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-/}/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest
index 77439ee8efd6..d2d7a21c14ff 100644
--- a/media-fonts/symbola/Manifest
+++ b/media-fonts/symbola/Manifest
@@ -1,8 +1,5 @@
-DIST symbola-11.00.pdf 1610961 BLAKE2B be2ed31f7d6e2401d76292a417a1ef4ee2d9974b0ab84abb5febccbecee0e3e625fb234a8950114ef13b1ec1242c7220a16d819bc71c245947d9c75a60a036f0 SHA512 92cbc6f0953cc5a8bb7ba5306e9e1ddf2d1081a94b2ecbbafb8c8e8c6cece4e20d9d3367ff67ae3688e2cb88b67c69716b3bd058ab80d2efa6dd0e064b032697
-DIST symbola-11.00.zip 2907542 BLAKE2B 38da4a33acda4d7177c70bcf832000647ad99c3d8aa6c15006792db1fdc5641399d5080e7f2970bcd321942ff87affa23a13c6c8239e104ee8817cde7140a6e8 SHA512 be7b3fd8b2070a6713b189c0ee0c6d8aef481eb0c7e476dabfa3eb1a599cc7f3a00f14d7b9ca1f563722d550c098f272f62bb99fc490aba8132ed5ae7de59a7b
 DIST symbola-8.00.zip 4668110 BLAKE2B 2807945aaab54509921756792da89d31721b575f6a1a4f65426b69ec348d1a6bf21d457d1c7a78205042c9df67187bce7c56f9bb4ba42b9f6f5f5af6ef9608cf SHA512 f496be58660c5d07fd0a9422eef1dad3d0aa06e350e37f84a547496a6a9c6abf6fa4609e9051e40772e952cd4f71a7dd02ad0ba16cf3aa2b51f31fee09ef9b84
 DIST symbola-9.17.zip 4122777 BLAKE2B 60e7188366ff9204c41e42b99ee31242c0d2eefceb2bf663e6b68bb5a924a269d608d8ba2085e956dcb5d4c2c85d7a2993f199bdf8e0597d27e3d4bc34c50be6 SHA512 29c2141ba7d5be96b4d2faa52e4d2efbd1ff6a8368fdeae8986a4a3de50522a813c46efd462556b5b6c10bb97777ca068564b9dcdfd7961c485ece5fda18e04c
-EBUILD symbola-11.00-r1.ebuild 677 BLAKE2B 35d895f76703bddf1b1e39d1e4f183a6fb3b5a95af0c2212fadc9a7dfc6f8f4c170bfa49d413a9f7cd747077567eebeb07e69fb798ab9613769493bb55b3d78f SHA512 f00f515807cbf449b93db54d54079d71934460a0ac24e90fd4a9a88f36e2e95e91952d513123f25620bedcf74367bfcec53e31bbd15c2326a0aeda620c4c0fd1
-EBUILD symbola-8.00.ebuild 606 BLAKE2B 2ffd9a500840cdb4c0ffeb5aecc1d3350d56afad51f07a815785c197dcaeb6a1f0e08bcc27cc3a2b69675e4d39fb6e7c023e47a1a11237a7b64174018787fe7b SHA512 2de7fd71bdbe1a00780862c9cc4035f0908b516b89040f060e822c76bd098519021a1c2d693e795def6a32b00b54f7775da560ce3464f5c1a6ec29314f1c3b9a
-EBUILD symbola-9.17.ebuild 592 BLAKE2B 878bb5b48b7bf8946aa44ab99763df10a5570d522366d0060a4ab20481666ca8719275b7843130072e7bde7a956a9a1b8c64fbb02996edce2623514f3c26131e SHA512 4f3ca1ae81315a073abbafa33641b3d69eb294823f73fa242e5c6de0aeff4d3239403e062a448de93c75b3d50d675be58906554033a78bece60f17d74c1b83b9
+EBUILD symbola-8.00.ebuild 615 BLAKE2B d08c28d186550904b7e11d99e0bfe9477ba87fe10beec4e945423f6ad960a23fd7bd4cddd5f37d798b4f64d708c673554f4f1c4071f557b347b3490c07f07b44 SHA512 329fcf6d6bcbb3d50388f4f82628ca111cceb1c026600bf98b7d3f55a749774cdd4cb9525678413acaf7650e6bf85ad521ee619723164c9db74a12d2a0b201b0
+EBUILD symbola-9.17.ebuild 601 BLAKE2B b07084c77959762b5a79f25d402ca362ca72047cdfb8f2c4bfbc99dcd17000a4db8458282afe2c6be51e7eb30f5f18cafb9bd30ac6b5cd33143b8223d03bd283 SHA512 d27128d941f7f5a7f499e5a9e743e358b8e6fa75700792bf1e46cef07bcf3895040ba7b758a9c5a203e4cd16c72be1bc9c1437c9e3126d02ac067b9796370407
 MISC metadata.xml 364 BLAKE2B a3ae59e04600fb512fe1e0dd6ebb3d146faee164775446754633c9bf88845f0ea0459fa4a145ce7e232206bde0bf2e72b4ed29420fe667620acfe5b8074d348a SHA512 2b2701e4698f5adc465a1ab038f176e405a0df1528560560831e43ae34421eb74e4332ad3001c6ad2eba43ac976b6856e2ee2690685a03428fd1ae71552017e5
diff --git a/media-fonts/symbola/symbola-11.00-r1.ebuild b/media-fonts/symbola/symbola-11.00-r1.ebuild
deleted file mode 100644
index dbfeda55a4aa..000000000000
--- a/media-fonts/symbola/symbola-11.00-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/s/S}"
-
-inherit font
-
-DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
-HOMEPAGE="http://users.teilar.gr/~g1951d/"
-SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip doc? ( http://users.teilar.gr/~g1951d/${MY_PN}.pdf -> ${P}.pdf )"
-LICENSE="Unicode_Fonts_for_Ancient_Scripts"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_prepare() {
-	if use doc; then
-		DOCS="${DISTDIR}/${P}.pdf"
-	fi
-	default
-}
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
index 249cacd708cf..2ceca26441ba 100644
--- a/media-fonts/symbola/symbola-8.00.ebuild
+++ b/media-fonts/symbola/symbola-8.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,11 +10,12 @@ inherit font
 DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
 HOMEPAGE="http://users.teilar.gr/~g1951d/"
 SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
-LICENSE="Unicode_Fonts_for_Ancient_Scripts"
 
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
+RESTRICT="mirror bindist"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/symbola/symbola-9.17.ebuild b/media-fonts/symbola/symbola-9.17.ebuild
index 63d08457a4a4..88a01a52e29e 100644
--- a/media-fonts/symbola/symbola-9.17.ebuild
+++ b/media-fonts/symbola/symbola-9.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,11 +10,12 @@ inherit font
 DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
 HOMEPAGE="http://users.teilar.gr/~g1951d/"
 SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
-LICENSE="Unicode_Fonts_for_Ancient_Scripts"
 
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
+RESTRICT="mirror bindist"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/tengwar-fonts/Manifest b/media-fonts/tengwar-fonts/Manifest
index 8195ae4cd724..589dfc1ef3ed 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 716 BLAKE2B b7bf136f1407e5bc95c5a45105aac61bb89b6138bdcda39f41a893b0405ffd672a2e5eaaf18ecbe40fd87c3b50fe04cc7e5a6c4e9583553fa8740fdc8e77b27e SHA512 e6655a4baa224fede37a569e8ab0cc43b01ca859884df1e85926533bbda7269b9dcce982d55c2e998b1384f73328058554fcfc560d22ffdfc9f14f2bc5d7ac52
+EBUILD tengwar-fonts-1.9d.ebuild 714 BLAKE2B dad6e26f501802e3965b8e46991eb55b059cf01d3591f468747f9e80e54c8a0abfb0ddffe47a8456dd4628d6073ef70c2e820a94e0c561ea29a6d4a0a9758c70 SHA512 2d1543a49aa99bc1c1a8167d0db255dc1dd414c147797a208d9a704ac65427d223407b872bf8e0ce20ab56685cd32e1b7cb34c8c9781dd79df4623b38d0541dd
 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 26c4f3bfbbe0..f3d8c4b99344 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 1e0584c80d71..769b2647e7b2 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,7 @@
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
 DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a SHA512 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
 DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
-EBUILD terminus-font-4.46.ebuild 2612 BLAKE2B ad7b5faedfabfd0beb12e79da5ddca73cdb39358c231b69e717740595bf040d1dd52da1240b6862a8e7871ab5b929f70f3694fa5607c6ef1b2469b7702723d04 SHA512 e7a5a528626d632b550b0dce2ce6098406fb7ddfefa9dd40190f78ca79d83744eef730282ba37729de79bce3040cd786d128d8c03af9d6539a885007ff56d675
-EBUILD terminus-font-4.47.ebuild 2623 BLAKE2B f6f411bde1382da1741842da558ef23f89773c254945759af8055d5566fb1948aa8b3d3b31d49c87e32ca530377608f9f477d56c2789822614618710034f0477 SHA512 04374f1b1dfc761c377f79cdc85ddfc312c4ee9aa0bee9f3e18951353a0825edec3398fce4f5fe9773f4e8dd67127c909e6e455f1552e2b522918f7c76c87957
-EBUILD terminus-font-4.48.ebuild 2623 BLAKE2B f6f411bde1382da1741842da558ef23f89773c254945759af8055d5566fb1948aa8b3d3b31d49c87e32ca530377608f9f477d56c2789822614618710034f0477 SHA512 04374f1b1dfc761c377f79cdc85ddfc312c4ee9aa0bee9f3e18951353a0825edec3398fce4f5fe9773f4e8dd67127c909e6e455f1552e2b522918f7c76c87957
+EBUILD terminus-font-4.46.ebuild 2609 BLAKE2B 5b7d71a268c473e7a2a610c8128912e84ef6b8f6b2979589bd2a551acd0df74962a1b29080198d61be0ad760e400940e33c18dc24feee3e85fb5a56ac53f4718 SHA512 eff0f4526b709be6e08b98a397f545207486eb0b6381f6c3ed8d44e18dcf0f9384a595bf265b3eb79527b1a9f46281c10b244c9a1e2bfd57172091476662e900
+EBUILD terminus-font-4.47.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
+EBUILD terminus-font-4.48.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index 4451622925d6..017cb8d501b9 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index f37d2391b735..40ce47872db1 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
index f37d2391b735..40ce47872db1 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index cae4132a3d86..a7906d2665cd 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,3 +1,5 @@
 DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
-EBUILD tex-gyre-2.005.ebuild 485 BLAKE2B b7f4a5f8f71a73a9d43c3beac6f25b6ebb827522feefff789d98b19c09485380ac0e767da610f9abafa81b9b362e23a952a2c38da8ece3e50fc619fad9d309b8 SHA512 598e175d93142aa73d5672b11765c52da5d6908c5b14d3ae6cc7ab94f9b900e0ff4a4737b2cdc93c1fc7f48e387fca3ae3e47f40062d4246043a6a74bb601cc5
+DIST tg2_501otf.zip 2559336 BLAKE2B 8a4872f1a694765e56ef6e41fab523ee80a9b69de255add3160068131a10f226cb237572b1184f6411afd49936606af6b6809f3a5aebd502122d062a4dc23f55 SHA512 a335e0bfaf16a157c290fcd40fcf8786e8677f14189a8b6fe56ff112f008aed198600248d8eb1334bbb689b9979996e013f61bf5bfa6f0549b6a910d03cb2929
+EBUILD tex-gyre-2.005.ebuild 496 BLAKE2B 49655b7b6b70367710e97497db163deed50573243db8bfd361e4d9544c675c2d95e0cacc7810a00878da4b56aa8aa988fad82a04a42b88c36ba95980d5eb9101 SHA512 d232d0a9e63bffdbc9e39ade1665c75888c622389fbfd192374caab1cf7f5da81df33858e01ad5573e8c57f37efb1456c8f1d6b25ef742ffdc715d3805147817
+EBUILD tex-gyre-2.501.ebuild 544 BLAKE2B 316ff7ff66650518e04ec26a33330528c6bd01b2f8871ecea464532dce1188eba37c98656af5532605a43e36409b268b33238f28562ae5dc43044171b2834310 SHA512 7a6644461f3ef64d6c5f1e1cd03777de4e3805a6587c800806e22e5f212e0d8febd69d666156c5e46b1299891b72d1fa3ac9dd544b13b7084cf4972d1b600d3a
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
index 950ee4b56c4e..2e47c60fea52 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
@@ -12,6 +12,7 @@ LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
 
+DEPEND="app-arch/unzip"
+
 S=${WORKDIR}
-FONT_S="${S}"
 FONT_SUFFIX="otf"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
new file mode 100644
index 000000000000..ad498a6c96f6
--- /dev/null
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit font
+
+MY_P="tg$(ver_cut 1)_$(ver_cut 2)otf"
+DESCRIPTION="Extensive remake of freely available URW fonts"
+HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
+SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
+
+LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+FONT_SUFFIX="otf"
diff --git a/media-fonts/texcm-ttf/Manifest b/media-fonts/texcm-ttf/Manifest
index 043d75cefc74..d74c6dd9f308 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 518 BLAKE2B 860bcf77841dd89add4258fd712f6c5f5e156b94e73c6c94b7f74ffbf34e6802531ce68088e9587986b0218b69b2f47c25f7dd89b388410ec3c94d2df8f36c8a SHA512 9b81553b8479def74cfd937d77493a262aed801313591fa51f81f90853e660a923542334253208b5e11d8a198432268f2f11ce1aa63151817548d7489524e171
+EBUILD texcm-ttf-1.0.ebuild 516 BLAKE2B 24c2f8faaecb3763c20ae12f44ee1659805312f6ee58df532a260ada0c432fc0bac0250823f4f233e253025a1f369f1d7c8dfc4b0f4f1b6d834e5253a108de21 SHA512 bc1e5738798e887b5cff95d4ee0e4e6fadefdebb3305a56c8751036244637824a309917206f7d170d6bf35a6251c3557705da9d7f7b0e933b5f4d94c381eb2ba
 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 28c8186a5274..3e8f2e652552 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 
 LICENSE="bakoma"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm 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 a499f1a93928..569470c20156 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 549 BLAKE2B da20ca156ec4d2872d27e32abe358da917d5f578f732bf998adf24f766547d567c5ccf57f9aaf1917943255f8b2d1b280a25c554f58c452de196786dc07a1ec4 SHA512 7361dc62030add522ddcfdeb5362cd4d07b54fa9b0b8ae8bf914f632963849fbbfbdddc7b778b5e8faa7d1e07d9de9f5241e06b3c620d9fb29d5cfc71774d5cc
+EBUILD ttf-bitstream-vera-1.10-r3.ebuild 547 BLAKE2B 59885991eeccdfd22bb89b874313ad244ac03de04d53e2c248b0d2abf74b8e8707e47432a203b19a64aec7ddd1d59985d35ff3a4212c69ef57590f10583ca9ca SHA512 9b8c95e3b395415c6c4edc3d96daeeaa31a017180af61f42b04cb074a2768d1815c9e940f0207adc0009b8e9161bb1cdca75c494e2cdfabbd049d8d74cd61820
 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 1022ac5e98cf..47ccaf02a4b6 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
@@ -11,7 +11,7 @@ SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.t
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-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 a2fb7ac1a27e..bd832a84a114 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 521 BLAKE2B 489161ecee772c46ac407ff30ea4c98ab0de8e1d7bf9a21e45b6f64835ecc76fd854b3bc95882cc9eed2b81c4f09ad6125f1799a8170317fda6d7f1113480601 SHA512 72983609129136802fef370aae79f9a479f30fa7958a47f25eb30c89a1751edf75413f8a2ccb94546ffbe69963666b503f119c0efde2d4bcdf9a85e80684f8f1
+EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 519 BLAKE2B eda8ce1d9444e79292ea59ac6f235b5781fcfe2cfcff0883e52ac0c38cc47fd9beea3697869936b320e1b684ee0a5b99bb6646cadddd8af7f520ef3c72b7c63f SHA512 a09a00ef366a05ed6d2189a6450fb5483bbbf843224bc74f13efc8d63b62bb38141bb29efe8aa177f6abeed52f343d8d69e445e9a44df2b35f40ff0433e682b7
 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 aaccc5e493df..7f99a77338ce 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
@@ -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 sh 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 851848a6b761..6d2a5746a75e 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 513 BLAKE2B c8df437dc774b3e75afdce2c4a3f80ecac13defd030f1feac29af3d6dd0768ef4739b36d8060e7ce2e17a6644b3f07ce55342bae95d0c1af96e15cde8a1fe682 SHA512 a61cb72813d54e5b1e5a451e2f59fc5ad6815f3ad48e9a197ce0704f4bb5396afbe4917554d2c6dcbe27f553e23050949f282c119f3525cccd78a40bc38c237d
+EBUILD unfonts-1.0.2_pre080608-r1.ebuild 511 BLAKE2B 9e192962df688cfda440a2786dca646a44d593f70997bc35c3d624540fe28d0f0c62e3c4ee7cb9e17e336b73a2d8ac3cce1e810c80b010a699784d9ac5283162 SHA512 cf9fe9c3d0aa06ad71d955bb165023a1e07a49d6ffa1d9c3500a5b0b8e544b8f6a086cb94f61cb2b60d34f2285db654be04412e99ddf20f4df0f5cfd8350170c
 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 467f8085013f..4f0ea6480ecb 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index fa66f50199e2..ded923ea8dc4 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,13 +1,7 @@
 AUX 10.0.06-make.patch 645 BLAKE2B 7aea0a47997233e54f150d4a25f3fb376106378b93e86a68c8623d0c66e3650c6fb4bd4a6c98441f14f2ef176b40bfc23addc4168c78e34797b75b6e17b565cc SHA512 b205457eb2ffe1f4693e82a5597f1a95b95a62744101bd5a73a36060030541a855a62f84fafe255fafaf1e89b7f89c707dace2eccbe7b2746c3059404e7bd38d
 AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf2e8239691af1e5506dbad7eab1f590bf3bbfea45f174af0e8f8fa9d85b11542ea91edc218cdaa08d13b SHA512 f8a286c4ecd9af7ec32f2f90ba0ae91e2f9f4111cb1f65dbc4cef07dff787eae4ee96aca7e15a61d2ae8930f3537dd6fa77393dc720a4fc91300a2c9a5c1d9ea
-DIST unifont-10.0.04.tar.gz 15651848 BLAKE2B 6308298244c45b51647e7eeb41cf19e085be89677688402b3fa384f423c27cb666ad8254ab98d052a93e5f928f490890d767fd96fe4c963f6f628cf14c3d9983 SHA512 0f9bb622e469ed340cc5ff465f6922b32eed2115014cad3ff445e8b17cedbf7c4c7f0025825e14ec4d046d9a28edb6a90eb9d9e402c38ed22b10303141f473b9
-DIST unifont-10.0.05.tar.gz 15645240 BLAKE2B 2707891d66e7ee71b3bf68aa63ebfb303c6f2f85f39a48fb281484fedccfef02d76b05d9ce5ee5305c39336f26750dbf4b766db700b8f1a87046328be171efd7 SHA512 fa9ee669ecebf8ae86d4b972e66997fa8455ee37c0e95b3528394e7e10046fc0083950fca2fe84b265ae6066bbc9ed02dde1d7795f2fa5f34bdf8ffa47ecc042
 DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
-DIST unifont-11.0.02.tar.gz 15874967 BLAKE2B ee3c887ae441e70a95aad9a8f11d955ef848a5d4921d9c4c340d2f91a4c795503f2ef514bae93899591978afb797bee9d03bc222801f7d2daed199fb6045769b SHA512 d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d
-DIST unifont-9.0.06.tar.gz 14785468 BLAKE2B 9d2328eb8918e9af82235279b9d01bb3a0487480123f77d8d7a4618742c0938a3f62c33b7b148657ab83c7e6a79209ac959d4875b686083fb15167b254c8fa81 SHA512 767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988
-EBUILD unifont-10.0.04.ebuild 1135 BLAKE2B 554f63191b97233aef18333a88952d38ce71ca268678b3db153403ee373beae7162d4f17c4bfff1a1a09e9b06644599cba228c7c19295552fb099f0bd1870915 SHA512 42596d03d88b89fdfb71294432452d0869e719eaf40d9a7d81142ba96dbc30c407845af1f5c755a10f3d8b55a14d923beefe0d2d815b77ecfe30a3b78676af9c
-EBUILD unifont-10.0.05.ebuild 1135 BLAKE2B 554f63191b97233aef18333a88952d38ce71ca268678b3db153403ee373beae7162d4f17c4bfff1a1a09e9b06644599cba228c7c19295552fb099f0bd1870915 SHA512 42596d03d88b89fdfb71294432452d0869e719eaf40d9a7d81142ba96dbc30c407845af1f5c755a10f3d8b55a14d923beefe0d2d815b77ecfe30a3b78676af9c
-EBUILD unifont-10.0.06.ebuild 1165 BLAKE2B 1c4ea9249f2da57d6de0f4980c9c964a295f6d14d0cd20f8666022d6c51dea48ee24eefb50a5df47bd1f3f62c5f9bf0248b4f58d9dcde5b51d623508bf9b5747 SHA512 017a9cc2700cee96bd60a3ad116b6ada5ee35d13ccbbec819dd0e1a7d9d3c7971fecd48cf805658fb01befa269504775c1cf855b4b1dbdac9ce6e4c6af7103f2
-EBUILD unifont-11.0.02.ebuild 1172 BLAKE2B 7a94de448b285688d0f77b425021d5ef52e4c30e595c7c676522e7e080034f8be3b725da26cb78921f44eacb683879f2ee452a53236f3c00fbcdaa964c67af1d SHA512 6c6bbc5026395ca585f690d0f7eb4a3fba420f9c3d80f92508713797a30103c3f547e00c8d23c6e745008e69eb9d0c884a010f3bd4a3985b53102f0c330388ac
-EBUILD unifont-9.0.06.ebuild 1125 BLAKE2B 777e3a44d0414b18efb905a8c6d8cf5dfd5d5965367e62d5b941edce31ffa3428101b102aedaea29362e66480e1dea053490895eb61ed345b5dfc030b1c21d8f SHA512 0dc03a28043afe0f4e7e2a1b8cab1985341d49ecd6433c8926e487d2447fc43c3381d69bbb61cc59ef25357f14d19acb2d2bfd0a2b682bb0fefeef70cdfafd38
+DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
+EBUILD unifont-10.0.06.ebuild 1173 BLAKE2B d7337cdda06f108bdab2ea4073537624fb604de5be3b9184f14d305413c9c21558cd7c105f3e6ff7ee33e83b51414161457d37d4464d9c086d9d1f9ee6177bcc SHA512 7474d5a58330937d9d0dea0efc657da9e5d48d65be4408818ee6ef5f40c264587e33d74030b98ec21c626dbe5447f1caedd76e4a3f8bbf48ea69c48ca0b7cb69
+EBUILD unifont-13.0.01.ebuild 1110 BLAKE2B 9b8d83517204cc8685321b3c67c06405a2ffbfb6f03841c41e07d8a7a9eeb74ed52b782732cd670ed680ecfc3c3445b1f602cd6cf4f05c706afe5b1e9319194a SHA512 fcd272f0c7fd3ce1961c956b4a7218586982c645c880cb146a39b70c694b8e85dabdcb9b2e14c828e2eef704062f4f35a01ce4a93b3f2d2d2bd90381b1bb77ed
 MISC metadata.xml 587 BLAKE2B f8ce31f7041e62e483b63f7883239f52fc45b1a91c9c35563df48791a19d2ba354dd4b192520486e11ef4d66eb36dc58f8a309dca5f73a2edb4786632bb06ed5 SHA512 1cbde4c79a99908c900a5283ca99249440477623c557859f1663bed14c8a3513cda8767e50606a38f8f3e2db1f270454a37a4e793f20124922239a61a497fcbc
diff --git a/media-fonts/unifont/unifont-10.0.04.ebuild b/media-fonts/unifont/unifont-10.0.04.ebuild
deleted file mode 100644
index c7f38721c874..000000000000
--- a/media-fonts/unifont/unifont-10.0.04.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/unifont/unifont-10.0.05.ebuild b/media-fonts/unifont/unifont-10.0.05.ebuild
deleted file mode 100644
index c7f38721c874..000000000000
--- a/media-fonts/unifont/unifont-10.0.05.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
index 809688e7153e..6c00044c786c 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
@@ -59,7 +59,7 @@ src_install() {
 		USRDIR=usr
 	)
 	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" install
+	emake "${makeargs[@]}" COMPRESS=0 install
 	font_xfont_config
 	font_fontconfig
 }
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-13.0.01.ebuild
index 09349057d2fa..edbacdbfdcaa 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-13.0.01.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit font toolchain-funcs xdg-utils
+inherit font toolchain-funcs
 
 DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
 HOMEPAGE="http://unifoundry.com/"
@@ -11,10 +11,10 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="fontforge utils"
 
-DEPEND="
+BDEPEND="
 	fontforge? (
 		app-text/bdf2psf
 		dev-lang/perl
@@ -34,32 +34,27 @@ PATCHES=(
 	"${FILESDIR}"/11.0.02-make.patch
 )
 
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
 src_compile() {
+	buildargs=(
+		BUILDFONT=$(usex fontforge 1 '')
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		INSTALL="${INSTALL-install}"
+	)
 	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake  "${makeargs[@]}"
+		emake "${buildargs[@]}"
 	fi
 }
 
 src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
+	local installargs=(
+		COMPRESS=0
+		DESTDIR="${ED}"
+		PCFDEST="${ED}${FONTDIR}"
+		TTFDEST="${ED}${FONTDIR}"
 	)
-	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" install
+	use utils || installargs+=( -C font )
+	emake "${buildargs[@]}" "${installargs[@]}" install
 	font_xfont_config
 	font_fontconfig
 }
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
deleted file mode 100644
index 2f51aa949a30..000000000000
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index eea12242bddc..ea45cd29930c 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 1923 BLAKE2B f8d0faa6263871b6cadbc7b5a579fc397c22eb4c5ca14174aeea8be82336f84cfa578bd0c6674cb4dac5cdd61ecd28bf75030b323c647b1bea300ce3eb42093a SHA512 95f9bb8fc8c48ad32d1e18d023f7c2afc53b440600bc83707da83700d522fd88a3d382dbb59d042a5d072267697f958a676fd0007381dae10534cfc53c433cd9
+EBUILD urw-fonts-2.4.9.ebuild 1921 BLAKE2B 9290a0009852b1150b2d5737e83f2064b712db10d6bdb9ebf6e3aa43666ddb3b0c596636b978c99882bc3c0a8dbe1087213599f4164bbd7c451e7c973002eced SHA512 69ab2303a4ed82545633c6a23d5c5c76ad3ee35c5a73d3fb2ba4282f896f854de7e63e01838a65c5f7c8894d23118c072d5dff82e7e4c58488b9cfa456b1ee57
 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 6e4cde4201d4..2e718da2c507 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 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 7d967bfc3fd0..5090a916ec32 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 940 BLAKE2B 90fadc7b11eebfae25963cc626eb862fd85eb6346b5de86d439b03873e47d5fa4ff75c1cd11d8b631bac7d551bdadeb10dc98e1ba6f03923414ca6b7eaacda28 SHA512 bb7b7dda93848372d0ea4a1ab6fc8a65ba707481b0241769a50fdea818274818958c75652fc9de6e87ddb3e90479a61e01e06d4716f15c686c48270ac9defb25
+EBUILD urwvn-fonts-3.05.ebuild 938 BLAKE2B f1b3b4746f883af53712ff8cdc91190063a37a5c9db08185a3b4fb7dae6fb0c5a40afb82724c0ba4d1ba5099c93bd69188ff64b9a20872415e1a8907244a9f22 SHA512 6c73baf968cb34a72800fd530163f57cacc0ffec598f3005aa5550d07992b58a87a3b2f1ac7d4f0101ea467a37afcb9dbb8f53b9f3e51d17fc05bb6dca38ee68
 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 73bc45f66af2..90b1212c2e5f 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
 
 LICENSE="GPL-2 Aladdin" # see bug #434262
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}-ttf"
diff --git a/media-fonts/vlgothic/Manifest b/media-fonts/vlgothic/Manifest
index 32fd89b843d8..83071dcfec27 100644
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@@ -1,3 +1,3 @@
 DIST VLGothic-20141206.tar.bz2 4952134 BLAKE2B b650481bd63c71f996e584c60e612201d131c6f89a4b2d5843be30922ea05358add61cd6c5fe3205a1f81f5e79a049c284fa90092196d79f5c114d4a58205806 SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d
-EBUILD vlgothic-20141206.ebuild 530 BLAKE2B 57f7528050cfc48c439dedfcbf081f9266b1fdf8c09ff00120d6c28038b4dd692138ecab7d3be19713b4fbe319871a9108039a878577cd621d33a3dd218f330c SHA512 c91f41aa72ef143ff9f6298ecf4f7c6efbd2af23d9919f32290d910d056e5f99475763c514ebda0d69ecd97200fb55c970b1d76cc1aa9b39dab4ac39656f37d0
+EBUILD vlgothic-20141206.ebuild 531 BLAKE2B 5b994879b6e2d18d2e2db71b1d34025649db99481f73a06b0d66a907fc21a353302f5211c2b95102b000c6d0667dcee5f9d6ce5c7f3ed5372f0e60222adf9c92 SHA512 1d6c91dd0e68f12319a1cc7d857fb891d026c872b5abf612fdb5338200245974e9e38b02070c89adc5289bdc6e3480bda7ddfbb4a679b9da3a3e5f2d0edbea25
 MISC metadata.xml 430 BLAKE2B 5a58b9c299fcb447e5d3895a54cf16bc8c3e2233c062a35e0d6dd3764bc7ba78fbad57a07ca5c02ddbe90a6a4967d268c7c9a44599f996a4c6674d765964bf9a SHA512 ef2fc0344b55c169ba468dcfbc72cddb81c68f63974add68430c39924ac5f7aa77c2130815496c68a025f7809fa0454aa0b44a0c50892d6db6fd64052adfbcc7
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index 2ebb10781be1..cf7d44d508ff 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index 562c615f996f..fa69809a45ec 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -1,3 +1,3 @@
 DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1ff594cb48d488cf800114a4fc4884c02e7e9400bcaa4d6b6d344283e7a2de885f9c95dd33beba690ae7d9 SHA512 f6d3283a06204491119ce3a3796dace7db640469192b9d44fd44471a185dc580a2ba8160f2983371b6160cb782adaabcd02872cfc2b1d05b10f3d6e73c60cded
-EBUILD vollkorn-2.1.ebuild 612 BLAKE2B 5f1e48cfa584eae8b506e96c13fd417ca2cf542739ae13f9c1e80a36b860f8af1d7d4c0696fb4811e2c554b7ce623573010115387a0e0b583114d7d3a840c19f SHA512 5dddb89b5694bc8135ddcfe4f90648c1dc617d62fdcb8d24bf153eb8021af0952b6a266488e3e410d18ac05e81b3976568460e0da74ae80dad4d048609c8abca
+EBUILD vollkorn-2.1.ebuild 608 BLAKE2B 4ff45f26e9858a91c004bc3aa8155b7f4a9bf36531f38680928f2c5c142878399e8d5f55d89e9a2e7c82da4f51a80efd959680e9e6016b302f699a23521450da SHA512 92e1c5b55042a9eb5cb24c98713af7b1735b43a2e88641ad879584a1ff847860e48ce57f7ca42cbc6ee6b732cb43a900355b5818734b26505f40e8d234181709
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index 582cd7cb3eea..77be6a4a34f2 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/webby-fonts/Manifest b/media-fonts/webby-fonts/Manifest
index 2c458ed8a19c..d59315123992 100644
--- a/media-fonts/webby-fonts/Manifest
+++ b/media-fonts/webby-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST webby-fonts-1.tar.bz2 7915 BLAKE2B af914cf3132a808acfcba204072807dff5113b4d413c5609d0b68735651bd76f34f1e2fcb6d1afa19af0c9693604ed101db842cc3ed5c2b69d0c153729c68a7a SHA512 5ab4b1ced4937429cda2c4d18892a781048bed0fba74e158868df113712536620af2de244326af80d79526fd4299f7671a348c11831c2a4f231390e5f68759d4
-EBUILD webby-fonts-1.ebuild 407 BLAKE2B b080b1cf69a5cbf2595ed8da22d829d52fa60055ac69ddeffc103aa8eeceea3ebd4c79ad5d64cac9f883a5945bcd3a4a01c65390ff4058cfaa1571647af28845 SHA512 9aac73cf71a3f2b8ed66846b07eb796d36212e032c54e8a0d7b5ab23bf2cb94c120ec939fb5046c9540efb462d30f9fa047ec3ce7d1622cfb8aca96f790153ea
+EBUILD webby-fonts-1.ebuild 408 BLAKE2B 45b053eeb19c164de913ddad81aefba07f7a1c19c8617acb09d805b40beb070d6d78e7a38c6cae0da5657dbe549d6b14bc205aa40f1a1599159893780d905572 SHA512 3e61060ba2aa8ce203da18cc410f41c36b45f6d4fce536d835209e392c92a6f0a4e37ca58db9908d3bc863bb1ea49a65909989c8e98408a551735e271024ea20
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/webby-fonts/webby-fonts-1.ebuild b/media-fonts/webby-fonts/webby-fonts-1.ebuild
index a00ae785479f..6430dc087627 100644
--- a/media-fonts/webby-fonts/webby-fonts-1.ebuild
+++ b/media-fonts/webby-fonts/webby-fonts-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.liveforge.org/fonts/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index c27f88448950..897ceaeb0d06 100644
--- a/media-fonts/wqy-bitmapfont/Manifest
+++ b/media-fonts/wqy-bitmapfont/Manifest
@@ -1,3 +1,3 @@
 DIST wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz 4041184 BLAKE2B 63103b63f17a1e9018093f0346a0aa8bc89804b2fa919e797b0716343abec743ab87431c35c2ea26f63a2544820e316e1e5b9663bb7d49da327e7b0ddb9270a8 SHA512 190c726e79c43be90b5620b3f5892e8cb7a11085a06180dbadb2d56208f1813bf7b0909deb035957cec5bd6fdb5d5f049aaea46f8f26fbc9f5d43d835c1349e3
-EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 554 BLAKE2B 7b95a83110c4447e2ca4761af326683d4c9470a64efbbea3bbe226a629dad5d74c4b8fb3f6b302c8d4e90f5fcef92352412a4892d0c330c3075754940146843b SHA512 cff4c7d97c12185cb7887e65d66c9834f4aafdbd54d251d744a90ec5eb09a4e09a917f9a304cd314ea2b92ad61b09d77d527a66e234c686a0525d29625e22d6b
+EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 551 BLAKE2B b0ed16935fbbec1518433d27862196c45faad6817a77a9df6dc964c5e21c2df6183d864bfba03dae6aa9bddbc432d7263183255e39906136df8cb0364f979795 SHA512 871c0d46850eb76f533aae9df3b61569fbf2a01dbb80fc8627379ba401385ee5721cda488e4324b6add38d29d1938951f3d8df82b67d74db7c8bf66a3a4db05e
 MISC metadata.xml 829 BLAKE2B a67c5dba6f711b919dd61abeb130847aec6d4a375c6f4647dbd80e3f57135784646fe65693a2632d7c1e0bccd5db6b5a1a9ee2609bd1537bd9fe12e1a5a50a0e SHA512 b5619a21e31cd3c3445825618cd500089b690e798db303f045c0e735e065bb66ee10d2f4d4ef88fb8f3ebc2914b5f730aa15c344369c0e32b2465305a7127092
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
index c5d1dad91b0b..a5e881c74c0a 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/wqy/${MY_PN}-pcf-${PV/_rc/-RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 161b07476e1c..c134e63d4441 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,5 +1,5 @@
 AUX gzip.patch 472 BLAKE2B 3804de127898501b76be41a8bf016bc1eb224b19a1d56ee1dbe6345352de5f6634692d2c45c1747bf38bb9a90fdaa42cb359e711b7591398576e51e624940099 SHA512 b3ba5684c9d60435032f69e22f74feda6d4a49689db9ef28acd5ca8fbc8190c344e8cb7991ea707f21317f55dd2edaaf12b6e0bb14d70d204d252a63b184a280
 DIST jmk-x11-fonts-3.0.tar.gz 624357 BLAKE2B 5513e46116cb7ac63e69d4d0fe03f627e437a11ea378c4213b1cbf13035a5e1c14dc4c1bf230e6490829b4cafc2ba3dd1b733f8549d28aeaa1e7389e527e8b85 SHA512 7a99689be59eaf50742932ce27c8b41a99d10076adf9c2990e11745a873eec610257d50e844f8380658d340cf821724d459dc9b6b189666180596f2bf255957f
-EBUILD x11fonts-jmk-3.0-r3.ebuild 667 BLAKE2B 6f5d4c97ce4a24937f1fc1937e696fb9cf3beb44b27eca91b4e9e47607557abeca7a7aa85f398efc10afee162020232b4da15bf1cdb4f5f23d1912d43dcfc5af SHA512 c9bc3fc8a41e0f921350aa527654dee2652c4a71df091d8e9e27f1734a8fbc2aa1331fd95a448802bc695321c549ad6c016ad8c45f0f0a29ce0201e7354c7063
-EBUILD x11fonts-jmk-3.0-r4.ebuild 726 BLAKE2B 927a775a2e98d0e707f46f7e4fe8b0ceeb98a23a8416edb6c4e7a7afd46e0bbc85494d0e91c0c186841c84624f891077f0526cb51be8c0930c343b9dc520d80b SHA512 8e42935a1a82ac7dd46c4a4737a832e2b2f372c3e9162b9c0a5b49f67a84b2ad68c154e1051ff52c0c87cfcd823c037ffe721d6c64a4870046a63f2bf3dd3218
+EBUILD x11fonts-jmk-3.0-r3.ebuild 665 BLAKE2B fe9a6d8de5f17eea74700bc9e0310a0cd3e2da43873300659a381888a5b99c3765135ff34a27d9a02db05f6edc73420b0f25988d575f154cf5415a991f5f41e1 SHA512 7d1c644460da8ebfd9c76a811ba033187267ffbde8a5047009da5060eda015ec975eed2cfbe3f4e063eee96129f835a666374ebde7e16fe4552f0433c4c4df19
+EBUILD x11fonts-jmk-3.0-r4.ebuild 722 BLAKE2B 8e52f4a7285b02b351f5d43605a4f83fc1ff22ec2ef76dc67fb2b40b575ef6bb142c0f0c055495660cd1218dcd563b81fe5ae6e8187dfef317e027717deb5a60 SHA512 ea062253c89094783ffc341e2539ab7ca283fdb3d2b753b131d957386813ba4971cadb9da19a12bdff4558305d08ea9227b729300968527b79c5ab9ed46ccf34
 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
index fef31db5e9fe..3e27e1485653 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 
 BDEPEND="
 	x11-misc/imake
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 827d1a9bf3ae..4f59cf47a978 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
 
 BDEPEND="
 	x11-misc/imake
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index 573097f73d81..9589852c55de 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 969 BLAKE2B 290c416bf751b0d62791a73f3e23c0d276ba5988fcb25cc9a5b7bd590bd4e2803a0eef43345ff50203eda510761b47c2a4ba38414feaf542909db5c01ce31231 SHA512 06ffd0d2ac0df0d0f7f71c799bcafb35678f25217e91dd489dbe2338067afe1b026ffc956f55f27fe4ad8e6ece2d4ce713eab02555b51174848e3350477eae52
+EBUILD zh-kcfonts-1.05-r3.ebuild 953 BLAKE2B dfb041d96b98ab99c5e86675d4f372359944dadf1a593938999a2588ed45d2b575bdfc1a351871798e7bd1aae524aa81f676121be637a2c023c4987ed6c81806 SHA512 f581b574807abfd7c79d87d5b46661c6b9d245e09ea9e2a86d71c194e9cb3d5acc19ae46322da8512406b71725889deb56346228d016deeee133a1efac7a25dc
 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 25a0a498bac4..69688882626e 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
@@ -25,7 +25,6 @@ RESTRICT="strip binchecks"
 BDEPEND="x11-apps/bdftopcf"
 
 S="${WORKDIR}"
-FONT_S="${S}"
 
 PATCHES=(
 	"${WORKDIR}"/${P}-freebsd-aa_ad.patch
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-fonts
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)