gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /media-fonts
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
62 files changed, 82 insertions, 583 deletions
diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index 14634b727882..daef5ad21fda 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 369 BLAKE2B 98df7da8c24fd35dda26b7017906df3541ca67660e101d77b0ca0f4f4d40147adf8cc412f356c194746458c762e0b3d7909efeff3ddefb50ca7ac3def79888e7 SHA512 89a0d92aae8d1c68a9c7e9ec1a103468252b90f7537183205bd77a6371f98b6f225a290bd101c7b9f94a178f2dfeab01864087a4835bc9d6d0d5424b8c424fbb
+MISC metadata.xml 399 BLAKE2B 18589286f55caa559d9c006582a0a4ffb6d167f2c993bd33cf9688ac594ba284f93992f21b26a7f2e4b128c05a59743a28fc3e4c89e6d7ad17e56ff9c8aa8416 SHA512 d21f88d0778e3740b65408dc1b451c215a56dd05501751ed5a5767883a8942ddf494cf9182a88d4c8143d88fa5e84af21b40a9b018a42659a004eea91f7239c1
diff --git a/media-fonts/Humor-Sans/metadata.xml b/media-fonts/Humor-Sans/metadata.xml
index 15a01a677fea..0f83e01f8c15 100644
--- a/media-fonts/Humor-Sans/metadata.xml
+++ b/media-fonts/Humor-Sans/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>bertrand@jacquin.bzh</email>
 		<name>Bertrand Jacquin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bb90402be9b8..69bd5499232c 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 7ea11a28dd91..f2ee2ae54ede 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -3,5 +3,5 @@ DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2
 DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
 EBUILD cantarell-0.111.ebuild 1257 BLAKE2B 0a1b39b702131c214092b0ccb1f8e5cab88aee5e1c71929203fa18a86b29d37da70ca99104ec78f141a3e2f48f3f25ee6d8be35e781e9f73e5b9e19c289e2cd7 SHA512 620544a6c62c7ab30c8da32f47b72c5308c11e67ba921967e777da1c56cece0142889cce753c0676ab42c4a8a096cc7a880f04e3d1f336730a70f720daadcc1e
 EBUILD cantarell-0.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
-EBUILD cantarell-0.301.ebuild 1059 BLAKE2B 010173a7bb93ef64eb54bc9733fde9531fb66a77a8a2dbcf5f9d9021ea500edc4468420147a18889d2df01bf95f522d29797e282e09b563bfeb8f33c381a3ce9 SHA512 a6ee8e359af6097aa9042ed7f297bc66d558c1a44165604604700435e052e9fb39a3bd7368702c948e90f94904ebd87e23dcf4f00143e89c7853118e1e5e095a
+EBUILD cantarell-0.301.ebuild 1058 BLAKE2B a14f99b30ac0902cb6397d5786a145efdfb344e4b3230bea0aacc8a0dfeb7aa8efe4ca1567ff34c7d46455daf0570ed5b62f84ef37a6661a6e742caa4ab15548 SHA512 3a9852e32bfcbebb4cf3614024b1f6bc2a7297d305ae73bea18bff428988c95d4d5344b8077ed3c3b9bb199d2731157839e994a55d0df20d8787b2fdc67357ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
index 85fc727bee7d..1f8f9dfcb3d9 100644
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ b/media-fonts/cantarell/cantarell-0.301.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 647cdb0eedf9..109eb84dd7b0 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,5 +1,3 @@
-DIST cascadia-code-2009.22.zip 8217333 BLAKE2B 0c3e4cb95cae4869c911ea93e16b496e249778150fc208a04c392cd6321245e2de822953ed79346201e73dd8ad3359f6ec99b3f156f33b49b9f698413d5be568 SHA512 3ddc0b243b10fa36ffb89d7f63cce50b39bdc6b263ab124c9c34840eb7e775fc84366dffc1785b3b5cd48b1fda045f5f90d8e0301ffac754a0b7b9d8063b3d04
-DIST cascadia-code-2102.03.zip 8676365 BLAKE2B eb72c4b2459619fdabc43a137853b9df67855965b27a7370e5e0607055ae43288644035ab49211715a84d0b1f1214a840728bafe81e38ee26ad38d67defa7b82 SHA512 167629f5111db4bcf7e51937e5fa072e16ff2dcdc8a3f003b70afb2f49ab15d839c1f6261d9c0ef15a71a45e0f04a29a5ae8102e8dd6cf6a00e8b003cf8b5fcd
-EBUILD cascadia-code-2009.22.ebuild 521 BLAKE2B b56d561d133a1c12ae4a73bf56608f72506a21b6f2202ade0716e028c768e8b536a4c5e9d82e4e48470d6067466d69f30cf1f86c1033664aaee150439cec135d SHA512 22713cf2f49b39d0163e7309fa70d468bd5e17d1ea82fb0e7d908af7050ded1236f9980bdea2682298adf64ffad6a6763b3e6ecfc18e25d9736e12cbabed64d6
-EBUILD cascadia-code-2102.03.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
-MISC metadata.xml 642 BLAKE2B 48b342f9f8e818fa5b1f48d7124c9c38eab178c08e54f228e1474c0ba59248d528cf491f7e94db93f468a5128755ca814e1790560c760ecdaf2ef16e48e9205d SHA512 59d1bce26c031793c04023b8011f044f76c7d647774e3c6c4f12280d60201994a70c0d95f7c64de2518f86e9050a200456a9ee2373fe6941a642f7471109b70d
+DIST cascadia-code-2102.25.zip 8666729 BLAKE2B 86e11e003fcad686f0ad9ee38af488447fd0a6c95b0f9a89e945ca173c44385af0090a50e26b355ea8019c7e33ca45edcdfa7cfddcc0734fe224c96c8d941acf SHA512 4b0b1168bf3f1adbff362ed2d7fa1f548643e5c9506866e12dc26aefb8e807b7515e0c49705f03faf1a44c037d414ba3ab3f2189d29491711d6e802035914002
+EBUILD cascadia-code-2102.25.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
+MISC metadata.xml 672 BLAKE2B 08b9d480c2c90dc663a0150d8d0ab4d8025fc8557488e3fa1361961817c6ec70b08e43f035f806726e0d68f19a2b8dc39f6c36e8fe0a63451628b04e0f5ae80c SHA512 8c8f161c846a81a82a1169c67b9d8e9fcd5696918f7e59d334b13f4903f0e0feb21bd3fe21b523ef3ab618fe813aca82ee7ebcca7b1d5b114bf2f7ee6d3a8183
diff --git a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
deleted file mode 100644
index ac79209160a2..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_SUFFIX="ttf"
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode-${PV}.zip -> ${P}.zip"
-S="${WORKDIR}/ttf"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-BDEPEND="app-arch/unzip"
diff --git a/media-fonts/cascadia-code/cascadia-code-2102.03.ebuild b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
index 3726a28cc6c9..3726a28cc6c9 100644
--- a/media-fonts/cascadia-code/cascadia-code-2102.03.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
diff --git a/media-fonts/cascadia-code/metadata.xml b/media-fonts/cascadia-code/metadata.xml
index 6e92b8e773c4..cda11dbe5954 100644
--- a/media-fonts/cascadia-code/metadata.xml
+++ b/media-fonts/cascadia-code/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/comic-neue/Manifest b/media-fonts/comic-neue/Manifest
index 44e38663eae8..07b35977acba 100644
--- a/media-fonts/comic-neue/Manifest
+++ b/media-fonts/comic-neue/Manifest
@@ -1,5 +1,5 @@
 DIST comic-neue-2.2.zip 1547231 BLAKE2B 3c28d2ada0c9c634084b67694b83ae765594d7e732c870bf6db538967b922146863b023e5bf1407b08f8e9f77b264d867175fe5dbfe1f6a7e53a6fcc2e83f16d SHA512 4c13a764a8a5f1fb23bfb47b1840249286fded918d243227d360ae8005165de2e0e02cafca59a82a306129689d67347950d47ad5d8ae49bb165c0d4a18bd2d91
 DIST comic-neue-2.3.zip 2093174 BLAKE2B 80b345e3c61839d1abb803cc8a97d3b03bdf906408a9eb96aafed9e67d3b0f4a99ed82adef528b7fa4eecf9e1c2443efbedc32ba8c08e5731cd3ad180bdf3aa7 SHA512 37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5
 EBUILD comic-neue-2.2.ebuild 418 BLAKE2B bc6d0287f1e3d230141a2d7df1fcebd3a20d6ef8433e26a91eddf3f6befbfb9f2d942cee55703f9fd29bc8980bccb3fe90b5e7a527b0a53d3cd99b8ebff758ca SHA512 434a072b4925694307047899709d30510eb7bc89345b9bcf9091b947bfa42350456c293cdc46e5f9aec0ec4901a5d42b6f711fa690a5e3cc14d2aac6eed1ab0d
-EBUILD comic-neue-2.3.ebuild 516 BLAKE2B 2ea2f718743670fa6cf5f9591b8f52f0748df3331cb320d208c0df15aae6dc8722547c885c343b0efed6d4cc64bcab0c2dcac0df28525576f2581f347ae18162 SHA512 90b19f75fa2ff9476eea609bd835e35bb10deaf10decf3e6570350285ce50352e9f73d944075a363ea733254d46afe59ec776b138b1c2762c77c9f8c0a5710fe
+EBUILD comic-neue-2.3.ebuild 511 BLAKE2B f8759469707cf2b5cd26fe206000093af43fe7eb45e135fbcd78fac043c707059a584bb452fe6903c34b37d139eb01f023c6c21e05a51583d4074a7bc0aed026 SHA512 7f1f14be57220373f77098ad14d12decfae28d309b46cb465576a3ae96c87b3b557bec8c7b98c5b364b3b4ad0232df4a2118eadc46bb5a6aeba5dc1cb2406e40
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 07fbb94be27e..6932b1f00995 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com"
 SRC_URI="http://comicneue.com/${P}.zip"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 SLOT="0"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/croscorefonts/Manifest b/media-fonts/croscorefonts/Manifest
index 5dcc0c421792..37e53a04b24e 100644
--- a/media-fonts/croscorefonts/Manifest
+++ b/media-fonts/croscorefonts/Manifest
@@ -2,8 +2,6 @@ AUX 62-croscore-arimo.conf 830 BLAKE2B 3a9c244065ef41a2352d00ba89befa53ea0a250fe
 AUX 62-croscore-cousine.conf 852 BLAKE2B 4616f113926cb805f819db360580271bb787dfe4c4bea52641cb9fce7fcaed78ff67fa8a5cf85ee0064cc42c7e92a27199b93d7b7dc7937ff5da4427a9e6c9df SHA512 c15aa19cf9c0195e80d337b2d4e9203f3e69f8194a593405fe776e747582c9333dd04097ca834f168fefa6b7bf012bc9bdae14fa983f79774e22e55a0914f949
 AUX 62-croscore-symbolneu.conf 366 BLAKE2B f9903ab279cc6fae210896409deaf118bdbffac68135be5e5360dedc89be1ba81e13b490923c7d322f739df507096dec8269024d8e5b48c7b985871b4b21a4f5 SHA512 2c0a0e37422cbcfe59fd9d18c0491b208537a2510b6475cdc4fafa8700628b152a5c09256cec274c79201455976988fbea21b1b600e3713f6ca9f6d0b633aed5
 AUX 62-croscore-tinos.conf 842 BLAKE2B 6483ec81aa6d93385081ca48c128a2943ea5e3f58696499d65eeadb5d59abdca1c81ecd2ce9d9d1c950db9dbbb65376014014c6efa13ffe5f2460d8b69eb8b9e SHA512 5cffeedc50c0d4c664a4f0939db603b0c0cbf48036ccd04f68cee1a40efd4bade3aecc6ae704648229c0e8ae8e18c6ea40f43cbfd2b6545f4f6fc3702a1d3d69
-DIST croscorefonts-1.23.0.tar.gz 2696327 BLAKE2B 915ce0e294fbab5687c3021912985e2806f066684a16b68f41a04fdd66ba2a3af494f62ab548cee48a734891faf59b19aa5d9e33a56f41d99e00f2a58717d7d4 SHA512 069444d57a59bd21d5b30c4b9d32a0e7b649126b2f1d10d992155c08adefb1d30119deda7818e388bb184aadb3f8dd20ee0f26c9d14b3e53bfda7fd682acf3d5
 DIST croscorefonts-1.31.0.tar.bz2 3223864 BLAKE2B 4fc011557f81c19d4bc79f014c438868d2a63fe8932140a51523fe582a62a07ee1e51799bb3b13cb801a6ac0af72f23abade4cacccbc4adb3523f3a8d440ea8d SHA512 dcd5ebb854f78353a1d91bb74a5ac7b5e237040994c7e2a69cf68511f06b10006fc3a490840d48c12ee7f862d2dfa3106c9e1787a726a4b158eaea5cd5ba8842
-EBUILD croscorefonts-1.23.0.ebuild 746 BLAKE2B e8f9049758c9cd7d53d773e313d25c7c7c6556da4aa7c3f7c38a2fc92c5cc2d04d0637e0ccd223ce94d2d02df055d64a79bafa2994c010322e41708cb700a9e0 SHA512 ca60b6bfd351b25b18691fb5efe46595cffac1317aa6401c5304a2995bce021670d6ed08c1b0550c06896f47179d553addc4090cc39c309caf1547f15f14cb52
 EBUILD croscorefonts-1.31.0.ebuild 744 BLAKE2B 954af1d2255bbeeae92522ba37539ce5569347b0005f243341142f7ec21ba5a6a45f9101bb9ec80e321b6b07f33862ba98c885b85ca5bb6b89d3a09a687910ac SHA512 008c42421d3d28ffd5959dca19d62b70daa5437f16a5adb8cc5d68bf67c10e23a9227cbc03495d67c658ecf6dfe5eac184df885fb37eabed5ee42c2b9bcaf767
 MISC metadata.xml 790 BLAKE2B 1299513e819f53f388bb8d639aa070cc00acba9d619656e9891ac35ed043ef61d9ed285f11113bc27803201d0f6e0cea152cd2fc314f72db1ad65ecf1be837af SHA512 9ce6c85eadb03a6f058f1ed2c3f3d68db160627bd88513c8cf3886e5e6556ccf1582391a1c6c96dd0ca8baec1573acb88df4495e1bdffaf37f6c069fd9d08a41
diff --git a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
deleted file mode 100644
index 04735a01288e..000000000000
--- a/media-fonts/croscorefonts/croscorefonts-1.23.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Arimo
-	https://www.google.com/webfonts/specimen/Cousine
-	https://www.google.com/webfonts/specimen/Tinos"
-SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-RESTRICT="binchecks strip test"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	"${FILESDIR}/62-croscore-arimo.conf"
-	"${FILESDIR}/62-croscore-cousine.conf"
-	"${FILESDIR}/62-croscore-symbolneu.conf"
-	"${FILESDIR}/62-croscore-tinos.conf" )
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 3603b0a882c3..f11ca379c970 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,7 +1,4 @@
-DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc19092d1dbe3cf5c8d02f22affe70cdcb5e0d5d2b787917c43bedfb9b8ac37d1537e3d79a9f6e948baf0c4415ac78b00b SHA512 a00ad39b3f02dc3866b54b522b299d65a571bf7c0625b8aa4f7095fa15010cebecb8b2a51a3716336c48531acf617b557dd4114b670910560e69d2b315715cb4
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
-DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.35.ebuild 1975 BLAKE2B 329ef5ba2587f36f4cee4657ff77aa777ad63394ce4df37da73f596e3eecd4d436f697229c77a65e12d7b6fc199f9016a5eaecf1ab399f6f25f9c0b25f4dfaa1 SHA512 f0394d96829677ef52a6cde45972c1e6d0e33d872fdc3053fb176964784fb5ccb16e246ccc5542c3383635c82a654b5a3d673621ce7e1963a151f3e2cfb808ed
 EBUILD dejavu-2.37.ebuild 2040 BLAKE2B cde88b2163d76c87d2bcb905294d2ba6c32d66c91ecba3e22e98f916e7951f7ff1dc21b64d428e7618933181d111c4194bf61086dbe4c7f517c5409a8bd07504 SHA512 7a2ecad59bb45284e58c4ae1a761fe2041c822c0319dd992eaa33436037b8b63fc5a64ec32cdf1ed5d9e2dc86ec6377d464109bf90033addb0faf8b054d25302
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
deleted file mode 100644
index 8a36bc5c3102..000000000000
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
-HOMEPAGE="https://dejavu-fonts.github.io/"
-
-# If you want to test snapshot from dejavu.sf.net/snapshots/
-# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
-MY_PV=$(get_version_component_range 1-2)
-snapv=$(get_version_component_range 3-4)
-snapv=${snapv/./-}
-MY_BP=${PN}-fonts-ttf-${MY_PV}
-MY_SP=${PN}-fonts-${MY_PV}
-
-if [[ -z ${snapv} ]]; then
-	SRC_URI="!fontforge? ( mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
-		fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
-else
-	SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}-${snapv}.tar.bz2 )
-		fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}-${snapv}.tar.bz2 )"
-fi
-
-LICENSE="BitstreamVera"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="fontforge"
-
-DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
-		>=media-gfx/fontforge-20080429
-		dev-perl/Font-TTF
-		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0 )"
-
-FONT_CONF=(
-	fontconfig/20-unhint-small-dejavu-sans-mono.conf
-	fontconfig/20-unhint-small-dejavu-sans.conf
-	fontconfig/20-unhint-small-dejavu-serif.conf
-	fontconfig/57-dejavu-sans-mono.conf
-	fontconfig/57-dejavu-sans.conf
-	fontconfig/57-dejavu-serif.conf
-)
-
-FONT_S="ttf"
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
-
-src_unpack() {
-	default
-	if use fontforge; then
-		mv "${MY_SP}" "${P}" || die
-	else
-		mv "${MY_BP}" "${P}" || die
-	fi
-}
-
-src_compile() {
-	if use fontforge; then
-		emake -j1 \
-			BUILDDIR=ttf \
-			BLOCKS=/usr/share/unicode-data/Blocks.txt \
-			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
-			FC-LANG=/usr/share/fc-lang \
-			full sans
-	fi
-}
-
-src_install() {
-	font_src_install
-	if use fontforge; then
-		dodoc ttf/*.txt
-	fi
-}
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index e93fc32c01d7..09f5c0139957 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -3,4 +3,4 @@ DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
 EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 EBUILD fira-code-5.2.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
+MISC metadata.xml 426 BLAKE2B 51de3d7964aa09626eafe8df4ccd8f3d14d5014f345a20c138b252a9165a082993c0f71e4c3a7fb69d2a269eb4b5270d364e4fdf70921b6cffe24ac7698f4ada SHA512 7b0f3435a1df7115af80f9484fe11c7cddcaf3e7d287da66aeefd810a5e5a982324c0a6fbc2ad0a817d6fc0b1fdaf7332607b6124043395bdd1a64755065a0cc
diff --git a/media-fonts/fira-code/metadata.xml b/media-fonts/fira-code/metadata.xml
index d3698aac3028..c97e44b664fc 100644
--- a/media-fonts/fira-code/metadata.xml
+++ b/media-fonts/fira-code/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-fonts/fira-mono/Manifest b/media-fonts/fira-mono/Manifest
index 720987fa34cf..84266dcb9ea1 100644
--- a/media-fonts/fira-mono/Manifest
+++ b/media-fonts/fira-mono/Manifest
@@ -1,5 +1,3 @@
 DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
-DIST FiraMonoFonts3205.zip 1210827 BLAKE2B 99152a5b62ecf32369b84ba3b66662cb5db1662d0bac5f7c2d1cefb7e3cd0e72be13a2177f2d08e77cae30cebba2ad5c55b0b34235c55317f9f726dc774e82f9 SHA512 d1a05ed2610e6d1c688b5709bd30ff6de4597c93db99d049fca9f8a8b3e2bfd2faf2de2a6d23a5b24efaa502e0cb2f23f5239cadc0bb5cb709d04da1d37cba15
-EBUILD fira-mono-3.205.ebuild 620 BLAKE2B 6fcb2844dfc850e42cfb9e253a8565da03fa3aa0f0d44665507bd9c40fe753c98ba8384e1f8889daf2336168ed0274db33b3d424a358edc42d498501508ff703 SHA512 0f9d49941b2f4af815c9711a98c5bd14d9906b7fb6f81fb84b951b63bc1cc725f96e72e5fe9b31b47d2e1af501b63954586efae003d2f463bca411f0ea739310
 EBUILD fira-mono-4.202.ebuild 823 BLAKE2B e456d3b60223c32987a2b4110695e837f786616f663505d346f074d831d878ab732419bbf56bcabb2cef279af401d448e320774086c0e41295def40db28eba32 SHA512 5328bf72d79093e1b515c7b87f73c16a2eb0a2beb019adb2c90e9d8d94230503c9bad4b17603d026397b7cc99471e89dd9505225abd6b686897e37e17365aae8
 MISC metadata.xml 399 BLAKE2B fbe1c1518e1df8b646fad2460005cee18753f93d18a0e0737af0aa5d417c765dbf7db63716a93e9d8dde13b4d9e7afdbabc9c61a00c154ed72dda20c45a586d3 SHA512 ca38f2f10617c0ade03647233010ead6a9c38f7acf9a768f2daf8beefe73956b9326f3d876ea98958d003a4abf73b8b0db3942475e5b6d3a63c24597731859e2
diff --git a/media-fonts/fira-mono/fira-mono-3.205.ebuild b/media-fonts/fira-mono/fira-mono-3.205.ebuild
deleted file mode 100644
index 777bda1a12f3..000000000000
--- a/media-fonts/fira-mono/fira-mono-3.205.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_P="FiraMonoFonts$(delete_all_version_separators)"
-MY_MINOR="$(get_version_component_range 2)"
-
-DESCRIPTION="Default monospaced typeface for FirefoxOS, designed for legibility"
-HOMEPAGE="http://www.carrois.com/fira-4-1/"
-SRC_URI="http://www.carrois.com/downloads/fira_mono_$(get_major_version)_${MY_MINOR:0:1}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-FONT_S="${S}/OTF"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/fira-sans/Manifest b/media-fonts/fira-sans/Manifest
index c8301a4c6c40..d2bbadfd550a 100644
--- a/media-fonts/fira-sans/Manifest
+++ b/media-fonts/fira-sans/Manifest
@@ -3,5 +3,5 @@ DIST FiraFonts4002.zip 22975177 BLAKE2B 6dfc143568605ecd4fa956d8ef567ce4d86e187e
 DIST FiraFonts4105.zip 27227111 BLAKE2B c8ef15673735537c0d849c3e0dfa46a0b9cdcb7fff1d82d50d18b0119192282fa3956f57fa182420f71479f9479a4b8da5f87cddedea2469fd01562dc7bf8ee3 SHA512 f451e99d761ae9e714461e1ac244ee1c12af11751f61c94fa7ed10bf04bfa26520fbf50d1aeae55346348aec932481888780ae12df27349c966ba79a3eeae37d
 EBUILD fira-sans-4.002.ebuild 616 BLAKE2B ab99924f4db432c8cb3ed7753a15b8942a5c6e50b21bea8598be0d708e9c4203934f8fb7b53bff92503ec264b1a5c6d269bea95c9626f6126ecd7bc1e3613c7a SHA512 1f49ed133338ecfab566b7717a86951ee3d6ecc6e46eec9cfd38fda015a6f408f6f8597998f40c0d1bc4f2acfb104fc3379864284290c849ba87a50b921228fc
 EBUILD fira-sans-4.105.ebuild 600 BLAKE2B 20ac4479827bae8547f702c6fbf767c7c285780c4ed06dbdaf582e5aace1ddc0bfd7a2c3eb9409463e0b0430ebae78fa94a701b554faf22b60a05e1a3e098b6c SHA512 26959ebef08d1f509f0b5ea44fb19b08308a74ab59f9e915de7dac0bd6c8258a524fb2c96e9ec60a680bd21390cca6b27b7e0691192cb5cba512121bdafb925b
-EBUILD fira-sans-4.202.ebuild 823 BLAKE2B d7127933080cc7ed896492c3c3d4ab33073f381aaff56da33a8b7e63880952301c18d37cc7af7a2df16fc66cb80602dd7dd9c4df854f41d46462e61408bd40c5 SHA512 c437e27c99c01977fc39eb59329af8da281f8e9ecf74da51d86e7223e2a12a0c54006683ce39ad60565c76ddeceb178b660ec67c3a91d28c1cddd57465abeaaa
+EBUILD fira-sans-4.202.ebuild 821 BLAKE2B 718e502470fefbad825758eaa10193ed08ba4ef73aa0620d24adc0b4fb6b9e07fc0e0740328dd68d8ac066da080c1ceba949b238590f065637f51c7166c39cd8 SHA512 59137446baa4530261c015f8ec2a04aab3ce01a9af72eb547d51f2f8093be89c0de366b7cec32c6903a139e009611608292bff12084abeb46455d954ae938bc7
 MISC metadata.xml 399 BLAKE2B fbe1c1518e1df8b646fad2460005cee18753f93d18a0e0737af0aa5d417c765dbf7db63716a93e9d8dde13b4d9e7afdbabc9c61a00c154ed72dda20c45a586d3 SHA512 ca38f2f10617c0ade03647233010ead6a9c38f7acf9a768f2daf8beefe73956b9326f3d876ea98958d003a4abf73b8b0db3942475e5b6d3a63c24597731859e2
diff --git a/media-fonts/fira-sans/fira-sans-4.202.ebuild b/media-fonts/fira-sans/fira-sans-4.202.ebuild
index 90dc65ee232e..bc843c1d54d4 100644
--- a/media-fonts/fira-sans/fira-sans-4.202.ebuild
+++ b/media-fonts/fira-sans/fira-sans-4.202.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+otf ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 961142f4153a..5ddbc03e96cf 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -5,4 +5,4 @@ EBUILD fontawesome-5.14.0.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5ba
 EBUILD fontawesome-5.15.1.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5baedb6b1b89f0281afa2cf4d66868481e07c8eb80c288d6f87c18c0f43caa1cfcfb624fc5a43213cfaf91678711d642 SHA512 453ec352c4216b648b963ab775c2b7f4ea928230c0f80bfa5d48aba7177cdd088ddb1bcecd9741cc0b4365baca617b4bda03b1ebcb33c48d3b9fcbb8eff90613
 EBUILD fontawesome-5.15.2.ebuild 754 BLAKE2B 69e3e74b9c30206da3a3451be57a01982bd7c0ccc98ccff87c4a86eabb687719b6810bf8945ee6c56634106085f6284eb7a78ae0a5e9f51e88ae7defd9baeab8 SHA512 f1e2d758b48be58ba56f744cf0ac43fd8f1765d2f638f4f8b33a9d96ce41035dd435a99e7d2f86d7f36a2de1edd1a7cf86177be70cead9c1306e286bb5aa8148
 EBUILD fontawesome-9999.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
-MISC metadata.xml 532 BLAKE2B 2a4d5bb78ff9948de3569171165e91bc9391863412dab5236ff996182671decde9ba0339d059c3ec2e58670c362ea7f49dab9b5e1abfc6d277c62a6c8f2dcd08 SHA512 862296f7e1ea8fa2fd4acbbe2d679df47076ad290bc6d571f15971c590745c47f3c7dba39d823411a0228aff71aedbb77b739fd4cfac990eed54f48c85406904
+MISC metadata.xml 562 BLAKE2B ffd93846055a9550e8146f9bd31e50f27822f7c2220ee0d8f059d9a7661b6fca8e7ef25d901fac389c1aa51de7939470fd1314e76640331c75263c65bb3bd76e SHA512 36e019943cd70848f6f62f0540e7b5b579e95c1ccc190abc3c1ed8418d3a0febdebbedc1a6efebcbf9220b0cc5aaa6c863f4e4d92047767bb6164bec7b6793a5
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index 795d5dc16535..42226d316edb 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/hermit/Manifest b/media-fonts/hermit/Manifest
index 9590a323fff6..8b9491e32b84 100644
--- a/media-fonts/hermit/Manifest
+++ b/media-fonts/hermit/Manifest
@@ -1,5 +1,3 @@
-DIST otf-hermit-1.1.tar.gz 15077 BLAKE2B 1435e521e2e6c50f910fe6eb7cf29513bc665766478a4584ea06455d64a70dfd81c80447eb2d282a511f13bd24fc6d119e0e57f0a4469dcd355a13e0920b76cb SHA512 ef87f69bfbdb0f84b16e42e06a950a351fb1203fe599dfb7cf6b0c69fb260d99e24b67c741d738f9250fcd1f14aa162c8f285fed7e6481ffd55e78a1f1617d58
 DIST otf-hermit-1.21.tar.gz 42646 BLAKE2B c67dcaa34a5fc5f8280547107a817deb4a40db7c6b3a0b2edf8d92c2dc230576bd7fd194bff1943fe481a143a027eb56484fae30ebeab5c6a563d9bdb07011ac SHA512 5b980068d349e67d78a33a100d9b38eb24c374d0cf6ac69676df0e8dd441451acc0112089634c4b408f1afcb49501bb9f5940ec6c18910b5c11f7f7f31c739ac
-EBUILD hermit-1.1.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
-EBUILD hermit-1.21.ebuild 376 BLAKE2B 6885327a6d304c7c3ffa6d1d3a7509e2a1d713f28651bedcc1bb245a5074446885d32a68cf92f1c67d006ebd62c7d2840c01e4d7ea74fdb0fd1ed32556f58fdc SHA512 28e4ddf93f45122af0ec03aa6edd6c7a9dab88084197607614d9e2000ced00fb661ab97f4cd4fc7b5540ac50dc40df0f46b170c0e04712462fa4417ced96f417
+EBUILD hermit-1.21.ebuild 377 BLAKE2B 79491f21dfb5755ce45df7fa0ea820f4a83b38db691801ae90dec64ee0888274eb4bfa7d7df786b9c0c1b37aa90db4a6b7e10067f238477082ee342339f4eb2d SHA512 383be4cb5576fd1fd90cb9d43c3a34068f95efcdf20781e87fd2840c8575c374d742d7e1b63877cf03a68eeff099e596476cf7ea9118ee27e5d37a8e203f73b7
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/hermit/hermit-1.1.ebuild b/media-fonts/hermit/hermit-1.1.ebuild
deleted file mode 100644
index dffd2a5cc5d3..000000000000
--- a/media-fonts/hermit/hermit-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
-HOMEPAGE="https://pcaro.es/p/hermit/"
-SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/hermit/hermit-1.21.ebuild b/media-fonts/hermit/hermit-1.21.ebuild
index dffd2a5cc5d3..449a4bb83c1c 100644
--- a/media-fonts/hermit/hermit-1.21.ebuild
+++ b/media-fonts/hermit/hermit-1.21.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+FONT_SUFFIX="otf"
 inherit font
 
-DESCRIPTION="A monospace font designed to be clear, pragmatic and very readable"
+DESCRIPTION="Monospace font designed to be clear, pragmatic and very readable"
 HOMEPAGE="https://pcaro.es/p/hermit/"
 SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
 
@@ -13,5 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-S=${WORKDIR}
-FONT_SUFFIX="otf"
+S="${WORKDIR}"
diff --git a/media-fonts/inconsolata-lgc/Manifest b/media-fonts/inconsolata-lgc/Manifest
index d8188eccad9d..57de2e27ebf4 100644
--- a/media-fonts/inconsolata-lgc/Manifest
+++ b/media-fonts/inconsolata-lgc/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-lgc-1.3.0.tar.gz 274350 BLAKE2B d8864cb189a0c3019850a123bdd15b6fb9275059b3fef48edf0a6f53ae4a7304b1d1f2c10d1ecbac2c9e65913065dc9b68acd8530df38df6ed72575dec317cf7 SHA512 1958246e38f12b6f6675eb26ccdfa35d870e44a2e50e1263a7f0268e1e4af9fd2870a11dc8dd0da452f7c436b4a998782b5c80233803448684602e36c658163d
 EBUILD inconsolata-lgc-1.3.0.ebuild 511 BLAKE2B 01a12077f8edcbd69ad1652df57380965e304369617ba481ad07998923e3864c2eda039eab19ec5edc9866eb81a8bcc0b81149cf9eb750cae438787d492d9acf SHA512 c8f195e8870de64e6db7d0540bc4f4fca439cdf132af616f80ca4a85752a267901fbfeaba6ebec42d4e9d4a4e28ebe7282cf384ef0011fc678452cc8c618f0a6
-MISC metadata.xml 472 BLAKE2B dd3215a7a9a93a0497480773191dae3399407515a54e0bd58692fdc0db2d2b1c63d52afe677b53f399c5918552e25de96ef8d413598cef534d721fc94eff2b97 SHA512 0d72c22820f6fad11ce1841ffd3f511be9e8ade45392e15f97168ecdd073c9c6e56488d322472ba79f452cc7687ec089a320aadbb4cc487376d91116f3169985
+MISC metadata.xml 502 BLAKE2B 75009d2339078a1e3db3eb0436be24dbbef0a2f387cde6517a9065d4cde3b72a1d331ac5ec7438ca479dd7aa6e010606c60e490efb40d3d103ba537c3c46630c SHA512 2e4f7146817a21e2c6e9bfa9b20a5222b15e68efd082ebe1ea12fde2006739de83bc10c4729fe511d6737efc79aac0c40ddcd1f23336ea1fabca038434903f9f
diff --git a/media-fonts/inconsolata-lgc/metadata.xml b/media-fonts/inconsolata-lgc/metadata.xml
index 6614cda1761b..9f3a027ee99c 100644
--- a/media-fonts/inconsolata-lgc/metadata.xml
+++ b/media-fonts/inconsolata-lgc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>kitsunenokenja@protonmail.ch</email>
 		<name>Rob Levitsky</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 715061528af4..39b297adfc9e 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,5 +1,5 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
 DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
 EBUILD intlfonts-1.2.1-r1.ebuild 894 BLAKE2B 86c75a4b62ff840f20ffd376f2b164f004b1f175e79b42821975328cb840f8b52d9967fdaa0ca2ae6a650d971d78a3407d47c4392299d56cde09c10fb9221d85 SHA512 42116031b3ee138300b06f8a21bc86c5b11f9f19a1d954ed296cedfe9f1dd70c17b36caf15194dca758b922844c05536d92f630ba1f4afa5f328a17456cc2ab2
-EBUILD intlfonts-1.4.1.ebuild 744 BLAKE2B 6ef4a79f94724a0f2d3d58c3d500cdb3a38dd2b344d4832b2ecf3d6d06b996e39706040613eb27d8d2a48f85baaba3274f5fcbbde1b1b15a8c16b3bdf5627f92 SHA512 8a099df46dbe3916e95e571b90e0df317892af50373874328cfefb6d3d2f84af147864591b1d5630853c0f3fe33e0980032b33151c870984859aef02bd70bbde
+EBUILD intlfonts-1.4.1.ebuild 739 BLAKE2B 42e7df928aa7a0e9ca06b1633e497ed2af6f5f9364563bc1bc57d2c18220663549fefec56e3e515c413afb88520d09c9078295f0a92a9b485dc7b2134c92a653 SHA512 1f7887952afee7095c31147cc16b3288f88b5b3f8601d7be252d5ab67f08c202a779c759ef9eb26a3c092df2f71fd52b05d1c8c0af2bf223588e8ec37496b925
 MISC metadata.xml 370 BLAKE2B 7783e99cf31647a374b109157e9df67f528f61cb89d4f7936172a7e001b10e0cfe45a96aead40b4618a987af0f68f44b6cc7ff2536eefdf8ab737ca072daf06c SHA512 c41b35cb543c1756b194ffbcf0c14935ab70b588dbdd4b51615901c5c7244eee2566771b6b070ec13451c0dda638f20303a12f3eab39c17c5dad6a548d7ca83e
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 8cab818529f0..57905969451a 100644
--- a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain HPND GPL-3+-with-font-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="bdf"
 
 BDEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/ja-ipafonts/Manifest b/media-fonts/ja-ipafonts/Manifest
index 7d3664329352..d9e4b674e558 100644
--- a/media-fonts/ja-ipafonts/Manifest
+++ b/media-fonts/ja-ipafonts/Manifest
@@ -2,5 +2,5 @@ AUX 66-ja-ipafonts.conf 800 BLAKE2B fb6de7c153a0560fe601b112ffd2d53ea6b8e528213a
 DIST IPAfont00302.zip 20113208 BLAKE2B 25c6e483b08350347dd8ecceaa1ec04cd1e39d9aeaf988e9d4bfdd60614dbcb3b275ee07da1eb26699499b1e9ad661114cd0222fcb32ed183218b30024b212d4 SHA512 58dfbb6b7ae5114aed28588d05d48649a2f216011d7bd2798a62558f1f55c9b998ad510f7b7a0ab9d272f75bdc69de1110bd67205ac61d221b0ce8fd71583685
 DIST IPAfont00303.zip 20088137 BLAKE2B 73bbf1d0f31cb5f6c6358ed1d4caf921bc2a5de684b27f4e01420c93a9412484e75bc2c68faec3d4728df89e64332cd54af64d457255c5ff83089feb85cb13d1 SHA512 d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e
 EBUILD ja-ipafonts-003.02-r1.ebuild 660 BLAKE2B 4df69d689be4d2c9d4ff7d37109652ffea7a73468e94385eb3b09fc910d7d9b0ec7a43cecf42150d42fe3ba707e810f3c529aee9392a332a834b30b1186bec2d SHA512 5ecf88be5cebaed3b86f775b54e8264552c90984ad15747599e03180287037d430d0e4cd10dfc6eb47fda8f7751285048f73c02cc2cabc155c809e5a4e304d06
-EBUILD ja-ipafonts-003.03.ebuild 673 BLAKE2B 81712cf7f843c6c1339d8de6d6603e66596822af30c1c9370b830ab6ab36616bc21c9c6333d8f5bc41ee0e7d0b8326d2e049716eb6ccbe681354c1b847981556 SHA512 61864661309a90233483aa118c67a3a19e73b1d3eace5fb5d86249fae612c08e6a7d1a3c30221228f3ed19ada38bc627f6837ab67c5d426175c8af054f278312
+EBUILD ja-ipafonts-003.03.ebuild 646 BLAKE2B 422ce5c20bea3370620dd54d7b1157d1adb513564b87cffce0eeaececa60cf4e36385dafd91e8156075c16b1d1e67646ff3f09dd3479ca6d82ea60cdc44ed0f0 SHA512 3651ec5c51eebc95659f21dd202cf8f57da04479341b0db193cf3d783f264e6efd7a0f7cb25824c10ed672006a3ed4ecec2502656add0456785be0b3f9620f23
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 49d9a3d1c6f8..3d8379098fdc 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit font
+EAPI=7
 
+FONT_SUFFIX="ttf"
 MY_P="IPAfont${PV/.}"
+inherit font
 
 DESCRIPTION="TrueType fonts developed by Japanese Information-technology Promotion Agency"
 HOMEPAGE="http://ipafont.ipa.go.jp/"
 SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="IPAfont"
 SLOT="0"
@@ -17,12 +18,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
 IUSE=""
 RESTRICT="binchecks strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-arch/unzip"
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
 FONT_CONF=( "${FILESDIR}"/66-${PN}.conf )
 
 DOCS=( "Readme_${MY_P}.txt" )
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index e51d0c088973..29ed9c732052 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,3 +1,3 @@
 DIST jetbrains-mono-2.225.zip 2981614 BLAKE2B 5ac8dff566378da7e9ac23218cdd696be8ff612a7f9b4f87668400c0c0bfb3a1fcff2a2a813a1c7527e1a105125c493e80abe4daefdbcd837ef59492d7bb3e5b SHA512 ce72c2d2a2f769c6b8a9ad70e7e09b82cf66a0928534f18556238e36fec690737c89077f6521a67850bfb0dc79bb2260b5c86ae4134d76b2210755d5053ade0f
 EBUILD jetbrains-mono-2.225.ebuild 464 BLAKE2B 3d95970258e6dd8a05a4cc0a682c7d876dc68f78905d6baad2539666d44708803657d65178f344d092c91f8625c89e42b115eab127f0f16f1e0e52ddffb0fbbe SHA512 ad9097dafe28bcd4a08821df6ebbd5a05c6ba143625e988117c4ee7106cd0e389123a4c5ddff95c0d93b05f1b24113e0a8a41e4f587850add600cc422cbebf65
-MISC metadata.xml 446 BLAKE2B 616fbc05a7e6130dacb8ba06191f0cbced65910683bd67e581dbbce48fb7db68de84460a1a1a2b246c96436dc7347b3bb33c91a4dd46fad1aa52001d406bd33d SHA512 04d88a4c4d059801e7acf933d3217b3552dbaa99b08d1319e0593e5e3b6cc93eac491dd5fa17620ff30f3606f9a9ddcd27907fec564e361dfd184692f1e70dd1
+MISC metadata.xml 476 BLAKE2B 3e8b8232486e28e3cd56fee7ab7b55e3522380d81bc15af748962d1a9c8ec3beda3c3a33172090c666ab57dbce98644973259cacb163a16a53940db168b5141b SHA512 56a235caee2582b1181a0889b87299a6669fb6fb81e502ac976938745858404e173abbd091eab220959901bc18062aae938c7a55ba45aa7462f5750a458cd101
diff --git a/media-fonts/jetbrains-mono/metadata.xml b/media-fonts/jetbrains-mono/metadata.xml
index c4c2aa2c7ca1..a2936dec442f 100644
--- a/media-fonts/jetbrains-mono/metadata.xml
+++ b/media-fonts/jetbrains-mono/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index fb5e2191236e..460295f11bec 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,8 +1,8 @@
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
-DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
 DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
-DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
+DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3cd75923bd77dca5d42ae3fa4fbe7be9fea104779caadcccaf2608dc6423bddb3abd199defcaae3161ecd997268078b6781e SHA512 826c002008c2c753957ae4228d8e5dac5b1de995eb7cf392e9cbef9a23bb438ff56303bb9e8ee45a52fb9797e5685b89749f6a689413537f9cc7ee8067dea463
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
-EBUILD liberation-fonts-2.1.0.ebuild 1260 BLAKE2B 367ae5c4f14a5922f41a39ebdb112ce3491af4f9015ecfeda58c7f3c12ae61dbf05ee55c27d9b1d13899ef5af09ec5da2adfe80b6d8d0170113fdd4af1016d87 SHA512 be59c886826d09fe8d23ee90d1c2b31b3311cc90b68c8d4f9a1b65d9a68da5ef84509e7ebf3a6ae4f6695b929c2f3ad6c34495984f94c27b2b503fb61d189706
+DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1267 BLAKE2B f60735a91a98b46366b8b741e18e0602994c9630feee641309e8c8d4bd7100de07109d3b7b5ec0f84cbf18a767ef3e18c77d640c5931b2153c482275027fc1db SHA512 fe42c6bebcc1c3aa988cbb42c97802cbd5c8ca0ab8beb0fd9dd14a26e3598b907416434e54c1b3fa1d1090827096a341b63457bcb83123cf14b5c4968baf8f36
+EBUILD liberation-fonts-2.1.3.ebuild 1273 BLAKE2B 236d8dc19cedd23307e82b8b94f91b2ddbff471ab8f0a62295e2b425802e9f30f6f6bd7a2a2713e322c2861dddae42a9be6c0f05ed284e9f486b960db61d58ad SHA512 0636f745d6d454480e37aa9c0e85e2b2b874a374b8f8515662cb0b55f652a9bb81a88b4274abe9863ffca5a261356aa28f3bad977c24994f399f925077698e1a
 MISC metadata.xml 347 BLAKE2B d87f084f711672ea5d33cdae481ac57f5359a87daa9dc6b27267d227e85a935abbb7abbeec64f3610c2aa758d59c46ad4d62f5f3cf90480c0a385a270b099f9c SHA512 e6b5b7a4374456a468c2a42536858ad64ef12b0156623685370350895f4e0210210d9c5618dd1c581733e114b5b54ba5cbc11bc42f9274040418d3695988144a
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index 1e17e3729cbd..50e68dfeca19 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit font python-any-r1
 
 DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
 HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178407/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/4178448/${P}.tar.gz )"
+SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/${P}.tar.gz )
+	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
+"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/libertine/Manifest b/media-fonts/libertine/Manifest
index 9bd5f456220d..afa6bdc1d608 100644
--- a/media-fonts/libertine/Manifest
+++ b/media-fonts/libertine/Manifest
@@ -1,5 +1,4 @@
 DIST LinLibertineOTF_5.3.0_2012_07_02.tgz 3001259 BLAKE2B b585611591674d2dbbc616a572afee7d89e3ba7244a3b19abee2e99937da1db8047739a79ada23f2d0ef5febe39970e08b907e347994996da922a5131a3669fe SHA512 a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7
 DIST LinLibertineTTF_5.3.0_2012_07_02.tgz 3673659 BLAKE2B 46107c8521a5cd680fa7b2ebc7dec969c0bf326f7598dfe850570771ec79b10cc472953be045a539a4fc414c1612f6865e1b6b86f390514ae14ed601854384c8 SHA512 ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273
-EBUILD libertine-5.3.0.20120702-r2.ebuild 729 BLAKE2B 6e81ba3cf6b06464cd3f8e14ac290af5fce8ad127413bcd58be2b2e47b981196731273026ba0b02222e86b7f5a3056c263f08caae842f439a2605bf658a62cb3 SHA512 acce326da070b0b061050070ce298147de580763f54d5e479a65f2d2ac597deabf779d5d55c55e8f67c981e3f6b6a53fa0a6d8c20ccdbc3d4630b291289adeaa
 EBUILD libertine-5.3.0.20120702-r3.ebuild 780 BLAKE2B 2d53ff3cc413520dc06df3750db98997e6c3ec3aa50efea050e71f14842ebc39dce8d82afaca74d5cdd4ef628885d82e3da5b91fcd32e9332d9219e873cc4230 SHA512 26c27c833ae19325c2216c01c1969dd3713ec0dcb08d0783bf7269bab50d6448e6939aa274b55b7f8eca98809bac4f7104e1686e1e7ba1c77ea4834ecd225387
 MISC metadata.xml 332 BLAKE2B 04e9e26384b60d2cd97873cd832ef6d71cff61e3c3465b3927de2d34b5473b6f921750be6f2c0eaa9b3e87ed7eea9a9388e3775713153617152bc75a8d323179 SHA512 494bd65f738485e4876e0309f61515f6b42a61d3ace6a403af533d268e80db72833387731656e6c14ed7faf73e2f06288f31c46c81eca174338d1f817cd2d961
diff --git a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild b/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
deleted file mode 100644
index 44f9d6c23dd0..000000000000
--- a/media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font versionator
-
-MY_DATE=$(get_version_component_range 4)
-MY_PV=$(get_version_component_range 1-3)_${MY_DATE:0:4}_${MY_DATE:4:2}_${MY_DATE:6}
-MY_P_OTF="LinLibertineOTF_${MY_PV}"
-
-DESCRIPTION="Fonts from the Linux Libertine Open Fonts Project"
-HOMEPAGE="http://linuxlibertine.org/"
-SRC_URI="mirror://sourceforge/linuxlibertine/${MY_P_OTF}.tgz"
-
-LICENSE="|| ( GPL-2-with-font-exception OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<x11-libs/pango-1.20.4"
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-DOCS="Bugs.txt ChangeLog.txt README Readme-TEX.txt"
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index b9b4ce138eaa..ea077784600c 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,4 +1,4 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1-r1.ebuild 528 BLAKE2B 20789105b21ef06ae5c09560337179327307494949e406353444e8412c97b859ee1e08961d28043ade8cce3928f744cc1b98b5bfeb3103b0d25a612b3340472d SHA512 75566dc942b38b3c91df6bedc689eb86c1b271690f9cf68fa5daa37a56dc4848f4ec72946476aa96ad87835a217660dff1d9a7f92d35ce6ec433cc0e8533655b
+EBUILD open-sans-1-r1.ebuild 526 BLAKE2B 2e6f3608cda93abd44ae64353c0912111aee98a3cc28b8b120fbc5370d7563511a8ecf8cbe1200783603dee3344dcce78549325d986a765bb08041594c41ede4 SHA512 f32d4673bea4087d7b9070ebadccdf975824c5a256e7be288fc7971ceb1a7d2a9ac6e16e7222701c6a753601eaa0e4ae0045352f2333a349fa5fd5f76852c7dd
 EBUILD open-sans-1.ebuild 469 BLAKE2B 2087672d2f82bffc5a84e2616764b7eaa57dee6d0e8523a65f7c59ca435e2388d1f786a38b6170efd3c79297e06365c886b09ca82022c4578f62cdf7d3d71086 SHA512 9ca685e72c3c926c0cd23e0a69a3eb8fb42269b106e7a4be3a8401f1dd4b997f1533f23c76c701deda9d28616e78f6a004bb9f13cd72804677f7c90ce681b60c
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index c4e5872d1e1c..925c27bcd92d 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/opendesktop-fonts/Manifest b/media-fonts/opendesktop-fonts/Manifest
index 53383881dc63..d6877f81032e 100644
--- a/media-fonts/opendesktop-fonts/Manifest
+++ b/media-fonts/opendesktop-fonts/Manifest
@@ -1,5 +1,5 @@
 AUX opendesktop-fonts-1.4.2-multivalue.patch 5022 BLAKE2B 71ab1c289670854ed2c9649dfd338b04dfa21c4fdb9344d58f245c1bd1825765fb9ea41025b5ec31475e032362149e3f5692af665a889a4b31a2a27e011adc8a SHA512 487053638d9fab66151a0dc15b8b721388c16812ec1fc1402c43ec2efdc2cbc2a8100a412d62f7cfd90afc8f5a5385a4a96a8eefbe9a0c8a9a3446f44ced9f61
 DIST opendesktop-fonts-1.4.2.tar.gz 22246044 BLAKE2B c00a55793278f900408b2958ed932e5a7cd4d7d1a7f01895ab13516f551cb0791bd1360a0978297a73ab3c57e2fa4f9f6fc5ac633296bda8f6125f0c0da432fe SHA512 09a5d8a8357f88716c68eb70ca1464c069645aeffe3aeef72a195f1e22e3baf260f655cddf7a8d8d2542c6a7420b61206b11d887af162277da84899a67662b50
-EBUILD opendesktop-fonts-1.4.2-r1.ebuild 695 BLAKE2B 95b5d154aee23863cfc3f3177955ab368538427fc0b6644aed87b7f28a719c3a459463c933d3663e584f64d7c8373a07320782697c24aa4ea29c76dadc3a546c SHA512 91e646a25bec73ae7aa891e890c13adfaf6a8f3adf49a3409e6f16b7680e746934e2043ab91ecc8d894fb0d88cec44ca2de6f3d37010f96936575e2998d64e6c
+EBUILD opendesktop-fonts-1.4.2-r1.ebuild 675 BLAKE2B fb020d177b8f1372ba9bee8098becbd7e9cb813b2dd779f4e5a046f1e547c6e568c5706a9908de86e076148c43ce6f9292767678ad2320bfcaff3e68e03bc91c SHA512 62073fc5394107a9762e61008a4d0263a7f439ca92410fdb460b5c9ba00b48d4cb86abbb4e7193c603be2629e5f9b1a492ff09e7ab591d450ca50f5a9ee60320
 EBUILD opendesktop-fonts-1.4.2.ebuild 622 BLAKE2B 984fe74ff9435c8bd93ba7aaec9ac27d1342821132160d8d90736fc0f32b91f8b502fcf07459d98949ea6a4cdb78a63460477d61cde2053aaf4a97957ef0e99a SHA512 557e43bfdc73594ee64d22f0f08285ee665644bf2d396a8cd402818982454a35b8fd1ccf09a3fd7ac492306a68549f35e2cd7e3d26335bb03accbfe0d57ae1e7
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index 235577e63fa4..c1f73d605bbd 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
+FONT_SUFFIX="ttf ttc"
 inherit font
 
 DESCRIPTION="Chinese TrueType Fonts"
@@ -12,16 +13,16 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 
-FONT_SUFFIX="ttf ttc"
-FONT_S="${S}"
 FONT_CONF=(
 	"69-odofonts.conf"
 	"80-odofonts-original.conf"
 	"80-odofonts-simulate-MS-simplified-chinese.conf"
 	"80-odofonts-simulate-MS-triditional-chinese.conf"
 )
-DOCS="AUTHORS Changelog*"
-PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )
+
+DOCS=( AUTHORS Changelog Changelog.zh_TW )
+
+PATCHES=( "${FILESDIR}"/${P}-multivalue.patch )
diff --git a/media-fonts/polarsys-b612-fonts/Manifest b/media-fonts/polarsys-b612-fonts/Manifest
index 55a082530c8c..5f6c557aeb28 100644
--- a/media-fonts/polarsys-b612-fonts/Manifest
+++ b/media-fonts/polarsys-b612-fonts/Manifest
@@ -2,4 +2,4 @@ DIST polarsys-b612-fonts-1.003.tar.bz2 2823506 BLAKE2B 31c918285f6072d6cc8bd44c2
 DIST polarsys-b612-fonts-1.008.tar.gz 5178817 BLAKE2B 3675c57002bb66da32f1ab0d1b2c487a11a12cca4098b9c3943b20a11bd4f49b8ca7c82b063a53b66bd99ee33f5167b46e9576c2383ed05ff3f4e8868ebdd58b SHA512 977b7bc6f1a41243cce381ddd0a5db2853df21a738ddc86debfc13954653fbfcffaf1c869b6287ea20482cc10ad479934bf6b70edc1e14dc656a22b1b64c64f3
 EBUILD polarsys-b612-fonts-1.003-r1.ebuild 528 BLAKE2B 91c9de4e91c41a31fe6d9b73a7cd3b71d83f9cb133d447075cce6b88df2525e42d2959cef1870fb239f42a89fb0116d74077421e1f0f3e81bfe4f764b1ba7333 SHA512 3b5bf7efeb73bed85090615a695736d6ec14e78a62d9700f60bde51d988345fd9e58f4b6ecc925713c3c98e73ac0823889e11a8f61a034fc7d25a4f4a9aa46ed
 EBUILD polarsys-b612-fonts-1.008-r1.ebuild 496 BLAKE2B 18d899819800de3e262a8e10592e552f4592d2ba761dacb06a259819a2a5638ca5236601efdf419dc40b5076faa135b9a05e57a8527557e0fa8011dd4b3ba308 SHA512 d74bb32c60a910b3e1998bf2d854c9f969a2da1c1252623a3b2163a1944f78d9439f4f2e271f71de6f8ad6b9e5657fe3ca22192e875abd83bc79426ee0f23598
-MISC metadata.xml 547 BLAKE2B 8f7833eed4fe368c250fcf32a0abc4993c4a5966ffe1085ac2826a3c0924eb126aae96914f2235993a2d47d878e10fc34a3aa42e9dccf1cd3cbe5275a13831fc SHA512 6da5fd376c417a7a0d995c7259d11369ee93715f35b298f0e00c412fe9d1b8a1e34beb2a7929ea38380646bdef11282b82777bb2729a2ddc4022120b19f5a697
+MISC metadata.xml 577 BLAKE2B 3c1b69173c1cf8e2089ca685bf63b377c069d6e66882f9dfd38bf8e4d5291558db2360ed4e75be1f89105d596a19a521e075c5898058d864bc2c59edb0170732 SHA512 85669f96e7f01e8bcaa629d6c639eb21a98917f9d41acec9fa4460e2fdf76b0ba267b3498d8f29f25ed467cd37836a6c385fd41a49ed368eeafca53589ed2f36
diff --git a/media-fonts/polarsys-b612-fonts/metadata.xml b/media-fonts/polarsys-b612-fonts/metadata.xml
index 8503115f591d..b5e6c15c7202 100644
--- a/media-fonts/polarsys-b612-fonts/metadata.xml
+++ b/media-fonts/polarsys-b612-fonts/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@taujhe.de</email>
 		<name>Jan Henke</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-fonts/powerline-symbols/Manifest b/media-fonts/powerline-symbols/Manifest
index 0049f04e76d8..113156b71eed 100644
--- a/media-fonts/powerline-symbols/Manifest
+++ b/media-fonts/powerline-symbols/Manifest
@@ -1,5 +1,3 @@
-DIST powerline-symbols-20150224.tar.xz 3972 BLAKE2B 94ce0e0f8ccd8e8be451c1e85f7b0ecc06a1b9d4513e40e7b80e0ef584109de96922d9211f2adf04fcc3c87ca9e450d5d2764787c762c19bd78c67fdded11f3e SHA512 85a4edefa692a7e28fd91c8d34c33b70424bee105f807aa1dcc182f64df3a66a29dd400892313b0d8ead59f9883e14f47c1a1afbf18af317b93f6aefb977c031
 DIST powerline-symbols-20170508.tar.xz 4028 BLAKE2B f0ad0360fb1bfe2c160c531a8ce473bdc746800c4540e56c8a1c27500883922c67354d9d7d8478a9111d56bace51a730ac9683e6e21be112df7d0df288f7cf0b SHA512 6908cb029b28002021530ea330c9ce5626f6bc5ed2336750cd2678f4b314d043289e29ebea61003836bb0cbca9bbb91a1b748f1cf24e4f07932eaf18bf28eac5
-EBUILD powerline-symbols-20150224.ebuild 558 BLAKE2B 2d051a37677de615eacc8bbe30b5166da76aafe02d0758d3683e9f45ee77d1a8766a28f8f882541f7638022db8055abdee0ed898927c0fc7e8c818db19341947 SHA512 5c408455c2bd1acb025c7809dda9fd0fd7a955a959799435b323ab18e0e06506f0db6164a20d5d5621dd0875c5cfc3ca4241db2de6d10d6870a9bc6fd26e54c8
-EBUILD powerline-symbols-20170508.ebuild 558 BLAKE2B d931c17ed6a7791ff7f4092030ffab4d45350b4ee5764b9410f048f6e563b08af8bd0b59da4a2bf0453212f21876e5f635441d1e0a033b59be4a241760ff99fc SHA512 1488e56a0733eb878c8338445a26ebf8380c2a30d9a845773cfa636042a66870942e0764412052b49ea4156f062a790e4499468569c040bc6d0e3dfcb472ea6b
+EBUILD powerline-symbols-20170508.ebuild 553 BLAKE2B 1ad83faa16376e69dc6842b17505e2594ca83c43947e7b9c193b584c0b4e4c4865a5529e43734c82915da6f7ef594e7c08d0322bfcc5a17c851601fe776dabef SHA512 8397f7eb1b103223851786f331832ca6106529955f6eceb52bf8963768e7c0dc0ca8b30ee51c3c6689966142cead39c313edb3b0071a0233a43cb80de19457f2
 MISC metadata.xml 332 BLAKE2B cbe33e2b2c8498b788b64ed38c2cebfea9e82813cb2c45771e5df4ba1d8040ff238900f3eb95e3de2011773f647904d114e293446030f51378e643b1d6a04d80 SHA512 628ae420eba99a6cb254b362d6477deec328910ada7d5dfc1aba9c3d3001e46b2e39acf2aff3dbbed4418504147a19de5974619922ed6734b5f092e177f114f5
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
deleted file mode 100644
index f03cb115598e..000000000000
--- a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
-HOMEPAGE="https://github.com/powerline/powerline"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-# We're redistributing just the (unversioned) font from the upstream repo here
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index edcc228cf761..e48ce54b5a1d 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index 9f5e0e786a0e..a9138a964fa5 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -1,13 +1,7 @@
-DIST quivira-4.0-Combining.pdf 311026 BLAKE2B 98544081c6effef9ac7cc535507fda6af8dc9d72ac4653faeba3e578387596a9dfeda3944b42be354861dfef4c68288768e609351cc1c86d677fac94118af5cf SHA512 f904b8587623782093db25d2a069e32ba671f6f1a60ea3b8c8374ede3f48ab0daaa2e0cdff5acc72e97422c00c4f7286a2fe9503960d666429073379282aab9c
-DIST quivira-4.0-PUA.pdf 354040 BLAKE2B 9710d626ee104eed3758702b3c1b668f22ced8e38d822a6e084f71da15e455b06ac31b4b3557a2a1a8cdf404195ccd315f3a78bf3f9be489aae294152cbaa289 SHA512 a07a41e1e0027a03f7f1f4e81ddfb50b09a8dfad4f1342a32aab71505e6ce9ef2a7a8733145887651b20dd472c58b4167faa34945f8ca61bc4e016859a65cbba
-DIST quivira-4.0-Testpage.pdf 822289 BLAKE2B 9515a8dff0178638566af96b23af533b11cdde5a5399d0ad599bf1d86b0aa9d8f8fb11ea01f4c05bb15136b3f924606e9bed57e2dd3e5a11d05f8a0441cd6a0f SHA512 8ed238c9aa03544308dcd471eb6145aa81423a6877a2a5e6d1022277545317568ba642871eb2f3c03c38a9d3030e3f94d8c30469b6c331eaed553b81db154585
-DIST quivira-4.0.otf 1475236 BLAKE2B a42490f1ae75912b217993615b5bb3904c2a96200dde4c5d209a3dd6e25232ab74b2dd38e89f8025f8400620f69ebd7b9fb845fa46a94f198cfb47cbef3d66f3 SHA512 2887152660a8908947c1baa83025c408ac11139067278bce6c8a789d846cf764b9a464dc678ee6acc2b555c9f0d40be3464ac102a97fac8aa9bc04acf926f1b6
-DIST quivira-4.0.pdf 3877062 BLAKE2B 5147d57277be608aea1e250df26fddb5c6e3b9bf201c47d1ef23cde50d8b8d68b59d7a2362dffbfa6aeae4d95adc7616a69d8688fc87f11d8513b74673ddfd5b SHA512 38469819d0b8e062ac2b4f35ef5d8be300ea36645ffc7841428015191d129e1239ec0dff1605cfa0af76fd32ee1e590ed4a146117408afaa9a826328115db4a7
 DIST quivira-4.1-Combining.pdf 152768 BLAKE2B 4b0bd89ca5077d57c6643036343b79a460c9215a70cb4a11642a7275c0d2304b0893dfb3aa6abe2dcf8fcd18abe1d508b0ca371c81132b020128cbf53e890d9f SHA512 87bc7bdc5e0c4584c70d65268305d1e6fbc11ba53dea37f958175140934e90d224d9d6764d693f5a5b8dbe888b547dd862f73b6f99381294ea9fd9be079d716d
 DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06756277f8eb266b1d2fccd36f148c549d24d30752b64112bdebf9bf0ff6419e0013e46d3b1f4cd6f68e19229d SHA512 9f235e0ff48fbf0d8ff024640a9cd0e408a648b0fba0fc37cda7aaf9b5c7c9bb106d5a0ac82381d1d960068da01e56dd255c883da48b3d3d9120f8b9ff451324
 DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
 DIST quivira-4.1.otf 1549016 BLAKE2B ec99585e4998c0411d4d5fb364d97ab479069549be475cb195b0b1512ac94c66ba5beeb7d07dc26cbe130ab44090f189e20d71a794334831808ddf58d05b63c1 SHA512 8f76c0e05aae7db9f4a155725f024dd019500bcb14fb1398182f897798128dd2ccf13840446382780b0c4873e6f8dc2d8a2e1c49e9bf17266b52248beb919c65
 DIST quivira-4.1.pdf 1632238 BLAKE2B 755dfd91812cc7c49875f9ccaadff9934dc5d7f86ce4cd2a1473d7c43aeb83f54dabf67985cbe14690ec4655b847c78bd9a92dc277520c63964ac548990f6a9e SHA512 7863b8c4aebbf9e1c8ef6033b6eacb9bceb9d52502ba90c87924809485c3071931a6f1382072bbe5ba1e39aa844d2e9551fefd746929040230ea6ae32b2ac748
-EBUILD quivira-4.0.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
-EBUILD quivira-4.1.ebuild 1186 BLAKE2B 2402c0c4d7489c6453f0239eec1fe729e5e829e18b0156d07a90f651df491d304e75e6148d977622f1028a16431ec9074af0c9815c162aa1c4b51be7fe54d0aa SHA512 3aa6517ca57e3db28de074907039bdd295b651612993d25b4191c0341f43b1504d67c3eaac20ad51fad780785808a08d3676ad8f5d6430a86cf54c94860804f4
+EBUILD quivira-4.1.ebuild 1196 BLAKE2B 09ab7f130f662b7fa71b5dc1bf847fafad24490f0c1c5b65f5277e8cb3e0ec14b31257a4cc0e2dc42b29c572dbafa493a4900653275b408a4ab6b45aab7b9994 SHA512 c83d66e1e7c9de36e0ffd9a18eb2dedfbfac48932dad03d0496a3482594b779c2f118a5df86c622717edc7aa2cec4ea3d0c8453214216757bcf4b1d87c45149a
 MISC metadata.xml 584 BLAKE2B 24a5dcc1462e9cd796888fffc048851540811d9e75cdf5b804832e4f29f9fe4cafbaed037872c251839182b9f48e56a9b2a655089f72d45583a44c708e50e47e SHA512 bc10043cd40ac32b7d4309fbec2d702ed02b56d8cd822ed324c39e925c66c3bd070f3472d605c0c28e6ab64f8c401e1f87ec7977142a29c98d4484a7c1010c7d
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
deleted file mode 100644
index edea0e21cfbc..000000000000
--- a/media-fonts/quivira/quivira-4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/q/Q}"
-
-inherit font
-
-DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
-HOMEPAGE="http://www.quivira-font.com/"
-SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
-	doc? ( http://www.quivira-font.com/files/${MY_PN}.pdf -> ${P}.pdf
-		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
-		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
-		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
-	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
-		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
-		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
-		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
-		cp "${DISTDIR}"/${P}-PUA.pdf "${S}"/${MY_PN}PUA.pdf || die
-	fi
-}
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 8ae94696b6bd..26c1d7afa8c2 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
+FONT_SUFFIX="otf"
 MY_PN="${PN/q/Q}"
-
 inherit font
 
 DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
@@ -14,19 +14,19 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
 		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
 		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
 
 S="${WORKDIR}"
-FONT_SUFFIX="otf"
 
 src_prepare() {
+	default
 	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
 	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
+		DOCS=( ${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf )
 		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
 		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
 		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 3f96ec72b7a8..0721874f3e31 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -7,5 +7,5 @@ DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3
 DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
 EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
-EBUILD source-han-sans-1.004.ebuild 1439 BLAKE2B 39a21713aee74e1af975a004c07dc97a441c055a17e10993b4244e743a3fb8d5112deedb5cfc2dbb1216c65cd9248fb4414f7221cc2d4a26185ef98ab5f33477 SHA512 3063b5a2771a947bd2f30773c4377680bfc94dab8d703ce9d63f076df0feb2976d2ec464ace8e8178235ebbe7ca2362eb2c9fa78204352f5a14bf472b72be064
+EBUILD source-han-sans-1.004.ebuild 1434 BLAKE2B 84adbfec84eefc96362021003db661cb903d63c980777401d2d03d3a405d135fcdf4a2685acb9ea934ae7d19d3899be216f6bbe48b3c0375eea08e332c928fda SHA512 18c7437e340cce1c456eb86bd007cc4423e6118d71c4162fcdb5dc6f009a6d57873875fca1ae0e7d7802df798b1ffcaa7a66832b3777bed6a68f453a1092aa79
 MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 44b627b242ae..462971468a8a 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
index 1423dc1cd7ab..dba5fd889a02 100644
--- a/media-fonts/source-pro/Manifest
+++ b/media-fonts/source-pro/Manifest
@@ -1,14 +1,6 @@
 AUX 63-source-pro.conf 820 BLAKE2B 7a84b7f3aae165d17b9c0983846fe609efcf20e87c882f2a2b15de6ec437ef6bf3ad455489aec6e2d4550705114a10f303bd1f37931464bd52943b52bd6b01fc SHA512 507bdef3f29b29969e05417d1c2d82850d4d94575cbd270b679dd65b0f4f4c5516c6db2938982bc86a444e77167e48ebd45bbe6c87fa583668cb58a7bd6b37f4
-DIST source-code-pro-20141211.tar.gz 2329732 BLAKE2B a99ae99d29054de940ca17c2f2b993f175588a983a034fbba9750eda9ffd655fa1f8038526fa165e21390902f0161d4648147b31176bef38ffcfa5f6e00f46e0 SHA512 85ec3768d72a56f2cab6ddfde01cf5c32871ec376c710d0dc3f7ac72e7bdfe9810c507b7ec8486d2802a30775e4bb87245d2dc00ee4b837956f9cd54f33811f0
-DIST source-code-pro-20160608.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
 DIST source-code-pro-20170111.tar.gz 8245124 BLAKE2B badf2cdf7e47c2ba338e6317408b5fc53e783494a9da5c8fcdb45f2c8d37fa6bce94e4acae83614ff90d6531d9c7d37a8b2346ee0780499c5b73c5a89d7e98a7 SHA512 e4ff04ac926e07f4cfa824d3ff4c6c9475c5e0a4172ed055aac8c80378f79c0c5838214377a7ea3bc2bb3997804f5a1420abaae7bf13c6e4a4ffe6f82d01a2e3
-DIST source-sans-pro-20141211.tar.gz 5503301 BLAKE2B 926750667a1a12cc36edadf6a2b07f55d408c2d0ceb25c26ecb7381a2da135e2f3add8aaf338b5eb94f83341db0981562034b95f0bfbd2692783704974f78f65 SHA512 9052a010e0635db84a3f09a3fa71a13db9c29c528b88f8a1f11d24f9a6f2be361d77fd902701e3fa674989034f01706cda1c600447c9f11db8c35c49c093d8e8
-DIST source-sans-pro-20160608.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
 DIST source-sans-pro-20170111.tar.gz 6735736 BLAKE2B cd05e27734d73bda5de6457d124502de4fc360af5ba719f62ee0a73b5de6b833fac286881ab54d602fea2477774258d9123253a0d3078ff4171a7c521b87549f SHA512 877b47b203d6f8ee71e60ba612a25b5a1b707205b0a4aaf02cfe2c806466acc6d393c93ad2fd6e76d761150b2594fcd6abce7b3c0415b5b915b06c6c143b6b53
-DIST source-serif-pro-20141211.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
-DIST source-serif-pro-20160608.tar.gz 1528897 BLAKE2B 1b28148bac4078f0a3d8a32f140d1e57f2051ac0e85d0fc93b496096dcfb01442f018ee323912cb3036fbd2c1372b15d65b8286ebfb5f5ac70500ae385cbd37e SHA512 d209ba66e0a16ff275ec11f322b940451b483f4295b1820f89e9895faa5271fc95e637d7c0e6b2a030b3438fa184de8076ba8e33fbcd9f7c36a6733c97bccf05
 DIST source-serif-pro-20170111.tar.gz 4682667 BLAKE2B cbb0a421be445534fc3e654a0c75af7e0b64b92160cbc5203a559db6ad538833af86145b5394be48f47b51a572307088d984d62f19e6c6ada05c2d73c61a6510 SHA512 7644269bc99674605014b2b6fe69dc04fcbb37714cfecf8fab4fa6921cd40ce310b4a10143da894003c5aad8fd0edd80ec18fd739aac5d74867f5f3890d96b23
-EBUILD source-pro-20141211.ebuild 1252 BLAKE2B 2c40005ac4e80b34c9915084743bc34319f19467b838d5dc931021e1ff8e0be59fe3d5269a27df5b02a92141f76817e6c764e8e10de73fd05ae7d26510013a70 SHA512 cfbf1921737ae9e300086c8b5b10a7ebd97753916e0b7b844dc7882eaf98bc010b330a11c0e9faf0c52690a6852d40274a4820439abb839096a2fd24944f47b0
-EBUILD source-pro-20160608.ebuild 1303 BLAKE2B b12cd8d108ae7b8de8db1e593ba82eb7e5b418799bad9f6ffbe8a0cf70586a75305c655ae9145b8ff9f2ce97cb4fbd6de195ee1b82123c2929bccd9038606cf7 SHA512 c5065fb83a0e46ebd3d1dc61786a5349f5a6c81859167098020c539920f678be4bca96759885b8abb9edfd99d78ba887085d981603e38642cf171a26368c725b
 EBUILD source-pro-20170111.ebuild 1297 BLAKE2B f7a03099bcdc5d2dffbacbad00fafac6a228a15878bf9f5f03fa7c0d6c5f3e23c9ebfe144f4b5977ed08c2ee372617d87058421176b061ce79b74ac7d2b1ee80 SHA512 a6e998ad0bf11495bf3a8086c6bea76f0ce56ecde76df6d10550e8fabbf386818f516acc385d8f778e5fac674f54a779cd606b3c36d2334f5375f38e28078208
 MISC metadata.xml 391 BLAKE2B c0bb16c63d4e035da05e7f72abeaadee956760bbd9b82b1363cb09db1eeebe11fac61b6345f1f19cfb76f30415c2bdadfaa4888f886b0600780434248ca22968 SHA512 dc4ad0cdc83213489305cf3c520eb181249496727c83635b2b6d5675043a91644e29e4ca7d3478e0453c74a0981f3d4e5c5a35c0d7631a808d5f2710b613bf28
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
deleted file mode 100644
index 9169bb303bb6..000000000000
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-SANSV="2.010R-ro/1.065R-it"
-SERIFV="1.017R"
-CODEV="1.017R"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
-	https://adobe-fonts.github.io/source-serif-pro/
-	https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
-	font_src_install
-	for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV}; do
-		dohtml ${d}/*.html
-	done
-}
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
deleted file mode 100644
index d6fd64638e62..000000000000
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-SANSV="2.020R-ro/1.075R-it"
-SERIFV="1.017R"
-CODEV="2.030R-ro/1.050R-it"
-
-DESCRIPTION="Adobe's open source typeface family designed for UI environments"
-HOMEPAGE="https://adobe-fonts.github.io/source-sans-pro/
-	https://adobe-fonts.github.io/source-serif-pro/
-	https://adobe-fonts.github.io/source-code-pro/"
-SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-serif-pro/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
-	https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="cjk"
-
-RDEPEND="media-libs/fontconfig
-	cjk? ( media-fonts/source-han-sans )"
-
-S=${WORKDIR}
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	mv source-*/OTF/*.otf . || die
-}
-
-src_install() {
-	font_src_install
-	for d in source-sans-pro-${SANSV/\//-} source-serif-pro-${SERIFV} source-code-pro-${CODEV/\//-}; do
-		newdoc ${d}/README.md README-${d}.md
-	done
-}
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index ba4f3c231d35..4c1040543a1b 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,3 @@
-DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
 DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
-EBUILD terminus-font-4.48-r2.ebuild 4050 BLAKE2B d99b80ccb89a8b19c10892bc0d4a07380d0025d91fee9cf4d5d70dffff198fd65031036e1a341295835bac0088074f41e1fa6969f02a33cfd3435b1783bb97f1 SHA512 24a6a5b6d802f31aba25eaa7b9d0b0f6905847e70d3cf73728d9d7fc7023b9fd43eb8e1dc13edfe87569f199532740ca4c9ec3b5eeee6e254b6c402a96863ff5
 EBUILD terminus-font-4.49.ebuild 2688 BLAKE2B f9e88bcf242d44a2a45fe87f57c87e4911f8ce458435bdd885ac0851d8771ce39c623acae61a0f98821df89634fdece9bbf3a6babd16590aaecff284555c450f SHA512 f04df99d5b13f877e485828c413b2ed02b11e46dd25585817180f616188e9059517fd5cac99d25b74227f09a0acfbf442463ea1fae9c79673cc81c2fe3bfbc70
 MISC metadata.xml 1787 BLAKE2B f83cf459e35bae521d4f6176c7d873cbde7413ca52241feaf442c818a9e1c30640cca1127788737da53eb659ab73913471d830f0234198880fca33aafe811678 SHA512 8dbb13ccb276600255a0188254098e78540f54b4ff5a481909c94e15519b1cbf58dd58f5f4c44adbd48252da22579fff8d1d4301eb798c466132ab820609affe
diff --git a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
deleted file mode 100644
index e66975cc3c1d..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit font python-any-r1
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
-	ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	${PYTHON_DEPS}
-	virtual/awk
-	otf? ( media-gfx/fontforge )
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS=( README README-BG AUTHORS CHANGES )
-
-REQUIRED_USE="X? ( pcf )"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
-	use center-tilde 	&& eapply "${S}"/alt/td1.diff
-	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
-	use ru-i     		&& eapply "${S}"/alt/ij1.diff
-	use ru-k     		&& eapply "${S}"/alt/ka2.diff
-	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
-	use ru-g     		&& eapply "${S}"/alt/ge2.diff
-	use quote    		&& eapply "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	local configure_args=(
-		--prefix="${EPREFIX}"/usr
-		--psfdir="${EPREFIX}"/usr/share/consolefonts
-		--x11dir="${EPREFIX}"/${FONTDIR}
-	)
-	# selfwritten configure script
-	./configure "${configure_args[@]}" || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-
-	# Follow https://bugs.gentoo.org/728308#c5
-	# build ".otf" (bitmap-only) fonts out of .bdf ones
-	#
-	# Important details (copying notes as-is):
-	#
-	# 0. Pango 1.44 now returns floating point ascent and
-	# descent, instead of integer. The functions were always returning float,
-	# all right... but so far, without a fractional part. Which makes problems
-	# too, for example in Scintilla based editors such as SciTE and Geany
-	# (there is a quick and dirty fix).
-	#
-	# 1. 'fonttosfnt' adds 0.5 to at least the logical (OpenType-scaled)
-	# character width, ascent and height. Haven't checked the physical (pixel)
-	# metrics yet. With some sizes/applications, the fonttosfnt converted
-	# fonts do indeed have extra wrong spacing, 1 pixel horizontal or
-	# vertical. It has other bugs too, but they don't seem important.
-	#
-	# 2. If you pack 2+ terminus sizes into a single .otb font file, KDE will
-	# (may? YMMV) use *only the first size*.
-	#
-	# 3. OTB has a single set of logical metrics. So, for example, the logical
-	# character width (which is relative to height) can never be correct for
-	# an .otb file including both 8x14 and 8x16.
-
-	if use otf; then
-		local source_bdf
-		for source_bdf in ter-u*n.bdf ter-u*b.bdf; do
-			set -- 	fontforge -lang=ff -c 'Open($1); ScaleToEm(1024); Generate($2)' \
-				"${source_bdf}" "${source_bdf%.bdf}.otb"
-			einfo "$@"
-			"$@" || die
-		done
-	fi
-
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# Set the CHECKDIR to a dummy location so we always get the same set of
-	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	use otf && FONT_SUFFIX=otb
-	font_src_install
-
-	einstalldocs
-}
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index a7906d2665cd..7b71378e133f 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,5 +1,3 @@
-DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
 DIST tg2_501otf.zip 2559336 BLAKE2B 8a4872f1a694765e56ef6e41fab523ee80a9b69de255add3160068131a10f226cb237572b1184f6411afd49936606af6b6809f3a5aebd502122d062a4dc23f55 SHA512 a335e0bfaf16a157c290fcd40fcf8786e8677f14189a8b6fe56ff112f008aed198600248d8eb1334bbb689b9979996e013f61bf5bfa6f0549b6a910d03cb2929
-EBUILD tex-gyre-2.005.ebuild 496 BLAKE2B 49655b7b6b70367710e97497db163deed50573243db8bfd361e4d9544c675c2d95e0cacc7810a00878da4b56aa8aa988fad82a04a42b88c36ba95980d5eb9101 SHA512 d232d0a9e63bffdbc9e39ade1665c75888c622389fbfd192374caab1cf7f5da81df33858e01ad5573e8c57f37efb1456c8f1d6b25ef742ffdc715d3805147817
-EBUILD tex-gyre-2.501.ebuild 544 BLAKE2B 316ff7ff66650518e04ec26a33330528c6bd01b2f8871ecea464532dce1188eba37c98656af5532605a43e36409b268b33238f28562ae5dc43044171b2834310 SHA512 7a6644461f3ef64d6c5f1e1cd03777de4e3805a6587c800806e22e5f212e0d8febd69d666156c5e46b1299891b72d1fa3ac9dd544b13b7084cf4972d1b600d3a
+EBUILD tex-gyre-2.501.ebuild 541 BLAKE2B d6c66c6a4c5e25d38a3b1b9e5d757b45650f853714e34d4db8fbe3cd6355757f506d33909910418c91f342fc24d9edcb9561e2414feb2490ba47c616a8313a31 SHA512 b305e8d2c0142ce99bcb75168dbcc00ef9b5e6670bb0304e0729942e58a00b20f12e97a06930ca100482f27239a3b4072613a973fe59a961e9e33245cabff721
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
deleted file mode 100644
index 2e47c60fea52..000000000000
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Extensive remake of freely available URW fonts"
-HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
-SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${PV}otf.zip"
-
-LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
index ad498a6c96f6..7d0f6ccdc7c7 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
 
 LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index c8dcc58084da..3cbc433b5312 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST umeplus-fonts-20160402.tar.xz 1763132 BLAKE2B 3e1406085d8dd1f62f69455efd53e0a51281d9a2a7220ef21a588d551fbd9c078110cbbc3e35ddd16cb9d31ee29d418c128b92fb4a5f980be654d57447d60157 SHA512 36a2ab6f2919e3e4ec99662a296f56dc765fc55ca1de3ea7329030312c88cd16c589ef2a945f4b52509d52b029cef749371d3dd4c1aebceb5c0811d5b7313658
 EBUILD umeplus-fonts-20160402.ebuild 458 BLAKE2B 89cb39bbfcbf7723ccc27671d101ee9e8cae22d52f53c7642ed0a00d27a08f88f496c147e02b3b9e2b731232818e1219ecb13aad5b691b71c1f06e7af77fdc46 SHA512 3d5b1f238a504d1a57e7a7ac7dcf1ff14ac86f37fc4f424bbd4184e006d98947a32d2003122563382dfad37e16a7d779aab1cf4e415a56df61d46913ab6075db
-MISC metadata.xml 462 BLAKE2B 793b6fc2171ca5b21ffec9ba0e1cc1db18a3a2f1aed87f6d6289dfb169ad134099a91d130f695318517a2b57bd787901d9337218759a18f08a4749574b01a382 SHA512 8ed1e9ce4072aff8eb29a156521a6076dce96f61eb36b0bbf09d9d6fbdef433049fef2326de34406fdcb79876c71d40a874cfcae0ddf8fa842caff0288a2f12d
+MISC metadata.xml 462 BLAKE2B f35780d07febaa7013c19dca08640407b0dc1594b24698ac4ca18e5f5aa6c4961c4fa9c456d72d36724c5739357bb37664470aefffce89ac640b1d9eb18483a7 SHA512 0e97c1316aeae497618d0dc919febc7ce9c9fbf35dc204179db31be3a62e7746db036f335249a5946562a61acc79086ef401ae2804383ad6d3a5eab0fc35fdb8
diff --git a/media-fonts/umeplus-fonts/metadata.xml b/media-fonts/umeplus-fonts/metadata.xml
index aec3c8272b24..461d81f58ce2 100644
--- a/media-fonts/umeplus-fonts/metadata.xml
+++ b/media-fonts/umeplus-fonts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /media-fonts
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)