gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /media-fonts
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
286 files changed, 338 insertions, 372 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e818824f88c5..1a9ab20f7365 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 7ebc183bc66c..78b8ee384b07 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 536 BLAKE2B 326957e74368eba310cfef7293b8272b7c71038a9f51ff80be7a6068ed38deafb45ad23ab930785f92a375f132782b3da920824ad106aceeb93c9c8a506b1022 SHA512 a5f7997e53a1acfbc64d864f753179e36b2e1b8c318c3cef6a593e7f10693c1cefbcab46d0f64397a50a4b63c00fbbef638161837307daa68733ee67d345a878
+EBUILD alee-fonts-13-r1.ebuild 526 BLAKE2B 352a2dd1b241955ee821d7d42af4098f3426fb10bdb334ba02eef5495536712e5fbb5d3549914c363545c4c2a5d61c1e7a642d8dcafe5632d4c002777f6a8e8a SHA512 5a11700f0abc94347eb55899c999f9615795c350aca169a6c76e30c96504782c756092a7cf89f31586509e7ecad9ff4889f045473c3bf3353c99da82ca68d871
 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 8b52886a9a34..b28110555bfc 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~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 804a214287cd..cd0ad341c287 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 889 BLAKE2B 5c29ffcbf2cd12fd3bcee9aa7e1a2a8cdc33366f34d45400a8ec46797300e09da1821d00334631bf3cb98b097fcdc16b1f06e98e062a0b8eb4b2a31e816ea5e0 SHA512 c136cf5767ccb472d10d8fedef41739052d15f3ca77b2f357531d2b2a0084149791f8fa850e0fdb04441dc80bfb086ae61e445672999d00468b8f3fba9597ae1
+EBUILD aquafont-2.7-r4.ebuild 879 BLAKE2B 799fe0c06d703b7bb7e00e0ccebb0d12a8a17f181f8b73f75f2e7360bf39cbd68d10f20e9513965344f89eaf48e4112679eb40992a905d6f509e7bb7b435f5fe SHA512 976b9f4887f10dd71cbcafefae48fa71e244627fb1ba8de69a6615a31658f58cea67740a5c62f2fab7c714b0ad502dd90d7d944f8ac3bd0a705b8fc10ec7b504
 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 155ef7a81265..d1d9f44b0fd0 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest
index 98083c9ee7a4..a0557c56373c 100644
--- a/media-fonts/aquapfont/Manifest
+++ b/media-fonts/aquapfont/Manifest
@@ -1,5 +1,5 @@
 AUX 60-aquapfont-r1.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2
 AUX 60-aquapfont.conf 451 BLAKE2B 435a16b9dc29a642ff006bea4cf0bf274c0544e51bbbc0a201f8f3a33643ddcb516b57b253b5eba8e8c87ad3caacc15f8e038f0178fb95d31cd8448385388e1f SHA512 9bf5dc2944a8e34bc5e6343e75b76a424e586cea27f64ca3a1ba0b155b423b83e33990547df72a0bcea0b38271a28d32e710a345dae16b49b2da6e333d8b44f1
 DIST aquap2_6.zip 2896324 BLAKE2B 4bd7e699c71758117b42538360901b252006af2619ece3294662a49724810c2f0e900ab4529bdf6bff774c9421de1dbe57fc82e91cbfad35615a3b3b271ac086 SHA512 5a46fe428eb81739cd9eda0570350a1a892fb7dd6f4e136f4f1d585837a668ac63d816bfa0f956ac24d945b20e16e7b72274cbf1d21e9f93ca057eee72b6af88
-EBUILD aquapfont-2.6-r2.ebuild 950 BLAKE2B 762246764b23c0326c64fed7cff1e52fffdfb34f3d8e05d1674f4012ca169e8cbcceefceff8f6e111576cbea97824e4b7424ff8f3477ec6431cd651266201896 SHA512 c045b26decc929b5feb9a5c01f3ea4601d5c27e288c1bf35bc5adb2344caa21dfbefe514b66e264fb0968e92d2977ef3fd65eb1952f3fdd5ee03204985100c09
+EBUILD aquapfont-2.6-r2.ebuild 940 BLAKE2B bc385aa55f5201e231f5fda7029a5e774db8d0f78bdb1b75997a0ac561af7081ede8310abae27be9a4edb2f34b433a0cce98844d4e35435b473c3d00ccdefc45 SHA512 ee86cefafe441038606268d2ef3a763052b9c746135be84a607e82a8693c4510d8afc6b1a8cf1ca04472587d6d12c26eb8c8324c06053d89f988808a977ca3f2
 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 05adf934127e..657d83c7c412 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/arabeyes-fonts/Manifest b/media-fonts/arabeyes-fonts/Manifest
index 199202bc73db..eb2a3c194e8f 100644
--- a/media-fonts/arabeyes-fonts/Manifest
+++ b/media-fonts/arabeyes-fonts/Manifest
@@ -1,4 +1,3 @@
 DIST ae_fonts_2.0.tar.bz2 1550827 BLAKE2B da4ba24968875d2f475600301091c486b7da8eae2d229604020e59cb6cbc55f43d9849b71ca285d94e27ca3715ec376770610ea305b78d2fc441a6143cc6a29e SHA512 46c94aa1ce872aa1ad4dd01d698d4691a6301786f8be681723df9bdcdfb86db12b15bef2a6acfed704b29867e9c01e385b4c2c490548ce68f7994b8127a9270e
-EBUILD arabeyes-fonts-2.0-r1.ebuild 573 BLAKE2B 5fe6e09c62de654de8d8c11b4a4613decfc5b4fb12247c3b4b09dbffea0980ad8672ac26df7549401cb4b96282248b02b904caf07e6d3b1495999eb1bf92a84d SHA512 a7c9f38a34fc8340963020e9de7e6b395b576172c20a0c367467b33bc05428b36bf970e85fd6234b410cb16234fc5d42f0700a16ae36aaf76ef396e07b106bfa
-EBUILD arabeyes-fonts-2.0.ebuild 596 BLAKE2B a488a6f472368c7335475abb5a85cf6bfa760da1835bf371748a7c29462defa38ce4594523b553cd5d983d71befb9cbd79159dac75dd1ce6134ae8ea7e0dfa90 SHA512 6e195f353bc57fc777c98159b7bd6b22f925d8356f88656016bf33a30bbca5f258e02163e5fd76403a8fabc9186963531b40d8da730efbcb60c1b3d961922c0a
+EBUILD arabeyes-fonts-2.0-r1.ebuild 563 BLAKE2B 4166ea0ef5448c21bc32abd0e7b534f99463e939c428047bfc7d1d01508e63545a8561265b7fb61f9d8e39c0873c4d62668edd7921b59397377e14e76a724981 SHA512 432e9f180205d292d2055f265ea6a481b7d31bb7c51afa34962410d9676036219b9617713ee0a6c5217d4504861864a2b74d87076f0b6b5a1ea20456fac04301
 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 e8a4dc84f6a4..297eb3d825ab 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86"
 
 FONT_SUFFIX="ttf"
 
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0.ebuild
deleted file mode 100644
index 5f5f40ca7aa4..000000000000
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-MY_PN="ae_fonts"
-S="${WORKDIR}"/${MY_PN}_${PV}
-
-DESCRIPTION="Arabeyes Arabic TrueType fonts"
-HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot"
-SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-FONT_SUFFIX="ttf"
-
-DOCS="README ChangeLog"
-
-src_install() {
-	local d
-	for d in AAHS AGA FS Kasr MCS Shmookh; do
-		FONT_S="${S}"/$d
-		font_src_install
-	done
-}
diff --git a/media-fonts/arkpandora/Manifest b/media-fonts/arkpandora/Manifest
index 0875a841e1fc..cdfae1f661ba 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 510 BLAKE2B ef975833919c7e1774171ae1a19b9abb3346d4005f6f45dd4827342cc9644b35513e9b10b1bf5faf31ada3b439f6a8b4e11f01417dac1f46e2fd2833f8ddd7e9 SHA512 f1bbe737d5b01d2babbe14b6a2a9635da68669b0730464263aeef1c0c24fbd147cbe9b2d06f1a383f909775a2f18857b104e23282402ebb05289b762c0ffb07a
+EBUILD arkpandora-2.04.ebuild 500 BLAKE2B 9782cdead0416cc427d6db9ab10995689af4dced6d89ccb56968e58ca25ec8771192606ae6420b356aa5e37ebe2349f7267803971332af7a8d9c4e3227ae221b SHA512 7976a204f101aeb22e44c4e76caab2a4d0d4972a8182cec73981b5f855cc94db605fe28fa46f3175bf8579ddcbd67ff379a60b506c2af2d48cb025361e188d48
 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 15a81423202c..a21a415219d8 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 74ec41ecd088..53fa2cce6c78 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 2275 BLAKE2B 6f73f5ef31b1d782b23545aceeb372acfb5fdffae24d8e39abc86a991238c773e5c82dafc1d40442e84344eeb74d32cc6c5143cadacf2dc859ee7590f06c8dbc SHA512 28474058adbddab8646eeecef708fba2b7d52d8c701513f41a6f159c0e5212872ef2a99057e059b6a7be63ca2b4bc1768a29bf97e38c6ac7c4024507ef34c847
+EBUILD arphicfonts-0.2.20080216.1-r2.ebuild 2253 BLAKE2B 1a63c16657051eda5188d8cdabe80ab5d321d9076388870da2722510fed963f90df9ce3152ffbb9385c28c813e7b451bc519086767690a7e860e5fc69dba4ffd SHA512 3c59cb7820f6459927f2a7739f7e4f016c66c6fbcf0a1a35c1e903dd23454b403eb491e56b0de6197f8db7a0f541050768be74dc1bd3dca744494cb9ca40d48b
 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 e9669cc08246..83ae795ec513 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 95cef094d735..49cee24b240d 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 514 BLAKE2B 6ee9922c0a21413af7f230e32de7554009afab49f8509d57f7292573b5bff5762eba78b372b2bf9b78ace9b52cf02e543794262f40ae2f32f7d3a7c29d48cdf2 SHA512 5dfa927f19a74f9b1adcfe3194f1244e7f793f63fccc9b378d59b73a60654bc4a2f9ff5ea1dc2e648c4216cee05748fd0ee3e3ed0bdcac6bf5738c63f90dde29
+EBUILD artwiz-aleczapka-en-1.3.ebuild 504 BLAKE2B 318fb70165e6961fd651921c616b00bb8b695e15f9ede765a0b9e1847752c5b73eef6abac50960eacdfaa6149255f6a293cf133f41716b7cb52d66b338ccd8cc SHA512 4f6995340d6defbc6ef87c035a78da3f9e02f51b132238b90c81ea30fc42df01c673a61174a6fafd4866fd197f7fb7b4ab7fe968e04772aa975eb6e315c20e5f
 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 646d5babdda5..54c62739dd24 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/artwiz-latin1/Manifest b/media-fonts/artwiz-latin1/Manifest
index 43414683dd66..81168a156f97 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 524 BLAKE2B 36f11bf4e171adc6f9445a20886797eb9539a21db3cdc50fd5c85c51302bb3242f331c6f8a94d57db045f4f0bd6dfcd06a82ddc91cf36bc688cffcc454d5462f SHA512 e1d9fa6ee3e0a3464a66d0c00c5f700c55a2c4d2e48487f1074427cd778f5818c6341919dbb0759b6e38e85db1faf4f95e1e1093df2eff460408ab83142f3bb4
+EBUILD artwiz-latin1-1.1.ebuild 514 BLAKE2B d16e5c9b791be9d563668d2305c7d7418d61f87ae231e5f0ad12447205cfe1c6ff23d0d0ae83e6334586bc38290766587e74ac2e9866d32d53ab2ebff60413b7 SHA512 0d6d18e4b509c26ddad62c996b4de97b51fcfd392cfe917d6bbb58556c9a38542cbfed0d9797ff8951544d0a52626dbbfb06467526b46a66a1f7bcbc6266500b
 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 3d2bd7b24e39..4600923234fe 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/artwiz-latin1
diff --git a/media-fonts/baekmuk-fonts/Manifest b/media-fonts/baekmuk-fonts/Manifest
index 1eb69b28df3b..dba1715ee4b5 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 1072 BLAKE2B f153bb601a5ce63aa1f2f60ee660f0b6db125cef82a556f0bbfffa78ad1df446760f987e34205d9e8efe4bd4886ad0e98276eee06cc735afa9bcd121fd5c02dc SHA512 c85c655637319eddc9f6543d57b9eb32d0088e00fd695057a2569bd1077581641b9a83c4ad6940eaa969a3192b61292ff694c00b4e14a1bd8e9300f182b779fc
+EBUILD baekmuk-fonts-2.2-r2.ebuild 1050 BLAKE2B fa03aa52427e248bbb8c22fcd7be58121b59a6d9a02f44664d05fdb0e65f4d64a213a7332cc49956fe63f84ebf7ccb59c4361237a30b195b3b84cfceda818992 SHA512 fb0db35fa1750e58c9d51d299adf98aaa692e765c0bf6453e1b8674e0bdaf7c429e299cd9c0ab3b95088edb783f5b7ff094ea406426834aefcb528c4b08b8f18
 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 e69a979666be..bf383cf5b954 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 75ae30cb44de..7443ed6a9a6d 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
-EBUILD cantarell-0.101.ebuild 1255 BLAKE2B 51c847b61bc6a1a03057da80ec77a895b0c9baca8286d068a4d60699aa700b3b358caa8039dfe633db2cb4be8610a2948030064bed2f4cf4caf8c81a65a2bd4d SHA512 56a8c9049dafab291dbd4c9d37162162e1eeb9b058de347cdb5e02ba661cbb3e279022971a8e5b5fb097876b5d108a4dec363b98313c6cbace3dd201122ccee3
-EBUILD cantarell-0.111.ebuild 1280 BLAKE2B ed7b19599fb51e31a6426fb6ea0b0adb530628a7edbcfed2ad7b02aea0b08d62af7984c2f6ac00b23426a339a1e60d76d1d4cc9096b381d90cfe6b211bfcd87c SHA512 80624af6434884acb262d91b42bc4b255607c63af1303ebd73e2d0bc6a6fa0b08f179c21837bc4319c76ef1d512804edf551973fe789d5006e26bc8467e1d221
+EBUILD cantarell-0.101.ebuild 1245 BLAKE2B b569bdad8b7fe4022db0ab0250bcbfa62cd32226d509cff99273061635487b9fe2b168334de8fd5d1642cf81fe1687ff6c9c1b9698b558a7400a53435ae6c16a SHA512 92721ee7c85bad1e876bb6c4b91020acfe49226d20d4a4c6af329d5f21d62ae9ce1e22d8ba9b9e90d722c1d147b751d6d23349a6adb46c8711e2a446eabb062c
+EBUILD cantarell-0.111.ebuild 1270 BLAKE2B 343262d98986c11644c0ab999a4d565d90525e9f46992f9e5ea780cd44782d635341aca6e578494e7ef7e34d8aea614211a6659be4eec4cf575da265af450b9e SHA512 d44cc14f02242c9ae56188b0fbdaa07dadde631a699cac7c446a43e73bc39b9b834e307e781ba11ac0fc88219f862e2b6f02009b589932fca1c0532a6f07acf1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
index 9f4627bcce2d..39f0ff55de62 100644
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ b/media-fonts/cantarell/cantarell-0.101.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 ~x86-fbsd ~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 ~sh 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/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 6b7fe0e26ad0..39e8373a117b 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 ~x86-fbsd ~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 ~sh 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/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 12dfb11e8896..1aa049730d6d 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,3 +1,5 @@
 DIST cascadia-code-1909.16.tar.gz 338681 BLAKE2B a31c643773a5c51f2cd803c26ab0001c0d3272137d1679e7c2f77c05f9a35751bcd6c9f7ea6c23575d28d1312e6a3a69d6e0c64f1691817599606115ec2d54f5 SHA512 fcb2cb28250e7007e024b57d6cce8b0424b02eff016312397e25fb236e73813ba48a3561ff01c6aa2235c990aae2428ad08d49e1c2f97c0b8ea01498b3c9ec36
+DIST cascadia-code-1910.04.tar.gz 442050 BLAKE2B 61612a310b9f74cbededf060d826978d6f8c3af101e85380a4938bcaecbb0be11bb1975663d80009b14599a04f739d0aedf1d02e5467c4ed5b38708760d446e5 SHA512 2594f8bd01956cc594012746b33a5def6d68e1c365fb5ca43ee21ba19d295e3960e2434849cbb9be6d1a4b39920357b38cacd0480d7543585f616f39d6378379
 EBUILD cascadia-code-1909.16.ebuild 404 BLAKE2B 5c0e9fbadc0da470f4a3b940c775238d9633218d4015ae6cf80f9d3d82b3879eedb2827ab1b86d87ccbbbdf9cca8dd6e918965ac57217764fbadbd56fe35308d SHA512 acaff6c81543a971d69408931958e93f70ecaadf9ce968e9235b1d4ca7a94d586cf68781efd86cd8de61d0ac00b94834751c73426244f00fca8eb7c29db2605e
+EBUILD cascadia-code-1910.04.ebuild 404 BLAKE2B 5c0e9fbadc0da470f4a3b940c775238d9633218d4015ae6cf80f9d3d82b3879eedb2827ab1b86d87ccbbbdf9cca8dd6e918965ac57217764fbadbd56fe35308d SHA512 acaff6c81543a971d69408931958e93f70ecaadf9ce968e9235b1d4ca7a94d586cf68781efd86cd8de61d0ac00b94834751c73426244f00fca8eb7c29db2605e
 MISC metadata.xml 642 BLAKE2B 48b342f9f8e818fa5b1f48d7124c9c38eab178c08e54f228e1474c0ba59248d528cf491f7e94db93f468a5128755ca814e1790560c760ecdaf2ef16e48e9205d SHA512 59d1bce26c031793c04023b8011f044f76c7d647774e3c6c4f12280d60201994a70c0d95f7c64de2518f86e9050a200456a9ee2373fe6941a642f7471109b70d
diff --git a/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild b/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
new file mode 100644
index 000000000000..ee27bbcc4a30
--- /dev/null
+++ b/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="A monospaced font developed for Windows Terminal"
+HOMEPAGE="https://github.com/microsoft/cascadia-code"
+SRC_URI="https://github.com/microsoft/cascadia-code/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/cheapskatefonts/Manifest b/media-fonts/cheapskatefonts/Manifest
index 6995bbe6de77..35145e8a10f3 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 1140 BLAKE2B 6ecc4d3d6852f089c2941df3b98810283378961aa076fb4abf8181ad1b7579904a8d44287fca81b557c039d7d373f438eb56bdaa054e6fb950e7ba551d1d0175 SHA512 0b44dc4044a0e90832135ced13cebe926cd9e86c31100462475876b469e8d6eedf7e17849671064aa9d2dde3ca220b2ea9243d5a85e3f17a8909b045fa907fa0
+EBUILD cheapskatefonts-1.0.ebuild 1130 BLAKE2B 7146c412f44f5f843a6034ed3827405e29448db347bf55b0bcc7d424eb97cf6573e0bdc8cd3783ca41a153329a3afd03355ac5cf8f7a5f3ca7a012d77f2c86a2 SHA512 fbbdb80e65eb4d904e4e0bf91d581c8d5f58746bbb2ce06fa1ce074046358e69e6ec9df62c6f8afd7104a2b90a7f753c82e2f40aa7e874eb5450658a1e21fa8f
 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 0c158e0e3e2b..28ce35dbaa9a 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.dustismo.com/fonts/Domestic_Manners.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/clearsans/Manifest b/media-fonts/clearsans/Manifest
index 5839d77c4a47..3d704b930431 100644
--- a/media-fonts/clearsans/Manifest
+++ b/media-fonts/clearsans/Manifest
@@ -1,3 +1,3 @@
 DIST clearsans-1.00.zip 3972903 BLAKE2B a60df319173cfea54fdd089abd96d7e9a52d4e54c6248db909b73ed76217a9a4ab7312921e6f6d5e7677f0d0a2b77d8870447aef0cff2113718d0f2a400c4efc SHA512 83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d
-EBUILD clearsans-1.00.ebuild 500 BLAKE2B 4975b9218f3dd990355a7546df30bb5e2ae2b593fe5ce76e60a9855ba4b949937fec398910313f216e705f4ff852b22e15a97f7207f9232e8d19868d6d4bb54f SHA512 8657e950daa1c84afdd558b4b839c1a7c45220b94a0759bea1c5a90414da41137d6303a74b1f289d3a07fca643660bbac9ca25f9bd35ee357c44b86525ffe2e6
+EBUILD clearsans-1.00.ebuild 488 BLAKE2B 7c764d1be4dedb0fb2734e3dfc2ec62557314809332b60a0c30ddb4992434e727367bf64ed4603e95e6f449e7afcc62996f04861b97d514afb50b6011ec777b5 SHA512 9bae2c4410bfa5685ce7483ec9869a6f2d8609dabe8bd4645973d188d5208c824aac6e6872c01514be0075ad48bfc2685aaa8887edc66df95fb1bbcd07617ccd
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
index 84e618b3ff87..d8195af05a17 100644
--- a/media-fonts/clearsans/clearsans-1.00.ebuild
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/corefonts/Manifest b/media-fonts/corefonts/Manifest
index 526a75b79aa5..c04a5cf7f6ca 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 1472 BLAKE2B ccf921ae9e365b8609d0563cdbc3bd8d2f69d996b03b4dc677dd72c4b3a739f44035d4fa3939be23bdf9d796497c736437e3a7934939d972e1b0c853f8348094 SHA512 f6cbe34375db30af9516e8030730e4bd4ed5db090fa35be4c51f8561b9ed967ab1209e0ccb8d5a34dce264b1053d68b79df2a43bda8e10b6a69a389343c6b22c
+EBUILD corefonts-1-r7.ebuild 1450 BLAKE2B 2d1e11314181f7b497d918c98a2ebd99c62318a737ca1706d8c9be3e0edd1d6efe0b0bb44814b14f7dac55b7ba0ae9156753fb558f0e9a7ae0361a57edc235e4 SHA512 8c1d2535e29751a5bae3dc4135ab61dd4eb6a4f8b3f85f09b9f4b388ac65b01f649a79f88aa9214eaac8097aa5c0b9e58694b8663bc1f8a1636e162c5eaf1721
 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 47289fa29b14..8114f27cb079 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-fbsd ~x86-fbsd ~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 ~sh 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 d8941561a6cf..bd80ef07ad99 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,6 +1,6 @@
 DIST x6rus-2.3.1-bin.tgz 602902 BLAKE2B a42ea9ce78e16533bdd7c0336825d3361b1a655cf2dd39a6928b1a606d0fd68eaed5b1f815519d1bb9ec6d2f4109c9ffe4ac3d6ee632404cd8cf700bebefdc6c SHA512 0bc585724fa13edb27f8f0d275620fa01f35f885835a017428f12ca5cd30111942d7422efbc2a7e6b055325e1e8fb54bf58caadf2e981c56fc7f6deb96a75717
 DIST xfonts-cronyx_2.3.8-6.diff.gz 14285 BLAKE2B 91021cb3033fb6acd96b2f8fd12f4c621f066aabe7226b90d8a6a8da98fbfbfcb765a8a4cc7397b764b7b4c1f196c6e8a8df8cae1b7ae8c8f8981920f9b8ce42 SHA512 15703eda0e612b2cc29b16a4668fbe3efbfc3ffcea9bfa25ee47c4b3a7e1f0f8f5637b0f3c9b1239ab192f7229d56a433b8ff1b4366131d8d4c722f4451a1288
 DIST xfonts-cronyx_2.3.8.orig.tar.gz 269169 BLAKE2B e867a78511b744ca1b4fd95581c820b8932f8c17b336cc467f894324817b223b94179fe9cd5de46fd85445044e20c78ff067b650495eb0ba6e4781b05484f0bc SHA512 ac6e0d18977fb36ee255c57114f333dc5962c5a3f30dea8a6dccadd3831baa0d1b940c9a2fc40c56c043c8cb276c7a1bc039b555a68dab05e00139884b6b4696
-EBUILD cronyx-fonts-2.3.1-r2.ebuild 1705 BLAKE2B 19903bbeb2a295df521f02ead08583f3da29b3e2bc205845ca5634c26f97112d064d3ce5f9c106bd5314853c6e02dc00a1c1faea4fc22fa9b60687d2f40ca656 SHA512 283f226219071ef98fbdb525d458a2a6bc7d0235649536cbc8276c2917e33dd8b827b19bd641a52b381bac4ca9d34180582b074c0905f32ed5e088b61078f746
-EBUILD cronyx-fonts-2.3.8.ebuild 727 BLAKE2B 9351923b96d14e18c222c53cca5980bf35ba473f3572e03279045727b45aec13a991e3a1599ccb6beea001bb09183e1e67eff221c5775d28a0760d238379f2f9 SHA512 0ebaeada416f6f62af4e49e15d876b857254721096d87c3abba65568d4b4e26434e0ecf8c4f6e9e2488c2f63ea5698cdf89d4f6ea54764931a6e7b525337a82b
+EBUILD cronyx-fonts-2.3.1-r2.ebuild 1695 BLAKE2B 94df9906a6ef86eddef1483adb1ec20651eabdad8822bc7190f2e15686fa5b4f12942ba871d853853d27da1798ac7dfaa1ca0c0abc514b809519c9c631ba3be4 SHA512 695ebf9acb6c062cc60cf04b23b23bc98fd6b061247c623edfb0fda2d6007dad0ba60de338fa3218b80a89310173215c5ab5931afcd08cf1287e8eaf6b0c9dbc
+EBUILD cronyx-fonts-2.3.8.ebuild 717 BLAKE2B ceab53f0038b2f5968251f8335d5d21731ff5bf8164ba1c1a46b9b2e073f18c2650d770b58d93f565924a450c46a274d0461d64889962460912753c3021eed6f SHA512 a1c1c33f6c36e1cac582a941d3464049cf84b3ced5f1725e84f970c463275bdd58f0ee9eac12507f473b820c900b0fbc5d373e21fb93f1247bb72b210dda733e
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
index b3625c5d0613..8bf97ee3051b 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
 HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
 S="${WORKDIR}/cyrillic"
 SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 SLOT="0"
 LICENSE="freedist"
 DEPEND="x11-apps/mkfontdir"
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 bcb39447ac75..c420a8ca405a 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 7aa6fe799e50..70faaf4483a2 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 4635 BLAKE2B 5999d8f0840d3f97940b0cb02d28f7b2795a536f3e1aa83fe218621576003fa8e151db8ae9bc8e95eb071c6be741b02cbe6dc6ee934acc15a401069e5b1d73ab SHA512 33f12c82bf9631f27cf9f8af9d9017d17c606ce326ae204b69892208e8223b5fe12383dfc0a1bfe51e988038358c1c5bcb2eed8a21a6a88e36418575c5a5a29d
-EBUILD culmus-0.133.ebuild 4644 BLAKE2B 438779c82574c39d23a675f300cd27fa1af91600f242c2f32080c84d2ebee0ca455bb6a8b56279ca0adcffb072ede2754c96ec6f587e5b6cde1f327e11cee376 SHA512 da4815892512e79bb820063260a6f708bde4e6a9613a7d3b401934240de3f2c05616b247ddc0866efcd94846081e227436b2a5f902535c9dc0ef1ce72163c3bf
+EBUILD culmus-0.120-r5.ebuild 4625 BLAKE2B fcfa1992479df819b0cc50e85cbd0022f1eb2988c7ccf9d29fdc3169ac5e95aa9b0d75534054ed614bdd3c2e757f3b909c5218871d9b2654ee2f4b6a3cd0de57 SHA512 eca583c614ac13e4e5aee65d300947c6450a7022dc71677648133d2334fc6facfdc249e073715087ed9352a764ddf2cce78dc81e10ac62c6f68500008fe9de82
+EBUILD culmus-0.133.ebuild 4634 BLAKE2B 02d6e9a3aa6a9a8bb40e5a48fe743e138f8640133abf5af4c9cd25d0e4e6db55e7fdd31ace0c54b50b7bcde4e9dae523b2ab9c88942ed8a01b43c53c7b752f07 SHA512 83323e9fe6c54bec5ec5bef41bf01175f74a01f2979ea907e2345bfc78a33124d8dfe92ed48954f5094d00f9b8c8c548ec4a97421f0750d1cfa9ab16401b3f6a
 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 459dcc39ef6c..eaa1f5351242 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh 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 ff86f58b23a5..cc33ae78e598 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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 dacfb8e010fe..63072d43a4a4 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 2127 BLAKE2B 270c1984e80f59959e27caac5a206877b9a31bf3433ebeddaffd6cb4587b2317e21d3badbf3ea355f4aa4f651fa77d03cc92066e0027336965f75c0a7b878b54 SHA512 2430be4a4b9f189ad08bd7c222d202e5d1f2c69dba413f403832531ce11ee6744c7f98a3ec8dc5532af3b77f6551a343f3783591fd2036614bcde5890a98fa2b
-EBUILD dejavu-2.37.ebuild 2189 BLAKE2B 8f9b2a184cc4f9777dcd6349e6cb07f130024f3520c8a1772fbe6575c8450034602d1beb8d1ded6b3615ba67c7ad4b2e7985c4dee726821bf4fb404cfe87c849 SHA512 411935b14df3455555aba34d3dee25045622c071c14d8cf907cd62b180417cc2155d6ebb9287239113804cf718dc09e6c7b73de86f4cb85c631e430861ff9cb1
+EBUILD dejavu-2.35.ebuild 2105 BLAKE2B 18063325a3cec07ca26ef21bff8e12ed08d7e3dc7c63abd62eea7ed3c61c6591046ed4f521b7e6bf652300208834dfc9174895e47db10ce5016d464e578a36d9 SHA512 371e7ad0f3bdca4d03b5b46f259ddf4f7d4e059979167679128d074a4571b50451dd23bb1e1f826bc1fd636644bc4b001dfd2fc1a353ded74e6501fe40ef5dde
+EBUILD dejavu-2.37.ebuild 2167 BLAKE2B 93560cca556c45223144122b71732331d8b0641fdfb98c749b470c36c48b2a230db47b4f43aecc2bef678256812c854d997f633f513d78489492d46184728712 SHA512 913e300f1e569bd3177002aa5f8e2edf6a9d60d9a00ed17c5744a1a6b9c71099dbad5f08798c210f1381dc1a04236c8556b572419bca000037ad5a6ee23971cf
 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 12d919ff5a1f..231aff9c53c4 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-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? ( x11-apps/mkfontscale
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index c33edd6f118f..2fbef3de226c 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-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/efont-unicode/Manifest b/media-fonts/efont-unicode/Manifest
index 73d30a759659..6cadfb3a4ef3 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 647 BLAKE2B 95c3d40263affd7d6111fa22387372cd6f0ab1245b120742e1f6063fa7bf7c138758d99783b31303f65dc60c4e60d5359a88ed5f9a3b01f64d5f95ba25c84550 SHA512 a6266b792a5c72092c2e179f20d30b7c0917edb282a84dadf556e8e6d632e81693eb7b56c9e7ad5357d46272c1b55324f405aa5034feec29fbd66539877948d4
+EBUILD efont-unicode-0.4.2-r1.ebuild 637 BLAKE2B 603ffce8fd03cd574f3f34c49ed3f32cbe1d47317cb0a7fe9141881ddba05e327879b3683bcbed94d686526618e8e13e5fbff85f72ddbd325cfe70fc9b1b0f3f SHA512 ff874e9641b54a2081a585a3b8714231836416a0d0b6367ae1e577ee482854ba99717c9702fb2bc939ec473083c7690909e2d03b9d49f4a4913ce73a24377993
 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 356aa38adb4e..2508edbe1170 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 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index a191dedfe165..2a00ace34816 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 693 BLAKE2B ccd89a3f60735b83b205903f757771a50d5b74ab4c2ffb5a7245af674227ff79770d9214f1caec720e8b40132b0fdb28455689828dedbaea7071a13f3228a0e6 SHA512 ea476c1cb66e5ee78914e3ec039684101b4009a267dbcfc4e78cf9ecc06ebfaeccf5ff9f1b9ceee47405ebeb6fd0375c6d3efb277a447a35bae22cc3180e71cd
+EBUILD encodings-1.0.5.ebuild 671 BLAKE2B 1732e631d8b3bfed058a0d842f167367413c64580368bb67b033760c213dfedf286da775c04cbbf384b28bb5e8f3e508768fda7cf8e9e2c93604250728c974d9 SHA512 6e485ff2745a4457160762db9b07bf9ae5c0a125a353acedbf9285c48cb98a3996e157ed089a82099a91f0aa74231827bb77d9942dc901fe99a8337d691aa4ea
 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 6bc36202fd69..e120cad060d2 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-fbsd ~x86-fbsd ~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 ~sh 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 d057065e64db..4e52dd12f17a 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 507 BLAKE2B 5ad075cd969258fe9e3cf8a9e7f72456f3e24217e854ce92081917c03e509330ebd8ea867abf4ee6c572c6fb318206353066938a1daf5cafd2221b80267289d0 SHA512 82bd1d51d9c90990a27bfdbeef14f529e87f3b5cb6a1f85f11448e56b435299b4ca19868426d577b877b79acaa739c2d9a6489ef1e3ce15862dd0a16d549c03d
+EBUILD essays1743-2.100.ebuild 497 BLAKE2B 5d3be1806a797ebd6fceb20eca0ccfebc0beb719d4b00c67f1f90be657b1913041d0b7d3361998cf55a00f22fef8df87e4a02d5c90a9a094bd7984230cda28d7 SHA512 dfeaf897dc5231a690856335b5343fbf4ac719a967057c887a2f5ac4ffbc1752b93c1520512c038ef5f71a97823e5a4a49537aa0d08ef16d225040d9e5632e67
 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 d0e2c8e5c52d..fd5e6cac081c 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -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 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/farsi-fonts/Manifest b/media-fonts/farsi-fonts/Manifest
index 29543a70fc8d..85ffad605be6 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 511 BLAKE2B f456bbfd1cf43c22400b52401e8e17b0a51d9c8cbc41dd1ee55742577cc216aff7769f12f4fbf24ec288253ba26c2d6f70824c4a0c955ccadc4f75d9940e7c92 SHA512 db83c2e9436ca33afc7eee60fdd052f4f90881493428e181fee453683db245fb8e307b2901c015ee66de0cdfa78dd7796a8a987d3a807e802a546d5f008e4628
+EBUILD farsi-fonts-0.4.ebuild 501 BLAKE2B 7815b1a451055600d9dbbabec9fa05b138ebadbcc15f015f84c951759c915ddc6a0580428904c053d5648edd3af522f190d71fe0cec480c6b5080053f3e8c529 SHA512 7f336b31225768bd7bfd0550a37a8f5515fa00e5ef6a3ff5526a9907685c3f503cd04d467e9e3c02ff21d5f461d1b3c1e96fa680f5232e01c429bfba23da8a40
 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 c83abbf3f31f..e7dc251557a9 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -13,7 +13,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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 2ae1ee729a15..3d3aac4a1717 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 307 BLAKE2B 4e1d9dfb05e3b6f6df99851956ea10b0a38d47927231d943819bea5102c2fc0ef5495d75f8fea25d7fb31a92c44046939241cbffebf79f6050a043892906f069 SHA512 abf48faae41da53301e638251a240df83ce17a25acb32bd6414cec8837283364d142aaa8437a6784567c3e8e3795f3cc35ee4173075143f04ebb896661871ea6
+EBUILD font-adobe-100dpi-1.0.3-r1.ebuild 285 BLAKE2B 22c47510378a2bd06396fd01512086f6758777d8c600ac4dc7d5499b65f7c67e93fd2fe4e1b1e4a697dfa5704d92a859ef99301c19b1eaf26bcee2f2f5d8c4b0 SHA512 e6c12a57032331f1591af4eeb30a6ea9f89afd669b69aa0a59d604e8c9fef436ed45431c7349ba38c961ed569b072da18a86808514a4a4a5c3de3914d672f9fd
 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 32c80570cc4f..c036fd6743f7 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index 7710a778b0ca..8ec73588eeae 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 307 BLAKE2B 4e1d9dfb05e3b6f6df99851956ea10b0a38d47927231d943819bea5102c2fc0ef5495d75f8fea25d7fb31a92c44046939241cbffebf79f6050a043892906f069 SHA512 abf48faae41da53301e638251a240df83ce17a25acb32bd6414cec8837283364d142aaa8437a6784567c3e8e3795f3cc35ee4173075143f04ebb896661871ea6
+EBUILD font-adobe-75dpi-1.0.3-r1.ebuild 285 BLAKE2B 22c47510378a2bd06396fd01512086f6758777d8c600ac4dc7d5499b65f7c67e93fd2fe4e1b1e4a697dfa5704d92a859ef99301c19b1eaf26bcee2f2f5d8c4b0 SHA512 e6c12a57032331f1591af4eeb30a6ea9f89afd669b69aa0a59d604e8c9fef436ed45431c7349ba38c961ed569b072da18a86808514a4a4a5c3de3914d672f9fd
 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 32c80570cc4f..c036fd6743f7 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 8d3865505365..40138e2e9b54 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 314 BLAKE2B 4d546810f208244ebb495abef7914232163bc329d913c0cd18b99197a74f1cf8a914f6a93a6bf2771a3270a6b59308192a43e72590c03d22500557e0906137ae SHA512 e2fec1e037b999439b682a94f9dca5987fc4faaadf8b3ead9694e1b972753e8b59d0e20a861219cfe6d0c85ae2b0aa15e81ea094a3d17bb58a5f895c1410890b
+EBUILD font-adobe-utopia-100dpi-1.0.4-r1.ebuild 292 BLAKE2B 27366474245e0304f144a488a3225b9fc824b5cda6e2809196605cb5825023318158f73b9e2fb5954fbed152795a5a1bb959a6850f7efc107ef038ea44a3154f SHA512 9c8e4779a49f4cd8652d2ed20cf6d0c153a777dda1813f5b30c6cacd40d72c138dc246eff0dc67e45d032c9e200e2a9ab2a05655419a755b78f8c34c888d8dae
 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 8b2875995fd0..0b01ab673f57 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 2c9e24ad6e8e..154bc5876f6c 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 314 BLAKE2B 4d546810f208244ebb495abef7914232163bc329d913c0cd18b99197a74f1cf8a914f6a93a6bf2771a3270a6b59308192a43e72590c03d22500557e0906137ae SHA512 e2fec1e037b999439b682a94f9dca5987fc4faaadf8b3ead9694e1b972753e8b59d0e20a861219cfe6d0c85ae2b0aa15e81ea094a3d17bb58a5f895c1410890b
+EBUILD font-adobe-utopia-75dpi-1.0.4-r1.ebuild 292 BLAKE2B 27366474245e0304f144a488a3225b9fc824b5cda6e2809196605cb5825023318158f73b9e2fb5954fbed152795a5a1bb959a6850f7efc107ef038ea44a3154f SHA512 9c8e4779a49f4cd8652d2ed20cf6d0c153a777dda1813f5b30c6cacd40d72c138dc246eff0dc67e45d032c9e200e2a9ab2a05655419a755b78f8c34c888d8dae
 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 8b2875995fd0..0b01ab673f57 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 9951cd78f9e8..122c3dfed583 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 286 BLAKE2B 59898d3764a02738d005120e80bd65059d03ccea29c6a56c77f8c9506e3c1be40c53dc0a01bf0dd01b294130e1cb679dcd6bbabf85e391ce125a068e9715f6e8 SHA512 275087886033092eb496791b65b98e52b31e7781748c5f24a21e17092555f5ae9845365cd6a20f623bfeabdbb13107799f417737987a17459582768aeb766fed
+EBUILD font-adobe-utopia-type1-1.0.4-r1.ebuild 264 BLAKE2B 4a441e336295fcf33e06b6762bb17e585c21f8276c176ef12404905daa83668bd05f36cafce1a8b138a38e2d40040a36e964029a01a1180e0b907dbb422ca6d0 SHA512 3669072f3920c06f866a629a24f126f54e369ff95101eeaf22f915c8def7fa14c6d71fce15b2e55e8aa582bd86e18fbf2afdf1f7a32009eca3776d1798453c12
 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 2f538d02c61b..1126e2353da2 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 9af1d46432ff..25c3e5aab3ab 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 516 BLAKE2B 475083cd65a9c1b6bdfc7a49816547e420f99b1e3efda6e687f09e234838a9463e20730be615688058549f6a63c70e1878402ef250bd14c3587385342b3c9136 SHA512 505a5f34ba834235ddf1aee873c60b27ab4388e072d17e3ff1f8c0b1b3cd1c30fecd4d1b6e82fe8718c976ca9a94172cee0670e8cad2c2cf628c341ad784c7ad
+EBUILD font-alias-1.0.3-r1.ebuild 494 BLAKE2B 625a40cc05af84e3b4fa3687e2dba25265c16037c9c3e9206a2eb3993cc376cbddda64a78945d238e62a86aaf0f5e8cbb085bec08fa98a9515d59c676b20db8e SHA512 6f424ed52f28cef160273b0fd2cf4aadccd45ea865b9b9f415f2e0e0b8c4984dc46fab26e61ec1377ba7dc202e7017a32651c1d96d16ee2a8ec948a21986dbd6
 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 805afc47057a..88d1d3218a13 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-fbsd ~x86-fbsd ~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 ~sh 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 ef0cf9be844e..47466d8eee08 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 308 BLAKE2B 19b1d3c30ce5518eb644289017ad2bc60893484705afcceb829c567209780264bb1e80c4fa4f6304212a34a7e6aced5ffb6589468da727eaf9329e1313dd6b8d SHA512 acb3f3b24a1b4d2104c15dbf7e67de0b518d8ef7220bb54254d19a0c0cdfdbc22a1ff461b022dc6b8c2691a534aefeb2bf5cac1ceb0732b579007ad0b4b78b16
+EBUILD font-arabic-misc-1.0.3-r1.ebuild 286 BLAKE2B 757305a9fa79ba7f707aa7c4a4aa3b88f00e01f8dc923b1b1532c99788c0f49e77bda46bab4426feaf55866c1702091c261515b6e493bd98b26dc2b4448e9676 SHA512 f9e11acbf69cfc64b8b7a918cd61e13bebb40cf95cf6835b29d1040a651c286495fe6b37a6de75f6269ee3f98378ad9f5f32edddb11ee0ac1f90dbaa7e5eece2
 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 8025fc4836f7..8b49319c71eb 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index bc051093d7cc..669af423d220 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 375 BLAKE2B b1eb84da9c24edabc4c9bc7f28c2d4822d7398db268f27f45516a14058a8a251bbe748dd22ce72e7064d4585a140c7e896d1d37ee84da0a0909c1ebe10e9cd97 SHA512 c62ef7fe4214209bcf22581bbc9791e52ca8a63941ac107a8010a2ce2933af6ce0406c9cc665d187fee2efa5134b490d9ac69095163f1b553b515a250c648ce1
+EBUILD font-bh-100dpi-1.0.3-r1.ebuild 353 BLAKE2B d2e8722c65b15267fccd5c0a72e8246c690153fec4b171016fbfbc1a8e15f5c35197159d8be56611305d679179cab0b8f5a69135bfedec229b1e2bf2eb541bff SHA512 0638d465c9324458cba58ab675634705dd82a1bb344e988c1e94f534cfc8640b228b4680529bb0eb7700ac421395733533a79f985f3f39a9fdfb2be6721624d2
 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 4ec726c9f149..20c8a1c960f9 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index b81fb9d1ad00..50b14a568699 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 375 BLAKE2B b1eb84da9c24edabc4c9bc7f28c2d4822d7398db268f27f45516a14058a8a251bbe748dd22ce72e7064d4585a140c7e896d1d37ee84da0a0909c1ebe10e9cd97 SHA512 c62ef7fe4214209bcf22581bbc9791e52ca8a63941ac107a8010a2ce2933af6ce0406c9cc665d187fee2efa5134b490d9ac69095163f1b553b515a250c648ce1
+EBUILD font-bh-75dpi-1.0.3-r1.ebuild 353 BLAKE2B d2e8722c65b15267fccd5c0a72e8246c690153fec4b171016fbfbc1a8e15f5c35197159d8be56611305d679179cab0b8f5a69135bfedec229b1e2bf2eb541bff SHA512 0638d465c9324458cba58ab675634705dd82a1bb344e988c1e94f534cfc8640b228b4680529bb0eb7700ac421395733533a79f985f3f39a9fdfb2be6721624d2
 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 4ec726c9f149..20c8a1c960f9 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 0e81e4ebb6da..fd10709d869b 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 383 BLAKE2B dd8358a5894c9846bd47755787af6c34ec69738b4199d929c1e3a39443ad571dbdf4c2c0b77b4d1393d91ce0e7670557f031a67471fe2cb939fedbb243cce0b3 SHA512 2451818c6057aff3cab4107af45ab724b9e37340e73aaaea79ef21434ef9ac8a0fa75215a3704049a6d14b7aa2539df6c37ce95be6a408249047399c8ceaffff
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild 361 BLAKE2B 3e1978add593699ae191ad8398331859ec9e302db217c657f4e20b72f5e769b7cfee483b1b4332b2bb6519d8d6f93e3f83c27f637d87086d694939bcb6d3be37 SHA512 6733bf9150a8ccccb8362f38cd6ef798b2c74064ce0e83a5cf92ab644383ca56964145e2070b150971c009a0d7655b0ea995bbe1d7ce06d9579caaf6c6772e4a
 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 17df212ac95c..c84399d76bed 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 7a0f9174b3db..f21032ed0fed 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 383 BLAKE2B dd8358a5894c9846bd47755787af6c34ec69738b4199d929c1e3a39443ad571dbdf4c2c0b77b4d1393d91ce0e7670557f031a67471fe2cb939fedbb243cce0b3 SHA512 2451818c6057aff3cab4107af45ab724b9e37340e73aaaea79ef21434ef9ac8a0fa75215a3704049a6d14b7aa2539df6c37ce95be6a408249047399c8ceaffff
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild 361 BLAKE2B 3e1978add593699ae191ad8398331859ec9e302db217c657f4e20b72f5e769b7cfee483b1b4332b2bb6519d8d6f93e3f83c27f637d87086d694939bcb6d3be37 SHA512 6733bf9150a8ccccb8362f38cd6ef798b2c74064ce0e83a5cf92ab644383ca56964145e2070b150971c009a0d7655b0ea995bbe1d7ce06d9579caaf6c6772e4a
 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 17df212ac95c..c84399d76bed 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 125bae7e7d0d..8959feae2d4c 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 326 BLAKE2B 61f2282d83682e426602aed25879ac193dcde68ad076c67d711d37c823d748c94ce3b6d3a2304c9de8f0e91d28949e31d1b9f424bef6ba9635054497afe576e7 SHA512 a3604c46aa23e29ae540f81348e1fe7efe033ebd6015d303838895754baae735dab7004663d478394b09f72f7bd9e4f429a787b4686ad20b8f3b0fd357491abe
+EBUILD font-bh-ttf-1.0.3-r1.ebuild 304 BLAKE2B 94d97fab5b4fbc2fcd71b3d77f8dd84b22a40cb848eea2478b47658130da3396cf7682bdbe728aa461ca7b738257e2738d1a319d81d037ad30b6d6024b6d34fb SHA512 aedb5376844c433a91814d6d466e1cc58e05d07fa6d0bc36f28dad34a33efb373deb97bc64cf0de0904ef44150c7583a85bcb31c9255ce0d37acbd8aff879732
 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 6af4e42794b5..cc72f258b62b 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 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 34317b61a466..fabe53e97d10 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 319 BLAKE2B c0408bca9ad5706db34fbcd7243bf7999f251aab6f02cc5beafa531d9844935faf29a07250737a2eb8adb981de98b6421e3e4343fa27101fc4f40792d335cb9b SHA512 5d153ab08aa060910ea18ffa1701cbcf25cdff44380a3612d97780022dd0dfb9a7887eb907a23c279b026327d5077bcf9412f1a2ddbced14343ac5ff93f47e54
+EBUILD font-bh-type1-1.0.3-r1.ebuild 297 BLAKE2B 0b6641d7544205f7a189df7b6d80cb935f68ae80f1a20b39ea6ca42d69642d6b102fcaaff1212a4597cda28feede1dbd4d74bacd3d5ddad8fb7167003da673d5 SHA512 4f330ddcf9a77efd782822ed8293bb2bbe3f51b30c48cda7e55fc9e12ecf43c8a14b9e3bb80ff175076542999a98fd4f959476c9d8bc415c5f66b5859cdb2f47
 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 4711f533aec0..faff41d157cd 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 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index f57989a34ce0..5589446253c6 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 311 BLAKE2B 7dca945aa6dbe3e065dc3d3f2bbd93147555354b68a7f03c656ab4e55b6e9ea296875fa8b7aa9d1e0dfb92ae468012e9d00252d87931d90ac9489e15b2dcdae6 SHA512 42842d7f4a109f2c40df73343fad4b06edc601a9303b93d71c6d0f903218965d71df0741e278f4255d1e23fb3ad9cb2c36d33267f1f57cbf9d059a937df56664
+EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 289 BLAKE2B ff9c485f116b7af3a4e3c156db6d43e06328329c787aa6ee218597d89d540f1aca5230d620a329f4dd4fbc5c8634807f7dea60bfe6d61d09c7ff586ebe0a3ada SHA512 b129ee8ea4ecb6941ad20b7728b1c2c6becdd477007ef9ec439f80a0b2ba9f5f1a7f0a75db9b0ebb64ff730463a946c03e9c7bf733ba7bac72ba7df9e33cdd71
 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 b9020d419e67..9b356434e0ac 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 0d65e8f25822..0e504b468385 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 311 BLAKE2B 7dca945aa6dbe3e065dc3d3f2bbd93147555354b68a7f03c656ab4e55b6e9ea296875fa8b7aa9d1e0dfb92ae468012e9d00252d87931d90ac9489e15b2dcdae6 SHA512 42842d7f4a109f2c40df73343fad4b06edc601a9303b93d71c6d0f903218965d71df0741e278f4255d1e23fb3ad9cb2c36d33267f1f57cbf9d059a937df56664
+EBUILD font-bitstream-75dpi-1.0.3-r1.ebuild 289 BLAKE2B ff9c485f116b7af3a4e3c156db6d43e06328329c787aa6ee218597d89d540f1aca5230d620a329f4dd4fbc5c8634807f7dea60bfe6d61d09c7ff586ebe0a3ada SHA512 b129ee8ea4ecb6941ad20b7728b1c2c6becdd477007ef9ec439f80a0b2ba9f5f1a7f0a75db9b0ebb64ff730463a946c03e9c7bf733ba7bac72ba7df9e33cdd71
 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 b9020d419e67..9b356434e0ac 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index ad42b4aa5404..a59de10d1b4d 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 277 BLAKE2B dd4ed08950bb2724cf4024c0a845931d2f7a6e29c15ff1250b924f6022fdf783ec06a4db19347925e9625c6f09e12dc3c091c52d78aba1948fe0b8d2ac1c1456 SHA512 3760f5437897cde3119673605eb7e25b5ff166dd389e0b09b28cc5d27353522b9d7014dc00e78fa54d7cae5883c62721f231475df7214c495449f40c0ec9b82b
+EBUILD font-bitstream-speedo-1.0.2-r1.ebuild 255 BLAKE2B e1028b1eb11d00816d878ec35c7c105556a515777b969c73c9dae27ca42f4c273de7ef29ed0cc7a4c8f762afff17f1c6a42ae97b616b25a01cbb93df1b6aa825 SHA512 5da7440585b1be3a3ceeb7ac94b07a81610efb95ad7567d227f1cad938d36a3c7de0e080d025fd448c141ac676447c21d7cdce24b08410fa6fcf64eac6adae48
 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 fc5ab16a94db..ed7b358a6039 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 48142bf2c5dd..327b23cf9337 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 288 BLAKE2B 876ffa1352beb29b67cb0d4bbc3497e077c2503f8d0cb43d6ebe1d266907e7a18e6375f2299024ffe28def8684cc29f50bbeb9740a955d901faab973ce3c108a SHA512 0752ac0ce8d4f54a21ce6ead9b10ac1da1519501b5be3d8ac0f0e88685571b7a588c4b62383a6aad01da9cee3bfb542029615ba19f59f3cccdc960561e0028ef
+EBUILD font-bitstream-type1-1.0.3-r1.ebuild 266 BLAKE2B 9eba60b2e31912cf45143e0a4d7a35feb6286bdcb2391374036c4a1afb4e7df141946b204c3abf0553dfd01e841fb4001b35754555961aee36d32e3bcb11120a SHA512 2f7fff0fe392e57bb70b33eaa0c54e943a18cbfa170a35105d1c34f25bf00204c57f149f79f396367178c7c9d099903c9f924b57b805f1a438b761cbd404b3e6
 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 90b8b64ddc97..b8449bfaae14 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 85fb132d441c..698153a40929 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 310 BLAKE2B e5e54f133e5abae56063790ff7e60441c221f462aee1aef1a9ce99e2d9c87f7e1d44b69e6de2d6c3514349e9b828d957b9007c2250bfa08a302774f504e640ba SHA512 6776077e198ecbab091d3ac69b2ddc5911a171ceecfe7768581ac9590a6cdc21d6f89b438ba6630352254235a5756a8377e84d4672d07c87eaeedf09516596fe
+EBUILD font-cronyx-cyrillic-1.0.3-r1.ebuild 288 BLAKE2B bfeb1aa246c7f71e923b570c2e70454f74e7fd4d8e0efa7c84592fc7935bb834684fc429234d0e5fd63a723711c31f066aabb793c401c79cd87e8afa38a33f12 SHA512 97b54d2d777ca328a9b3cf397f58c6c39c1b02da98be35aecb140c7830ff062a80ffa60ccc708b3d84386c717b1da47097315f8d1d1767163ebc6c7e5f759230
 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 e337bc61457e..bf75a144fdda 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 2e2ae22ae3e3..90fe006be91a 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 307 BLAKE2B fc44ae7aa09e341a05405bf1858e446e3036392cbc05976a9a3c4a79e30dec03c33fbc1f893fd6f1a46da4b9a8209f4e63dff4aca0de56ff7b9cc08cf0bb29fa SHA512 47d19c2afca85cca96ae4baa64258d53ea0137caa704ce95d34eb22762184d3ac8fcfefba5c02da92eda50fb83dd98fa26a0fb0841a9d817a2ebdde083f55194
+EBUILD font-cursor-misc-1.0.3-r1.ebuild 285 BLAKE2B d8262a90934a50706151b492b6b8d6d34ec95170c77b236f1a452f40a5f3dfb35bfb330ccff2c83e18b5df319d5772ca944830708b416495827c4f03824fefad SHA512 4712e68399f6f6e82531e2a1950789619661ff49835de3bd2cbb8c40159ea992a87b3e7576d1088feab0a78e79738947aa5a806d6fb627029a6031b9c3e55c66
 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 dd9742e54115..d40186432d21 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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 ccfef6608f5e..e336880c2eba 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 301 BLAKE2B 26e53169ecb63ed91e9005407fa92431d480191f68e5e7f2f36bbd2ec24578fbd055d32ada8b81f3af25d93ca3593b52bfc705cf73b6c2b766c2f1900fd08ff6 SHA512 75a73eadc270638e4c1cc24fbf99cd4415a596481c9b8feacc2df9222d692d82067aa1e41eea7864cc43f659a6f01b7a7bbf7728fcfc647620d97c6a75bd9be6
+EBUILD font-daewoo-misc-1.0.3-r1.ebuild 279 BLAKE2B 8e823732c86e947008e5ebf3acaff6d65872ed38682b6030ed45790ea8d352a31daa97d78244e1e17e44cfde811b2829c00826251e912f2660082423a73d453c SHA512 ee0be470196c9110e7d841a7831640f9247450c3de5da759598218da96ae5ec118db8f7cc63bd3cf3ce8ac979ae804793d42d8f1463fb99bad0d4b582b480444
 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 56627462fbe3..8420e25e81d7 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 1bc42b244dc9..63e36764b993 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 298 BLAKE2B be2f2d5703b098fc5d149974adf112153b89c9b06c2ade3aeee095010e3dd6093ef41a10856b2dc5b2a2f54f0dcb3875b74981dc7119ba3986f995385a1da63a SHA512 96f0098fc645dac4758077b09b7e3cedcd9e59431f0930d439f9f77d47ab448d713b6430d753582b467094233774554e14ab0c518f81dda674833b9341c78eca
+EBUILD font-dec-misc-1.0.3-r1.ebuild 276 BLAKE2B f83678c326a69ac35e351692e0b0c911d91448bf459282fa5f95913621435f6ad1759d999fcc95bfb668973973a2d2dcc84ef40636a5415d9da4444d362816ec SHA512 d804ba45ab6bf2f4b34d5e9ee33d983fac4fc21bd1959008821021cbba3e821373ef24f8aa1a4fe81605139646845c3c6dd84b68d18f7ecd8f92ab9284b46604
 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 99355af347e7..6c98992d503e 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 46dc7c075652..557ede73cc66 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 277 BLAKE2B 863a84683d622d9a146858e3d7325510b7cfcc02b6645f06ab00aaa5f41acfa7ee925ec1d40826dc7cdd8bb82a36a8d0b2a85f54611e603d987305d752078d93 SHA512 f724cfe61c6a0e384197d407cb8efd482f327edd27b57905808085743048a3e31f69ed242d70dd5d99ddf55ff25897b2ffb3b5e2df234290e408475ba2abd716
+EBUILD font-ibm-type1-1.0.3-r1.ebuild 255 BLAKE2B 680e3a45b59492f20758c5a6e6ffe82250cf45c533ca797d5268068f5fc58647693d682f13234060219ad9dda2da9c5ec6ff4d69775003576dadef5a61bb7fe1 SHA512 86cba87ba95a281d10ced908fbf106debf692de35c7d0eae65e55f2e17b60c158d52c49e3dcfd8aab5964208c60f7167ad160692bf26ca35e0bd635001f19d8d
 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 59e57eafc9a1..13a4f12c6443 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 8c74782781bf..4d823aecc170 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 347 BLAKE2B 36736b88318c523128d70b3d00d41e5fa08db090c05a90805b5c5ab10beb4f45eea3feaff6456ab244138e75809f07ee718901042ec65a11c194be9c8c44d949 SHA512 a0c4847b2984ae7e6743abd1a074259a9ad8a52f312ca14e6fb09d6f94839c3aa55807ebc9c47e639e4dbe31e0dae4492a9e2f5ea129846559ecf85320223612
+EBUILD font-isas-misc-1.0.3-r1.ebuild 325 BLAKE2B 5b842e5d8dc0b0915e91a4d892cf1d8c4970174e67382ba77bd379286c786220094012f88ea4e0c05a08120e1c8c922939fbeead1b5f622f8996d9b579363c25 SHA512 7a311aa1a4972bd0a4d6cdd7e49068ebbc85419630645753c4e652a22fc589b3a0992216a2bfb4fe2fbdeb34c743bc0b3e2380e7700dc2f2ef7c6aaa145aac79
 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 08c4afcd25b5..91a7b9ebbb5f 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 4d1d8781ed73..039f455ca278 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 308 BLAKE2B 7b9c9f4a0894a6ec9d84ef21755ccddb7bc66810faa5b695da3002df3c9efa5c4732ab5d5d86ecbda5f28bb3dc8104a27548266f774b0f1ea1a3fd4accea3f52 SHA512 3a6907f7da7a2f1f29b2a15fcef421147dc0ac0a2a7729614e1aa4e99a97456ff7851fb689a6749e25afd56336292805032c7710e29082e5502c1783ae728b97
+EBUILD font-jis-misc-1.0.3-r1.ebuild 286 BLAKE2B 6d45034f8a68f18aed1476ebaf0c20289e7f4e5efe71798f358036a9f4003d7d7ff546b71b4d3185f2aa663e6ae247aac7b1fde060fe8f95e4ff4238a224769d SHA512 193cc23729ffd7d10416790df2903686cc9609c7d355726479949e388e6dbc488ca6a30547e3c0bf561db4bc03924d652d64baf57edf01be9d0e2c57cdbc7e20
 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 fafddfb6b983..93a8458ec561 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index dfc6b46392b7..ab2544cf1029 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 328 BLAKE2B feb588e4636aff37eac8a6f05df3cf2e875c8407fb8c86cc603c0a6dc59061b448add07689e365b523fb1f43c61206b8cc27fd97e0d7f318c1efafc570848ba3 SHA512 5545cb80da6da26f850a86bd8af1a09f9bacce6be35163a625f8ebdd32d955021db475253e7723a43c59c6717f846c184a17cdea4e2abf3a1ed47de9991edb78
+EBUILD font-micro-misc-1.0.3-r1.ebuild 306 BLAKE2B 2a7c3c00cea16e81c7cbe824dde3b8f83e555be05a7a22f7ab88daa8df79308f7544f97fe8331315c190b5801a3eaa9fbe693589e0648823152983ba67a4d063 SHA512 cd59b5f60ae1f3d130246fd145c7aa1429029bff435654a0d4d75c6eb0c8af6e8f1da54ef4c555d5a83264c239a4dd39fc33682220a48aac27a6911855c90972
 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 3a04e9f5529e..ff8165f6aeaa 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 3248e7354874..1b2e5fb23dec 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 308 BLAKE2B 9aa69d9170eea8b1c1448f94311c57a6396210e3d378ff3b52edf788a95a958f6038fe25d88743c2a9494ac7c69ce225f6d621b438b8a77714a6ad3aa7de65f4 SHA512 cf090e6362f33979bf02a3490c404302b59795ea0098493a35a10caf3bdbae5be40b508e02c0d68197721bb70951b5e32c2c53104188b74b65f2a281a800d137
+EBUILD font-misc-cyrillic-1.0.3-r1.ebuild 286 BLAKE2B 5804458735bca59e9d00470718fc027e05dcd1e29d1682bd661654eea0bc75b14f0154c9e99c08cb3e056eeabc83e3a42cb04790b95aac59fabc00a2e199ecef SHA512 776217778e5c027f0bd247a2ebaf94db193b4a2421f4a7016df536b9e21067409b7d7a8adf3ed233ce631c57002c65a8bd7d5d5689980cdeb8d5a46372a32e63
 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 223522cef475..65e63e2e1364 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 78e0f24589b2..043ae1c0e42a 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 544 BLAKE2B a5932f78beecf6c764bd0d7d0613b4b8002e843f256d884fb194137e2c8acd29be9eaae240ea743dc0cf8c0f052a2d1a4d0c2a544ce186bc2bbec7a22de7d9d8 SHA512 76e118ee4fe6d172459472ec73b2c5344f6a1106c18cad45148b73c1653b54a0138706141d9f6bbf1ba59bc5613a3e7e949e4435e11801b54a290e9dc47d38aa
+EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 522 BLAKE2B 0777572e48368d787e4b4c99468d0cd7edf8b0770f9d7e570e44cc85a599d8d3500636f762ba5cf79299c1539ea8409c883911200d1be2bb430e3e7d40a176e3 SHA512 b511bb7a005b52ae668aa264f9fecf11b854cee469469668f82ac06eb8ee3d249cc915e38c82130778b88d8afcb9856305fa36a416a9d4771826c91d35c449fe
 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 0428a508d971..2760b862736b 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 d6356131a37d..e4c90e54fcdc 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 294 BLAKE2B 1c2be6372eb2283998d5f6d1ea468dbffc5c639050f20003d199429c6fe20f87356bed284dc8050dfca5467f3cb2e6c9b8d566f70e25f25f28be8532c880f167 SHA512 ea6f5735b05ce1cff414e8c816163f8dac49f5fd6e3b753bf55acbc63ce43a869b5e99e6fb43b385ea374193aa0011c3bdf50489916c8b461e4f959425147463
+EBUILD font-misc-meltho-1.0.3-r1.ebuild 272 BLAKE2B edc9e0cde7fb4c3fecc91becd9b326a6750d747a50995986ddae0409d2038c50bde7d1cdbe589c1abc3f7f2527e03631378b752308287f0524f581266ccb38bf SHA512 3d7bb9268c091b1ea13c0429122c3aaf5d1e98378657b9ecb9427f4529e1eec41ba3358c84e30b2fd0dde2fb2f43bdef7193926e16d22a1d5b88c9d4eb0a9505
 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 60b85c3ec9eb..6c60f6f6fb0c 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 95a3e384dd31..aa663162cf25 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 402 BLAKE2B d3720f0ea605ac41236488e86ae25ff384bce20aec4b9d209e2d5272907b42a371704c13d36def4902dbb4fa63a3330809b812d9984605cf203758ca7e32c12e SHA512 214c0c3966cf5bb04adc696617a50ff793e6a2450b1b17e92d216b82d1a6ae62d21e0640e35dce574819fef373023c14f931980f80943515d0bbadb10dab9f42
+EBUILD font-misc-misc-1.1.2-r1.ebuild 380 BLAKE2B 4f9f9506b07850fc1875b8b6dbca32a2c6ac5247b6808daea48f93fcac2df122c8071478a0ec079dc6657efbe1620c427fd0ed26aaebf385a838ab4a330c073b SHA512 40da757e9a4a5530889c65431eb3841ee24061e96b3a557ced56d8c472b071aa1913911ca8a5d4a6e12624389910edcaa96c4c1dbdc46c3e9de4b75d27906b5e
 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 044238341fdb..a0478266925a 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-fbsd ~x86-fbsd ~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 sh 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 710f7a4b05df..c39dfcd75953 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 303 BLAKE2B 23d50b23d5913e135e5d8796e2f895d4caa6743311ee90f8fdb32832ae4125ad541d6b0a5b1046bc6f3bf26553e5cbb7bd2cc32bb128a61058cccdc90ef2d77d SHA512 1148740a60ce9e63f84f4d4348383ba21e35570123aa73bfa3fc85837503109fb3058a59844bae5f16daac469c803352f8672f10d5df2d5bb084022a4985b8a3
+EBUILD font-mutt-misc-1.0.3-r1.ebuild 281 BLAKE2B b10077a2112485622e6ac78e499dcd7f67cef21b5c11d695c5c127f30617a6856c45b3d5ab1eed844e2a38e9022191cebfc627b8a3ba498eeb678a9cb11704d5 SHA512 d3f73f403ed7838b771f59ad3973362a7583c921812d2dea66b0beadb73f42dea9c92be25e75d274e567d8f10d47f7d507eb1d25e1572de177084062acecf8d2
 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 c071a16705e1..3eb618ef9535 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 5c06f4b8015d..05239ec47f37 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 305 BLAKE2B f63ff986a81c9ef3ff5055f602f5dbc2c88996eb167c7ed28e91c66c58e76dcaf9220118b0c20b72ddf250f47a5264a357e88a91d9a911743312b62c2eadcdc1 SHA512 0e08c7d7ae16e2b3c6bfea432e80a2393e7253b1e0052c62feaac1c28c08cb5fb07fd3b51892e0047164dfd7921fe1fc6290aa78a8e46b1fd43d54068a5df41e
+EBUILD font-schumacher-misc-1.1.2-r1.ebuild 283 BLAKE2B 1c95aab114e53f1818743c5bf6836fa5b7e7d926e7666d64e0f58e3f7d513ea51d6b5e76992c1db7ce0e7a5fe417489c755b454cfa12ada8d367ab056c6d979f SHA512 673a4e60550585ff4e64e89858a371c42bd06bd286073df8cb4403ee9ebfa808d2e30f500360f7641d43aa7ad8ebad07bc7cefef382846339991c844111b16ca
 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 c97053d0e309..b8e6d26c0706 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 20a51f8e1689..a49ed674774a 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 310 BLAKE2B 40878372b14b47f504241a26505980d4bdf850bc9304edfed44d9104d517b4b21fcc2dd9055882b5f8b89d1b58ee0d7ae28e4d5af4b19c7cb5f41fe06204dbd4 SHA512 3a46186fb17c4be55b5b2aa3685b745447e1f47ec26998e0965ed0d8e524feb1657006398fd7414b8dfca965bcf140b6b6b94a7d8a81177298eae74e5aba9d24
+EBUILD font-screen-cyrillic-1.0.4-r1.ebuild 288 BLAKE2B e08df5080e2e159f0b7fe1154efa7a05dd24d35299f0ae243278e60523affaecd1b7bdb699b973d31c9947a7d1059d4410fb526a06dbefd71fe20c9d1bb771be SHA512 0a2b1cc52fda4f8e47a78790457d949234c4a99ec2066c6d681910b33617866840c9eca3cd7b4024f99242c06ff6bb2ceef1be377bd8a73c72fc8908b41d4ba8
 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 9e24a3b1f0b0..89e0da1f44b4 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index a312f5b0d3c3..e0afba2a009f 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 299 BLAKE2B a066dc88d38d3b57057a41d7b2ccab6671bdddf02a0aaaf376bb3f6b1f1574702554e20e233f92f1a659d097f2187cd585f4c645955e957a47737f9fbba348cd SHA512 bb0dc82e34e4437ed0895dc9218efe1ee77f1fbb099e051ad5afb1d2166cfa96ba77cbde4f2e94950ffb84b91b30760cd4c8562c6db8f28dd97997151a48e89f
+EBUILD font-sony-misc-1.0.3-r1.ebuild 277 BLAKE2B c8669cd4b76df360925c042bba5ba2d68ba40def71652c6d4d0a3e694529ad556353b51dc3da0c39467dec1f42ef8347ff0610d39c7d9d2d9591ea111e21c818 SHA512 3e6e6c980f263919949159d30b191628ff95c38a515e483ae041cb5fb4079a9aab7b5b7a84a9bc9aff09a92eb87f76b302acce77183c993ee81013149958d2ac
 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 b8c0766de49e..9ff157c6bef3 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 27118e89ea81..1d064b8e721a 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 322 BLAKE2B 5487126bbe7358b6508f150412ffc8a5ec87fbf41881dcb7ca8fe3549ec44fad543b7c6a2194efcce622a53c59e6c35c85a2a46ae689377b331769099713f174 SHA512 de4786c6dff92bcb0c807798ec6b8ee0ac09ec9b01f0c671dcf288f4ea66b3420b1a0459f5c7f28ccb9699c58404d7c8a3f5e53b606bbdc7901276b7969df8f7
+EBUILD font-sun-misc-1.0.3-r1.ebuild 300 BLAKE2B 1949b58f8852bac7a61240c3c003c0d7a394bcf60c63ea0f7dec211d6bdfebb4283c0d3c29c688bb92859d2733c7ac85e33589492492b2b2e4365e6efa393c61 SHA512 b0cfcdde2af48382172bdc52cbd8080ca95fac67533bdc2a7ec8cc9cd26b4c9c8dc2e09637e6d23481a28aa378dfb160dc535bbb277e2543dde303c63b2df34e
 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 010123af1d71..cdee730f86e9 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 df604faae46c..a87c9049f299 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 637 BLAKE2B 085a1e696ceaf274e46ff08eb1da7b6e2eddbb590facbd0785b8b02417d4939c3f175c8ee4641e919222c9ce952bc8ad5a09ab404a0a0fa564b00a2c1abd242b SHA512 7f6f3e8fdee9621034c83a5396fc3bf63cb60aa3603335a7948113b62819bcff2dbbab92af1b920c435106432e5f87feef7c3a738fd624f412a8c2c0795522e0
+EBUILD font-util-1.3.2-r1.ebuild 615 BLAKE2B eaf41960a5c9fc30995575be461b6e34221ca3b86132329f8d355137ac74db98b73f78586ebac6345041f63c9507c1aca7258250f8e00b8d53f600c300d4a6d4 SHA512 751ed83d1a18497a3cfa8769040fee7baf992b8b4b4f90389af945dd8d69e6c419353b80297b9b1ca776ba85ca7fc8b43f1edfc685048177dbbf7851a013756b
 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 007e3ae66794..e6361e5fe4ed 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-fbsd ~x86-fbsd ~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 ~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"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index e11514054d04..f69954b19324 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 311 BLAKE2B 2a7032cb2274d03172210f50d7edca2f7cf187cb6faa17ceb77486dbe82bd9d6229919ac21db46c978b7fd4b903258779b71c19a7fc5c5ed935aa48e0ea7b46f SHA512 b407554bb392f78d4c01d993ba29bcb4ff5690b538e3eee920f1469118b934dacf5097a7b6f7592d08272a3d14b0afb13db7bd851b359fcc4c6b1fdc90c6cb11
+EBUILD font-winitzki-cyrillic-1.0.3-r1.ebuild 289 BLAKE2B db92756f6b46ed73d1878ce74a47bb93a77d44f4f9f17f075b123c56e37c64a36f8ee31ac5730ef6a1f1ce4999f449e55accd5a65ce907c4b69086a8918550f7 SHA512 5aa453997918230cc9c648258af4051ae411e850d0d870ede852c6c613c37f69a09a4787a959b384168c56ad19302edf661dbdab87e0a3928a0c5081eca39873
 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 e1e2bd209e20..fade1862f1d9 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 35dd8cc77ee3..32dcba9baaf9 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 280 BLAKE2B 8db321eed346b48f3529606bd3961cc9d939d06ee8c8b9d3ed344410402f8c0fed12dbf0ff4f0286c37b49d59e44544ad0918188f3e7915666db25c191286476 SHA512 8e02ab66dcd5131dd636ddc9d8ebef0acaa7443cd471770d326d2f3bbb01638d6d74f4e12a7dc4f0e2ceda4f8e207b958cc15f73d91b2be9438a9aac2a1b0ae9
+EBUILD font-xfree86-type1-1.0.4-r1.ebuild 258 BLAKE2B 75c27bcdd14d1ca51f1cfe0d046cd9ab3265666d54284f4018dbaffacfa06e266bd20fba3063af89f6f533de1c2b5daba9060f785f0c0b43bb1d86d0c731c21f SHA512 10833f652edee503bb802d7c5d8732465fe2bb3494b1346f165117d45069c2968680dc38f33daf70bb562236a70dd962f82643be07299dbb333d80b25de62c6a
 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 4f7bd70015f7..cfeeda45ff84 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-fonts/free-bangla-font/Manifest b/media-fonts/free-bangla-font/Manifest
index 1378b5367179..3b9f7f18efda 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 1007 BLAKE2B a264b13073c3f8eb6e0787830a25fcfd966f9ed3e195efa851682c531df9838862fd9d4a1f8a5fcff719d1926d30b672f69d820f2c9cbc270aa63b90f6fe17d7 SHA512 1062a1bb9957813337db979ee690048fdb546fd3fc878cf5d06f3eda7761c3b4505b67a5520b3aba7a16f83be15f34b49994958697ae4ef7bb0be3f7c5c00133
+EBUILD free-bangla-font-0.2.ebuild 997 BLAKE2B aef780cf4f0c04be37428983cb92228766e051ece787db1e301aff0894c12b9d49ec26a7bf30b34136b2e7ab651ee7ff87f0b447c948cb11cf3846d60d4f786a SHA512 dbd0d534db0e14b6ad2d4bee086fbd67d6f57d5cdffd0b2bcb4e5ad24c46af884496b12dded329c474d837f019de86af780f02e289d893fd46e5f319ecb550b9
 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 67e4922006d1..5353896850eb 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
@@ -20,7 +20,7 @@ SRC_URI="${SRC_BASE}/${AKAASH_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh x86"
 IUSE=""
 
 FONT_SUFFIX="ttf TTF"
diff --git a/media-fonts/freefont/Manifest b/media-fonts/freefont/Manifest
index 2fb66b19f181..919ca750e0c0 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 639 BLAKE2B 3ea12fc50d04ee511e5b7d176f72aa55e096f561e0dd9dbd46b3f6ee6cf5d3361759b00693db7e741838ad8a796a9b63db6e3909b322642bbe5502f217222754 SHA512 b70b7d24d34b2ee554c6ab1761811f10ebbf7efd9c2dd3473b29d3807ea4ceac8986a606178345c99724c0d1773addd711d7f14bf7eff63d39f7816fb9e36b84
+EBUILD freefont-20120503.ebuild 629 BLAKE2B 3c4de44c140fccaf4cbf844b6c766b718512117f3d7217da96c6381b06ee26aea8e08fd456c7c71bec3ae1d0bf440e945ee6b91552f6eb823ab36bb5d8d252e8 SHA512 679c29573da314981dddf814bc69b22da80e3294cb3678d49ed80170337d5015f1a3bdaecdc7e1a709dbf13452a87aff8451fe321dced163d57c8792439ad4fe
 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 51f4099c69cd..94771b0cff88 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/freefonts/Manifest b/media-fonts/freefonts/Manifest
index 5b4cf539985e..1fdaf038ff5e 100644
--- a/media-fonts/freefonts/Manifest
+++ b/media-fonts/freefonts/Manifest
@@ -1,3 +1,3 @@
 DIST freefonts-0.10.tar.gz 2422824 BLAKE2B 9ceec3e86786957a2949660528de128a40e5d02dc15d28068d8ac2d8b61633dd8d3060085e2c7b20ff029a0076f789137a28830bf90ca00e15f95ebce01d8015 SHA512 21b911cb574015b6474b125fe20be6670fe32fe40e6534e738f8d0b527d3b7a8000843206343187deb565970e04fa900eeb5eae43e14b19a7acbeacad6b057b5
-EBUILD freefonts-0.10-r3.ebuild 479 BLAKE2B 1ca0378b4fb81f228a87fd55eba6558551e9e73defa0330b7a450a680c070ad88c168168aa85e0396d53cf3c1562cbf3e723fdb1ed55f2d57b08310913639b00 SHA512 eb9536ce8ab19a2d2205c0ba37ada0dc13a3a131957e2c628af6e0a9d06543033bad7e10e703b915e75ed056c7fcbf781be61c738ac7002725dc248816681d59
+EBUILD freefonts-0.10-r3.ebuild 469 BLAKE2B b80a3ae1f21ea47cb3e38aad73aa73caf1906e6aa6571c816c2c60ea8ebcaa4bbe61673f12c71296031dd4b04468f3b538d02f03d75cbbabdfd265b7c6c00224 SHA512 c51cef847209a1d998f1d4d63d59ae02337b4e2b8ac91f9c286e1c194429adfee51f9fb0adc665d88d2465cf820f89121dfec2f508a11a3de11ae6720e6dca37
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/freefonts/freefonts-0.10-r3.ebuild b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
index c96d6c9da397..7427d02579ef 100644
--- a/media-fonts/freefonts/freefonts-0.10-r3.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
@@ -8,7 +8,7 @@ inherit font
 DESCRIPTION="A Collection of Free Type1 Fonts"
 SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 HOMEPAGE="http://www.gimp.org"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 SLOT="0"
 LICENSE="freedist"
 IUSE="X"
diff --git a/media-fonts/fs-fonts/Manifest b/media-fonts/fs-fonts/Manifest
index 63eff6796afe..bcbeb527dcc9 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 796 BLAKE2B 10713f9628671da8135a07010735c61b5db6a5eceb4dba127a3dbbbb62d2af91a73908e1cede670593d7a040ad5708d0c0ec32c8a2808e5613bddd3485c3c33b SHA512 24877d404af5dd0e8d1c47a0d2837e3db762ca80689791389479ca51c0533f0057d03b273c9fd3a92ce52a2fcc53437a246bcb632004c3d541a204864aa36453
+EBUILD fs-fonts-0.1_alpha3.ebuild 786 BLAKE2B ed3516292cda4d54948cb2ac3bc3351959dbf80f451d5adf47195923aefa1f27ad7e5464a605c606073a6e6bc0ba9a04bdecbbf8a20fda512b6f7546e6f2ad74 SHA512 06fdce69f84c2086082930dde1a88ae552a0de1c5924b2136bdb714c8977b766e605cacbfd4f6c2a03a994f711540c6b6518195e2537c40a24c2d37256f08e32
 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 f08ca248cd55..afe49f5f2acc 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Japanese TrueType fonts designed for screen and print"
 HOMEPAGE="http://x-tt.sourceforge.jp/fs_fonts/"
 SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="public-domain"
 SLOT=0
 
diff --git a/media-fonts/hkscs-ming/Manifest b/media-fonts/hkscs-ming/Manifest
index 5a42cf9d780c..b8e60069998e 100644
--- a/media-fonts/hkscs-ming/Manifest
+++ b/media-fonts/hkscs-ming/Manifest
@@ -1,3 +1,3 @@
 DIST mandrake_setup.bin 17157184 BLAKE2B e4d237af15a7a21f05d086b1ce6e60ed0c3a8a9113abea539028a7cd742825000db17e32eee76107c5dd67434392336bb7344bc61f7ffc5991c78a14b13144e1 SHA512 230466146642f3348483bbfb6a63a27dc3e76e248abb34fc5872edfa6b5b9a2a93cf8446c23f64b80bcac6c0c8a16059a8dc3945925a30815d222a6621daccb2
-EBUILD hkscs-ming-1.0_pre20030919-r2.ebuild 1362 BLAKE2B 156ee9269ea9ebc6a0cb25644dc2b0859d6aead8459caa45daef5790ae8f15c155fbebf515473fa175640fbee420c0f4ae1dc9e318192cd15427b7e2da71e5c9 SHA512 4833f0f9a37337196efb901f272e695a3e1e0a29e3a218676b93a402c81e81cfac532061a104a2ab2bd0b770a8b343d973f93619098c457f1645b79703750abd
+EBUILD hkscs-ming-1.0_pre20030919-r2.ebuild 1352 BLAKE2B 2a6dcc589aefe54d0622ff6523c0999dc69144decb0b8bf45252e4a163ffb3bbde8d4d0e77eda7a2594d4d66f3be87d9ee8cebc65b9e4e681e1202896836617b SHA512 a16ef08ba4f105a7099943e8e806ad2acc396f39e00189da5ee09e85c1b9ea140e8c3ef2a0f696b30725dd412cd6ae36c9b363c896cb2b8e9707c9a19d0dae07
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild b/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
index 5cafb202d5fb..91452223537d 100644
--- a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
+++ b/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/mandr
 
 LICENSE="HKSCS-2001"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/hunkyfonts/Manifest b/media-fonts/hunkyfonts/Manifest
index ec97dd4fb064..02b2d4956ede 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 524 BLAKE2B 7ba75c7bd737dc5bbe9433e72e78efcd6f5f097ad8580fb1f2fe5f73f5e3599326b0f8a6910e673eee402fb9ead7e3bda36d1c9d071d1ae71269332f557676fe SHA512 6ed81164760945848a120a25cbc738e05e59c2fb619572ce9744a6dd96f631b12188dbf50b0fd56e6b5bbf631fe35e050823ea96d91a4529077289ec9e2b57b3
+EBUILD hunkyfonts-0.3.1.ebuild 514 BLAKE2B a1bc50fc8d3ac1edabc344485ffaa70b9ddaca2db920f695941a75a44752e99220ce0d22623a669e0fae655ad7535851110bc4111ceac222d0ed6b6e917aeb67 SHA512 9085c331ba324c4730a0ac909d263f2d7ec8f4124330235e0debd1dccd57a12bef438f8ce44fd55e0ceda9e9eb76636f6045405177463da4c2012b64841f55b9
 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 26edec80449d..b1a013836c95 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}/${P}/TTF"
diff --git a/media-fonts/inconsolata/Manifest b/media-fonts/inconsolata/Manifest
index f645fd78cc59..e4c04adc61b7 100644
--- a/media-fonts/inconsolata/Manifest
+++ b/media-fonts/inconsolata/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-20140821.tar.xz 72544 BLAKE2B 7d08482d9a58c864f629112d608df08d79beb71ceccc6fa4eb1c669843d7d43e2828cd7f288798b0d8cf8eb2b5bdf6f969315afc6bda7f51de716744ad6906c4 SHA512 295c0ff893e421c4d2dcb298a608c76b1790646774e1d77a820a7fa626771a34e2353e6d27b8d49b177541b7f4d2343a12152a75eec05e15e384e0118b19c773
-EBUILD inconsolata-20140821.ebuild 507 BLAKE2B 2e57a65be642707cc1b3b29ade87a3d688d6703ffc118f8699e8fd2b75af8b44a8fd27a74830742baee034c15babeba403c7f54e099eda27f551afb9ad5514ed SHA512 eb0a6934aaa180a7c7f025fbc598673ac036b5754bc1bc59ff05942ea50ad33f6896d5670d601b3a0e31f778d3eccbd7b5ca35eadf2f17b21a82abe3baa32001
+EBUILD inconsolata-20140821.ebuild 497 BLAKE2B e1b0e13502a364e1d2c59fded242b454dc827dda21e9bbc3c4c75056da4d80758e4acb92f930a0daecc32b086d39d629a538435e4622630a802f2d4ce60f05ca SHA512 5dadd3d5ab9523e17feebcebf85fc026a01d2e66ecece938cf232200a1135905fe90e31ee66f6323808f66a8404e23e03f4c1f129ab974ac3334103e78405c17
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index 43eeae2fcb7c..172532cee460 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index ebc1a01715df..6d2691981472 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,3 +1,3 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
-EBUILD intlfonts-1.2.1.ebuild 768 BLAKE2B 1b9195e2fe31112bb56e32d083cd0acae224418de97e27a6414b7ff757b3dda25f0c5b41a0ecfbd69d72b9d1a6f9f3c2d605fcbd67ed6b559c7e97f182d9c9cd SHA512 677ea20e8720eba898c69b9cdff22cca84ef2e371505af03e02b8b47f51ec124e376f2989112318f092d6c036c541c19bd5d4ef5c206c4636ef6b7898799a060
+EBUILD intlfonts-1.2.1.ebuild 758 BLAKE2B b6b31251a65ce3217e7ee7a6007eaabad0d2ad8028138a5e09d58bb5c3c639e883649ca9b5bc97aeb4f554345b0e756e59cfcbfe3c20b15dac30133003c41a47 SHA512 0c2625631cf19ea00cd3b6399547bef4b1f246696e432ba976354c25373c059dea8b23ffa740fcefd64e458ad3314d2049ed606d6462215f8b3485084dbdc230
 MISC metadata.xml 310 BLAKE2B fa2fd301aaecf5199872cc505f1f3e1617fcdc9d5b2339a09fbf17a5c211a86aa36679c02f329b8a2ad6303d4273e637e053e45cc49cc5cf2d749e625065482c SHA512 d28b30457a33057122995d04f513281a3513ca0b30c5afa4d5bfcb222912d0eb870c5afcd12dc2426b2d10cb82a9254888d6b307a9defab5112c4bbb6e60f22d
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
index 8d879e2d656d..7d5465ee4446 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="x11-apps/bdftopcf
 		x11-apps/mkfontdir"
diff --git a/media-fonts/ipaex/Manifest b/media-fonts/ipaex/Manifest
index 2bf4ca97e9c0..12336957fd18 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 651 BLAKE2B e8504f88b783527a33dcdc3b08c24aa6d33c9d54663e8010cbe72e682f7331768cf45482600201a9afdeccd4521d9c12dba4d3bfab91df6289d4de48d7ac2e13 SHA512 f302c7ed6b324b727b7380c0b2758b30307a152a3c9a6bb61fe349d505ed795ade1a26ed05e8a638c49f3ecf3c5e3fae9f309a16754fbc42a17c512b48ac8586
+EBUILD ipaex-002.01.ebuild 641 BLAKE2B 70553a4924108b401b3b0bda29eca9951331e14ee5f6c693162d78b5d853d74fddc3f5c48f98a8d1e7d533211cfa101cbf3f318b0ce4445067816a15162f4027 SHA512 d18274f43511b6e6bbcae1018f502602ff44cbe8078a0c826acdaa9eeaa82dca516eb0f02bfc01918450f3115b9b8c847c1b6179ce7c28dad213f9f9595f6d49
 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 da80e8d35f54..51cbef83d03d 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh 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 c81a826380fe..d867352bc82a 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 681 BLAKE2B addc3811ecae48ec6c6ffc80c9652be20accf0ce3f08637374b32c1a38923c71f320b65b244759416dc9a27ccdf31f189dbaf58acadbf690c11f0ee3b0c08aea SHA512 2d1469ee9acac15f62b029a62bc939b931b7adb526a9d854179ee50411f9581c1186b0d96f4f17efea6e32ea941d8176bbcc4bf278f0cd9a17d355794bc84b85
+EBUILD ipamonafont-1.0.8.ebuild 671 BLAKE2B aa1a41653febe7947b5987305ce1004458e41dd67cd968f3e60d353a4d1c20d518906478de4f33b9a5ad8bf129a62dde47f6adfb15161e339e3fac954de67e6c SHA512 6d235d4c2e8eda1e16470e6ef52599575bccf5dd0eb6ff0ac50ceb9a77db1576aa94558ab7b6034d7281bbc202f10f9b8f4a1512c1c9d04b8297491cfe31b803
 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 eff1b88faa20..c1a4754ed835 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -12,7 +12,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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index 22bebbbd5b99..3871b50796f2 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 684 BLAKE2B d9d8159eeca6fabd5362a57a0aed0d5972302995ffda19c1bb7fea72850d586571b789b01bedeb711e38106eabaeaff133eae839f86140595202bf5374ad7e06 SHA512 2e0d61329c282ce7233946cff574401970ab34a38efbc13f832c6ba55d66e5c4ba46c4d090c03a27af69bd9124bdec376d45c27ea9872f4f7e5827d50bcaf310
-EBUILD ja-ipafonts-003.03.ebuild 701 BLAKE2B b3ab75c6d74b7d8dec0fafca60d0591838346c6ff04b17e55bcbb5eaa8140a1f1a3a405cbe329e4452b75ee3e51dcfaf2299d73d0f0371da614368b55a62b3a4 SHA512 b2de8e49b18749b6f839716c00b29ee49e86f2d92482a99aacbd9f571ea87c60c0ed775b01e30725e52743efbb3b14998b56f649dcfb056fb2ecf4dc18c3005f
+EBUILD ja-ipafonts-003.02-r1.ebuild 674 BLAKE2B 8a1beac44ebfe58be4600a3651b9fdddcfe9a7db6764b317deebf013d6202a56c573004cc2e9c712e24a7a7bd1fecafe2aba070bb6bd53dbd4892517be2f8018 SHA512 8440efffbd67d0f8a832bfda68a4d3782e4d508a528f5ee25529e8ad6229ef2d14431a59adba902dd082c27cec32e872d446b5dc5688203fc94e96c3615b6388
+EBUILD ja-ipafonts-003.03.ebuild 691 BLAKE2B e16ceca7f1455a83e2cdfd568c91e7a444510f682543744386af55e8bf60c288b728854a028667a61a545bf3cc0cae054fdb47b5f9625fc709479001314582cb SHA512 6bd23d1d6a4ac8ae6400bc0434a103ec35b3a652add46d9f36f8922341aea738d5e3fa8797a0cccb685878d16f1863f04735c2a4e0a407ac4e17ff41720f1c3e
 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 f1d488d422da..d8778eae89cc 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 467fceb0366a..0fd0be000a1e 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/jisx0213-fonts/Manifest b/media-fonts/jisx0213-fonts/Manifest
index cc22face0438..74c3bfd1d97e 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 1207 BLAKE2B 48320ed6e2653bbe3ddeeec5f539319b1636d36ecc3f61788b213cc39ca9fc6a5241019980aaf6d3c5523e2685b1c4406308157ddedfde712ca9a5523367afc5 SHA512 2dea3244905beaa78b8b008ef7c8f2b98a70b51d4ceb26577cd173dc06e8856d0eb0ba630c040ac48a3db835a2cb5d8bae12b251643d33c4a3578d38dda8ddcc
+EBUILD jisx0213-fonts-20040425-r2.ebuild 1197 BLAKE2B 6142ed20d756f2ddb02591f5d3d283283423f3f34eb345470e7473790b7059cc9961619d9e6ac83a86abe627984711f1a79bd35e9984d8735576dbdb548fd4d5 SHA512 c7b5a3089bbad521ab15856fe9412e078490ce181a72ed3dbb5db0d40123ca0836472ca07ec9413ddba49df251db26cbbf19f7f4fd24b9ba81e3293cfec1f4cd
 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 f7f912173349..c20636c3f49f 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kacst-fonts/Manifest b/media-fonts/kacst-fonts/Manifest
index 2904ab1bcd81..d108b511b8a3 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 477 BLAKE2B b2a31c6a0651f1eb3775ef75ab8de464fc69fbd46afd71a0d4f576ae3532dd2f566d5304b09e159365dce2314743c478daa1f5a691074dd28c4958afa0868669 SHA512 0e80ad16f7ea67da345b213c35f22512c693de581698f4f7f3a1ea3decff3f26a228183b352b224343c06cfaf00b42135196d94c7cefaddf39e7fdb0dfb068fe
+EBUILD kacst-fonts-2.01.ebuild 467 BLAKE2B c150031507b6f17341d20c408b4ce99641955708916089288cc09b8dc262a0b2792724f20ed974716f4a1e7d3c504b104beb9dcfe553e611ca69b29f65133d65 SHA512 f931b25ec00e56d807418499de8caed3fad54278c428159ec0f322aa2adb8df7d96c2f8bcbb69c92bdf7ad58c6ca34ee7cdd221f445f8ce9cc261d1d756de5df
 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 8966321b7ec5..b81857a9a458 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index ddd24e652ba3..93952f080aa4 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 788 BLAKE2B ce1229147884a4f4b09617739f796900222bf60a02c8872b9b187a610e8781d1c08791fed2c1fa248b238ceb734b220a66c5703d964588b7ff8291eb0f4b97a8 SHA512 fb418831e35e10af8253c627e64f6a372173a0f55d9109cbbe263214f6fbde61450284ab8295273391c9954c561475bfd327cd73620329940c7c2390b4cfd005
+EBUILD kochi-substitute-20030809-r3.ebuild 766 BLAKE2B c4063d0869c267abe78c421ae81c9c14d0e2248189274e9cdfffae724fffc964da36519c5adaca4b78e15eaa82be27944027d31e043fc61734e6733aca1815e6 SHA512 cc3d49b61469fd6b6f11880fcfc4dba2d4df5bd9dc292d8b80dc4b25f673dabebf622302468b0bce159624753ae28e4b863fbb46dcc262c46316f82279dc5c17
 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 457f99f735a8..e17e46617c7e 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${PV:0:8}
diff --git a/media-fonts/konfont/Manifest b/media-fonts/konfont/Manifest
index 2d0218036485..84cef8206ef0 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 629 BLAKE2B 821d22997c3b57d239e11fdbedfadb2d3a036ee30bba6b39229b6efcc37abca71217439d8cf2fd93126d7fdfe620d7666a0aeea33fe70d76cd14d31b08070bf0 SHA512 370a4423eafb3a672269b98780cf996743b343ea6607c1c926cdd784507bc2f8cd0d045d876474ea28f0c185f7781872715a614e1398c9376bb6d2b16d070321
+EBUILD konfont-0.1.ebuild 619 BLAKE2B 51741b2acad66cb25124ddc8cb3c5cb49f32db7ed1426dfb9d783e337a1a5074f8aa4f49e87ecf5dad24b2414eff5326fdf1e5bcd7335472fc2b48392e4c4708 SHA512 6112606726b8383d19d20354145895c138abaabed7437301c52a127acd689264a8353e4ebb11719bd2f91f968617384e1f247345cdcc6efc678e3e348e2ba7bd
 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 070d6c721c27..f0040e33c07d 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://packages.debian.org/stable/utils/konfont"
 
 LICENSE="public-domain"
 SLOT=0
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/lfpfonts-fix/Manifest b/media-fonts/lfpfonts-fix/Manifest
index 844e0a6e925f..12f069821f6e 100644
--- a/media-fonts/lfpfonts-fix/Manifest
+++ b/media-fonts/lfpfonts-fix/Manifest
@@ -1,4 +1,4 @@
 AUX lfpfonts-fix-0.83-noglyph.patch 523 BLAKE2B 1acbe7b2abd66530ac04ce44503178c10c788b2a7495e1467f84d768ddfb584a984e6e3d23d732dd7691fe9eeb67872aff8e51abb2fdceec2e8650ea92558d05 SHA512 33a9dbd2bb9be37f91f7b3d8814c715b20f3b845aeb77eff4b10278ec53eecafa956d42663eff7fb4d9ab2b90a1aab79901367c27caa2b07b6d69333875b76fb
 DIST lfpfonts-fix-src-0.83.tar.bz2 172461 BLAKE2B 6d943a96d6dec6290f21b6df8daf7f1305c8f6c9175b544f0c64a7a0e18f671f9e2186f73bfe3ffb092d8adec7350f598d5a159e9ecd06b73e6ffb04d8641860 SHA512 154f36eca48e2869e6e5362c7d8de5511b4b7ab96466f147c21a792016d9065c8216dabfdda0b8763a6119510b3c4eebbe40ceb093ab89a308431b059716a23d
-EBUILD lfpfonts-fix-0.83-r2.ebuild 754 BLAKE2B be19c8acb06dc8a66700c1866b1844a899447158a0492b701bd00b00cb6f86f04fdc05a09a4a80616d6b81a638b71b2b9259494031b07545419f9042aa57212b SHA512 3278e27fb09fd8b615db7c50d45f199e7e99834554b2de6be34c27788f4cca481f7162ee653a43ccc828aa11ca66783c0cb79e4feed728bad8b43db273e0a76c
+EBUILD lfpfonts-fix-0.83-r2.ebuild 744 BLAKE2B 31a3db27d1a0002e3385cd47644237e6529c3ba30053d1f4ff38f6836a5654e2afb98f37dfb01cf6750ae53e1ac4d09296a7eecda7e4101cd425e674392f218f SHA512 75401050f5c6ee37ff70e0281ecc26e59ab61f01067b9a389681b3c757208b273f5ca0a8108cc6ff2c52a1e20d3e5d1a40ccb775f8f089fbb77abac0664e8bbc
 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 c4f3ffcfa89f..371687a31729 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/lfpfonts-var/Manifest b/media-fonts/lfpfonts-var/Manifest
index 5e83b2a37295..648af02c9f93 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 533 BLAKE2B 7318a976d978a236ac58669ea482c31f3a1211a48f10082d12c2c74f59229fa81376d23c4c0e05748bfd6da5a19f3938bf07225395d3c6e826151c41e648e190 SHA512 7c9b9b26c658e67606f7b0892419c04ea806535d158cdecab110157313a3ecc423169dca72f48d08466de366b2225e25f66c738e8eec09750596b64e4891f4a9
+EBUILD lfpfonts-var-0.84.ebuild 523 BLAKE2B 7bf03ee3ea8ad32e299da925d23638c81c7b750741ff37dbedece241838c247723494b98d1d314f9ed2a55a052852623a1eadb958dc06eccc25955dddc3862b8 SHA512 332526fba1b2e78f7dcfd792f16a0882554be10d303b35e9bb75bb1989347126c66cc7af3529834146365302fb1bf4af99fdb29568a8a13649158dbb6f6a9851
 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 15d705c8237f..a84f06240eba 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index d225bc8e93cf..611d2d6e291b 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.00.5.tar.gz 4935865 BLAKE2B 059adc20217238a0783ea669d7e7
 DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
 DIST liberation-fonts-ttf-2.00.5.tar.gz 2355722 BLAKE2B a782ab6668168b85cbfdba85df99a4ed4e6c173db7c47a2a2b0d67a1484bab70648b7b950fbb51448dd3cd31f68c3ea68a977966f0cf3cfd0aed903b8922c29b SHA512 fc00494842475d040c01029b6fb134fec9a37516a5e8e1b9ba945a2b38fe2ef3df6a0acfc00dc024cf2019f1106092d063c8322eece1be1cf8690db4ed8a653f
 EBUILD liberation-fonts-2.00.1-r3.ebuild 949 BLAKE2B 31e981baa4879a0838ce6e51113da376a55f2a84f932b42a7efb91eb3112dab0bdb2b93eb13573622a9937d1b3d2d6bba357763c7dd06ad787a75ad4ddbfc1b6 SHA512 7dfae220ca92c82e73a6f441bf994f3b5a493028d258539a51e8329022835dcb83f4ca05ff80d1593bb810ee0ccd6360c12f0eafaa1e7f0ded5925cc6a5ceb29
-EBUILD liberation-fonts-2.00.5.ebuild 955 BLAKE2B cf2c6d5d715633cd952ad121c3a764d70b936a580e768b947bd1d7d2ef050edd92233d1012ee3d044bd8d180ae3b87a727acb42157858306769bb664f2a11077 SHA512 bdd6077ddde7a94f57adce287606e7b2e74718c9201a32928cfe6e5bc69474a05d5a6031d93136b0c911ea18b26210685e9f58169017ca14a43f31bf75dd3dbb
+EBUILD liberation-fonts-2.00.5.ebuild 971 BLAKE2B a930c145d3befd309baf10935786b2256ec32aaa8112f408770cdae389f5d7250dfcd51d87a4ea7985358ed8e02ec8181acb17bed31b7529a7f2d97ba68873fd SHA512 44fe2edd8d3c6155b50169e9376d38f0ac1a9661ba11fd7eb2a3cc6f3e74fbee00f70fd1dd6d3d312f6d00488298b78267dd0942c5411ac501011455cbb597d5
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
index dce9d1c39a13..f7cb941b8238 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit font python-any-r1
 
diff --git a/media-fonts/lohit-assamese/Manifest b/media-fonts/lohit-assamese/Manifest
index 85057c449664..9944e4c3fa59 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 655 BLAKE2B 703a46ebc8a2e9d12cf653b501156ef3df5b840afaa4a8b50c7fe95d8d93a0b3fb66fb0aa6082c52758875ba69a1d892a5e6f7340f7edae22a8270ddcbbe563a SHA512 a8cee15654488c806c8758636b2d32e6ec2fa32d8249e39065c04cbafe1892227f4935a8b29eb6cb8de539b11ac0dc054b0dff5a8190da14fcb3f42e81b1ef2c
+EBUILD lohit-assamese-2.91.5.ebuild 645 BLAKE2B dd46504ad3b0e178a91fc77070df35705db50b89dd0692f74c4f71f8fd7fb48642728c4e5efd279decdcb8d11994b679d82689086dca2f6accbcaa30b13835fb SHA512 59a95d217555080dbaa7a24568994446f524dd19196eeccc057e10e29f23a2be3fc7c1ad2826bed3559476f19a31d5516ed9737af3a2fb3912ca5325d7da8102
 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 fe68268cb956..3b48d57c11de 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-bengali/Manifest b/media-fonts/lohit-bengali/Manifest
index 4013caf078c1..6be5bfbe2f01 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 654 BLAKE2B 0f648e6159d027478571e14d05a4af9181a2911853581232110a49bab60bd37dbc5d658980902988900e486c458975579781e2ded157a1e5ca67f47a6249c323 SHA512 56391253c27935dbe537f209dc763632063435e81963121ac85d01fcbfaf0488ccbe8516f33b5105158552651de7b6a5d034ca1a46211e38120e5d2d9a18438f
+EBUILD lohit-bengali-2.91.5.ebuild 644 BLAKE2B e9617c1d8b30bd4ace1ca8372f67f0350754a2e42d7b96900f12dbc0701446f900d05fda987524f7884525fd9f1859ef813a0d52fb6f132796592dfe80b76f1a SHA512 72ca0398610ff3044b874eb243e70acc2915d33f76f9233fdf6b857df81f57a5fb62eb1c7a3293934c43476b77428d5dc4844d7e5b99e80a2b0540a509420912
 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 66d5edfbc73d..297b96607b71 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-devanagari/Manifest b/media-fonts/lohit-devanagari/Manifest
index 995311dedbfd..dfa6aca7838b 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 657 BLAKE2B 97916d648a0907d6684a8f357f4529ffae702aa1556d6a4e342777c1e86b71759498734a899dbbd80d217964aa8d2b7a706951130cbd976dfc2da1eb075ac2da SHA512 684488b1013cd84cc7b6fed65b499767edb8bdfe9d2a1767d82c53597c27f4b3cf6c506df144391dd9018666b94451ebf2117466e89c515ab03259cfb98529a5
+EBUILD lohit-devanagari-2.95.4.ebuild 647 BLAKE2B a125e45e29f4e8fe48839baf56263456984635fb08e149cb27db6e637e1d68bb90e64757395363adb9db8d2dad331d2e941ad4c48de41e5ce14b1f3e0d5841e0 SHA512 85d714fb67dfa49b7a4b10f25b155178b49eb722b7107dca4ab724fec45b72791fea65c44c54d266c2ce93f67850768400bb8c57015d2b5f81db69847b184be1
 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 bc842a6985a1..6f6c5d1a62f6 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-fonts/Manifest b/media-fonts/lohit-fonts/Manifest
index ba079f97bffa..f2be283091c7 100644
--- a/media-fonts/lohit-fonts/Manifest
+++ b/media-fonts/lohit-fonts/Manifest
@@ -1,4 +1,4 @@
 DIST lohit-fonts-2.4.2.tar.gz 684860 BLAKE2B 41fedd2a798dcb85eda5e35913a5c718a027a21ed77d576b5996d1f90bfb3d55c9d1ab892fda82b74ce0bc59dce0a74c6023b58e3a424232bf6f00f3c7583e85 SHA512 f4f06f7f37118a704f80901a925c6c871d7a5911d16665d0d469f01bae09a706a576e023524cc2334ca373639ef8bbfd97c1fdfadd8141603999ac72634cd5fe
-EBUILD lohit-fonts-2.20150220.ebuild 784 BLAKE2B 23717641090696715307b1298db71f28c531a7fab8614849f0a2136e97c0d4cbfcb76c482e9227fc551e1e97544896198a29271564f82d93cb36e5961179cb27 SHA512 c1e04bec621a827dbc519c380530d9a1b5d2893c6ff432d23047f1adf676c76e1ac8cea6c843997ed028cfb629a191000dee79ce00e71a56635f26dac038bd37
-EBUILD lohit-fonts-2.4.2.ebuild 657 BLAKE2B 354347826b10b707d18147b5fc75ad90db1385f3f01378cf0e4910eb32d41aef334e20497ae4910ad2c09f899590a2d4d809633488fa59d5a8bf626cc59476d7 SHA512 9aaf6d69a0be9c3588ad22234abe05183aa202cadfe3db1ee3af07aa7d7cdb9a5b06adfd6912fc9639e7af74e277bd79941676af7e2aa1466712292047e15d42
+EBUILD lohit-fonts-2.20150220.ebuild 774 BLAKE2B a1d08d5af83a76f976c36751ef19061066760529470f34884b131e1092f173859f62783c727ae8b0b3e574191ad69f38c2e7ba5efab170cf012e7ce3c1da9179 SHA512 7df620b2c71393af8c80708e22ccb0d030043ac99304e5ab69610d3d2f21bd97d3345f9f10ba297a59e139f23221b4b54abd43ac168643c0f66f39ffb1c1d54d
+EBUILD lohit-fonts-2.4.2.ebuild 647 BLAKE2B 1e4f536eb5b6cdaec1fd1675a93a2f6ccde2dd531ca91a25f0fabcd49cd8823e6b0b5389600916c4d6de8e8dcb7301da8daac8a38a9d435b93172059e97a1b99 SHA512 8ef579ba6e9dc1fd33c5bc9c5d3a6b88f5cc5e63464cde77b3790d5eea4c19a9e168ad5beed05bff491bf86c9a8fdc01ae9630e8afb5d8f9c251a1bed3da9099
 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 a4ffddc7e98b..5dc0c9ae7151 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
index a3b29c8d4edd..07b6f635b177 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SRC_URI="https://releases.pagure.org/lohit/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README"
diff --git a/media-fonts/lohit-gujarati/Manifest b/media-fonts/lohit-gujarati/Manifest
index dd0328ebf39c..ec59b3726adb 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 655 BLAKE2B 7902cb402aadc1e9fef32586fa6a8ba83ad2ef4d71f90e644b7e10d40850fe894dd774871209047be480422643d7d83a0a2f2008e34e5b9dd30423b1794c9f4b SHA512 667c0c07cdcc18636ac6a77dec9f4493fd9d05dffcf8ae0e9320b4bd1fdaea3de153f239d1d821d22bc0ba32489fb0277d243b518c7d9f18ab0e059750aa2e02
+EBUILD lohit-gujarati-2.92.4.ebuild 645 BLAKE2B 8cab28c70367600f35b95af205dad2a8c2741a2def32ec61eee822fcb33b33fd95ea9f3614c440164e306407ba4279e817b811cbbaa1eed7319e13472e3827d2 SHA512 719a42dddb6746adf16f91a2459fee76655b2b4a7326b6f5597a29bfd6838a40fd77eedb88d50bbec255d08e613ae92b56446ed4d5ee4e823311db30f28a607c
 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 41736dffe01d..ae7a88f49b8e 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-gurmukhi/Manifest b/media-fonts/lohit-gurmukhi/Manifest
index c86b097ec204..fa2b228cf761 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 655 BLAKE2B c5cf68d99d76f1c0495d4ed14fbe1e2d5b0ba319e9dafc6e772e798c1be296dda26ec840ad1eac0bcb91e39c4376a50876b7e2822357261f3c1a2b26d8ad9f36 SHA512 7759f5ce6515242b4b1276b64a5e4322287e680048500bb042fcb2dcba453e9113942f2ddf9e42f440f83cb7c03e99a111990658b32df9f846c74e060814d5ed
+EBUILD lohit-gurmukhi-2.91.2.ebuild 645 BLAKE2B 82d6b983e75f820430f801b2485b07ef9d8ac727b1b7b7c44d158a8093d77b0e5186e71e0ea0f2e318c2dce39ac1f4a2322e9df2117f7128db814b6b75c561c8 SHA512 1dbfe639a8e192963bd0fcc22fb07b9099388109663a20a205b9d12d1478d20aabc20e4d585707fd31a0b5ed6ab1457e6b0d07fe657d7712b519cef93b178bd3
 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 97930edf3b53..a73bd5a63ac0 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-kannada/Manifest b/media-fonts/lohit-kannada/Manifest
index ec6153dfd358..8992a2cfaacc 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 654 BLAKE2B 77d33dddf6b06de6d1511aa731a0c0e2a6f222c225985dafe71bc72df1e9053002e5bf42e386152c466267c9f17bec277b22abdaa276de61a630b982282c92f3 SHA512 f79997d9a6baa4dd44b3567ec34e1e97b97021b6751c45069862a7d05ef51d13a678f5d3652497722a266489bd1a06b83fbae40ba2b172a15636ab5ffc503eec
+EBUILD lohit-kannada-2.5.4.ebuild 644 BLAKE2B 489e2696de7608ff63252b1b476465ea90d8b998bbf8638a5c4e6d819b35473a5044a432c6617ae0d85e8951d224858ca725faa30b73c6f7a33c7e2705cd914e SHA512 aa4df96a62d15e9f442f3c8b06e9d66a2ce3e2046dd4be255c41025b6c2bdbfc5403c92c6fcec338cf1b01a26f9cb1a0b77e8c2718f5f325d166dd1507b5e589
 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 5db24becb826..d43dfb278093 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-malayalam/Manifest b/media-fonts/lohit-malayalam/Manifest
index 6acb8cb84613..3b6a51a17960 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 656 BLAKE2B e99f763901ff8af1e61a3e253f676000834699e81c433803308d8216178758f369aba901b34ac92d0d14bc0f6c6bb0e9f7ff1d6481941926d74f6fcae9dad152 SHA512 9594fe752fd876b549044bf6adc20fb27e68adcbfb82233d783064b7269f3894cd608e3bae4468bbfcc9b299b8822234b11a3901ff129857cc7427630d73453c
+EBUILD lohit-malayalam-2.92.2.ebuild 646 BLAKE2B 0d0dd7aca432d22e0c925b1c04965d1d1705db930952401eeeba01063e6897a9e1b6e182da2b4430683d4a8acd898d43c2c8214e9160595c719090563bd90146 SHA512 003cf93309c2b7822a5ac67696fba047290ff622d73d5be2281b366d7b4d64fb38a58236e5a64d8628f11ac13ad1418278bf449083092eadd1c7ff8580637896
 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 884312147327..b25eece5881d 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-marathi/Manifest b/media-fonts/lohit-marathi/Manifest
index ea1f56e20c2b..6c61ae08760d 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 656 BLAKE2B aff9c3eb9e320519c6bd4d113f62b7180fba51e212764dd3ddf8f52bb7905ab1eb5eff6917102824d788d5e68ce0034b36d6441392d18fc51fb8cbe8c07b4180 SHA512 6d6327b144ecb059b117e1e67ff65b528a934787fdd30bbc5a9c080d0c89072a6358a73c005cb4cde5a79186cf08458645eb55286156a1029c149f861a6ae755
+EBUILD lohit-marathi-2.94.2.ebuild 646 BLAKE2B d3bbe9207cf907a79ede24483992ad3d690ce85b814412c39c801289905babb779d0f7473a11a4d7a83abe7e6491d8c3f5c9b31f4ea872041b6e4508f289f498 SHA512 d3b9761a64fd5587bb4bb79c6261fbd02cbdd0f2c7a201524cd39658a939fb630ee637f058e0fde1361497fe065a8e5768564b9ff093386d81fdeebb75222b6f
 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 b601c8ff3814..89bde8d205de 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-nepali/Manifest b/media-fonts/lohit-nepali/Manifest
index e54bc560a938..a915123b37a7 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 655 BLAKE2B f9380770687f24edfad7b74dba52d3151d9903e7649919f58b6286acd52932d3ebc3450fa71ab98c7c3f17f665a0714391ff56346451889dd0c08f0c6e6e8f25 SHA512 bd45cf211d8aec1dad21a4782d89470017a75253e292448c0c1de57d706346916e9d836a9331752dd07e7d3283cd3b51e961dfb50fc69d55d78e3d18e4e9309a
+EBUILD lohit-nepali-2.94.2.ebuild 645 BLAKE2B 142afd45a112e9b6b9a43e5536d196f8f87380f9b4fd62d3b7bdd618170915781cd4bd3d8e2bdbb0bed8d82ae5b9a4cbc58d8593ec1882d351064a993d8fd97d SHA512 57685158d2282621aa6bcea4dfc1f08f7ba6b5aa6763411ab8ea194126f3325ee96d47d662de18ff4a1689c0eaede2f7d564b0012d31915a9d98e81d248d79e0
 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 96c6b8551b9f..11608c34c15d 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-odia/Manifest b/media-fonts/lohit-odia/Manifest
index 481e429811c7..1a31c088917d 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 651 BLAKE2B e1583a7ecbf592a211c207b8c2c78c706b3804dbd33d9d1f4a17ad2e1d29ab31102e75ea490f51e1dc1dba3468e5d70614c13bf27ff6f3027f4e5f95203c5f9f SHA512 db000c195d0466588c8feba4974c1ba0c16afa442a58c11f11ae4cdfd4ece630df29cec504a7b7d5e0f001633fa9a1e94fe700f1790510e0c85f4ac90ddebf4d
+EBUILD lohit-odia-2.91.2.ebuild 641 BLAKE2B 370e9ef5c148a5ddfe09217bb79df070cd5b4e05e06fe5a9f3031e4fdf6ba0627ddd5296032a7f0406806b0049b6774f156304e9d58eed4ebba88df157c010ce SHA512 d3e9e3609948f61249d33c1c22829d0cf97ace104845f18b649c42fa6c9150649c0778db7151c0a0caaabbc18c5c8eb04f92e4bb1ab20406ad02971cfe59e60d
 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 9378774b4db7..1c2abff4f043 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil-classical/Manifest b/media-fonts/lohit-tamil-classical/Manifest
index 2c289ac3c87b..5a38a31a21d8 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 662 BLAKE2B 42ff072b48912f2ed8cf198766be5fc8b57b3ff233ad603a1ab4b172f202a8993fa2ace86a1abe3654189bc43dc2ec891cd27b09c43799873ddc9d2718b90138 SHA512 bdf2f294db02f5facb033a6763e26186d7f4deda9e6c12a98e76bd9a4183b76988210e3864557fe6df7bc6293ede429697e239ba6eabc4ea0ef70da6afe095be
+EBUILD lohit-tamil-classical-2.5.4.ebuild 652 BLAKE2B efa531c934b43a2b1140eaa1e102c251456cf6526dabe7feef0d713ab74c6af615e358560cc3720d0029e36ea9d80b28ea08e63f59ec71b550e0dd17427052e7 SHA512 71fa898f39f1db517997b74cb1f68825d7315a57c943cb8c0d77c0321791297154783279494ff013812f401684c18101477c7012e316c0a7c36e94298701882a
 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 c387bd48ce22..ea5d977fbd88 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil/Manifest b/media-fonts/lohit-tamil/Manifest
index 3682fb7d5a17..60b88d62250e 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 652 BLAKE2B 2e04f3eba2dfdcc7c92e78453141a5630c44701cf5a2bc255d8af29f733ec4536f9db61068ac176945b6e8969b9e5d0ea24c56520d82f2b49e1a26427c2c82dd SHA512 21eb4cc7715402e0fcc2c7754917ab81f34df431546cb5e77b7fb77e4a51f6d01ebaea4730ff8aa13a55a459cd6930b82f36add5d18d883f7d739843c7749295
+EBUILD lohit-tamil-2.91.3.ebuild 642 BLAKE2B 0f677361fd7c784b73de1b0040ae389c1856c77cd1509734e8aa53e92ab118a64207bc97770446f88f10ec3d4c43800fa21f9b7f4a3ea05142261b884e04282b SHA512 ae30b583ac7a8a7bdcf063a95f68fafabfc3da57047046a4d2db0c27260fa7fd352e07135557c52b8d2dc47f708c72db4b63e0c61536d23ef5b1b6fbc9ffd725
 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 d971d4a7ee3a..de39ced3d9bf 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-telugu/Manifest b/media-fonts/lohit-telugu/Manifest
index 0c239f78b6b3..d4b5344bc494 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 653 BLAKE2B 89b907e2fc5f17bf7389efe1508bec435f83a973203b5939069ae1fcb0ff5d45201eb8792ce34774143209530a890373f63952d36fa2dab38c21e7e1d75369b0 SHA512 2f5c1eaf29254324a447993ceabfad5bb2e16dccf4e6762ab6ca69afa3d83b224a457fbf2194c39ec8a9c90e88c4accfcae3ff54920c790839543c290ab257fc
+EBUILD lohit-telugu-2.5.5.ebuild 643 BLAKE2B 12212b9d4abf19615868be2ffcb5fed0c018f47f8915248e8ae7ecbef4e41dd5008b6c69d18b03670f7825e5379dc02cbb6d9ef0d385671d63827ef889bad134 SHA512 af80b126511c1806ff0d241ed5a7943402991a9ce1289dfe0f037bb416a56a43ffa8e0bc10241225e368c2e1f58905a18ffc894cf7a2490dcb12312b6b5cd2ca
 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 81d9fe516574..e18dad1194e8 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/mathematica-fonts/Manifest b/media-fonts/mathematica-fonts/Manifest
index af1a46fe0369..c8c33d847a2e 100644
--- a/media-fonts/mathematica-fonts/Manifest
+++ b/media-fonts/mathematica-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST mathematica-fonts-10.0.zip 586368 BLAKE2B 2be8b7bdd0c663ca0b9e4c1642ed84811adb853c6887d3adcf420d49a386b0a562d75b6cbc09d47ca6bc118703675461087b1c5b6551c55565abd94a64821df2 SHA512 4429163c427bc762cdaf7d310985becff97f78e7b452b184e9cb64f5f787559d283b5438a16f4e6bfaeffe86429bd416d2772707350830f646c70f53b519f4c7
-EBUILD mathematica-fonts-10.0.ebuild 525 BLAKE2B 0d6abfdced43d1be366a19b38f8bca630b94a1166e9919e828130ab5ad06da26df9fd764f6dceed90b5631a5d143e2e3fd7b586c2691e2dfba09169b99031f7c SHA512 f56c91764f234dcf91b4271556afc8fa36aa2e5e66f10e84bf76b10487dacff17a559f328a098dc7b1e4a92610a40e8b49e84c651b453b57efc7fe4d26af32d5
+EBUILD mathematica-fonts-10.0.ebuild 515 BLAKE2B 1f8a70c93aae412230d359e6b1c7e9fee9ab528bc0f7e05caee4edd2c01a0f75fc25e30b784e06792481c7d74b02d029ac30b04656270d61d39c6f8ad09dd10a SHA512 baa911d236bcedae7f18096d116f527583eba8bb7da32a8abe882a4a28ba3a95e986f8fc37226aa0284219cb2f6e5265c1a8c2591ffe1a964d764950e2c6c1c7
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
index 2161ea5d8414..1055ca7025e0 100644
--- a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
+++ b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> ${P}
 
 LICENSE="WRI-EULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="binchecks mirror strip"
diff --git a/media-fonts/mikachan-font-otf/Manifest b/media-fonts/mikachan-font-otf/Manifest
index 0415e48204ad..c27a498249e9 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 575 BLAKE2B 9c48a6214d13add01c7adc32e60e04146bc282747f4b01c5342f0be804b3c6d7e0b55779649358131aa3c8459bdd25493a5fc8ae62d848c926857c8b96db0ac3 SHA512 11c434a068b386a28d935468ec2ba30a0b122f8e9387378e8076948fae56d8872213794bf688cdba3541284e41c643ac1d3ecc17452ab36a4057ac5b281eed79
-MISC metadata.xml 416 BLAKE2B 04e36656581ee9672baf54a09588ded5b3b671d3555e69ce4171f75e95b739992f641dc03f3bba6a28b740a2f6c715e0633ecf119c239d21d6c5b583b843095f SHA512 cc18ed22c895689abe8a19d193320f2dc74c42d87dee103663cbe60218764540311737674953bc00b140f2b77c82ecf16bab3a2040398945671830b01b1b9f60
+EBUILD mikachan-font-otf-9.1-r1.ebuild 565 BLAKE2B e0722b544a3034228d0104b7663260eda294a056f91c96c8cc08188602ab8d08b8a297bd2478ee1ce56cd65915edf0a432cbf4daefc075c02f535bbf6db1dfeb SHA512 9e5fd83021f619e9415f3202792fafc04620484d476d040fe2f292ff3fe2a53c1896216cc0921a346c96a21de3e2e11ed544c1df9ad62b3a11c4449de626e9a9
+MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-otf/metadata.xml b/media-fonts/mikachan-font-otf/metadata.xml
index ef7a919a7200..83a7eab12151 100644
--- a/media-fonts/mikachan-font-otf/metadata.xml
+++ b/media-fonts/mikachan-font-otf/metadata.xml
@@ -9,8 +9,4 @@
 	<email>cjk@gentoo.org</email>
 	<name>Cjk</name>
 </maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
 </pkgmetadata>
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 7517f0267aa3..8ef1c6b0b225 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="otf"
diff --git a/media-fonts/mikachan-font-ttc/Manifest b/media-fonts/mikachan-font-ttc/Manifest
index f31e84a92191..2d652042071e 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 649 BLAKE2B 360817e0b5259cb091ecf71b55de1cae1333e64fbd5d0b5be1a8f542390c73f2b104ecd666667b11e92c8c592f03f3b925beb8f46703fd9b186d49f21efb33e1 SHA512 7a634887291cfce3e2ed814a0b844ffc7eb2a50e074126f27ce355b56ccedf63f1a88e2b6a4023e9857f0962c1d684f570e0a98f175e3ba9ecfd4f4b20bc6ac8
-MISC metadata.xml 416 BLAKE2B 04e36656581ee9672baf54a09588ded5b3b671d3555e69ce4171f75e95b739992f641dc03f3bba6a28b740a2f6c715e0633ecf119c239d21d6c5b583b843095f SHA512 cc18ed22c895689abe8a19d193320f2dc74c42d87dee103663cbe60218764540311737674953bc00b140f2b77c82ecf16bab3a2040398945671830b01b1b9f60
+EBUILD mikachan-font-ttc-9.1.ebuild 639 BLAKE2B 78d0fec4eaf79ccdfde3915d546af448cbd6200735fc5ab26b6254bb4c8ffc01ef586784858fe8db958fbcbf5c1a5e207cc3e5807b5a33d56123c76d7ba2aaa4 SHA512 c860085d9463ceaa6de395bbf8cb95b982a99d2a61ca9241a39d9b2552f70172178aab1a6eb5574c7f5cd782ea6e954804d30ed59298a0a12e90448e5fb26668
+MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/mikachan-font-ttc/metadata.xml b/media-fonts/mikachan-font-ttc/metadata.xml
index ef7a919a7200..83a7eab12151 100644
--- a/media-fonts/mikachan-font-ttc/metadata.xml
+++ b/media-fonts/mikachan-font-ttc/metadata.xml
@@ -9,8 +9,4 @@
 	<email>cjk@gentoo.org</email>
 	<name>Cjk</name>
 </maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
 </pkgmetadata>
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 dcab31410e8e..15e62429e2c8 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}/${P/-ttc}"
diff --git a/media-fonts/mikachan-font-ttf/Manifest b/media-fonts/mikachan-font-ttf/Manifest
index ace0d6794a22..3ebd6e897aad 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 1052 BLAKE2B a9583df07384f1703c851b8371abe723735f8cb6599daa43cd22103adbecb8828689f239a3eb82bb054dbd8cac9c5406be5c258fba26e7e519ff43aec405579b SHA512 432764d011bb4fcdb4874f91cd8fe19ca300d182384786bb2d7bbb80141e16cd708f1f44619e970863e1df1903ceeebf00bc3b92f499976a9022c6a21f790cb7
-MISC metadata.xml 509 BLAKE2B 7dca9cd3b08461bd887696171ac6fee558829365522105af3ab851b18650def9a68fc2961393036166007cedbbee1db583abfc66d6bd62ef90abe5d2e2a0d6d8 SHA512 dbcad39b91847aa3f6141fe6b2c01f2eb9c10d6aecdfd744d0ead0c5cbc80d778e00b75fae880d7035284451f9b49764bb6299d2a15f7d60d784026a39822d94
+EBUILD mikachan-font-ttf-8.9-r2.ebuild 1042 BLAKE2B cf92843f10d1687b91a3e45cb50abe78e8cb84ab58d759af1b6e62673f19a22545150e8659eb5427b6e799c4d4b458a5bd5aa773be349350e19c63168e150cc9 SHA512 1a3e600ae58b55bd3174e87ade8c6b230a2781d125e1287176ecce991e9245c3558f911a94c99559ba54ef46f9ab2e840b6eaec2170d93302a877707806d5c31
+MISC metadata.xml 414 BLAKE2B dfcceac5bef0da178b6edc05fb4d0cf8c2b36ac526be3a42c2d66ef2df79bc47951d0769feae31ad23638ab2343dbcf32a0784625c526fdc66b2e87b32360828 SHA512 733c65aaf57d8df7fdf5783ca2e67d0a7ebe5b194f97ba3b3218b65fa5236c3c1e9f853d09e3f36852f0dcf28df28000d35f60278d4d7fe6c86c1e02fd7f83c9
diff --git a/media-fonts/mikachan-font-ttf/metadata.xml b/media-fonts/mikachan-font-ttf/metadata.xml
index b51c06ba84f5..0b6ad9b51e60 100644
--- a/media-fonts/mikachan-font-ttf/metadata.xml
+++ b/media-fonts/mikachan-font-ttf/metadata.xml
@@ -9,10 +9,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">mikachan</remote-id>
 	</upstream>
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 62a2dc8ce53d..4150ce579921 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}"
diff --git a/media-fonts/mix-mplus-ipa/Manifest b/media-fonts/mix-mplus-ipa/Manifest
index 31c266111be4..76b71c2c5903 100644
--- a/media-fonts/mix-mplus-ipa/Manifest
+++ b/media-fonts/mix-mplus-ipa/Manifest
@@ -6,5 +6,5 @@ DIST migu-1c-20130617.zip 4373842 BLAKE2B 00fd09bcfa67796d1d81b4724a247787c8852a
 DIST migu-1m-20130617.zip 4268071 BLAKE2B a5607fb7ef1d029bbb1f8a9b4149b75ea75a788e526aa82e876adaaa0e3e395f387a0a3c7b223163183685812da38914fce7c39b301eaa32e53aec38d204fdfc SHA512 6a0b33cdcadb57e856606c372740f1243b95c0dbd19b00873b9efa84056176ae7c3477258e90e6ef399b3f67e51a3a269792c30c7920d56d29ff3c5a3af2f8c4
 DIST migu-1p-20130617.zip 4365146 BLAKE2B f083c90b90814c91f2619549ddc61e4f256eb4b646d4d3552414bffc40a01058759d6b35ee35cdcf3471de51e5209e6ac0004e7b2006522abeb433ed3d8f65d9 SHA512 d7e04680d7bfc463d2bd757950deea91843b4c0ca40a190ef75c46cdb5dbf52e8953be9a373e1b253d94dfe3dba8a4f3b76c928e107e3f666009af4a408fb6d2
 DIST migu-2m-20130617.zip 4266805 BLAKE2B f71bd9785e1d4960f07242e8728c7dc2e52b189bb7d827e51fd30377ec94d196885b533319e07db6be3028ec5910c436712cd2a730f7d79805a9279826632d85 SHA512 926660fc18b113d0794c9a7bfccf1ebe5f08805de5d2d5bb4fbbbf9a17e86a748e09d75a693bbc8f5a4d5bbba7ac9b205ee47ab507069a22428740b89d855e83
-EBUILD mix-mplus-ipa-20130617-r1.ebuild 1019 BLAKE2B 0dabab3723c939b850ac56225cf171cf348b2082683a7d0a44fe1c3d2bfc911b605ab3e846368555814b25ef05c660ef960868a640990017d705e11c1518862c SHA512 2fade7495c68e3f18321431363ec46a3249f3baa859ec18b8adc3210fa303b488bcd06e7e88b1405a43cb2cedc79a62114721631a35ca30253ae53e3b42162e4
+EBUILD mix-mplus-ipa-20130617-r1.ebuild 1009 BLAKE2B b58b0630951127659980413678bc031702a81d2748c7fc2b71af78c1ce6b71a4fe36ecb251bafe097dc9115fc8f7958ea215cd8a8b139a1928096caea51ed188 SHA512 33b4edc41311e86babc2ef3b6ed0d80c6e585baeed42b7b824036df01fd2c2dad48606b5b15d5245e4c8557a35946f040678703b5d0cf4dccfc0ed9ab54ac442
 MISC metadata.xml 324 BLAKE2B 51017329fa09a00ef96fde9191a5004f261574980d0fb621f8d924e6f204437b95322de67b7112aa9ab7ad1d7ff73de5657ae6ff47cf9f4c6a3126b4741697e7 SHA512 4d86e705ef5287be8dd82f391cdf6557407e944280d238c21f7843fbf3427e22c8c377b6896fb86246e3dc0b6f2f4ed40e26128d39532513d3037fca1a6f27fd
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index a9b375acb29c..5c6ac42ed26d 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
 
 LICENSE="mplus-fonts IPAfont"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index d9fb89a64ff0..a5a613204422 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 1457 BLAKE2B 04270fdee11642eb6b79b50f1d16595495b38f7b92d43bac3033d4599f01a6213d677d1ac93141490e9ba9c017963c7a7f154bc0ee3bc24c6271a697a3d4b65c SHA512 a939c2a31fd10d5cfc631d0dfbe81b6804253871f2645216f69b908038ee47ac94371f5c3c2ffba36e29728a40a62f031ca5a692059116ce6435bf3992f7d534
+EBUILD monafont-2.90-r2.ebuild 1447 BLAKE2B f48464dacb084f37b2983f2a0277c04d56353c757624a13461cb236175adf3e8f4d40e5126db5f7a316ffb6473550e3113f1834dc16c562d4ad9bc3ee03a35a8 SHA512 91a28e7b103632d8c3be08eeacb91b30858b1816380d2f150d49c006bf7e29473d66f6d20f54095a285e925c4c7aa766d8d45c0626fee3d13faba1bdb7c8ae72
 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 fe4d5382ea04..d6f100c47b5d 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="truetype"
 
 DEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index 9f14f48b93c8..fe4676e4e1aa 100644
--- a/media-fonts/mplus-fonts/Manifest
+++ b/media-fonts/mplus-fonts/Manifest
@@ -1,4 +1,3 @@
 DIST mplus_bitmap_fonts-2.2.4.tar.gz 382574 BLAKE2B 76f1da0dcf9ac25425ace63efb751c5c193f717e76a51750e359216057469cc74cf84572c8162302ac4fb9682ddcd5396325b5ee570a5639f06f338c1ce4d86f SHA512 77aa46d651dbfbbfd6e254619ec917fd861fc44bc7847c2f9e7c4d5ebe0f90bafd8a543eceac394bd3482f868dc6a54440dda384b8be0c24e0c4093735f017e8
-EBUILD mplus-fonts-2.2.4-r1.ebuild 672 BLAKE2B 10ad9cc4a2e28f5571f90572567276f9b53673449a54adb700adebeb6bf6b389845cd51140d0c4c25ccffb666aa9627b89f989573cb8d3565e3c948d9ed4c925 SHA512 36c047b163327c2c226fa63d6b636f79d807c29a03ce83b03374e40a667f45de2c9ce176d2ab3150e6b5470757b04a01b7ad6af76cce3e958b5dc80fdc700be6
-EBUILD mplus-fonts-2.2.4.ebuild 683 BLAKE2B 9c70a1454795fcc382757c3562e416bc1ea4b9c56f7c56c6f96e6ee5083989c7549b264cc48881f4a57d8f17e4be8ea79c309403c2042be3085200c90ce1df71 SHA512 563d65f5caf0fa2f60e8bc7681fab65092b29f9b02638240110991972628ec97c8711e219fa116f0426894bd9e3dc558f2507c1060458b621c3d4e0fef45d874
+EBUILD mplus-fonts-2.2.4-r1.ebuild 662 BLAKE2B 831b9ebe31c02efc34727761b98536fcf7fdcca0e926e23c28de7cd673645ba9626a31ae3eff893716f8aed5644b4b284d68bb7e97aaeea1b924b19ba20e9a98 SHA512 ead8713cb04048270caf50ce21de0598f17a834beff5dac53f5cb376dc0516cec2e6917cfcebbe20442711b09be3844987e3597c725ae53827c52b704a30d219
 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 fff0e9b0377d..925a07acbc80 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X"
 
 DEPEND="x11-apps/mkfontdir
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4.ebuild
deleted file mode 100644
index d42072915d6f..000000000000
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE="X"
-
-MY_P="mplus_bitmap_fonts-${PV}"
-
-DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
-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 ~x86-fbsd"
-
-DEPEND="x11-apps/mkfontdir
-		x11-apps/bdftopcf"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-FONTPATH="/usr/share/fonts/mplus"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_install(){
-	DESTDIR="${D}${FONTPATH}" ./install_mplus_fonts || die
-	dodoc README* INSTALL*
-}
diff --git a/media-fonts/nepali-fonts/Manifest b/media-fonts/nepali-fonts/Manifest
index 7d707151cd67..56248240e290 100644
--- a/media-fonts/nepali-fonts/Manifest
+++ b/media-fonts/nepali-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST nepali-fonts-1.tar.bz2 555877 BLAKE2B deac623bb4bf0e64c26846a62494e3dd841a8241751e2de66f271964378eb8d7abc98f9f9d0d59db6093bfd1087935c4953e322c80afd7e24947237526528edf SHA512 f9f494aaf6be60b9abe621618a3883f966212dd12357095704b1daa28352e417f521adf3b4863b397ec9bc5f9cfdbfe45959433b7614f3d858f727a6c001ef87
-EBUILD nepali-fonts-1-r1.ebuild 520 BLAKE2B bd32815cd58882074711c187dca600659aa459e409bb710e570da261921fb2f2418eabca07a2617816cb27bbd8019092c1bf90d49646f1860bf1f9b6ce865264 SHA512 75334c0c3971ea507416844cc139b6cc00f5e50241daaeda655cde0fef52ef8adcc278152c6d5c95abd7794e29e4a735fbdccb983464e65c0226ada8282721e3
+EBUILD nepali-fonts-1-r1.ebuild 510 BLAKE2B 886912d76ae95beedf81091288dbb2b188c1e59cd36879a631b5d803fb9e264339b71d558d5d6fc26c3cbd4d678e1258e7164e6bf20a64082f144a153ee7c928 SHA512 ca2613f81199f9d7801b5bfad9b358f8281f217b41e4b62da14db89287825de5d117a21d8a825a85000256fa7669344066bb056baa4fff91ff7bad421b613bc3
 MISC metadata.xml 234 BLAKE2B a936e880a7cf2b37756f6cb1ffa44992e9f812fecaee521bc5aa804ad4371731df2b3f647e1432bff27713782a3f8ccbb7fd1105243cb1bd67006f8a98b57ce1 SHA512 eb2691b4aea3787af7906a40be13e5a6daf385faa6e743f1f1fc083473844dbbc489ebe243ee35792b75a4042074476d6622c670d538d0e14536362c485ff8d1
diff --git a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
index f3213bc6e474..523c6b8a5501 100644
--- a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
+++ b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index baa28538399e..cdfac095c72f 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 709 BLAKE2B 7e22d04246cf4c52b32c8a39103ca2596d1f1888b06f5335015deab98336d6065a0234f5064699a6bc93c800490fc7a2eb67a871e77c12d40f68118053c6716c SHA512 4a91b6552139e12ca8365fea91fe644493e99253f0990e44fc23d63bafd61e680fabb0e29f85ef31de16b9ba7af270213c4334e4552eb30548035c21632b132c
-EBUILD opendesktop-fonts-1.4.2.ebuild 635 BLAKE2B b8d657a55572f5513a93fbcea2588155a8fa85d64fc84b7dcf36bca16b132d1fc3fb14bd929f52b6b1e4fca3c91f15f1eadad0c131b4d2e6842340092b39d123 SHA512 7954c985bd7d8ffaa7c41cfccf16300b71517bd20383b9f4359d19ce80466de1eaf1745330465157074d38f877fd21f14da6bab5627bdfc9b8c1b577bd7f3c33
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 699 BLAKE2B c852382c485b7124b427d903e35c6110bbdc7b06468fb51faa0e418eeb138e8acdbd6d01f911f66d3b1fe4fc4045b2fae8ed7dedf63735ef13482265200fd4ea SHA512 e377210d1c532b2fb2a917ba2ca6bab85e194fc5e0cf6c88b57f2603d9a3670b4904da76b1c1b65d99bced9ba8d404f4da9e10c39fac6fb3ffb143a53f16de14
+EBUILD opendesktop-fonts-1.4.2.ebuild 625 BLAKE2B 4cc303b710de95ab03c25ff6af7edf42e10664dae094b36120ceb0da152b6a4467e81cfbdcb6ac6b1c7c5974cd469c37b1d79540496eaebd5c0a43e7005fffb2 SHA512 5015f522c2c60c713508ac6c21415a437121303e152ab052142030ee0568eb5d9776831a94f2195bc93eff584f55044a0fb688ee58359bba2943af819b4ffb55
 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 0c3aee0affb2..26357de82656 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
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~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 b8517aac0d0d..8d6ae0c99fad 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/pcf2bdf/Manifest b/media-fonts/pcf2bdf/Manifest
index 7cedd06ecf82..0eba62b17e6e 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 756 BLAKE2B e5bdeed285961808d9c2e298222b80a8a7c8c5a3e10cdfada57b6bee73a0318024a62f65a542f05e4918ee1365b53070044069ac74175b052c32fce3b61de0d2 SHA512 f93659ffe26d05c3475e626992e3972b94bc39f431159ed9fe90575154438352cfac310e91d90fc3fdc6d51c1accd5620ecd5cf040bae152f355cb9a76799334
+EBUILD pcf2bdf-1.04-r1.ebuild 746 BLAKE2B 826e170e6e61711c7c331d4ffa0037b6709a93ead27b69156853895053391d1d3ed794fa05a5a36e925d48daf883bb51ec48a5bc31b189443ef6c20585b363a1 SHA512 6ae875197f9d9a22c28e354f75563f9e95f8343e88e56d6fa382c8aecc3defd129ba83c1282b656d64e088f298defaf1a446c15c29d86fa6d1e0b9d3d3ccfa43
 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 bc3efb853d05..ecaa05f44c6d 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/media-fonts/polarsys-b612-fonts/Manifest b/media-fonts/polarsys-b612-fonts/Manifest
index 1ac508716ed4..ed72e6f25bb1 100644
--- a/media-fonts/polarsys-b612-fonts/Manifest
+++ b/media-fonts/polarsys-b612-fonts/Manifest
@@ -1,3 +1,5 @@
 DIST polarsys-b612-fonts-1.003.tar.bz2 2823506 BLAKE2B 31c918285f6072d6cc8bd44c2b57114eb027447b0002ea16d737dd75772299169fe1d9f20620fd09fd96c34b61cf41544848d945c339db02224f045d979d4d22 SHA512 7ffb6fa858eb20d02bc2fc12788fdfd3fd15117b1a5e1ed2cc70fd19bc9fad5ec92c714dee07c85dd954911862f5852716eeccc6b72d63ba32993f3d03e35f44
+DIST polarsys-b612-fonts-1.008.tar.gz 5178817 BLAKE2B 3675c57002bb66da32f1ab0d1b2c487a11a12cca4098b9c3943b20a11bd4f49b8ca7c82b063a53b66bd99ee33f5167b46e9576c2383ed05ff3f4e8868ebdd58b SHA512 977b7bc6f1a41243cce381ddd0a5db2853df21a738ddc86debfc13954653fbfcffaf1c869b6287ea20482cc10ad479934bf6b70edc1e14dc656a22b1b64c64f3
 EBUILD polarsys-b612-fonts-1.003.ebuild 496 BLAKE2B 006946ccd542d8bd1a31ac46a0a4e6da8fb6a7c632c66e0b34b1c744fb4acc32934b5fac59f1b8afa78cff0fb98c419e4de53a88ecd59e751c4209146cc190d2 SHA512 0f86af3aad9406d969cd05a6358a82bcf9d3a967dcfdbf336e713e8a3cb66979dd43bbdb21797b60a888318d56dced33049fd03132e721e3c3c7b01d4133db60
+EBUILD polarsys-b612-fonts-1.008.ebuild 470 BLAKE2B bed4428b6d845d8c7bd5a0c82fcd1a9c4476e21e6e4b6f767f1491ee1c9d86ae6c0ea334c4ba6424729630b13da8fb173d6fabc81788bca7389af0c3350051c4 SHA512 d83e76c6c4ef9cb1e96ae02830086d87c93550378b4ea7b0c7262490b1b1940a8be459bd864be51a0aeba42b2b6e6aba91b49d6d35de3df0c8e71cce2f5b20ce
 MISC metadata.xml 547 BLAKE2B 8f7833eed4fe368c250fcf32a0abc4993c4a5966ffe1085ac2826a3c0924eb126aae96914f2235993a2d47d878e10fc34a3aa42e9dccf1cd3cbe5275a13831fc SHA512 6da5fd376c417a7a0d995c7259d11369ee93715f35b298f0e00c412fe9d1b8a1e34beb2a7929ea38380646bdef11282b82777bb2729a2ddc4022120b19f5a697
diff --git a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild
new file mode 100644
index 000000000000..b2c835d0e4a9
--- /dev/null
+++ b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.008.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="Font designed for aircraft cockpit displays"
+HOMEPAGE="https://b612-font.com/"
+SRC_URI="https://github.com/polarsys/b612/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/b612-${PV}"
+FONT_S="${S}/fonts/ttf"
+FONT_SUFFIX="ttf"
+
+DOCS=( README.md )
diff --git a/media-fonts/ricty/Manifest b/media-fonts/ricty/Manifest
index 674f76664b48..27f71bde95ab 100644
--- a/media-fonts/ricty/Manifest
+++ b/media-fonts/ricty/Manifest
@@ -1,3 +1,3 @@
 DIST Ricty-3.2.0.tar.gz 13286 BLAKE2B 11f53c1e55d43af517343682025893e8d8e8cba3ba9c187114c92c3e5b4e4778afd89b73b920f2e70778da3e376640f8c99b0609cffbd90fa573b15ad2da8028 SHA512 77b7416e8c2e6847ec4c964dda8e4fa52ba3e63751ce030fbd0cd83a07a88c777319690777e48e945d36ebf06fe4717d10a7e02193f48575507c5c1f71446b36
-EBUILD ricty-3.2.0-r2.ebuild 1059 BLAKE2B a87a05850fa391fcdc56ece7049339d7b40c12b321b7b3373bf4a72648b3a220781ab8746eda52c2dc81283d00a164c5911faa06077abb0ac16cd3cc8da5b179 SHA512 3ef1a7353f9c085d660289870db73c56cf609d8dd776f521e2b3cee1f7272cd1f281d6072955e4caf3686fba03f6796c3b3048c9b34a0c7d198adf38bd4b5ab7
+EBUILD ricty-3.2.0-r2.ebuild 1049 BLAKE2B 9404f0a96c0fa245a7281fee56c6671eeeccfe0e4b81235a345b52ef279c3441954686e9a2c506d8ad96a25d487d7b5cd933664bfdb35340f09f8e9f7ebccc22 SHA512 ddd85070b0c4fea800c117dff4b11fa8b00085758cd1e342d627161e88301fc19faba8aef0ff7fe9b590bb7028b11dc0cb34cca0efec36f0c5250e5f9ee43532
 MISC metadata.xml 318 BLAKE2B 0d2f085352785987bf21c4d46df5d19b543f676b683c4afceba84ca6b4f5b7770b306b4d36a48824efd3de389f0aae99bc54aedb5f61c1447e1842029936911d SHA512 a370bd25baf912693cb8991978e2e6599ebee2d69f84242558698da92f8b8209ba5d4f7a2c7034d4019d4af0c41ac6c557537d08d75ee5b8a3ff60314c9f2b89
diff --git a/media-fonts/ricty/ricty-3.2.0-r2.ebuild b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
index 0c8d7ee3e056..40fca3d3a27a 100644
--- a/media-fonts/ricty/ricty-3.2.0-r2.ebuild
+++ b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.t
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-fonts/inconsolata
diff --git a/media-fonts/sazanami/Manifest b/media-fonts/sazanami/Manifest
index 1ea1c33b06f0..497a86e3203e 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 678 BLAKE2B b7e4ad444098826b25e4f4246b6b57b610c494bc60d8db59e14e883a71a343f20d5ab17d9aeba1d8db5d50424630766d809dbd476e82397ff7ebfbc9489a58c6 SHA512 e698eeafb8067a0ee8037bf24ed1451c2772bf6bafb857108d0341bfb331e421113bf17bf1fb5228c244acd2212b84e77a51f9f58f52f23f0cccf4549a3b358a
+EBUILD sazanami-20040629.ebuild 668 BLAKE2B c27fc8808e44791dfbf06021745dc5c2a128f94120a77570e98fd4854acaab328835cd114f5e8c545084d0ebcc4033a0b27569aed485dad3d1b241a1acc74a38 SHA512 a54df95e9316a9d0f3762619a05566cc88383e04ad562244aa3be3b8458008b78e77ba7fc9b4533d05b10dc5c504a1cffd63dd0f8fc3bbc7c30dbe01d4787f9e
 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 1c6d06d41c6d..5ea245da4d47 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sgi-fonts/Manifest b/media-fonts/sgi-fonts/Manifest
index 40b354f098f3..a0abf3fe9dd0 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 503 BLAKE2B c8936378fc2f438f47a9a020f8d2ef2a8518d1351a71c417c695045e2a88490d720f7584b58d11ca16f79393b26156e7247ef9b35529a515db281a937e6fcca9 SHA512 cbc7f29c6952a9d88410fdad7f716bbcd547cb8f47097f8ee695dc5ca56f6722a51ca9b79db1d983e7ec39c1b919ad048f2ff760960e15db0f69ef226cf15889
+EBUILD sgi-fonts-1.0.ebuild 493 BLAKE2B 5961614d1836ddb6ff82b7194fe0380717bef9585564fd8e9cbc86b03e67eae4002d97879f7a4a58281053fa67b4ec9d193346a141869cd07500d9160541d98d SHA512 e1de845e8cfc7e9a8516b975544196542b83bd01046821a2f38fb14a921fdf350b100e0f95cb17d0c36d505d5a7bfc8c1550fe7dbd3a2864650431f844f3a187
 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 14294140d151..d7b3e8a5fa07 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
diff --git a/media-fonts/shinonome/Manifest b/media-fonts/shinonome/Manifest
index f96c4d61b204..86622a860a17 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 700 BLAKE2B 68bde7a9f0d55b2682f307cda5e4ee4e359cbf8e6bb4e718cc33dc7c3d2849c9a1769796eb3422f317472819153ce6099814d70908c9b88d03a85578de81f85c SHA512 f8a2cbbbdfe794a3d91c32e2df12d69da16a3422cdddec7cf798daacf41ce20f4f9af62affc777066a1fa0973225cdf1778c1df7aadde7aede9212c9cc198948
+EBUILD shinonome-0.9.11.ebuild 690 BLAKE2B a6df8dfac26eb04c59bb10fdbe338b5e7282375fbd033afc3041076159626a0f2e749236321c7b2294cf1818fcd1b9e2a51cd0aa80cf9eac625284996f327a41 SHA512 a84429f840ce8210d0ab23868ce99098ce203b9113c55f5ec6597586a6c64b804bab1efcd5adfc61b0da2f424cc9adafca3716a9dfaa2feb231e32ac0a9fd075
 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 4cbe5db989b0..1a05e6cfaefc 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://openlab.jp/efont/shinonome/"
 
 LICENSE="public-domain"
 SLOT=0
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="x11-apps/bdftopcf"
 RDEPEND=""
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index ec479d009239..85c8b02fe248 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 697 BLAKE2B 6084478fbc146a483a4b131691ff32daf32124a9b3752589e337189d5bb7d2c8642c6935ebb01b142abad6e7a65a33cca6d46acb37fb4354d489b5a5ea34f741 SHA512 ba8e826f1754e9d4d62f643329320c5236578a815ced240a7beb0e5e3692932f6e1270517ed3132d48e31c8ce87cafb5024f457458e8f7cc8c29b3b04e81a868
+EBUILD sil-abyssinica-1.500.ebuild 687 BLAKE2B 8c031722278dc7e526b1fa34dcd0ad788a85591c0e8fadf781846f7c34b923da2e9352dc2f09b37dacaf34ef11aa815b2455bfd95211dce3ca621b341de918fe SHA512 1c3c1991398e2f2a13a4181e1e337f1d4c7e9d0bf4c33eddb452241112c35967c344c8f57c1d8d036e608332b0852c575b21996b7af8576d5d9b31418551dcf1
 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 b951283c6b9b..ce058f143f01 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 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~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 38b451711228..03da59004be1 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 740 BLAKE2B 8c65d0de99ed841cf8dae5bed90683fd83dd3d0490f89b343f6eefbfc792a29de23af9bf93e4b06d713059c5be2eb61f1c9a37b3d9f5fc0ef185d2b388eab66d SHA512 fda17cee734cbcb8520def2229ce620bd5ff8533bd52f12dfef72ab3d040ef8e78efedd3e62f865b177227c8165a4323579a5f8adcd05ffab57d0b48d640ee85
+EBUILD sil-arabicfonts-2.100.ebuild 730 BLAKE2B 6db59b4cf4fa5008eefa3ab376987840808a70212e8480d4e74a933f1055a305ed35d689916f69ce4ea99e04e88f1db166158f4a5d24f2bd1d92a9bea3b258b9 SHA512 f4c960f79320127e77483b53064c7f9d7a700c3e624be7e1946099eee1ab8d3a4841fdf2ac5f3db482dc059960ac17b78adc1cc585316cb00d73b62c227ead77
 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 b3e2c4b22a28..c18be2cfa143 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index eb03f5d0e65c..5553453171eb 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 977 BLAKE2B a8d27089ace76def0f662d13ac34298b869b37e4616633cbb08b4f09adc14ec8ed75d4f2d655817e7ed1b6c9fc604b608514ead398a854220b7f0e6248773203 SHA512 c23c03bf1fda141659975f15623ad25a314532fc56663c9b68a17953a82b4a00cf51159fcd4263dca8a33a6e3df3a828f8569062a46a0228dd473bc11487fc54
+EBUILD sil-charis-5.000-r1.ebuild 967 BLAKE2B 04ccb0cdecccc715a166a0d6b64c2d0560a51a04a5496b6bb4970774ae8094b928526b7cd0a759b567feb50b1d2c0da23f637a66b38797009d55591c3ed507d4 SHA512 0851d16f5047b135452673da58441507e2ea6b8fb030f0c84526b843567813f8ffe15004e9c437e6f9e217fa5aed24eff1f17d13f248daf67c8d9d3290680fd5
 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 e5f7df65a7c7..326ae693298c 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 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 6271647c3667..30a5e660e87d 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 629 BLAKE2B e344421d1d07252c100fbbe22bd0f878d79f03122f5fdca8a9ccdda4efd020c115d6abe0b838cbb26c598c85baa43144b1057a97c15be7eee897a3770332d36d SHA512 c2592941338b0178c1f559eaede70ac4e3d7a7079bdf64a334debc41ce3046cac798fc1eb806167291069c7b19006a882a8c880ce79124c505ccf21ea7591178
+EBUILD sil-doulos-5.000-r1.ebuild 619 BLAKE2B 32d50a83b8978f266e3d2d7effa1edb3834af598dd590bc43921345e40e6117c8689ee333ee0811959f003e16c9234aecefa4ad9fbe7d2ea22a08c14b256a246 SHA512 ee0660ff22b91c4e7e4ffb4a2382635f255d47cc7cd1527cf76d92122a3c871479151aec7925dc823d03ad2d371a697ff82d74c54a373cd22b9ad3e1a6bc8b83
 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 28ca843c4eb8..e29647831ad7 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-ezra/Manifest b/media-fonts/sil-ezra/Manifest
index 7736e829e589..d99e6c67e2db 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 593 BLAKE2B 3defb34a4ad4a578319a871a03a1d17b7e14c2c2e71c14971a1ab0363132b2471f90c177987bf7a8909c3ffc3887443cef98147d17166534fee8bacc44966ce6 SHA512 ea2417b7de2e5d05657b8fd635ba5da667fde9be548dff57ac38be4ac0b164f201970ffa3b53254d1b52846a3549a5004cb1be74402fcb189c2bad5a4b9df0ab
+EBUILD sil-ezra-2.51.ebuild 583 BLAKE2B 41a12a592473a0a1a59c3a5cc10e8d24b54d03a3baab14af29bc79a5d7f441f2c7338b32763c62fd7a1825f85ffeeeb68245d286ca55f3918553da87c45cb6b6 SHA512 af34451d1ea9db282bc5f4fd1860f2af490e043d9ca89e7b2f9c423faf4ff9db34f79db6d9c226c45799dc9a5f2d58307e864e8fd476572d08131d4450357f74
 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 3dec8222c804..0aa20b2c137e 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~ppc s390 sh sparc x86"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/Manifest b/media-fonts/sil-galatia/Manifest
index 5c97f3cba2a0..ab42ff083439 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 510 BLAKE2B 5f9cd45792d592cd86ae7cf9fc90730be6107dbf99b151a7fdb5e56329047e554c98f38142a2ea940dc6978f6e5ae28b164ba4122fe70f751e8be244aba4d47f SHA512 ead540095b1a95ff108d7991ed2d2e29391489b21c15371d27dd2f6b988e94c1cb2329275f60ee89d75e7d6ee33d52a75c4546389df4c04bfe5cc070dc2c31a8
+EBUILD sil-galatia-2.1.ebuild 500 BLAKE2B 5d7cb2acbcfa82bb3eb4ee6d336ed4324393b353a4df5f346910c8db4b69df30453470c6010dce49461b622b4f7f3ea62346e84f80510de8ce2d8b1b0552ddc0 SHA512 f1516663da64b70947575541356a3d535c9fe9379cc87ef3476789e90653c3fd0747d57deb42e3f91be72dc6c80cfd56d72d2373d64d6d30124cc86284aba84c
 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 276138f6d171..1b253b60cefb 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index 1d4a12d36412..d29a76f8f8c2 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 1105 BLAKE2B ce5e3f8f5e93c05694820b551f285cc79a39fb1479eda458b7a2208977ba908e46a6d3c0f24a0d7cb50e333815c2ac76f84349ee026528f34c77c221c339ae38 SHA512 bad2502e353cf8ecea80dd06eb854b0439452f21f6dd9806114c8e410eedc30e3c59ae1112a9151e40d07c93ce5dedf39cefd012c7689e71ae40c6e11663f127
+EBUILD sil-gentium-5.000-r1.ebuild 1095 BLAKE2B 3e112a8163ced72e13aa71ce469792e1a2f87f10fe7ddc72ddd634979ca0f07f12d3557762e276c7a01ace9d892cb71720f7a27a6cc686d4c89d9d97ec648ad3 SHA512 3f0371f5db76e6c57ad62fe59ded294ba8485f5dc2b3badb4a336210447246bb4abef8d538b4a9e1bc7c9530cc25cfc73be2cb72e1329113b57bd2e45775045b
 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 07ca20894df1..dcd7cd32b9a2 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 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 29b23e999dd7..79e284997390 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 486 BLAKE2B 7f5b49ce5706fd1794323b42c47951e5d56ff7d7ffd2507c53244d299da16d05fb1be493ae34e0d49af846639ecd8d524cfd4e55cee6e18e885c1380c3d6c66a SHA512 1f7f4702827dd0ea99a0b7b0f4229a183bf7ecdb5661f53d6bc7cccf8ab0fc669ca803c6f51d5e99d1c8690b6110b8225354d01697d4a6a190b75a2764e09224
+EBUILD sil-padauk-2.8-r1.ebuild 476 BLAKE2B 87511cd9d489dfe7db6c11c45c927bcf9231fe04f7108d8cd94243bd5a8725033aca6fec2df054c2fb5abfc208cbe398021ccb8f3a1985e809a7e00284205796 SHA512 01e02c25f99e4665d6024251bb9611d5644c54c9cd2f59d68c2b20e96dc6a8a343c3bbbe24ee3c5976e51eaecb3d902f6ded42218b4ea410b633696c30d116f5
 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 6f2bc08773f6..0372415ae3ee 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index d4f9b65c4afc..e0c20df41387 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 1194 BLAKE2B e72504920779c8f2cebd09239afaf3760dfca9f8feb4efe78228439d882ffa1d5cba1567956710886d8d2a92cb79fe7a5a4b12745e3b917d2543b3f3665a1068 SHA512 3dab3882c976162dcb36748f2ff51b7bc8fda748a47ca1cdae6d485b35518dc9c3df5f5652ebfb7b068da29ef2e1791bd51077f1aa55be64062410b034a0ff54
-EBUILD source-han-sans-1.004.ebuild 1443 BLAKE2B 9b839f997b647305eca937123114e90466708cde91e7a6856e31843722e0e617129a36685606b16bdf49bd2754a6f1ba1c99a3d8c577333b26ac0753d18da074 SHA512 ee81670bcd420a71d1a8288f9b10185039f3a86c3040c45954c5902bd517ae8457ad69132b845903df56a4e3a5f757250aef0c96171c857a3d59acd4f0589986
+EBUILD source-han-sans-1.001.ebuild 1184 BLAKE2B 0922ec9644dfbb225486657e57b9f9c8a14cd8affd9e5f9d0519368019375833efec32729389deccead9408928728dadefe92aedb9b4da7d1d72ab9cbd40eb92 SHA512 6a4967c4ea0a0f2bb15bd3661079b92de4e98d849b7fa426fc3f7ab88c42fab13d643dff61fd5d361b43c4c266c3a6391cce58e2f87583445af6dec8c2e987a6
+EBUILD source-han-sans-1.004.ebuild 1421 BLAKE2B 7dabd05766862fd41c93b2d8854d3bf14bb80ff0645f2a272f3323271ad156adba1c8173f55766deb430103794edb311617f09b3f80c9bbbd1af5c38640a00a0 SHA512 7e8d5381d93e2087b7ad9a031a3e865b73a454da1fc229c52bcae5634028adb457f5425b963c3a57ebafa06a71ef3fbacb3adbaa0f3e0f0e83f94fb9ae3e4c45
 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 08b0d686a634..8ec6f586e158 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 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh 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 4ab248414568..a24712f8e941 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
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~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 85c6993716f5..53c1f816e3b7 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 1267 BLAKE2B cf69c222d1a71f8ca1d25b9f4dfec9bb1c6ec236016ddca448e05db2a7463ca8c7af50ae46770c181f586631f6b975c6128eacc34ff01ddb0bb283eb2f5c0bc9 SHA512 738d88240afa81289dab161ab9776aa5da8dc71c84e25a25db9292caa1cbc87dbe430e6421de57b350e9bbbc945e466175acd3d23ab5006ca49c5e619395dc2b
-EBUILD source-pro-20160608.ebuild 1320 BLAKE2B 3e43990d7f941084ad715f2c0a5505c7c917571f27cb227e35a4ff7945cd7a8c595b74943d1f7f2b8796899c2ad35e845c6429f7ec6e8f1219e1cabce9a3f748 SHA512 6d7fdcc337dfe24fc5e199db45c03cf8fa085b9709e398e711bdb0f1ba83803d351e2f1c4d2c94f936cb8a3b471b0cbf1323f57197acdc20b2209a3b79db7cea
-EBUILD source-pro-20170111.ebuild 1321 BLAKE2B 7bf9847700fc67bb21dce976bb3c28cb1a08c2566a56e8fd7a67ff3684d3ecdb4496f2aa3f22d99fe0fda83463cf6a342669819106066a332f322878dfc73768 SHA512 84f259b4015e75740ba2028cbacc85e96539c3693b50c800179e5291ad5d040609b1fbf41c179681ab9fc9cdaffdbd7fbf9a341c052e04df66a3060d03baf1a8
+EBUILD source-pro-20141211.ebuild 1257 BLAKE2B e9d0533d45a9bd39df2ba6a506642a33159d466c5932d4f2b8907b08207dc7b4711c7af8a38d6e6e8d98e10ede4ccbddf25aff9fabc044f449fb16b0416505ed SHA512 684fb5d63b6d32e93c63d82ea9ff27d97217407911799bd1f47643158efef03bd6d2c812ea63ae26280203f2dc6fe640054babfc38a26845d514910dff7276a4
+EBUILD source-pro-20160608.ebuild 1310 BLAKE2B 81c73db02f2b9903e607dcebad3b505c61965a71f10c92dbe5faec5adb553c7bd7cae5ed7255c7879be50581c5340c7f96681555098bd8a885000e958f5d997b SHA512 4566a8e10000492d43c7b52223b880afb57a7a266bd009a70dbddb294c84c0dc96988b55a9b4d9e47f8f9ee45266dfaba88f2e4f353142a0e9aec65c1ae85b70
+EBUILD source-pro-20170111.ebuild 1299 BLAKE2B f0913ac8edd89fd494ad9138a2bf6447f342608ad66c1f7db8c9be726642d4ed5070fdd94cbb53809b17342e1c30b058a9579d1377c1b8d84a66f3f1c316168d SHA512 f95e71919aca32b7bf973e392410441d2eb24bdafa831a3d6ca52089abbcabdacb9c5a181a60d42cdd4756b9fd3c0a82771eb8ae0fba472d18336f944c7ea4d6
 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 734d5c39d580..65ecfc88a7a6 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 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh 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 d3bc5fd415c1..998049146066 100644
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ b/media-fonts/source-pro/source-pro-20160608.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 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~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 cf4b216d2bb1..234d165aa57e 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 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/tengwar-fonts/Manifest b/media-fonts/tengwar-fonts/Manifest
index 666fd1acccc4..81253cc1c328 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 740 BLAKE2B bf4c831fd8cd9211be5f7f746f58d6e38d884da44582ed4e714a77ede2d6f58e0d5ff176096179f34dda9edf4d82c54144cf1291f393a679c5527ea83e3df29c SHA512 a3cda13319dc4ba1fc0615dbab15f16d32ace7e618b2fd2317b5cc049ee75f4b4f1c25f35fdd84f8f09610e5cb2dc5db917621b4468b5a09a06a966f37b6458b
+EBUILD tengwar-fonts-1.9d.ebuild 730 BLAKE2B a1a1ccdc195fa49b1fc34883d3d065c468bf819ef8eed05d67d3a668b330a299be052767923d76646c582140eb2435bef4a24429865449f1066b8e199aa3a715 SHA512 97c7cf2e06861d8b522a7b699ad5dfa2ef882e7832290a32049556144efd3699ebffc022fee2c829db33c1b568e367ce4d13fe73990263577f8e2195b0ae6e69
 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 09a62a883adc..96b3e26dd736 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 61659ffed922..731e728ad8d6 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 2628 BLAKE2B 1b9f10db79f1c88567e57679049430ad5ded7432966c2098d36a4bb8343d4b3b5f48695fdbdc24dc046461ef70f5e7c5bdf5606338f9a9bf4bf4d7f2091aae2c SHA512 cdb46b7eb3a4e47943dce2fcdf2a4ad5ca936cdab5743b48a884ba78f1c9a5f22ab5633e3c1415f572ac54f6666be61d0bdd68ea30461d3b0b978f07c8f82e95
-EBUILD terminus-font-4.47.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
-EBUILD terminus-font-4.48.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
+EBUILD terminus-font-4.46.ebuild 2618 BLAKE2B f5d076ca5a211600af8e0199a0182d36849ae6b4e4182dc0b00c5813a2004de63e8725aa9a16b0332e252436a25784ae69ac5af78247820b53cbddf6c71f714b SHA512 a48b3b18a3f8706585340371cecea89b708d25f04317b5f3d137a8ce60dd09ef7ab6316931d77adfb9766df0627a01c6f99e0253869bbc8cfe6ab89dfad9f140
+EBUILD terminus-font-4.47.ebuild 2625 BLAKE2B c005d110b8c1520bdff588ac20ec96b12138e49b27f30596151265deb55e6c1f2eba5e5eacaae10b7532c5425a9bfc6854d36102a0b384e7c57fabd6c38f26ef SHA512 55585837ffdc1227f707fa555d0137ab870dc4bd78208d06ee7bd99a4fb33fe050a51fde137118a4e9a61722ff06136a42716fa8ead78a692a3d041a37a74342
+EBUILD terminus-font-4.48.ebuild 2625 BLAKE2B c005d110b8c1520bdff588ac20ec96b12138e49b27f30596151265deb55e6c1f2eba5e5eacaae10b7532c5425a9bfc6854d36102a0b384e7c57fabd6c38f26ef SHA512 55585837ffdc1227f707fa555d0137ab870dc4bd78208d06ee7bd99a4fb33fe050a51fde137118a4e9a61722ff06136a42716fa8ead78a692a3d041a37a74342
 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 2ec48a03373b..b3e178148461 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~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 989749e2e555..d82100c3b33e 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 989749e2e555..d82100c3b33e 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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/texcm-ttf/Manifest b/media-fonts/texcm-ttf/Manifest
index 1889d3e3a168..384c67776be2 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 552 BLAKE2B cb0220829b64cf1b3990c4809dd0a1d1004407c6377013a95e15b97eb213d5f1eed1702e94f800c1afe23d404d9f1b3b544707eaca9a6db01a92157da984ae7a SHA512 08bbb12461963e48b0fcda2bc7341fd979d4913dac9bdbdc086169ff19e64f5d0c4b02a503343f7417100fc544f9b6ddf1132aa4e9397d14ac67bc012d3bd651
+EBUILD texcm-ttf-1.0.ebuild 542 BLAKE2B f5972106ed635fa70e14409e26592003ffc33971ff38dd865291025a5b5c4d19aa263d0040aa4e1801b0a9fb9cb0e0828e02b36c429ca60a34c5de2acdd41e48 SHA512 2a6e797cc9d557455673ec6931fbde6b3d2ef7069bf88bd63a22f3cb2632fcb3e5484ef8f8a2bf8bb6c40ff4e1ddffe40b210c73d38f605cfa2060d452d2e5a7
 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 5cf87bbc624c..7cccd401498a 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/ttf-bitstream-vera/Manifest b/media-fonts/ttf-bitstream-vera/Manifest
index 4b63a0ffeb0e..95bc418391d8 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 493 BLAKE2B d8381e09c4d44563c4ff52d7512f020c93bb2f78c4fe4087638b5ab95ee7872a642a441c7f99d38c91fac516da339500b45433ec29ac4148dea9c962e64da875 SHA512 b01be51d11bd9b63a8ddf91d2c3da814937b3ebb639aec9826fb110162c0a32d3df3190a8c53a9533557839a959318be6a6b8af30c328d68f47d1782dcafec99
+EBUILD ttf-bitstream-vera-1.10-r3.ebuild 483 BLAKE2B a0237ca85ffb8e9e606d81d76cf736677f660ea65251328678e97bba31184a470686fcc6b2b0faa33bd2ed6e1fda3e1cda50c08df5eaec1fccc277d6a9f540a8 SHA512 28c47427c96478e8b976d188e3998bd6c6a2737695f5eae9fc50b6ccd4252e43c23c6568bafa46538d390a392a7704ae6a104f8256ccc1a62688a9dfd3e7d23c
 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 f0815fd143e3..430ad8c7745e 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/fonts/"
 LICENSE="BitstreamVera"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts-extra/Manifest b/media-fonts/unfonts-extra/Manifest
index 9aa7da0afe8c..3752da61381e 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 528 BLAKE2B a7e3671354fe6494a13f9d099b9f480b4bb27840b039de5b5a97d3f2d37e1da2ea32aac9dd892795d204c0a20aaa06e378a63758a40707bc29d8567ae6bbf70a SHA512 ab0ebb2d9abe715f45e92de9fbd4648643548c6947dac4cb8fe5b877f6f8fb3de622877ede61f3ae39f2a4f951a02d4c1ae4a513151544e983a2e1a9379a78d6
+EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 518 BLAKE2B 4fd0246ab96ec474b3f3e9a42222a4d666960e4bad3ac744c2b4adba6b61488adf9cff6fe55e29419151f32b77f571872cd1076f46aabe3c0f3e21333e04d212 SHA512 196889b38ef668ef22afd7b751465e128d67168e52a8653455186eebf435344ae6f3e94c8c2158fc1ccd1924fa9edb0fc978eb77db52c58a85f38963703d2b08
 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 542c8a2f39aa..0b241ee71c4a 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
@@ -16,7 +16,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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts/Manifest b/media-fonts/unfonts/Manifest
index 3c7736d17f19..96e5ef8337ce 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 519 BLAKE2B 02c72f0812451319953f812852e99a438d34408f71173b7af440c49d09d26abc26068f8e2e99af50c8e6555b76654b9a83cdae86c176f8735b75a95cf78b6822 SHA512 f418e46fdd77ff7fefaea11d9743030bad604fdb9b80ef407abec31d70d3c7219fc620adc1f44fff791c54517eddfe61188727f78c678e0a6e38992c10cee569
+EBUILD unfonts-1.0.2_pre080608-r1.ebuild 509 BLAKE2B 0dd3bf5588e9a26f76fdde83244dd769ca549915f9c09dab9b8da2ecaa6dc6b503a563f47053e730fdb54b1cc1f4c6b6f7e37ac9439b5a173dbe9e3bf630a9a6 SHA512 a4e0ff757061f84e986f284c974283febb3c7f758dd6360d471bc34a1bf59f8dfd7d8084573c42979809bfceb6aa316c34f417593a560d0aff4bf5cad945613f
 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 a2cb79753e87..dc3701816864 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -15,7 +15,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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 8c9b23e6f02c..de3eda28f197 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -5,9 +5,9 @@ DIST unifont-10.0.05.tar.gz 15645240 BLAKE2B 2707891d66e7ee71b3bf68aa63ebfb303c6
 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 1145 BLAKE2B ff1d34b3ac507397fc08ec36d5c613f34f4e63de83036684afa03aba8d8a0ecbb13225c433ededeedb18af94a837a85e8eb0ff78cebd8bde991a6c6bacb7aad3 SHA512 30f5ac1eb2114a35da98c5142c48f1b6010cf5ade8168cc0c8cd43ac0af47e22e8881e664138ad4ed0096ed8bf0a469b86facd897733e1e68f4bcdff3f55055e
-EBUILD unifont-10.0.05.ebuild 1145 BLAKE2B ff1d34b3ac507397fc08ec36d5c613f34f4e63de83036684afa03aba8d8a0ecbb13225c433ededeedb18af94a837a85e8eb0ff78cebd8bde991a6c6bacb7aad3 SHA512 30f5ac1eb2114a35da98c5142c48f1b6010cf5ade8168cc0c8cd43ac0af47e22e8881e664138ad4ed0096ed8bf0a469b86facd897733e1e68f4bcdff3f55055e
-EBUILD unifont-10.0.06.ebuild 1177 BLAKE2B baf9869891f6bc5d46ae231e3992fdb808e013a332f64efde4f9d69664993f2eabc8a1cb26de4c4745027cfd7fa8464bd2188e97347c00008b941363c1aa2124 SHA512 ce7c043a011eff4597fe176bf39c5b4ff13eb67cd2c1b5836bc86dbecf665fa55373e1476e941f9c6dde042415821a1a3418bc30bce9351a16e364cc08b17eab
-EBUILD unifont-11.0.02.ebuild 1182 BLAKE2B 79fd51118ec6d98561a06e7f832a875a4f50095eb23189934e4c5647bf3b0d19384510fbef341920283b586a81f7365a603af5ca719001e12264872ae932c432 SHA512 da88e52ad7a36f793bb4c6c291343328a735c932f803cb773e95d41969800247e46e6774a17828022d86948a7a06151d9eccf0afa8c04ba87c2e913e9f7898e1
-EBUILD unifont-9.0.06.ebuild 1137 BLAKE2B 491708c2e1682ae524fb218fe5637ba1b0df37987774565d42281a853da5e04e818848e65e74a8a191b19ba4423d3f2b4db2c2a1fa861cc8949c6ba362d556b3 SHA512 5d61476bd901ae55327df8bce318a99644a25494123dc39780851939f59ac8faaa5b2721c6fa442564ce4299e72e51e6ca7ab8f2674b1b4511dfc2b27e096e26
+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 1167 BLAKE2B 563ab5cd915231bd3ef837b9cb66962181c2371df3b2687565566be46173b3b0568d4509a2b1e76f666dd4fc5b81eccfbb1f099ace89f3aafbac5af900e26b53 SHA512 ea85cbea88dc3532d7220819aca23b54ce8521348a778ed38e86e7942d530f63f8847a7f8de505a527aead0a81db35834c3b887d3a686e469a143402ad31e16e
+EBUILD unifont-11.0.02.ebuild 1172 BLAKE2B 7a94de448b285688d0f77b425021d5ef52e4c30e595c7c676522e7e080034f8be3b725da26cb78921f44eacb683879f2ee452a53236f3c00fbcdaa964c67af1d SHA512 6c6bbc5026395ca585f690d0f7eb4a3fba420f9c3d80f92508713797a30103c3f547e00c8d23c6e745008e69eb9d0c884a010f3bd4a3985b53102f0c330388ac
+EBUILD unifont-9.0.06.ebuild 1127 BLAKE2B d78f722668b3b6a055fcaa8a7c7a664d0ad5d76bec7f313f51be3fb52720559b194130cbc4166031165343ec2a12ac37e0b16717e0b38e6c71dfce0b0464b2c9 SHA512 be58a681e7e4bfd5b5aa82283549fff1843a4b13dea7424a1d2447ff5344cdcb741e3af1666032ca030131518b1018a4b94f6d1ab0f15139642b4fab88862c00
 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
index 73cdd4ba54e9..c7f38721c874 100644
--- a/media-fonts/unifont/unifont-10.0.04.ebuild
+++ b/media-fonts/unifont/unifont-10.0.04.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.05.ebuild b/media-fonts/unifont/unifont-10.0.05.ebuild
index 73cdd4ba54e9..c7f38721c874 100644
--- a/media-fonts/unifont/unifont-10.0.05.ebuild
+++ b/media-fonts/unifont/unifont-10.0.05.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
index e084b87ee295..e204ab76d11c 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-11.0.02.ebuild
index 54818db00cf6..09349057d2fa 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-11.0.02.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
index 9de087f46b3e..15a35aca4b72 100644
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ b/media-fonts/unifont/unifont-9.0.06.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index 54a40116f97b..e23e30b21f26 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 1990 BLAKE2B c2794a1c5536e4ac96c2cd45f6202a9515406e2dbbc181737f8c23920c707814c0331dbc0cb9818708878e2868c199c9600777aa708c49c87fde5c7a28f1f4a7 SHA512 201030ae4cdd605d1e5693f092f034e35460ecb327511cef9457773340de15bfd0217c273886f2e0ecedb061189d7d088a26799143b58d7331de14123c94d1bd
+EBUILD urw-fonts-2.4.9.ebuild 1968 BLAKE2B a8b19d1c757c78161b46310031130b7d86e7216281fe982a4ca3fefe21c170f3d7fe5625e940750f0bd1bf39a3adc175c087d6c2d3c1140b87740f3143900d24 SHA512 df0c278e6d21a1773912c4de4b60637c7207046a0ac94f71728a6a4ca12c414f0bf428414181968b75d25b5dda79dbac7171812983a49d99ef1fee32d196ff5c
 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 82c60c5d4025..3e98c730fec2 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -31,7 +31,7 @@ DESCRIPTION="free good quality fonts gpl'd by URW++"
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-fonts/urwvn-fonts/Manifest b/media-fonts/urwvn-fonts/Manifest
index 5e1a070fb4cd..07b7eff1a048 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 952 BLAKE2B 0c2bfce8bbd4e179b843f4e90f4a72521724b1ada868f572cd3048dfc0cbbfa8fd31576cc5caec27c77756335aeff185ba3ec7b3889e193c679e62e2f0d788ba SHA512 11d99a48c7736155f6c858f13d1272b29e8a7dcc012010a9fadf01b24e34e4b5ce73cf1e2237d88e7484389f415a1b29427ddfbc6169a80a0f8ce979eba569f9
+EBUILD urwvn-fonts-3.05.ebuild 942 BLAKE2B 58be6e0298aa06261aa8d6430499b32894bf118a9f3e60801ca92382713c13cc83a3477eb0701197cc17f63999eb043bc368a67cb60b90ca846a08ed210c4701 SHA512 9c97c96e6f43eb0c253b23a1a3e0ccfd1f9ec011e142a4d415ce5d05ec48c8a354437db07a8f450ee8315155012fab57adbf8e0357aeebeb71bbfe281418785a
 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 e514104c2bc0..51b90e1532f3 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}-ttf"
diff --git a/media-fonts/vc-fonts/Manifest b/media-fonts/vc-fonts/Manifest
index eca1ae9b046d..77ed0a0d0da6 100644
--- a/media-fonts/vc-fonts/Manifest
+++ b/media-fonts/vc-fonts/Manifest
@@ -1,4 +1,4 @@
 DIST bleed3.bdf.gz 3351 BLAKE2B 6e308fae7f892d839856f440630fd925ccd798d633155230a5dc1e4f9d09c79bf653b9641765c3dd1fc9bf23e082b7e1dea46a01fb788537c4878f26cc92c176 SHA512 3efc415d4220640ac84c5b32da6094aee2d693e96a0d679d2b01f6e1d3543e21b5cc4e5494cdb552138aae6d83d12133b2e0d7d0f144dc516491f31a62c15e6c
 DIST vc-fonts-20020207.tar.bz2 18154 BLAKE2B 46e47d0a85a8d7bd229850de16c80479ddf612efc35255f8a068792f774b48c7ce4bed992a40ca41fe0db879bfbba95609c50a958f7f147925414320c65ac174 SHA512 f65bf2edbeeae8af244ab255685076cc09729a31a10653032df59fc9751416082fdd2817c6d0077954bedb7d1554ac633a1abc01f5808285c259700dca18d310
-EBUILD vc-fonts-20020207-r2.ebuild 660 BLAKE2B d705d6f2504523ce863105fc66d0e09712de9b82e869ee4f452e9126a58f181782c8b2af248138fdba7d79394668967a6f038127e94c59abbafdf6bd46aaa2df SHA512 f11749ee38a3a2b3c4f1de9886b191c42cde33e84c2ae47d8a0e34cfe0c6078e4a640d061b763cd2077784630783da5a6c2e92efca9a0e144f66f4c551eb4006
+EBUILD vc-fonts-20020207-r2.ebuild 650 BLAKE2B e5b569652dc336ef09ead5b51e636d34f6838be8d07442f99d712ed5dac494be6527187896cb65bbf93e1f5f151b74fe0ed1a9573bdd9b68fee6974f657dcdf5 SHA512 42c5762e4647ec6040f82ea30b46f6bdb4df91131292cc8ce3752b32a08e13d23526dbfde50feaa45c2b6087907c4468ec5f458942449fc08e7ef5e5faf75319
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
index 32652ae0e51c..2ac1d4fc9943 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://vico.kleinplanet.de/files/${P}.tar.bz2
 		mirror://gentoo/bleed3.bdf.gz"
 HOMEPAGE="http://vico.kleinplanet.de/"
 
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 LICENSE="GPL-2"
 SLOT=0
 IUSE=""
diff --git a/media-fonts/vlgothic/Manifest b/media-fonts/vlgothic/Manifest
index 7da14c748451..5977c841a55d 100644
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@@ -1,5 +1,5 @@
 DIST VLGothic-20110722.tar.bz2 4797664 BLAKE2B 03e3afb8914234843a22221419d106cbea48b3dfd2d74367932a30c405e08850e4405d8346e8e1dcf27b20f106c2a91acc143091d416c7e888a72baead49b550 SHA512 91693c293e0ef9db01532a08d3f5f96104e7eacda580213537dedb9d8d8318b8520aa292cb625629db1d6f2a4714e977f55d23721fbde746c10049c971183f1b
 DIST VLGothic-20141206.tar.bz2 4952134 BLAKE2B b650481bd63c71f996e584c60e612201d131c6f89a4b2d5843be30922ea05358add61cd6c5fe3205a1f81f5e79a049c284fa90092196d79f5c114d4a58205806 SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d
-EBUILD vlgothic-20110722.ebuild 535 BLAKE2B 470b0d3174516678ed0d32e3dc1766cd6ae6fa71d8475df027d982f003619ef7ee8a9cf6c900625280b9bb1e16d63fdf9b14f80078497475f2d060f655bd6db7 SHA512 b658ac2b29857126c3a33e5785d30b99c8aaf9990375a2e473ee0a4688e6ddd2b3c1289ee068ea14f36c6ed3eddf74d924915163e65bfa60abd7bebf77e3092c
-EBUILD vlgothic-20141206.ebuild 556 BLAKE2B 31734e7427a202eb4dc8888476ea7de28563504ca1f4c40041713f9e3b60d6b9a14ab7f685e6fa558f65e48c92bf1c7834658f1f84acf48094bb4b90836c54f1 SHA512 798b8ba393e8aaac47d81840495135ba33bd98b08d28c38b8fc4bf1eb83ebea388ce2442994f2dba103f0a5ae95245d61e49b73319b3ecea9dc4a950ec231704
+EBUILD vlgothic-20110722.ebuild 525 BLAKE2B f1337b817cf1495036485fd3d51cfd06376b5223dca4fef38b030f250c86fd00c587164cd73987de7916c857b31458f78e8d09654da1f4b2dc03484546e87f42 SHA512 a28e5941a20a8dfb4619a32883d38034b414e694bbf547a4d996274361d341b69887a56905aa86d3ea5bb2ad65048b7f93baf29590974e863ec9c599ca665f6d
+EBUILD vlgothic-20141206.ebuild 546 BLAKE2B 7a3e52e33dc3974f209394999106c9712adc434bd26a3abc85c34a9cae6cd9a32c059f955d6560afa990e30882597701f23c5ef0441f9386f7b2662624c646ae SHA512 85e4e35e326f17fa099b3e5cd21d3442002ce9f3629d5bb60821a0b2ee472ec4f6831d51f5883dbc47de3f3a794ce4baff494a50ae1306e6f4b5b3479170c015
 MISC metadata.xml 430 BLAKE2B 5a58b9c299fcb447e5d3895a54cf16bc8c3e2233c062a35e0d6dd3764bc7ba78fbad57a07ca5c02ddbe90a6a4967d268c7c9a44599f996a4c6674d765964bf9a SHA512 ef2fc0344b55c169ba468dcfbc72cddb81c68f63974add68430c39924ac5f7aa77c2130815496c68a025f7809fa0454aa0b44a0c50892d6db6fd64052adfbcc7
diff --git a/media-fonts/vlgothic/vlgothic-20110722.ebuild b/media-fonts/vlgothic/vlgothic-20110722.ebuild
index 25a17e9f156f..15d9b83c3142 100644
--- a/media-fonts/vlgothic/vlgothic-20110722.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20110722.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/vlgothic/52711/VLGothic-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/VLGothic"
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index 39a185621749..d41bfc2fafdd 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -14,7 +14,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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index d23860f9ff06..c048a97ce4aa 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 635 BLAKE2B 654dd2c23ddc9ceb67f1615b48ff364a2990b1ba857275ac65e58f6f4489420522c5ee94a52b14b9609d402d7ebae4bcf93b98cbd983b4bc74eca531f8390971 SHA512 4b17a066c9dbb89b1edad584cc1bb1dc1491716fecc6196c925b03fda0ae0e8c8836b04a9b6bd5e307ec7ec5fead853d48b6b8d399ad107802471396b557d4c0
+EBUILD vollkorn-2.1.ebuild 625 BLAKE2B 609df26730cf383ec0c6990cd124c04a0487be24bf649c0359433efd2e5075d42e66a5d2f81b2ba0e70e8f10ab28a892d5edb79376f371d7e9f10b1dd0dc5026 SHA512 022d9b318f47bd7c1e7655eb5b6de8d10641768d3a8e6a59d72a7062ccd565aca7d9140402ff92659be25d2893d768337478508dc3eb4283304b6d8324265e31
 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 fb0ce28b9cc9..4be7e54553b6 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index 04426060dfb5..34c442bcf6e0 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 605 BLAKE2B 51c28266c0837fbbe5e95b60ee27ce389af8963901a00eba4976e1dd8319e0f6b83c069012e0d765370be9cb5d87e9f581d86bf287030f4bc79329a444343b9d SHA512 9f6e3d89870a392590be73e6885558f5df6b5361a369a112935d9d33400f895444ea1c6900bc5cea4bb80996616b8bc4f1e4127009cf59352a4a96bc0d6f630d
+EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 595 BLAKE2B 9d00e553f2100e500732f7f2f9c9c25577b79208656cb5809b9460ace0076934d41088fb54744b2d8d83738ae80099fa72cca6ba08ff25a718989fe916230e7c SHA512 fd50b0f0b5fa83c05b0e19f6d7dd83384623fa14e035e847e33c21264953896e472b51f03f7ecf1d4480227764dd22f3e042040daea2f202cfa68d7d48bd9e10
 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 78e1d2da34fd..031d261e8dd0 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
@@ -12,7 +12,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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/wqy-zenhei/Manifest b/media-fonts/wqy-zenhei/Manifest
index e18cbe11c14e..a6c803eed6e8 100644
--- a/media-fonts/wqy-zenhei/Manifest
+++ b/media-fonts/wqy-zenhei/Manifest
@@ -1,4 +1,4 @@
 AUX 44-wqy-zenhei.conf.patch 1909 BLAKE2B a0d5ca675dfa8760c9bf0bac535958fb1fcd8e160d613931c75f75b687079d1969b886d87a47e2ed48e095e9558784b3fb65e59b86e54663ba75bf248f828b4e SHA512 dd1583dc436a2f5f05aa915d76fb2ce13dd09fbe4822df9890e890e4e084699a1c371fe491b612b087a89eb9326d6647966952c736296b84f4e11ad9c71c7839
 DIST wqy-zenhei-0.9.46-May.tar.bz2 8665887 BLAKE2B 5cbbaccb155f337dc9187c0c4a8f8f0d2d1c452ab960df7797ecc2b339d5c9f23747e9935db3d190c5eccbc8739888c86c4a7e0a01c7e33b76256dd92c301836 SHA512 ff41473fc9bd69c04cc509d1f8915d5bcf99d175ed9dfd2f9627fd56f6a4e7720e4930d35313d1e89f090b229f2e3f461c948046257fadee192dd618471f7833
-EBUILD wqy-zenhei-0.9.46.ebuild 1184 BLAKE2B 64b518f87b9f605def1291e93a2f899c07e9165bae5d990f0af6ddcefa93bf1f6b7f6a746b845eb75e9083e3cdfb4c09c41fa2108e487335d8220af41c910545 SHA512 3951e0fc6416080267889066cfe5e3e33adca316248ae9125f1c4d36ebb7d973209908e7d0f5c1b85560e20b146a1b61a822f00d967fadb89ee5bccfec46ff47
+EBUILD wqy-zenhei-0.9.46.ebuild 1174 BLAKE2B fe08c6105998ae22a8a12008b456e74eaf63ad1a91da8e7caaa246127d06bbf9b0d59374a09d4b08cbb6d0abad56e4b0b3035929d9eb73fde6ba662b8da6ea9e SHA512 46329681a8932a1004297e001189bae158a49238be2574bc4ad16a325c97ceda9e844e8fb94b4a9361b9a9259eab8b7587a40873bed5d298702e5433d69d094d
 MISC metadata.xml 311 BLAKE2B 7225a227c3d32a5ac754531f23c069679433f7f04ff2f3ec3bc0352007324deac71c6e3ad1e602320a2f582868e33b903d9f36cb55e985f5cb4869b825fffd00 SHA512 cbe957ce61a145cb171670724027e56e801021deee49eefa2675f199b5a50add88eafe5547b01959bf55b22df4579ff62a1e603cbd24e1ebdfacfd0ce463083d
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
index 1ffc48121423..f67cd84ea337 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/wqy/${PN}-snapshot/${PV}-May/${P}-May.tar.
 
 LICENSE="GPL-2-with-font-exception"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index f15035f86d2b..4a5375c695f1 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-r1.ebuild 766 BLAKE2B cdbf3917a84bdd3dddabfa5600100ac717b871b142fe071077ceba36fd498907c2986751006dcc2bb70142ca782bd28e502edc08deddbbc250e97737661f68d1 SHA512 cad2af87670266e2c1bfaa3ca7dda9b12455c18672283e578937a2d05a41dfa44e1dc1db3d483e36400dcdd840d07402835d373c91db8d258967883321e88092
-EBUILD x11fonts-jmk-3.0-r3.ebuild 755 BLAKE2B 10cbf56afc54d7bccdeb7bbe9c1bc5138992b72daf16444ccc4530cd161129854b6ab82e37e115c70faf3075fcecf700fa4b937e165dd15e3b324ec76c7aed5c SHA512 8188a9946c7cbead8ed42882278064c25be41651a73a606e9ce061e0706c8e1f4543bfc785fa4dd4ddcedeeccda7216bae7020404aa575ecec557c881906abdf
+EBUILD x11fonts-jmk-3.0-r1.ebuild 756 BLAKE2B af8c310da7119c996013917e4d7c82cecc2ae53ce0faa99587ad196a87855a51fc45b6c9c2ca1fabf6267e93498a9f73171989fe027416d1ff224c2ef21f5012 SHA512 d847b0f2fd8b3950c541d226452d1183ea6a98537eca1d90f3a96578136d83bae5de350a3bd52b9fc2d81ab63c5bea867fc1d90316234d21465ab240508d1dbc
+EBUILD x11fonts-jmk-3.0-r3.ebuild 745 BLAKE2B 4870507346612029d634acf11c8eecc199abbc03c0c6499ff7ef7a21fcb358dc5c918c7a66c5a14e28c595a51d76ccab54c211278f78c5b9155171dc659009e2 SHA512 4af811442061cf18d724951059b88c458a8a8eb3d7ffdafe8776f94f30a5f995ef385539273555d3b084332b201d3b489f4406481926c90e6f8e5984576834f9
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
index fa902fead1a6..1f561ed25693 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
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 b539d05e352a..bbb83bf52277 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index 0ff0ff3e3be0..d4b7f047616f 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 362 BLAKE2B 7566d4588ff2daf66895a7a78a271c1f02fe3fe1547321681fd46bf7d7bc0a4941b019f9d2d0e05c60bd4da3a5fed44eb0f6e369d6361884d61beb6594968862 SHA512 16adfcdc4a570dad0fc2abf9cb36fbf40309a0ceb1d9c3938169ba965603c9fdf89516b82c2645fef3ff39e2fd0acae19c59c36ba4ddbaa8aaa044f9f9f941e6
 DIST kcfonts-1.05-freebsd-aa_ad.patch.gz 4825 BLAKE2B 681e23308fe202d6f3276ffc0a61186d623bafb95a7af66949ee2df52ac76632dfd65247b98e0f6ee639f19e098fd86a205e2b96a705982697db7f68a3bedfd7 SHA512 31146c530e5f3845b184029e22c71b7ee8fa1fd73e0fdf3e6cf90500129e70a58738d75926c97c71467571899f8a1f2f71df5a15fb68a503a5f06a4354ea42f6
 DIST kcfonts-1.05.tar.gz 903701 BLAKE2B 344017187fb5ff1a13cb9e05e84a56d38a7b7d14865ec471bf9c36c383f1681b1944346af2d3b1f67ba340b8101a968ef527f0a27ee7e5ac3837f1c67da33325 SHA512 a8b94e8f8095a8578ff340637bf4a197db56948d0d7ecda0d4f17da51bafc09080761f32894f88a54c88945f72b10a11dcb04e5841c19c4eb6852e263fb64209
-EBUILD zh-kcfonts-1.05-r3.ebuild 1024 BLAKE2B 02dc68758d588464e8a47e9c0df955905080618334b0e06bba5341a66d35bc60bc485b4b162d92e23f1d81dccccb9580e6e89876dc99239ee09f4c37e659ed94 SHA512 9bf8747a16f3a32f3a2690874757dabffe06f0c05fe2b9560ca47bd2a8f1a5c910d1c956995a029f3de3c7ea107a6f0678ab4aed294afe965234040a5ecfc1b6
+EBUILD zh-kcfonts-1.05-r3.ebuild 1014 BLAKE2B fcde38e08c9f24d312950251404d85af61a708a93cf646911fdea79692fd89d336acb5a538575490cab2f0f610014fbfdea47497fd3a04b3b97a79620fbf66d1 SHA512 b1b9702a16f2e1fde964b369fed3befe53389969d16589ba87c53525c8ff7b6277155a8d0a9d9e263577eb4b228996feec33fe456e44d0529415acd7e2751620
 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 c332b898655b..fcc568527812 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://freebsd.sinica.edu.tw/"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 # Only installs fonts
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /media-fonts
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)