gentoo resync : 16.09.2020

91 files changed, 149 insertions, 155 deletions

diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index 630565d1e17e..14634b727882 100644
--- a/media-fonts/Humor-Sans/Manifest
+++ b/media-fonts/Humor-Sans/Manifest
@@ -1,3 +1,3 @@
 DIST Humor-Sans-1.0.ttf 25832 BLAKE2B 4190361e42ae30a5870ba79a1125e16569c6eeb2ad6fc739d18068c36d39dfb33d46ee0d0944af6f7b61fdbd7cffb992ef6e69bcc736d322897b612305fa9bcf SHA512 f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
 EBUILD Humor-Sans-1.0-r1.ebuild 470 BLAKE2B 1cb8726f6b05f42ddd634386e6aac1b934de3e8894c0fb30dc07b05d4d4f628988be902f2e4595fcd4bc4cbde80adcec5ec4836eb13bbd6a300957d1cf403de3 SHA512 f399b467438de103cb65cae033172d1ac861104550c1849a3a78773592ebe4eeb8a6f54b98778cda4dbadaca194c94514c22d192c4e3c0e7022c7d5220a65746
-MISC metadata.xml 447 BLAKE2B 4dabe996257d908ff535332b5d0a02d8ec460e9d5c2e24571ccc40f4a6c2f558643c4e1f859193adec70b347b05b94b63a057936ba6785aa83e8973a5bd74d72 SHA512 6c529893c55d015bee56c3ed28b0d46b6ee847461474776fb4d7fc77705f7b0ea5207f95a627f63cd9ba4b673251b9371d8f4ae690c5b32cb5c54f8582fec1bf
+MISC metadata.xml 369 BLAKE2B 98df7da8c24fd35dda26b7017906df3541ca67660e101d77b0ca0f4f4d40147adf8cc412f356c194746458c762e0b3d7909efeff3ddefb50ca7ac3def79888e7 SHA512 89a0d92aae8d1c68a9c7e9ec1a103468252b90f7537183205bd77a6371f98b6f225a290bd101c7b9f94a178f2dfeab01864087a4835bc9d6d0d5424b8c424fbb
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index c97a5a03835d..15a01a677fea 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -9,5 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>A sanserif typeface in the style of xkcd.</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index d22c1f990cfa..444d340ce417 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 99c3ced5efc5..6093dfad990a 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
 DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
 EBUILD cantarell-0.111.ebuild 1268 BLAKE2B 5422c6790d42f2f71805859910b0c7197a4d7a02e042537cc80f421ec6f321f50b7631ff19fdb6db2844a80836b94f897f68fa5fed3b04f92acc8431526ea825 SHA512 945c7dace2e99d4e71f0d586e57887d3c2c9d29479cf6ad4ab306d239ee038a35edf28eb621f7b97187f3cf2ff2453103639eec95a44ab8ed5b1253e78af546d
-EBUILD cantarell-0.201.ebuild 1060 BLAKE2B c6422995199994e7f50517661a30acbee98efc6c5f4a1ff9af821061c7f05f53629cc400ea125b8848e8507bdf0a2a7ee92313859a54888eaee3c339bece350c SHA512 ebd0035a0f8f164ae76900131cdecd1ef3fbbc51d2ef6f7519c9667c7bb7d1a9dab50cd228a19f667c06eb1e7874863e7444d786f21bc705a800de366dd11ad7
+EBUILD cantarell-0.201.ebuild 1059 BLAKE2B 8c9593db074c85d770a95d5dcb2f3dcd09cace4f7cdf57cc5c59663c9d51f467b5274bf6c314f3ee9bd81e33c3bba124b15733c8200f2597970d3635aaae6573 SHA512 0919ee944ef3abb773ffc3885b8ad1e920d866036d1e367c3c63db89e1fd7b3583fa3c460ba031c98d4f3b54a7f8c68242a75c12657064d27fa949be633d97f2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
index 42a86d17e04b..212e5ac81941 100644
--- a/media-fonts/cantarell/cantarell-0.201.ebuild
+++ b/media-fonts/cantarell/cantarell-0.201.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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 8a20ee537fe4..27532a48eea7 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,4 +1,4 @@
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
-EBUILD encodings-1.0.5-r1.ebuild 557 BLAKE2B c605ad3a965148dff42f5a0f9fb9f4618db50a64f246c1ca3268fc61e4b8e7d32a22556119abd933249fbc53534d892a79f99c96184f2571ad2742beb3c956a8 SHA512 6ae2400e31e24876db20e8be64c87b2dc8a267a5181c7772c36d42526002219d6863f433c47812d0f7f576d593170b459a060f6e9530d69427c9fd9a0b4d1513
+EBUILD encodings-1.0.5-r1.ebuild 552 BLAKE2B 1a07f37a3fe59077d6d56f064435d0cd2676c72db76f99c4e6fb97eae8c689dc0a5341cddfec37bc2648e2b874f8a20385c0466de1d0c59fc73fcb64a4707e07 SHA512 75f3b13821554972998dc7b57812e188552e5d791f4f5b100a0edfe867a0cdd11f11c802deebd1a4173b89ece490ec4d6aabb5a196e6e7301755bcdc66e58916
 EBUILD encodings-1.0.5.ebuild 669 BLAKE2B bc2d5db13539e8a6c07864e6f5d48316d41503de9d46ff4da400fa8343d2bdd6f4952e4ab7753843bc3fdbd439e561b22adb5604219843506f6315287e999be4 SHA512 b439c884299a301c1efa3e7e9d2a70d78093de60d01dd151f99241b022cd3859afffb3cdf7215f6185863455cedc27f9c4c468f087e1fb7f860c298ce928f232
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
index e95047f6e640..5a006c26fcf2 100644
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/exljbris-free/Manifest b/media-fonts/exljbris-free/Manifest
index d5b4f5121a5d..7cfaf1ef6a19 100644
--- a/media-fonts/exljbris-free/Manifest
+++ b/media-fonts/exljbris-free/Manifest
@@ -4,4 +4,4 @@ DIST delicious-123.zip 90823 BLAKE2B aa340054f06dd6af5ed1aaf4f7e0a567abe6df38924
 DIST fontin2_pc.zip 74922 BLAKE2B 574a57be04646c23f78ad8ab5915bc4e570aaa2cb58177b94bb60d6549d82ba521d3533a217d885e09723e5e9dcbfb01b5a0f71a2b133d6dd85bb5d530f5e263 SHA512 c617440f96609909b2ee7291bcf3b26c38eb7841cba6fbf278e2acfde119b01a250b69f2bb804c4000f622080ba0c623a73b48951603129304e01f67c7f1567b
 DIST tallys_15b2.zip 16564 BLAKE2B a377da4605b38196c8d5088b996171a91c39493f06b2051aa8040d4dc4afbd66c2fe0d648a29f6575332006ebc6e826c655d85c7e463987647b8d784e0a60e5d SHA512 0b25146eae4669941706d8feb7de3da37031daa602fe11b8f914b2a2224b0e4cb496852014c3f5d85b9b853af61ba5013619abd8efa786b5fd01efe474552a31
 EBUILD exljbris-free-20100320.ebuild 684 BLAKE2B 27bd807998434129e655fe6c525349132fe091b3993b523211af281b154d1d2f4a2615126e4ba7ab35073460f39352e34899f84e0c909b17939ebc17eef577b8 SHA512 fea8dc7faa6fb70bffd9cbf811a45999c808b34528ba538a3509e995390e2fbd5779e59ec54275c9a8e58cfc9f87eac89640b79cac10e03b9abea2d8dda0271e
-MISC metadata.xml 388 BLAKE2B 3c830abb16cc0a24e9b602a56935bc01adf14d35569c18c691f34e87b11c6517495e4bb1f976f8776e467dd5d518088ce17b5df8a5525291a574b524438e96d0 SHA512 3ee66b2b47cac695ca8e34cae27aa841a7780ed863f83157ed2ca420a6c8c999cb153252f1fb06419bfb20620d9640e3d3e79bf94b7c9d5d09a63905a17fb1c8
+MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/exljbris-free/metadata.xml b/media-fonts/exljbris-free/metadata.xml
index cbe9b1cebf28..cc081897d48c 100644
--- a/media-fonts/exljbris-free/metadata.xml
+++ b/media-fonts/exljbris-free/metadata.xml
@@ -5,8 +5,4 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-	<longdescription lang="en">
-		Free fonts from exljbris. Includes the fonts: Delicious, Diavlo, Fontin,
-		Fontin Sans and Tallys.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 642ddac843ee..89f8059a60a4 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,12 +1,8 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
-DIST fira-code-2.tar.gz 7100481 BLAKE2B 1ca41276c56b6edb174620224d2a0a72750cd29c48c71a350d033896e2ff6d59454236f193b6dc95f8f5ccd338951ac52f5c2e27c6a5286589382af938bc76f8 SHA512 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
 DIST fira-code-3.1.tar.gz 5665465 BLAKE2B d1ad5d8e2d217d9dc1f06b9ac52dcf87f4f108aab1469399f0d1fb011f3619a1ce1c85803213da33a7b7f6e48fffddc194627b3fe560f7340a6a41b15d822062 SHA512 6acb941664a773a1186e6b6150ce747977fc95963d4be8756de05eddf7c2785ba0a5eac8319361779f6e747e8cd1edadeff1a72045cdeb3b152ce5bb2c1b77dd
-DIST fira-code-3.tar.gz 5665172 BLAKE2B c27861867102b788da151e9b5ed3b8a1d3e610f9f40d6facfc7f850fb15ff6903bc4e0579674e4732b52bf1477b3f9bc223158c59991d4517af3476f7f5d819f SHA512 2518b2fe1e2454da32a023e93c38358b0c89691f2f47b2e26e9ccf583109911b83d73880800fe02f556e9ed5888edf08e447360628eedb4e7a693a2f9e778520
 DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4aaffac00357bc7ad0ed99436b44220180f9753a0bc6f2fccc5dafe4a47df9cac91dc87fb1441952e1f04eeae SHA512 037698435b3f77f5ad2dcfb6ea6ff3063c50d224c2b95ada472bf9b12a6342e892d60220e1993045858697fff9c4fb5da97b41ac3437c4fa50f48ef1398c9738
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
-EBUILD fira-code-2.ebuild 640 BLAKE2B c367dcfe55a554cf3dfeb4102cf021554a178c1fdd51e85b50260a8c322c0c172f86165193a56763e34f3ac3af6d3c5a4adff54272b18f34cbd40c40907e923f SHA512 6ea833e78ddd5342f0535883bcb0fd70f7b54fe69543639bc890b8f8dee4fb8efe6bd1b7e489618bc56354ab1266d919d19c3a145560248b5c50ff50dc3cc63d
 EBUILD fira-code-3.1.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-EBUILD fira-code-3.ebuild 644 BLAKE2B 05bce38ce17b9d640dfb06ec4f57962a20a466f1d11dd998223fdced8e99a895aa74d49525fdce30dc98e49919830e443cbd8bb92312355fb0858a5bb84e6b87 SHA512 60889b899c14e753791ac51256f0c93694e0d0b0d168c2182194155c7c27d3196cfcfb2d21f65ce7a913468ca4bbbe989f1258367c3299071dbe236d7bd36005
-EBUILD fira-code-4.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
+EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 EBUILD fira-code-5.2.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-2.ebuild b/media-fonts/fira-code/fira-code-2.ebuild
deleted file mode 100644
index 9e256b7b90f5..000000000000
--- a/media-fonts/fira-code/fira-code-2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/otf"
-FONT_SUFFIX="otf"
-
-DOCS="README.md"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-3.ebuild b/media-fonts/fira-code/fira-code-3.ebuild
deleted file mode 100644
index 9d7a61c0f352..000000000000
--- a/media-fonts/fira-code/fira-code-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/otf"
-FONT_SUFFIX="otf"
-
-DOCS="README.md"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-4.ebuild b/media-fonts/fira-code/fira-code-4.ebuild
index 73fe57c4a3dc..c9c8dbb7c8aa 100644
--- a/media-fonts/fira-code/fira-code-4.ebuild
+++ b/media-fonts/fira-code/fira-code-4.ebuild
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 96e5afa14566..54b30e6e03e6 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
 EBUILD font-adobe-100dpi-1.0.3-r1.ebuild 281 BLAKE2B 1f8aaf3ac825469b383374fdf0654696ff2fef1fad6802e20c402fa28f93963acd0eaba28298b90abf3f4f791c57c17593d79e1b022fa237bf5f0ea201fea2bc SHA512 a7baeca6bcc4aa4e7d65a2de56c2148ba63eab255e29282484483c94ed3436bd90925a42dd70d1c1fdf7b0d5d9ebb026f8b5c4cfe0e3cecfd15074a490155d0b
-EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 253 BLAKE2B 7fbf48833c1e145d474b127a5dae177624fd122bdf872dcffe9ed602e296b1365fb58a67a80c8b654c03ef513f327e7656332cf6fdba0d54c94399211a55d160 SHA512 e430e53e104fd18a5b6af2e304b61e2ae7d7975220cddb2e430ede7ec5f841c9153e3f623e1ecc5ebc2679dbbadba2d367c405af4902889303e3125cb117deac
+EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 249 BLAKE2B 5324b377a7a35095ae172597eca459e20d5aa22e44a54a1b86f0b568252abd9299f0c5a1d3a11641a6af69717feb415364f68e78a0f93c70bf62fc7ad8934632 SHA512 773bb7feb03189ce1982828897302c82f03e2c88939d4d295ae2e2cd9e840c1e202048121ed99c540cf8981504f3d2694e0c9285d26df514e936bc18541220f2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
index b26fa470d728..80d0f3b546ca 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index a2f42cab1af2..65eceb0da879 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
 EBUILD font-adobe-75dpi-1.0.3-r1.ebuild 280 BLAKE2B 9e003a0ba804a63bf8ffa084eedf88d45bbfe333522dda2a728ef42f8a6db5f74de915785f04b096090e4fd5cbfd908abac4411d6746e02bb05405a2a8574aea SHA512 b81fe7390b05b03774e86c0847ff3975a33043c3a4e9bf1ebd2e78944c2cb57d5d7e9fc78cdd9f9fbe753e75712e525065812419200b092f3bdbfed636eeaa33
-EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 253 BLAKE2B 7fbf48833c1e145d474b127a5dae177624fd122bdf872dcffe9ed602e296b1365fb58a67a80c8b654c03ef513f327e7656332cf6fdba0d54c94399211a55d160 SHA512 e430e53e104fd18a5b6af2e304b61e2ae7d7975220cddb2e430ede7ec5f841c9153e3f623e1ecc5ebc2679dbbadba2d367c405af4902889303e3125cb117deac
+EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 248 BLAKE2B e2f92c7af57949d91cfe3ae450d805ea7618eb01ec9bc51ae7eaffcb0f85f8e54766fbf13907ca9b484e1c192f7ce8a42ab200d55112ee3eddd467652479a401 SHA512 6a5e10f8402b8f39b38f7a706a07a38da988b9527a1d0751deec3c517fc03a20422b479bd2d4cd2da1f5a6cba3679f44628a6ff5843b00ad38e2dfd884fb3ef0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
index b26fa470d728..56840a64d784 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index e5631b47d0a8..381fd9b66916 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,4 +1,4 @@
 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 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
-EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 260 BLAKE2B dc68812b747dae3c1f6646b06031fbb08f3aff42359b60072756bd867a079518fb6bf5ca0a7bdcc2fcfe7022374f872776b2a312ac59cf562918b32d556f46ca SHA512 06cb2c5fc6907b58b24ba06f8c7767ddf00730550d0f47c1a25bc7e74e5cec4bf36e964e64dbcc7f5002049a3851fd0b14a0c6c6cea291fb6f55087604f3ddd0
+EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 256 BLAKE2B 771179fcc5296bbda367480c52aa18e65f4ff88c339b838d68f12f69eefd96d2681911573b008b7a230730f02e1b095bc19fe2e5ae5bf3a547ff3ce440155ebd SHA512 0560d94b56b523e44b4c7b4c2f85f403b9e76fea7252a08b6a88d46fb8f57e260dbcd0224153d0b42793a2fe68f515152f5ba83a5137ee3cac27f4711134b1ef
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
index 3d240d9978b3..b779249a865d 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 5173cb64bb0f..edd7044adddb 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,4 +1,4 @@
 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 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
-EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 260 BLAKE2B dc68812b747dae3c1f6646b06031fbb08f3aff42359b60072756bd867a079518fb6bf5ca0a7bdcc2fcfe7022374f872776b2a312ac59cf562918b32d556f46ca SHA512 06cb2c5fc6907b58b24ba06f8c7767ddf00730550d0f47c1a25bc7e74e5cec4bf36e964e64dbcc7f5002049a3851fd0b14a0c6c6cea291fb6f55087604f3ddd0
+EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 256 BLAKE2B 771179fcc5296bbda367480c52aa18e65f4ff88c339b838d68f12f69eefd96d2681911573b008b7a230730f02e1b095bc19fe2e5ae5bf3a547ff3ce440155ebd SHA512 0560d94b56b523e44b4c7b4c2f85f403b9e76fea7252a08b6a88d46fb8f57e260dbcd0224153d0b42793a2fe68f515152f5ba83a5137ee3cac27f4711134b1ef
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
index 3d240d9978b3..b779249a865d 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index c2f6c94061ad..8f3c159c01ce 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,4 +1,4 @@
 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 260 BLAKE2B c2e871f984175ea867422fc907805a8227e52360377bd65fb73e1c39f62c18c03ee9c15e9853420dddc8e2288bd056d67c34b791f37eae2930380b023364db58 SHA512 90c9b3f33c6b4b4d9954981a6fb24709f528b6cddf338bb6c1cff77e3e073d2a6b463fdabaee60eb7ccf6243b833f01107bd045e6c6f9ee92c34ff25c151ae88
-EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 260 BLAKE2B 2d33702bff6c230944a900cdf8b65bc090eab3ac1f07dc11e419f901c7ea7b98900e3fa09a778825177b7a3b396240fe474ccd2cc087e9e0d1a95a6ac05925ba SHA512 fc56e5bb7d499f239e0cb9fb88ee37b86a2fc2018a5bfc044d0241074fccd60f83407dba275fb83d3b3277baef5c24e3e386b0016b1e5630a5043ba3c4592261
+EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 256 BLAKE2B b147831d64aaa4ef3fd92351e12b3ec9e113bcf070056253a5d9e88b6acaa49e126c4deedd2b623b57374811f118854c119779b953e3eb16828f87f38e0d3072 SHA512 295c3fa71fa713477f516c793d05bd08b48ca00cadd9ad42f020cc4b91b7615dc5959748edf340f1a985b51e2c350a02a19b3625a836adb0d8122147a3dccee8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
index 7eb3d2de7ebc..88f66785b417 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index a05279297587..59a2f73bd2cf 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -3,5 +3,5 @@ DIST font-alias-1.0.3.tar.bz2 102537 BLAKE2B a4a92e147a7c106c6feac39d7b2eaa5785b
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
 EBUILD font-alias-1.0.3-r1.ebuild 492 BLAKE2B beb34bf956e1564345b8f665ce35c30d6612df2802d4d9c9d9ce4e5afbdaada3c4d92eaa677c24a73912fa45bcc8ef2285807099225a1f7683f26e50977e4935 SHA512 7a689754264076cd8fd4df7d848271b6217373586b7fdb41e5d764dd39b83e7134e058f0d8348a6d43504cba15fb44a7cfb5277f3b96b563c99b42bf0d6588b7
 EBUILD font-alias-1.0.3-r2.ebuild 472 BLAKE2B 298b7682103dbe9014bc8a8b955b9e3191ae8db8aaae6dbb9d7fc36f301a376a38faac2892d28bfa5620ad5c70f75ce0831de3e1cf515c2335d7389a49d68024 SHA512 9e1f09feeb372a8d824dda636488facb1445a1f84a8c994dcc621d6a23660fd82b1368e3ace28ad788a33686c3c7f0c66826ad0ec5394b5015e152ac54b7932d
-EBUILD font-alias-1.0.4.ebuild 417 BLAKE2B 9bfd8bc973cd0ebcc526e1c15c1c2d434a8e4a0f9cc11f95b262069d66f8d115a49e9cc4609789de1d02695f77a3f8ac31ae8f8f5073323412ab1fea1de9bff6 SHA512 0f86d0cb490675169ce292bcdd996f428c197529bed917876388ec9fc792593e08ee1a2587a78eb49c8ab7e9b6a27f33990ad8a11c96fcbb3537c0e110c85b40
+EBUILD font-alias-1.0.4.ebuild 412 BLAKE2B f3c6af729074f80040f44135ec461737e44030c0a5e3645c959773a1c3595af87ad4f901fbd3d62f1d88969433709b4efd765ef871419743cec50bb8ff61a25a SHA512 0cb68e7f4de21b1cfaded412003b77d6411bf8e309584466492ad249b7d5655c010928cc0299285d6269e2bfffd3032430f864549c419bfd7a8b7e855f12f29b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index a608bd954ccd..35c119f29731 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 4fe2fa9230a8..6f5300039be0 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
 EBUILD font-arabic-misc-1.0.3-r1.ebuild 282 BLAKE2B 781ed3bf88b0e6e5667991f73d707fd4594cf9171bf448dac6c16c2e741e1919f6f53a6bb1deb36a8036ef153ec58e2e95f05b402eb344aed65f0319823522b0 SHA512 76ed85aa445ebd9864ca8e1424a318db9b707c0060b07751be9df92982626b253af8c722990742af0cc6d7de4eb874631764b8df3bd31210884bd5247b5d4a85
-EBUILD font-arabic-misc-1.0.3-r2.ebuild 254 BLAKE2B 6149d094be429383158d14478d33c268af0a9351eee44331eb257a11be48533fbd25a8af95af9c905b5c964c0213365aad1f6503482342087da69500320406a8 SHA512 3b1ea9692e83116b961d82e64b9312401716ed6dc762b1e5a33d5949e7cdb49129281e072207b07ce84c942cc94552e59c762453e03f6e579b5a41c35fcbe19f
+EBUILD font-arabic-misc-1.0.3-r2.ebuild 250 BLAKE2B e732c6ccef1db75902582949dc4b7f34447aaa5c190cffc1edb7d0739aae2f18d74313effe6ec68f1477942ba863631620820aaf2d3267a8d415900942e68e0c SHA512 511dc0eacabee5a9f289718397a00113fd73e3511c162a256397bbab258055252df5926b011e3349cc0caac7f1b1bad1a2c697f933c06ab69ef1cdbd3592176e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
index 6ef42eba6e5f..ce63f640a799 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index 5ab645316243..297e03a6ec71 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
 EBUILD font-bh-100dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
-EBUILD font-bh-100dpi-1.0.3-r2.ebuild 321 BLAKE2B e6e0bcce252111c32b10b5c1206bb08baec82d912aa05e116c7feacc4e9721e7b1d9f852da5ee7c467a7452819d4f7fe5dd3ce8731b511800cca000a29554822 SHA512 8baa889b5bdbc19708e0cccb077856d4df07bd9f8beed9024f0f7e6fe2551136f6f49a288e046ed32e92fd4b192e33d30e32f3d45d1a72601727b7f9e3bc73f9
+EBUILD font-bh-100dpi-1.0.3-r2.ebuild 317 BLAKE2B 326ee15de6c14dc656dd01158f501bd791da7100b0a15517aea6a8b9cc2b837713c26901c8089f1a9a9803a0592f18fcc1884a820bf892c6f6c2314293e95275 SHA512 31f32dae7e27911e9b0840d30bad914b094be9b26f3941608cfd31004e86356c08ce9bd78d2733beeca7ec4ca3613969b0b763638a608e41a84b230c6521acd7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
index 999efcbdb06a..2aca0cf8085c 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index e9a9686db6f0..e129df86c528 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
 EBUILD font-bh-75dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
-EBUILD font-bh-75dpi-1.0.3-r2.ebuild 321 BLAKE2B e6e0bcce252111c32b10b5c1206bb08baec82d912aa05e116c7feacc4e9721e7b1d9f852da5ee7c467a7452819d4f7fe5dd3ce8731b511800cca000a29554822 SHA512 8baa889b5bdbc19708e0cccb077856d4df07bd9f8beed9024f0f7e6fe2551136f6f49a288e046ed32e92fd4b192e33d30e32f3d45d1a72601727b7f9e3bc73f9
+EBUILD font-bh-75dpi-1.0.3-r2.ebuild 317 BLAKE2B 326ee15de6c14dc656dd01158f501bd791da7100b0a15517aea6a8b9cc2b837713c26901c8089f1a9a9803a0592f18fcc1884a820bf892c6f6c2314293e95275 SHA512 31f32dae7e27911e9b0840d30bad914b094be9b26f3941608cfd31004e86356c08ce9bd78d2733beeca7ec4ca3613969b0b763638a608e41a84b230c6521acd7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
index 999efcbdb06a..2aca0cf8085c 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 3796aa1a36f7..fd5c0e9abbff 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,4 +1,4 @@
 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 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 329 BLAKE2B d1b812dc6606db0378bd648e5b5a744f408074b931d37671ed0b0e42161f25a65a9e7afb33107f4d13864b5e2d951d689319ab54001ee3c546e33f06592cc156 SHA512 d68e5240a23dfd73bec2a81f85f4bdbe0b8aad5cc53bd8c8079858dba7d2f0bf31095884faf267272340c10290419cd781369b96c86a052989b56e162c4b1933
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 325 BLAKE2B 6b725a9616c269fb023b7e8030a358214619f50b0abba4c0b1f0dd5a8edae42d4cf01360288728a68cd43a36d99aa86a576f6aa1c411898dacc89c690ea65269 SHA512 f5f7dc6ceaea2a366be41e3be7df466e115f209dc1f0db100c63ad4077f200f75cf133d0327dc83d5f491df04654ec9aaf0a85218c86242d701684c6793aa6c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
index 805e9d4967b2..851241f87d48 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index 7c6a30ec322b..ffa9a8e90bef 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,4 +1,4 @@
 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 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 329 BLAKE2B d1b812dc6606db0378bd648e5b5a744f408074b931d37671ed0b0e42161f25a65a9e7afb33107f4d13864b5e2d951d689319ab54001ee3c546e33f06592cc156 SHA512 d68e5240a23dfd73bec2a81f85f4bdbe0b8aad5cc53bd8c8079858dba7d2f0bf31095884faf267272340c10290419cd781369b96c86a052989b56e162c4b1933
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 325 BLAKE2B 6b725a9616c269fb023b7e8030a358214619f50b0abba4c0b1f0dd5a8edae42d4cf01360288728a68cd43a36d99aa86a576f6aa1c411898dacc89c690ea65269 SHA512 f5f7dc6ceaea2a366be41e3be7df466e115f209dc1f0db100c63ad4077f200f75cf133d0327dc83d5f491df04654ec9aaf0a85218c86242d701684c6793aa6c4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
index 805e9d4967b2..851241f87d48 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index bd11e6ae1791..50f3e2e04731 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,4 +1,4 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
 EBUILD font-bh-ttf-1.0.3-r1.ebuild 301 BLAKE2B b4fdeeb545172e8846699b1ce02f3028ad05fadff4f5d06a079043d11683a164d857a6af44399efd69b9285a3b35ae51381e1da16536808fff19615fc39a9683 SHA512 4367939552429190a96bcbdc49db25cb7f64015e20bda8dcaa651011453d3c5d4733e7c7ada499738f224022747babd39643c5b30add4f9cb0a342d3c6cde42b
-EBUILD font-bh-ttf-1.0.3-r2.ebuild 301 BLAKE2B c8446a472c23298017d08275c12df1736f8ecb4d28545b60563abf0fd2a662332c4480b850911b2ec0576c54055b2a85b61ecaad6a0a7876097358cf7bde1397 SHA512 876e6d8ec946909e85f8af35804fb119038e7544f1544f09a0f83234a731ef7b72509fd74dc6e8a9152ead9fe804536dcf449cd85d0ae91056d807c2e52b3f2b
+EBUILD font-bh-ttf-1.0.3-r2.ebuild 298 BLAKE2B 4ada8f70e300bf4d753eeb59ec9b34683dc3f11dd1ac1524ce542b2f507fb3b2b4dadff0420f7205bb7a75190a8af2961f3f14c20ccf356a82bed232db04839e SHA512 0b192303b7e5d9aba0c86b01dec3f47d8a5ca24e4035c2efa2a374b120f604c4112d909f206287d8d1dd1f5928dc1cfdedbe6d364168514e03598bad0d8a7bca
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index f818889d4b81..af2272bba7a5 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 7003f21633b7..2cbabf0d84b8 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,4 +1,4 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
 EBUILD font-bh-type1-1.0.3-r1.ebuild 293 BLAKE2B fe164422178125e17beb9998894dd69ee010230ca9805508dafe14954bbb8711cc6147d3657bb095dea77395aa9f885b70095c49c40a35bf338572c72a1f693c SHA512 8fdfd94b4058032351b433fada7869d8a39b24fed0e0815b9bcc35f81f9a32ffd23ecff71de2fac69141108e5a973afd6b83ffa9ed1bbe304d53af8474cd7ebd
-EBUILD font-bh-type1-1.0.3-r2.ebuild 293 BLAKE2B ce0788f4b35ad46d4dbee36543ab9d3c559ca19144e51bc78d55250f1b67b892a6d789e7d339d6e5e6bdfb1588678d68e5c5248b46a83bf7813604c54f59eb72 SHA512 455504aa2afa5b2ce5983263e79efe8611146106b4e2a1f051ca2d58e2d8e20dc9478c26b7677671e91c4ba5fc6e5b4a3c2883aec17261d448784565364e5d42
+EBUILD font-bh-type1-1.0.3-r2.ebuild 290 BLAKE2B 9146814bd1cdb84a919f3bacd55edcea9256477fe02d6f8cf584049c6815556ead331b0f4fec63c46d18ee3288b65f860191f1c791cabe7a20ea61a86162fb42 SHA512 f1ee9b4f5a770a7191dbcf1fe9f95a869ae32c74c338ce51458026ed42a5023ebcded9a398d28eff9846213c96682a81f6506008067cca521a48f251d4519b22
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index bde1cbff4164..f4125772d08c 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index d9eee390a971..cb2ee8515768 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
 EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
-EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 257 BLAKE2B 5cc26c12bc473d9861c3ebe26017fdf67dd56c11cf73754be990959e404cfb05b11ff52d20a097597d585f24ed9b0b61a6a4101063ee30fccaad31f1657dabc7 SHA512 9211c8baf5eb54bf814b2816532b8a317703a27097a8f9dd768dbddcf80125678b5089df78dc7d7067660a6b245e95bf8bc94f9cc3b2eacbe78bf12d9d00c5a6
+EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 253 BLAKE2B 4812f622bbec2527f407125419ebefe061298fe03bbe018185e37ed9137a263359b6d6a755fb4a4a56e5ccd8a7cc465169ac3d01748083714685f46a1466f7dd SHA512 c07d92f25befa257184de10ceec2f663676dcc20983f17604de342842e2e45502d20683d784bd031b6dfd02553685bd91edae3cfbdc6c36d8fcf82483533e437
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
index c191329eaec2..c693ff8aab3f 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 10169dbf9177..34225d254980 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,4 +1,4 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
 EBUILD font-bitstream-75dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
-EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 257 BLAKE2B 5cc26c12bc473d9861c3ebe26017fdf67dd56c11cf73754be990959e404cfb05b11ff52d20a097597d585f24ed9b0b61a6a4101063ee30fccaad31f1657dabc7 SHA512 9211c8baf5eb54bf814b2816532b8a317703a27097a8f9dd768dbddcf80125678b5089df78dc7d7067660a6b245e95bf8bc94f9cc3b2eacbe78bf12d9d00c5a6
+EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 253 BLAKE2B 4812f622bbec2527f407125419ebefe061298fe03bbe018185e37ed9137a263359b6d6a755fb4a4a56e5ccd8a7cc465169ac3d01748083714685f46a1466f7dd SHA512 c07d92f25befa257184de10ceec2f663676dcc20983f17604de342842e2e45502d20683d784bd031b6dfd02553685bd91edae3cfbdc6c36d8fcf82483533e437
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
index c191329eaec2..c693ff8aab3f 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index 29581f9041c4..a4aaaf6f6b37 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,4 +1,4 @@
 DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
 EBUILD font-bitstream-speedo-1.0.2-r1.ebuild 251 BLAKE2B 85d1294df0dd493ebc244db975b0e1c82307cf25bad4469dc0e320972a4c9b181b655c26b7f027edd916b488f73a7a9aab301a2bdc3fa3ebd9a6521e09a35fc6 SHA512 e407b81a15f1d87b1be07de2345116883852cd578c38c8ed14abf74d92fa1ec7058bde44d8c37ba6ff8fa971f2a3c2ae678e67c205391a725623e577da6d2ef0
-EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 251 BLAKE2B 4bcd25ab95742fe35c74301609edebd3c46ca2b5a6c3acba8cddcafbc55bfb4673a529646c7771bf71e715712ee75c0459a35f991a2a5723951a16b1d7dd9010 SHA512 12199e0f0014886fa953898f2be7c43080196128d66e60e0b85ba603e639f9a517d0c0b431365a2502e0a53d2b0d89a9b4144f90d2abf8b5d3b950fda4d13c02
+EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 247 BLAKE2B 4a0a05e2e80165e3c3ac13622d6aea5ddf8b34e2522401c0aa8fa3aca5c6aeea66bba09a0575819ada548527cc89ef342ad4bfd1fbcb504e5ceff1389ccdf23d SHA512 6958d2122aeb700d1b37d6da1c13eec063ccf4e086feaf0f0c7410f9d55dfbd94f9621dd030c2c5cf8a8cda6997abbc79bbe31d58e684f9e91db42a5afe62ace
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
index 9be87cfd9f73..9ba3886a5911 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="Bitstream Speedo fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 7cc7049a4320..3cb3c6933eb7 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,4 +1,4 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
 EBUILD font-bitstream-type1-1.0.3-r1.ebuild 263 BLAKE2B 636499ca29e08629373e43dcc8f34abea4c47972bb87dbb0c2d65c7b8a8c8dac36ca1e823ec3c06dfa4292aff9419004bffb8e7df0ef2c375d6db03aac17d870 SHA512 21363161dd375791b946c42699ca5ceb3ba2e41b0f11a1f398c25bb2043259265988df6d475b1fd814f2df67bae330124696feb9df3936a8eb6c8b77448249f2
-EBUILD font-bitstream-type1-1.0.3-r2.ebuild 263 BLAKE2B 2c3b7d47b8d0d0018cace7ae518b1cca82c437daffe66ca87b959b9d0b3ed11cf849bf8bcf7101e8548132103e5e64664cb6740424c16dcc299084016710a387 SHA512 90b3fc9780a84598ca623a8ac54875c548738ed3ba12607c7a5a5d2aa57c402f3a5322237063109204029cfa8beb7b7c12936c01decf1e1a1f3a21d2c3f0ab2b
+EBUILD font-bitstream-type1-1.0.3-r2.ebuild 259 BLAKE2B d902346d464c79ed6650e692eb1842d6f373484e39d662bc5a1d037d40503c3b0355d0fe52e3d73fe1683524cd2a6e681eef9ac1eb491f91f45e5600bf680ffe SHA512 671f77e469e9c63d59d214a91b6fa789a3ba801370f1db8837942822c5c90e7e521f72a0aaca496cf199725182b21fce0a659901464bc36b3efaff33310fc202
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
index 164730f2157b..a84628c3491f 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 60be58b36993..28ed38f9091c 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,4 +1,4 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
 EBUILD font-cronyx-cyrillic-1.0.3-r1.ebuild 284 BLAKE2B e1663f2e0ca8aa05d79caddf5e94b47d147d8133d94aea1d441d73f6ccbf01be037d52780f33c4fbb8a279aee87bb2936e0bb1243fac8cdd4c478d494c44a003 SHA512 5605b110f9cd23e72da8f73a942469af64338a13b6259a2abe29bd6a5de7c7eefd93560395a6a513f454e376faa75dfd839ff3b139b29fca5e73b8328e2a88cd
-EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 256 BLAKE2B ddc2c378dd02b9cb2b1e5e5cf1ec857733e1bd9d7f8a472430147f72d598eaa48f205a6281a6352a5d50d42969bc473f88a2dfdf4665fdcafa430559882d1d87 SHA512 b95488562abeb1a5d83117f47d53c0af0d057685688f8231e66c0b7498837bafdf15c908e3bdd4ac8dd727af91943b0e8ef6111c64743719467fc4b4c4222700
+EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 252 BLAKE2B 22279e7e57a3711c94a5fd5de86f3de5c1c666647620f698111119b3be18b9f1a20f57927e0ce70b5603b1dca8ed4ec2fb1942dd9d8041d76fd41c5c6fe925aa SHA512 691b3c54ba1775e8e117fd3fd50e2d1a0b743aaedc1cf84a7301796f71d4c19a7bf6e7716b3984a621812b6d9f043fa6ff92234695775dfd379f3bb544883b3f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
index 4193374527a1..73a0810890b8 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 363d7192c4f6..eca901006a09 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
 EBUILD font-cursor-misc-1.0.3-r1.ebuild 284 BLAKE2B fd99aade2b4a710db593aecd46cc3a55173e943f5f4cf2d3e99a6736ddeb6e91ea72025ed44f328acb8e50cfca0de91b9033b9f0cf59d96299d7ac38d8ea900c SHA512 e2e690f6200c3e981e9b1c3a8876f25b7082e0d20e79b57e57d1311bb967b8375389f4630254ad1bffe88ecce359db9119f3aae468bbcda7e8df4e72a82f7b75
-EBUILD font-cursor-misc-1.0.3-r2.ebuild 257 BLAKE2B 71a2af8507c83307af7e5268f5a992b40e0e965e1c02c6b0bddcd556b970a5a8131f9f878093b7a8119da4aac1700a0fec60cce364cd3bddfb5c9bb2f60afc98 SHA512 da2e8cba83fb13dcbbe36fbc7d7a3e44b08f6ea5fe8577e925a2af340494c7573d45370d1b388bf6f3413c5e637582ab63533e03d4a91f50bb80620b2045fa9c
+EBUILD font-cursor-misc-1.0.3-r2.ebuild 252 BLAKE2B e9584b8c94935ff6ca6405c02b7f44f9df6ae0e3654a52daa1d9228947f03c8fba776a27c04c682fc62b6881f4edf4e9a3f5f9d4b31235f5ae37d3e49266a9d3 SHA512 560b116000e9a98e6ca11e911a02906e2ddbd15c75ba2221c1504d8c2e4f3201eccb5515ec0df31a9e899fdebb9c187b0f2011e0fbbc54bb118ef76c5f9bae65
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
index f413598f4f87..a9354173a8db 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 3e411deb3614..0a1229a663c6 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
 EBUILD font-daewoo-misc-1.0.3-r1.ebuild 275 BLAKE2B 548fef0c634ff5254092b7d21fa957e93e1180a30f210dd164977843344f0607eb391a30c6d28bcd908f6f9e1ca6b17c53346b58b76c7e3dc5b4ed11880f0220 SHA512 2c43be4ea2fedb5c3250f65da14fb2ef8937ba54b3620bb1a044c439ff83425fa03159dc237903751b4d75c0f8f9b47a6a705e9094382c0f2047db6b519ccd29
-EBUILD font-daewoo-misc-1.0.3-r2.ebuild 247 BLAKE2B 2937f3e9a0471a8c7e8455845f782aea3b8346d9fe2ddd0a7ed00b273dfa35dc96c970c7ebd10fcec908c6e468dcbe4d97be4de8acd9a751913f47f17015a3f5 SHA512 68059e7be6acce61ff26e885ece40dbc80ea6312c987018ee036a0fab56b7a49552b0922501a4f8010c224930779b16a791083e40845674093c73426e1e72c22
+EBUILD font-daewoo-misc-1.0.3-r2.ebuild 243 BLAKE2B 36ea2540fe49e40f755ba5e5043267733b587a895655642a28758a16a83669f0f5c69cce99fa93a868e3ca196b8b681a34ee38f744e075f4e2deb39af9fb7156 SHA512 ebbc0151160d1398e646d45ee898638e210776440e2bda40cdbf5508eb5cb9830c0aba0531f0b854c5bf19f7d4a9b4d61a00cbdbc96a3351d7f9f0c2ab4cfd3d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
index f36ef48c4bfe..19d387d40d88 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 83dc0d06eae7..e880b40de12f 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
 EBUILD font-dec-misc-1.0.3-r1.ebuild 272 BLAKE2B 6b3fb65f1ab4ea177b9252b43e02f4787aac9c59d2c01708280cd15b59b4755c4951e38d08dbed5d58d0c7d8503eae9c5b2a841fd92ff0e510a8129789d892c8 SHA512 8f30287dd6c66e1a2a969170731ee1c3171fcc690092a402930e34ffaf56347248df67e0a4c8d5af5ada28c19123e6960c622963c7fed9db8abc4c12d650f979
-EBUILD font-dec-misc-1.0.3-r2.ebuild 244 BLAKE2B 057339ae5653ac6fdeba44917a4c7b4951ac6f0fedc847b1d491810dc5b5c8aced06bc93b538bef1770c2a8f7a7e1b77ce3b6ab447f5cef8e0336310d9dd656e SHA512 464f60b4008a537313b4a853c152154c6d6ed102365e3da50186c4c1c8931dd0399ab4ef14be9599c6eeae88ce40e68eaa81812424b7b073556bd5391ad65683
+EBUILD font-dec-misc-1.0.3-r2.ebuild 240 BLAKE2B 8b43c2bc41ca7393a361417267ee103248a3d226d477342614d4752bb54adfb8d3737ae897a51a44057416d4896f3149851efea0d84019519118a4bd3d034bd5 SHA512 1afa5810a9c8fa2e16c48f8279def3f6ec44e498c5c3047c2606544964514fc8675c887072f3b13fe11c7f0b4ad09731fa432bc5f3644895111ce2b00cba843d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
index 7cfb2ba83427..c45c585a9cc6 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org DEC fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 9316b750ca4e..2f0d608fcc78 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,4 +1,4 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
 EBUILD font-ibm-type1-1.0.3-r1.ebuild 251 BLAKE2B ac514852141075e07dfbb30426266dcb21ff5bac16ea9f9881a0ea8b6ed2a3e68be838dc5b7b06cac9204985dad82274b2dce2df5936fd0dff178dac121c3253 SHA512 5d7934aecd9ab81bef0b8252ae271db2fff855a0ac8662871848a8c440a2457dc5c9a551671f926c7e03591bb776496afcd6c773f369560092fe79b700bcd32b
-EBUILD font-ibm-type1-1.0.3-r2.ebuild 251 BLAKE2B 4c1b45775a614d3b6061c43ba8f91f4f95f60b75b0f36fac4fbb8a8f56550623e5b35032c3ff678aa6c8b499a458b191b9fb2333b8666e7523e05458f4bd2085 SHA512 e1d5e95cbfd4c9ac7bb2611ca432defa5c269c53084ec4aae239294dc5a2af91a22b5180ee37211501044ccbed3cab1df5dabcb11bdfa0c9567c0e72db9b9834
+EBUILD font-ibm-type1-1.0.3-r2.ebuild 247 BLAKE2B b6a0d56a71f214086f39dff52d4b94ffef7dc227474ecf685fb2b2457c511c24cf9e936ef1b7a37dc81dfd0b41c8e3011ae9a2e1e0782a18aa3529d2de18e844 SHA512 4276bf614c130131c0b109e43fe10c76534b70de4260b15446b9f42903c3b7dba5931bd4ab4fe3888d9d4fce5921bc92d5638edcd30b0a8a966619fa5e093f92
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
index ae8f37679b80..d14428aac216 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org IBM Courier font"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index c108ad0d35d8..dabba0d1c076 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
 EBUILD font-isas-misc-1.0.3-r1.ebuild 321 BLAKE2B a677034f13bd2a1ab0a847f84162a452f9591a1639379f8e3af62abdeadc28d3d51e0fcf9fc0d1d7488555ed9717935a2c10618a1cccadc0a0aff2b29086dd9e SHA512 5197468316cc24f096a7c3b7bd9112b32786a6b6fb518e886353838e0f581ae9479782cd248dd7cf96211dad97d913a8c304d42d36ca606573c63dc504f18dbc
-EBUILD font-isas-misc-1.0.3-r2.ebuild 293 BLAKE2B a399666c0d9d42afc479280812c97cccc52cc648e17dad768f96b04fb24fc438095b53702c31cc60af3dba8fbeabd764009b56638711f8e55451d094468e0bbb SHA512 d51fe1dbdb66198f6d69b557f7d129d2d3478567b67076baf24f57795cd8d4aad7e986ce913924e27d729c8a6eb6a1af9994dc0a911b029fe098c4ed3b92ef42
+EBUILD font-isas-misc-1.0.3-r2.ebuild 289 BLAKE2B 0e23c23417d07a0e3217dfc6c79e1b548afaf4a33b32b23abd98c383c3bd1682df71254cd2ed9765a1a331ceb536748cfdef125e06a1850a6420c752cf95bf9c SHA512 f4eed78ddc62d547875901cdc0cef1c6713dda9727f67332504d0b51abd513e1c9d77203442473451c0526016b3d13a9c21f275e05bb30001e81363939d2413e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
index ac2b77bdc6a4..ce13dc5ee455 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index bccb972fece4..663c7bb5a115 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
 EBUILD font-jis-misc-1.0.3-r1.ebuild 282 BLAKE2B 6e30825501c3d12c7df39bb2a4620fa3a92afb5ab49479b689308356a0cc7e3f4c96f2b0975a4dbdcade76c8dadae438f7508452bbd8170bec1ad38f9e5e490d SHA512 47c044c5dc3cdc053cb82c45d21024cfc398f26f91f33798b43e3bdcf73aea2f5b1f2fc89b0e056c15a836481f55201b744b660790b607d7fcaabd1cc7cfd67b
-EBUILD font-jis-misc-1.0.3-r2.ebuild 254 BLAKE2B 2fd8c013b5dc21a19bcbf2ac0c3a7e16b81ecf1e72d1b525458c7e3a0e674c52155da3ccadd238fe70a341a0931b9fd971e876f3daea45ccb9b77dafd1dc86e3 SHA512 4defb01e34d76c4eed166af96ab1a1ef6c1fd95f6620f7274122438ea94ed86e72bf480a7383016df5090aa9579ae8fc299d1b525f5b8aae51ef1dbaf6b51f77
+EBUILD font-jis-misc-1.0.3-r2.ebuild 250 BLAKE2B f8af94b54c18b308f5b125061ecaa8819701018480b81bf3494d3f2b6f56eea83b03ec90751cdae901152119b08d28c81d2d6d66f9090b7c6691f5a21a6b05d1 SHA512 c117bc519dbe1e63a83098ba6fb842812c0a91d3398f0d8831fd81032cac72178136e7d1b7b9ff19460ab6706e95c205674b1d1f25cb6b344340b291e826004a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
index a45800bdad32..8fe8b6933cb5 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
@@ -5,4 +5,4 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index d2029451375a..51a094abfc99 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
 EBUILD font-micro-misc-1.0.3-r1.ebuild 302 BLAKE2B effcdfc209571156442dec3418172eaada20e20c0ee8f9e1b339c0ce715ca46579f2a89e57582f0643ef2fcf66fd70e301d11be438475afced58611c993a42ee SHA512 3d17cbfd5049406c6ff10cd32f09b6d75ecaa2cab2279aa32dc5e6bf0f84e51d82486056c36fbbaf685aaafc8d3c93f83cf5c114f5aceafe8fa993d44902f050
-EBUILD font-micro-misc-1.0.3-r2.ebuild 274 BLAKE2B 82ff3ac23d0d63649094b20bf38a7f8724d482bd0aac946ad8cc645b277ae2d490bc5b6fcd76a1ca89ef2de3140de7bc6669509557946a977659d60b181ce2e0 SHA512 6c41f4b25cbcaebe788c1f151e7512f80a5d37328ec715f7d2f238ccf968e453a650eb86c2630fdbf337f283b2193fef02f24cf3addf4052fd5306769e3dd89e
+EBUILD font-micro-misc-1.0.3-r2.ebuild 270 BLAKE2B 696f6e3ee713375b408e146ec59c88e54bb249ee7587ae9a9da34da4859a1914dcbbc76b92bba448318b491f56070decd3300ce809fb0b46c8f2c91c3cbc041a SHA512 f7ab893ab369a107214f0f4ab6d95bc1feeea9ae2368c026072a500dccb1536d05146748b4611b021fbc908ceb51c20f834e7e5245f9eac56ca207040de486c6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
index 4cb93bcf8417..b68200656450 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index f45627e1aa22..097a16263bcd 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,4 +1,4 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
 EBUILD font-misc-cyrillic-1.0.3-r1.ebuild 282 BLAKE2B e2798f1337303fe93729f191b3d8b7e171cf70a8f9f1969e7f2563b0e29855485e1be99a0675e9342ab9614809f7e750b5982d3a7405e98fd480812e1b286189 SHA512 728f7f4cbc3ee78e47a99e41224db9fbc4ccfcb7b4dd911dbd3907f19edbc8d8f0a275f48176c28e76608a6a30b58470f9665a9ddd7275fcdf86b814e456149b
-EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 254 BLAKE2B f4e076eb33f0c53274f7274463934154e943668f528b7caaf2ae6e47e35d717202961170eb58ea85bfd4f8065d210115f3a5190617b5600efcb4dcc1af11df02 SHA512 450db1970647df7feb19c8d3066ef29fa150d05ff49e035dad8e77c300ff16d02628f5362fa3b3d50060fcec1900e71e234a04d4e570340510003193616826f2
+EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 250 BLAKE2B 1ef43da85fa5efbccbc6fcf4cfdcb02a84e64bbcd66c7e8ac2cc2c598153cc4b018af6f0915ead0b72999ff9ba56554d0b791517f2d1886532c9228e394b3e8c SHA512 67bf1bfd35e32695287b9f1c4168e25e73546fec503c1b9cc2d63fb7ccfe8e867a276445fe09a16408c144a8117681c2731031c5753a58bc091e1a58bc14364b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
index dd76876ed025..2230c841e7cb 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 5b674f5b069d..ae33653da9cb 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-ethiopic-1.0.3.tar.bz2 245606 BLAKE2B e0cf89f4500226b7213d6f3f88b3bf575501140d8742fe5e30b07eefd2c1fe2fc9bfe941639032d3b5ce45eb7e6f352af7b6468e7f8b0fc941ed9cee8d531f96 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
 EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 519 BLAKE2B 8ea8d1ca143c4269f00e7003cd35e69548f4dcd9023760a77d09a7991bcd275df9f37631a126e777a71e9a7c717fa8a051ff4c273b76aac4cdecdf702f84eadd SHA512 6ab2706eb1ee5e0de1f0c6096d72598285405d89cbf9c5d0a0f3acd8e050bb1777a892e01ebbadad92efd8c4006bf5ebdc5e88bc3c6d2790b08b8d025c48891b
-EBUILD font-misc-ethiopic-1.0.4.ebuild 703 BLAKE2B d75205c5f35eedc04a855b3b256e21023817f06b9c865c4e33473c7abf90af155b8a49f260ff621d2e6a7f76eaca0c72b860985081069a9836f3204bcaa36916 SHA512 79d6f9c2588b3f6b2dda01601a3002bbaada8939a5231b3a1b38b4e5d5c499693eb62d6fb4ce70d47a0ff1accafbc9c3be09e046742953a66ef308435b1ee42d
+EBUILD font-misc-ethiopic-1.0.4.ebuild 699 BLAKE2B 04cb587581725bee803576d03600b003fb7f896f01c4aecdff51b7da8eb311764cf8810dfe39530b61eff3f0f0ef445ec0c249fdb218c13c44896de24af7d856 SHA512 6a8bb738ce4cdb036c8b5d48727a8cbfeb446042e6363ad187c0759aa9d588faceb248cd7973d989f464d5838bb1b147724e7d55dfb4cdedb64ea5239065fed5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
index cc322ce05390..596c21c31ec1 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index 7083ea80a01c..6d90ca1621cc 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,4 +1,4 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
 EBUILD font-misc-meltho-1.0.3-r1.ebuild 269 BLAKE2B 464f269b3a730e7f331444b6c3cd3c82952623b432aaff5ee5c3dd521eb5d6690c5f6834b4b83966e5bc2117ec66bd48262895e8f4b3d7cfd153f1a64a1e52ca SHA512 ced4837ed27b369e10b4c1b79667836588dd664a3de34d015939d09244db8b2cc4853b0f87a94f37c98eba104f67db6e5eb5e8a103d3a75fbd86a88686cea208
-EBUILD font-misc-meltho-1.0.3-r2.ebuild 269 BLAKE2B 3fc031e6fc7fb69678b684613040076af09b2da924f60091ef696a96964858e672c34832356accc75fa326d4884e4047ce35954088fbdfad59dac50ef1fdd3f3 SHA512 7160c310749d998fcc5a2739822b1eaf249d15f90748eedba6c6feb494b6eef2883407392483ccd8ef4996d5c70a32e9f6a624d611b1098927ae186f163e6736
+EBUILD font-misc-meltho-1.0.3-r2.ebuild 265 BLAKE2B f222d411aafd6801ee358b7f9a6e04a8d673411887beb437386cac089911687c74d89bc2eec1812bd679f290661e1f6550809776a45f9c814caadd593aca5f8a SHA512 7643a81245e4b648ad5c0b721f8406861371ca025d14d73df42ad54823960d4b6161c0c650b9e903763d63690465e93af738da15d187eef9c1e71709090c68e1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
index 6534fca2e8e6..65283a29a130 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 388475ad3a3a..1537db485319 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
 EBUILD font-misc-misc-1.1.2-r1.ebuild 379 BLAKE2B 07bf96100d6f700e666136a076cf86ee5261fd7728d5beb7acaa2e962f250adcdbca2def46f71717d86cf485d28cff6e843cc7a8f85f0349397f0d7d6ed801c1 SHA512 d478a512c869975a5d44c086f9bd2c6467fc8c712bc07cb39df52e0e56c54f0c02787d865c44cf2d55b10ba47c174d2bc296c93c3afe605a57c8905d9f6a927d
-EBUILD font-misc-misc-1.1.2-r2.ebuild 352 BLAKE2B 60501039b802ee7d54784a8d5fedd3d948da003e137dcf31a82d59cfdad93891d0ce099c39732b6ecf036f340f07a5b948b623a04ad52b4e89dbef37166f9c98 SHA512 df411b5a25475a055784eae8d5edabb19108558467e79ba4fde4758c2d959f37b8ca3e211e271fbc182e30b3309770e8c0f22130a4d584508a1471b257a46926
+EBUILD font-misc-misc-1.1.2-r2.ebuild 348 BLAKE2B 52e71d66ac404d2f429c9222c2dbc67dcc12967a84901365f752e86c9bc59532bf3d02c417c2904d1da126f38a176bbc9e63531e43ac79eed61b48d0445e913f SHA512 d2a1ade656c8d5f3625139b3806bf4f1839c60b7122042f73b20fb4891748d3266cf83b3e2d4f769e4b9acca2b5d1354c0e5916e39e975286d24e1ac731f72ca
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index a4f016cb6584..5bb45e0b328c 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 7fbb4841fae0..e2e8b1ae4788 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
 EBUILD font-mutt-misc-1.0.3-r1.ebuild 277 BLAKE2B 861cf124886bc44c544af6f2c110948c35111f3091d55eeafa680920604aab131db11f741c96ef89288f3e51af7cd3054e5b87aec7cc7c481b5275d57050f2fe SHA512 5ceb952a4642d77eb75f4c8074279581f7afa087b62642258816d41878a453250668346b3ef925af9ffc99b32922e2aab5132f62cdda9681cbf3316a7f10d95e
-EBUILD font-mutt-misc-1.0.3-r2.ebuild 249 BLAKE2B 524dd2984724b6fa2599f7c3283cdd318271fdec97a0b86c8a9add5a39f464a4aa1454df33408535aa6693b4c9ecff6e45c5877e1ccef32bb77a5288118554b4 SHA512 20c8808504e9614627397f567d1d21326c3edd4aac7422526340e5a4999bd5d354779289df317e152c3c93a9122732c07708f0bce629935758672ac439bbe59a
+EBUILD font-mutt-misc-1.0.3-r2.ebuild 245 BLAKE2B 03984103429420f98e2b67d944dfb7f4152180011a3881264ac1126d7edb8370fbf149374ba0fd737b42b206a6a2af51546972e0b0a77b33d32dd7a7801c903a SHA512 c3792cdd95c080660fe4700009ddc7588663622839845a25766a7b6c92510cb61e058dbbb308e59643af18b16628079e539edbe2f1add33b56a977b2b50e5447
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
index 30b67e357f77..f0e3ef9abe80 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index ae34e4d29214..c80c88dd1a5b 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
 EBUILD font-schumacher-misc-1.1.2-r1.ebuild 279 BLAKE2B d86e0feb6b8249f0ed4c4dcfc2dc713f244cf8d7353b9a07392866294da689e199eb9e12c7f1326353849c48e618d626990c1d330f568adbfdbbf73da8e9a098 SHA512 9fcfe4da7ff75bb24adb3688afdf5b4aea1a60aaae9cc0cd29274c9a54d83b92d2140d589d623d55e7547c36e8b7be0b6669482b45b1e6017cf1bc76267c31bb
-EBUILD font-schumacher-misc-1.1.2-r2.ebuild 251 BLAKE2B 9a555809748141d068487eda3b3af8ac9301ff3546ad399b09f1353980fdb5259a2c209ce5d230db9cad5a19d3a2392f04eb8d2566bac6189fc1d82c291cdb64 SHA512 62177986849e2b243c1eb5b194a7d72b1777b9ba88aee55846187bb253c6202622b2bf3b0b001ab0503ee849685a3bbe736b548757cd823403b330ed2513e096
+EBUILD font-schumacher-misc-1.1.2-r2.ebuild 247 BLAKE2B c77d7c2a4c6dc38b80b8f01e6aaa04344cf0a219941ea100505e4de657cc170b9c3e8fc1f49986446a1d4ee33c033b530d82ba20848ebc192905db62e15121d5 SHA512 41180879f8113f0566b6cfd8d30d06012e414dcf5a09878c3c04f3e22b3a3a6954362d98f32d6d888e091ac99c69247e42730ad4e67619fef1eedea719564afc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
index 77d7107fc343..6958ad6a37c5 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index ceb4fc0a2965..98b007746db3 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,4 +1,4 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
 EBUILD font-screen-cyrillic-1.0.4-r1.ebuild 284 BLAKE2B 47f98258d2d3581d589c69653333215854df254943e9dfcbbccc96071ad36eef854aa7efeb6dc82dcf92f48b88ed506b2eedf46c0d29f7f4f0166d4855a2ee19 SHA512 5c299bb33f443300ac098feaebe426544f6e33f965d27361e6a4544bbf5f4933d3a1381e9659324f4e8b9794d2fb269bfed53fc192eb309c9d86b746b045d8fa
-EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 256 BLAKE2B 9758bad0cfff466419403e44c491545fcdded94ec074ab6ad88b70c64da0e4ee486cb756fa64443f489469d5c06f2d656c843d3cff9a42eca621cb6fa720f2e0 SHA512 72473d502432afbd053bc7d77b490470a9dca7d504956033109f09234f55877e84fe83e267760dbed241d236d645a2e6e0c03fc5257a91efd678d538c43e92fd
+EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 252 BLAKE2B 8299712f7a0653bb2e3a7508b8bba326d29ebe612ee6ba0dbf81779e66ac293d4fe404cc807f02adf3fd0694be3d961f3f5deefbc51c6429f36ea92968d88ca4 SHA512 894a998af207172e07792487c2bc3eca63f229610a1d2e83c3499b3c0b5ea71f1e517dfaa44a00ab53fa7c4e0020eb7ccf7abcbae4d6116d1bc765a5a22994b3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
index 00e538c0f973..9d570b43a50d 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 7cc05553efa2..3009458c0964 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
 EBUILD font-sony-misc-1.0.3-r1.ebuild 273 BLAKE2B 28c65fd2a605c6ab90c410b9bfa9013f96215949491673e557c016996e79a55b85935e98c819cfb78bd1a7ad00628cf21a1f1fbe0113b5bbbee0449dc7c42ea7 SHA512 990bf5b685fb36317daa73cc3a2127698f466b41adf84750d0240503d63d2e93fb96a064cd9137e2aeb431169f8f5bb322e8834e82ddaca3508dd93ce24900ec
-EBUILD font-sony-misc-1.0.3-r2.ebuild 245 BLAKE2B bca0d9b2930f2d653b4b7877c7f7ea17b5528a205ad9387027a00c660aeaf89add1a6716f0c0fddd7c542d9f0b0683bd067424e7c1c672698599e2df5266fffa SHA512 c52d8c5820d85032aa803119896b3a2abdb7039480ceae33c2b94a1a66d78d7efc7efa0b4f5bae47173b285fc1937884dd3c0e77d19b7910d326788316af84c5
+EBUILD font-sony-misc-1.0.3-r2.ebuild 241 BLAKE2B ed0413fb3c6a162a9334cc57f72cc0b61c4e234dc2f50b7944079e187175ef864f0f64d0badf68ce3e5d9e106e19fa58f5e669f40d971b3848eb15345d029dd1 SHA512 02dcdbb4b18a712ec5f9aedd60e4cd9873a35524ed96184fa7cd470e1956e2f3d9cd6088c8501c96e2478e3d2c2875b557d93e96d9f931e450271ee8d1e74368
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
index b09a531644a9..437aafb2cae4 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sony fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 350199b008df..9603dd9c6f98 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,4 +1,4 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
 EBUILD font-sun-misc-1.0.3-r1.ebuild 296 BLAKE2B 1cac9a9e00ad6a050a630077295e9ce41d70004bb0a557bec2edea4efdb9ce036a90c77e441ff16987d641f67bddfe4bfff95742c0a225875469016f121b395c SHA512 7d921c4403d8ee304b5f789949e5ca26ce807024a0eb021bde8d1c47abeb8d52ecb81591157eebddac3246d388a5378449fd023ec3293c646520aaa390f4358b
-EBUILD font-sun-misc-1.0.3-r2.ebuild 268 BLAKE2B 5b76206737ff054beb84605b4d90827475a1fa90070d70d5d2490cc40e589130f9d784abc0fb885cc1ea53846f76d024be81e439f0b1ceb98f7d5aebb5febb2d SHA512 9864cc37ebfea3b9ed8033c7c8b63ead9572ff5a78baf778e1daf71631ec4721dd15877acd2914f9ee7a6cb2c1f3f65b8ba4e0828125a655cbec8ccef65925a3
+EBUILD font-sun-misc-1.0.3-r2.ebuild 264 BLAKE2B 4ed2efce7d59fcfab3072a19e43b478926510d7716d1eef69fceff27b481fee967b03b6f479d81053ca94ba1e735e13bdf141601bd064a37bbdbe700eff08c60 SHA512 7f2fc3e2a2a47bd38112e4d60ce0745b9aa75cd9d9f3b68fcee89d763b51db67cdd974c5c91f8a2a802f53a93d4fab08fe14aa199f5ae966fbdfa2e60b0ea974
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
index 0897d3f102f5..c81360b24643 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index b6c934eee42d..70c464691868 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,4 +1,4 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
 EBUILD font-winitzki-cyrillic-1.0.3-r1.ebuild 285 BLAKE2B 9076b0d1d6c9339cbc09e328edb2da63d7129d9cd0ce37e58c044d1e204b31e49661b6e655b9a42324c6e259c2fdf247cae223308ab6b597b155e87a472f831b SHA512 9b9eab6a13bd3e772c45481562ffa9c042dae8dc3d46f294383a35cc3bd2f0b8c5a99ff6a0dbc725d046e89532e2c5a9f681db9c9da0a69af7ca4af72649f2ae
-EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 257 BLAKE2B 20d846a0536c45d760f27c8614ceecabea776cf2bddabfbe99f3cba31d13f22ba123bd2d6c013d9274f446ae31fe2bb789b98b2719c1120e079146a5cd6f82d7 SHA512 8cd69c25854883038ea285693f76ea55d86438f7ad0a3b3a7afe8161d480083a09290ebeaf86a9bdeb045941354f1cf165bdaffb4035591a9ecff7378e3e7f68
+EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 253 BLAKE2B 5124dd9a610b501a84d0aae942f9b5d6bc603f3b26f649b32c8a28b06a5021354e6961e7bb802b695f5657e0ce3311fa6ecf341e9b0ed8cce5459140ee7e6ace SHA512 53473ce646857b0d24124dd4f3809dab8abc39cae3b22a69169521bbddc0ffe2a18f0aa5a6eff8a0aaf4fd996150498514ee79623cda53bca1262bce312caae3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
index 9cce83ef0289..fcd4c0fd5213 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 2d17dbc437f7..4d5dabb0ec1a 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,4 +1,4 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
 EBUILD font-xfree86-type1-1.0.4-r1.ebuild 254 BLAKE2B 842b95e9f2fed6602fc5a105bc161682c7371474e49503a07d66f596bf21ce88055165f9f59a3dc1e284460a827f3cd49eec3f926022a5338e6644c093d028e4 SHA512 e2b6d513be157675cdc8c8b76450893c4fc069e09051702e8633138975f8e73bbf817486786ef9c137e340ae519b37d4a7f7982397d9ec688e66112f731a7dea
-EBUILD font-xfree86-type1-1.0.4-r2.ebuild 254 BLAKE2B d2b50f69a8e6f6efd627c2b7c47e278a25b165157abf0b7314e56997ccc6a58b1bc27a214e659415a065ee8f5039be1535378f8bea414337fc13c3c471db1eeb SHA512 5490fda201d04723bb3abd2cfc3cdcbb0142d80ab5829b81b3b5d190b7f1fc6450d335ab4c590c67f73297ba54a11edd7c55f6f476839a60849769df826edb4f
+EBUILD font-xfree86-type1-1.0.4-r2.ebuild 250 BLAKE2B c0ac9d8e748ee99528ad53b7c4b69e3c4e78837ff168ba8654bbe7cccc0744dfb3548d131850115b069aec22ee34886bd95950b9cdc81df09dc865128e9dc829 SHA512 61543d236a3750994022b9743fb0cd15c1cd37db0e434db4676ceeb38f713df7d2280904dc420c8351f1096af7ad89c0e1a3ee284950ffe9ee37b514defa2be5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
index afe187909e44..ad9855ed84ec 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
diff --git a/media-fonts/ibm-plex/Manifest b/media-fonts/ibm-plex/Manifest
index 2e9a1cac3d09..e483770047d4 100644
--- a/media-fonts/ibm-plex/Manifest
+++ b/media-fonts/ibm-plex/Manifest
@@ -3,9 +3,11 @@ DIST ibm-plex-3.0.0.tar.gz 76653068 BLAKE2B 5a33c8166f111eb7edd377d6034defe90ccd
 DIST ibm-plex-4.0.1.tar.gz 75874486 BLAKE2B bd2b874695ab1951ef54902e6969245925d8ae0d5ddfb9ec3680b2c05e2d0c10b28e363d0d60a008b9f0b9280a18c4bac96ed54112585058eeb31c3f31ac1498 SHA512 67671764600c72e342f38a8a817adc3d4e680c512faa554f144c1cc26e246e9aa92d5837c4d3850a8571f121b834ae0aad7f0f8404d03a3cf0416217644ab65b
 DIST ibm-plex-4.0.2.tar.gz 75546862 BLAKE2B aa1f0040a16d86dfee5c78c1a73ae26934a66f4d9d2dd168ee31d68eaa76b7ce0562de78996f871dde0b20570c434e8c79ccd9371c2629436bb146173a7af221 SHA512 0877fc13cf5aa31ab246f79a7b879726f3854e877afa51e9fe321cfe2e96cbc56bfb56f229e2a75c5192743351d4d645afdc256d22f89a27ce872248d0169d19
 DIST ibm-plex-5.1.0.tar.gz 206344442 BLAKE2B 9dd7336e9e4bc072fd904aa4350f23401390b8208d780dac5becdfaf36cc3c48e64a02e6068d2543e6845187357b2bbebf13126e67a6fba10f33173c0c2edb85 SHA512 47d6ea7bcf23ba9cff744ad7683f378df8d6e2f1a623ab9432b51b975304569fd82be6796dfd9b1dc6214ff9cfaafad58d608de3525aac8711e1a128013c6265
+DIST ibm-plex-5.1.3.tar.gz 205796313 BLAKE2B e1ec5212189167203be8dfa7949390dc134f10b759ed90a1595a4266314e8fb2f44e2bb22ac495fa303c3e5f81e6a13c6d4be3b78ddcf47f5d05b932ca4aabc9 SHA512 78006a48b65dba22216dc8cb1fd17313969fac6ca75e139d3963efda2a4f4da2a869146c2c11da033c3119942ffafda027825d0b0cb624594774a409dcfc1266
 EBUILD ibm-plex-2.0.0.ebuild 1416 BLAKE2B 10ab44bcf69b6c9a2e938b76b5f87454bc6109f3c7f1886b81bd07060fde899ddd2ca4d2113862b28a6075c5620e652ccd2b1ab0a80525fc4776d6cc4431347c SHA512 258ad5b3f04ede959d7d8876c9b78e0314fa6401838390dbdc72e8619029ed5496507fd7591ff71dca23c684ed0d0ff7e7643e3e7a8472d63a53a984e40a5b8b
 EBUILD ibm-plex-3.0.0.ebuild 1358 BLAKE2B 4e9fbe5a54387e5e5ec37293636d47673020b490a907a2057bad34d5bf1c0efa93aa367faf9ccdf18111f6bca5bda2b8e973fbd52251fd76126ac9f76a43a4bc SHA512 581d71920d658ac2e319d2c74a5045635b242b5a2f4d687d5447f67611a600a0376b14494cad90cf58e8456e53089b109da5097c78ba49aadd1242fcf34fc370
 EBUILD ibm-plex-4.0.1.ebuild 1307 BLAKE2B 96fa7afe8a8bc61c3a3120c4a092af17618586a63b6f489b9a38604cbdbe44e6d399b473bb81b4f2bf9dcf967610e727166054710a3f22d49d0a7860d8387df6 SHA512 439385db000b288ca559589c36e9bac08c304c9602fabd76c802c554a72f3217e7ad7a3f6f86912264960b712f4cfe8e987f05ee8b3957e60a11e3f6b97ac11b
 EBUILD ibm-plex-4.0.2.ebuild 1209 BLAKE2B 7cf316883e37dd88b23f542fe0f0527ffb588ec3e023c2f633db48f4df663a62d27295d45f46d0cdc02f1e93c8844f69f2963a666fcc8c63f043d2dd3896af32 SHA512 be9e84c08ecebb5e713843c8c1c4ec72a53d957ec03c1a1e5a16bf5a3517ef1badb9f0529efdbfeb52e30061aad637742eab3cf5d6f3ccd5f76cb9f8fc7cb9e9
 EBUILD ibm-plex-5.1.0.ebuild 1503 BLAKE2B 52ad80aa6f42635b7fbdd5c6e10fe69996cf4d12981fe493c7c6b8e577a8947ea8eee9e2ebb8d9d2a01ae96fa45dce95950102a9bb4b601a9c9c42b5e187774a SHA512 a34ee0424272a6022af131583685733b0e99c8e20db1075e19ff705b8525b87c38e3dcaa99e2813b4c8f2e6dcdd24aa2cdc53c4a1333bd731e6870434e2c2435
+EBUILD ibm-plex-5.1.3.ebuild 1503 BLAKE2B 52ad80aa6f42635b7fbdd5c6e10fe69996cf4d12981fe493c7c6b8e577a8947ea8eee9e2ebb8d9d2a01ae96fa45dce95950102a9bb4b601a9c9c42b5e187774a SHA512 a34ee0424272a6022af131583685733b0e99c8e20db1075e19ff705b8525b87c38e3dcaa99e2813b4c8f2e6dcdd24aa2cdc53c4a1333bd731e6870434e2c2435
 MISC metadata.xml 350 BLAKE2B 7440f75b2e70848fdcaa34ba78a2b847b16e7202fa43e84b17b3c8abc6e0da2656e4d9e7488ff6f077ca5f245c8ff8582fb36b1169f8e258f3cead8bb02bdad0 SHA512 28b8cb595c5b0b4c5b56cafd8639a1ae59684b765309737bfc620110b376b73a4c86ec94ab9b4ff3161f7b8fdcc66b2c1a13874791d29c0ba024ad6b224b427a
diff --git a/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild b/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild
new file mode 100644
index 000000000000..4650a6a9a408
--- /dev/null
+++ b/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="The package of IBM's typeface"
+HOMEPAGE="https://github.com/IBM/plex"
+SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="otf +ttf"
+
+REQUIRED_USE="^^ ( otf ttf )"
+
+S="${WORKDIR}/${P/ibm-}"
+
+DOCS=( README.md )
+
+FONT_SUFFIX=""
+
+src_install() {
+
+if use otf; then
+
+	FONT_SUFFIX+="otf"
+
+	FONT_S=(
+		IBM-Plex-Mono/fonts/complete/otf
+		IBM-Plex-Sans/fonts/complete/otf
+		IBM-Plex-Sans-Arabic/fonts/complete/otf
+		IBM-Plex-Sans-KR/fonts/complete/otf
+		IBM-Plex-Sans-Condensed/fonts/complete/otf
+		IBM-Plex-Sans-Devanagari/fonts/complete/otf
+		IBM-Plex-Sans-Hebrew/fonts/complete/otf
+		IBM-Plex-Serif/fonts/complete/otf
+		IBM-Plex-Sans-Thai/fonts/complete/otf
+		IBM-Plex-Sans-Thai-Looped/fonts/complete/otf )
+fi
+
+if use ttf; then
+
+	FONT_SUFFIX+="ttf"
+
+	FONT_S=(
+		IBM-Plex-Mono/fonts/complete/ttf
+		IBM-Plex-Sans-Arabic/fonts/complete/ttf
+		IBM-Plex-Sans-KR/fonts/complete/ttf/hinted
+		IBM-Plex-Sans-KR/fonts/complete/ttf/unhinted
+		IBM-Plex-Sans-Condensed/fonts/complete/ttf
+		IBM-Plex-Sans-Devanagari/fonts/complete/ttf
+		IBM-Plex-Sans-Hebrew/fonts/complete/ttf
+		IBM-Plex-Sans/fonts/complete/ttf
+		IBM-Plex-Serif/fonts/complete/ttf
+		IBM-Plex-Sans-Thai/fonts/complete/ttf
+		IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf
+		IBM-Plex-Sans-Variable/fonts/complete/ttf )
+fi
+
+font_src_install
+
+}
diff --git a/media-fonts/jsmath-extra-dark/Manifest b/media-fonts/jsmath-extra-dark/Manifest
index c44319d5d531..0db997a42d19 100644
--- a/media-fonts/jsmath-extra-dark/Manifest
+++ b/media-fonts/jsmath-extra-dark/Manifest
@@ -1,3 +1,3 @@
 DIST jsmath-extra-dark-1.0.tar.bz2 242603 BLAKE2B 499460875bb37c1839a9f7af088137e10ab8e56487d0f36409cab373a63cb3d0c9d9b7880c33e6143969b7463f481120c34cfd9ae9e25c81357ce407c85cd6f1 SHA512 8be1486e27192107f4b7659a6d39c49f536e73ff40115fa03eb8a9b4692417a2e8c886ff18b034c132ebeafbf2233932f2ac0b6eb63e6c7ba7ec2e83550c2ca8
 EBUILD jsmath-extra-dark-1.0.ebuild 439 BLAKE2B 5752557f8ad1bc509852aebfa49a4b0e272d2d76deff47d4da5ee0a1dba117c08b6f10045569b6445dbac2a9280c21e8177cc59a6a8de308fbfe8547c5818951 SHA512 7461b4335e9420a2167856127e7ef97d3852ade0ed62e402ac953e453bb034a93bb8d7100cf35062f61cf6aed0e7d9b26c198fe1db5b39b9d99bb24274cd3ba0
-MISC metadata.xml 378 BLAKE2B 8cb7b478ea081a24d37a623e859047964199ae9af439acbfc3656d8be4d1d9add5d1b5c3d2fdf2a0720bdb34200c8ccb114cd7b5ba4ae4c1fffbb8da7f54970a SHA512 df25de97720738d9ec9745010ed92f4dd30f27881eff5e28a3388b780927b4754a8449e3af2eeaeac9cae7e478886b4e5c3c2873adc2a4ada46da3b7ca5a9245
+MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/media-fonts/jsmath-extra-dark/metadata.xml b/media-fonts/jsmath-extra-dark/metadata.xml
index 77dfed9aebcc..514f7304d513 100644
--- a/media-fonts/jsmath-extra-dark/metadata.xml
+++ b/media-fonts/jsmath-extra-dark/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Extra jsMath fonts, dark version. Used in math web sites.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 8600eec9a2a9..a44895329c47 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -2,4 +2,4 @@ AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b312
 DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
 DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
 EBUILD liberation-fonts-2.1.0.ebuild 1257 BLAKE2B a565c54a62c022e20bc220703302be1071f9538074f0209c5ba00db903ff160841d3cec309512913c22af2e9e0cb81f0963d9024c812f5b52fd8f7577f1a5d79 SHA512 9f459a12be08c3ede8a074825ef3a8518cfad02163d1f590b39314536285d7f6a6f14de5009f2ca0bcb15bd310a245bcbc51710a9f42752f8cb6dd1ade9f21ca
-MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
+MISC metadata.xml 347 BLAKE2B d87f084f711672ea5d33cdae481ac57f5359a87daa9dc6b27267d227e85a935abbb7abbeec64f3610c2aa758d59c46ad4d62f5f3cf90480c0a385a270b099f9c SHA512 e6b5b7a4374456a468c2a42536858ad64ef12b0156623685370350895f4e0210210d9c5618dd1c581733e114b5b54ba5cbc11bc42f9274040418d3695988144a
diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index 23f0fd181847..ce732ecfd183 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/metadata.xml
@@ -8,7 +8,4 @@
 	<use>
 		<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	</use>
-	<longdescription lang="en">
-		A GPL-2 Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
-	</longdescription>
 </pkgmetadata>