gentoo resync : 25.04.2020

35 files changed, 251 insertions, 68 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 71270de1b3d1..cfa901fe3152 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/baekmuk-fonts/Manifest b/media-fonts/baekmuk-fonts/Manifest
index 38416ed37734..a3aab54c9a28 100644
--- a/media-fonts/baekmuk-fonts/Manifest
+++ b/media-fonts/baekmuk-fonts/Manifest
@@ -1,5 +1,5 @@
 DIST baekmuk-bdf-2.2.tar.gz 9547995 BLAKE2B 162a86425042dd615bd7b41565a41f0138697ff512a71589fdd964a98220b143abd43642ac6e3c66c5595b2f211609f3eff3407eafcace256149c0447f30abe6 SHA512 dc0aaf1f684f1e75c70cde3a5e3084e7abae38cbc6057063063f53abdadc200347e3e1c609535c1e44b050ce9540de3175b69d9551de31aa755ba7068632d898
 DIST baekmuk-ttf-2.2.tar.gz 29241850 BLAKE2B f14685743d6e1ce76d68f26e740621d768376884fdbd1a5b43c57a77b71d4fd1c634ef421f5161d88efd6a89ee6c7dbfdcb51aab1f64f17b45af2df009a6333b SHA512 779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b
 DIST baekmuk-unicode-bdf-20020418.tar.bz2 1841477 BLAKE2B 92b781ba678314a58e145488027f6fe998a13f9a75a5838a5bb9572299018feca2acd7dc54ec0a51a1b43fc43f3b394666ca9fe53a99d3011ccb78efd5e8cac1 SHA512 e32fd44d0d19f0a0ac6229763dbf4b4998b766206402fb161ce4d1f7c63019e360b0f0907603a6baf2950832f43ed529f5174fa613e62b93dc245e8ffce7085d
-EBUILD baekmuk-fonts-2.2-r2.ebuild 1045 BLAKE2B 9dd2c52d2292fbac8fbf964734cdcb700e17ba7bbd8957c161b0bef6e0387a9462107ac13e61432967e496deafe2841ab101545cd037947be9cc3160df3e6242 SHA512 81d7414d7048f8f36d97c8305a399db2bcb4b81e8ea19e8083ae573a774c28ed74dc68f2247d6f525ac916ff4f284a1dc0089a2e2f61013edbcac50aa0f8dd33
+EBUILD baekmuk-fonts-2.2-r2.ebuild 1046 BLAKE2B ef8485ec8f9dbbaa79f9e4eb50ada0e7b18d192db49ee151f1463cb00cbf9a889258fcaf4d94ee93c0fb2a28b8f25723959196cb3d4ab857cd25ffac8c5d2084 SHA512 382d3f8955dd471b51639fe5b669e090fa18610cfc1de63333eb3412d5c544d2ca305ee6f5cc5fac862e629b83abe2d5317dc8f0210903411818ad107851cdea
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index cf2cd4c814bb..27ad4a7c1daf 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 743465148b31..197cbe20df9f 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,6 +1,8 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
 DIST fira-code-1.207.tar.gz 6640459 BLAKE2B ccd61201c5fe9d8755f0822d413df66184763f57b69965c22a6aceacda9ba117d4ffc0fbacb85e2c9202cd00de4b942ed36b599c3ecc46781fd3085b5a4ee688 SHA512 b0c555489f196c958a2abda4108fea10f13d2e62a94f26eebdc894e31ba5a34591e2a0214c4a8fb93fdb423b3e40c2e11045774a462c37faae24db1c85e4ce0e
 DIST fira-code-2.tar.gz 7100481 BLAKE2B 1ca41276c56b6edb174620224d2a0a72750cd29c48c71a350d033896e2ff6d59454236f193b6dc95f8f5ccd338951ac52f5c2e27c6a5286589382af938bc76f8 SHA512 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
+DIST fira-code-3.tar.gz 5665172 BLAKE2B c27861867102b788da151e9b5ed3b8a1d3e610f9f40d6facfc7f850fb15ff6903bc4e0579674e4732b52bf1477b3f9bc223158c59991d4517af3476f7f5d819f SHA512 2518b2fe1e2454da32a023e93c38358b0c89691f2f47b2e26e9ccf583109911b83d73880800fe02f556e9ed5888edf08e447360628eedb4e7a693a2f9e778520
 EBUILD fira-code-1.207.ebuild 615 BLAKE2B 94ffad9429749b3ade41f47cd598be8b0f6dd2edcc1e09e2961c9222794f0f68a93387aa053b595cd1e0706cb9387ec4bf084e8412a65c29c2529747fe507b6b SHA512 9da2f1fb6a322a36a425da7b79b19a10f7432a123b0c046151a0523d8c250102e29bffa67b006b81bb776696897a07f16e5ba2bd2dcecaccf44c4314a97726b5
-EBUILD fira-code-2.ebuild 644 BLAKE2B 9a98629a65396348d1a4f8f0c9df5e5a4666a694cea5c3f76f86996d79f30f8a37cf5884935f0ed416f28d59ffd9df8fa091590b670db4fb9f3d95ced9070cc6 SHA512 93737cb5d94017703c498d027f0157901f5a789c04db6685417dc052cbddaa1596ba3b6f3151adf58f1b4de037207f6cd57dc1088964a6265409e5e2b329f874
+EBUILD fira-code-2.ebuild 640 BLAKE2B c367dcfe55a554cf3dfeb4102cf021554a178c1fdd51e85b50260a8c322c0c172f86165193a56763e34f3ac3af6d3c5a4adff54272b18f34cbd40c40907e923f SHA512 6ea833e78ddd5342f0535883bcb0fd70f7b54fe69543639bc890b8f8dee4fb8efe6bd1b7e489618bc56354ab1266d919d19c3a145560248b5c50ff50dc3cc63d
+EBUILD fira-code-3.ebuild 644 BLAKE2B 05bce38ce17b9d640dfb06ec4f57962a20a466f1d11dd998223fdced8e99a895aa74d49525fdce30dc98e49919830e443cbd8bb92312355fb0858a5bb84e6b87 SHA512 60889b899c14e753791ac51256f0c93694e0d0b0d168c2182194155c7c27d3196cfcfb2d21f65ce7a913468ca4bbbe989f1258367c3299071dbe236d7bd36005
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-2.ebuild b/media-fonts/fira-code/fira-code-2.ebuild
index 27f63773a5e7..9e256b7b90f5 100644
--- a/media-fonts/fira-code/fira-code-2.ebuild
+++ b/media-fonts/fira-code/fira-code-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-fonts/fira-code/fira-code-3.ebuild b/media-fonts/fira-code/fira-code-3.ebuild
new file mode 100644
index 000000000000..9d7a61c0f352
--- /dev/null
+++ b/media-fonts/fira-code/fira-code-3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Monospaced font with programming ligatures"
+HOMEPAGE="https://github.com/tonsky/FiraCode"
+SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/FiraCode-${PV}"
+FONT_S="${S}/distr/otf"
+FONT_SUFFIX="otf"
+
+DOCS="README.md"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
+}
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 76a9b94c8b76..30c0f9da688a 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
-EBUILD font-bh-ttf-1.0.3-r1.ebuild 300 BLAKE2B d7831e6d41ff6385d41dc2c02aac159a4688eab49eac631ae33b778771d76d2dead1ef636a78d2441ec76ec3150a2b99a38f79df54272f816e498d3d694ea86a SHA512 f8d43f383853bacf5a974ae3592ec797de8c9a10c6141205a8675fb1c04eb015aeccb0e72198f1fc8f95542cd29a0cbcadb52c01ed0334f93e7664575016ae27
+EBUILD font-bh-ttf-1.0.3-r1.ebuild 301 BLAKE2B b4fdeeb545172e8846699b1ce02f3028ad05fadff4f5d06a079043d11683a164d857a6af44399efd69b9285a3b35ae51381e1da16536808fff19615fc39a9683 SHA512 4367939552429190a96bcbdc49db25cb7f64015e20bda8dcaa651011453d3c5d4733e7c7ada499738f224022747babd39643c5b30add4f9cb0a342d3c6cde42b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
index f19dc16c9176..d599e3d4e771 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index d7c5e04535f6..ab1d9d8e1ad9 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
-EBUILD font-bitstream-type1-1.0.3-r1.ebuild 262 BLAKE2B 636c7780dbb9c47842ad2888097377eaaca4e567335ea99b7b2be13057882c0a851a060c0a05af7a7cc4a4c52883696dbb3444bb2036f5bbe6dcbdb335f00244 SHA512 437b9073ce2101824ee2671f7d396387de34cc1555d8013e896c4a71f21a66b3379b7ad2d9910b5fba0f2b111f06c3d51964167025d80e560fdf2bcb70230f5f
+EBUILD font-bitstream-type1-1.0.3-r1.ebuild 263 BLAKE2B 636499ca29e08629373e43dcc8f34abea4c47972bb87dbb0c2d65c7b8a8c8dac36ca1e823ec3c06dfa4292aff9419004bffb8e7df0ef2c375d6db03aac17d870 SHA512 21363161dd375791b946c42699ca5ceb3ba2e41b0f11a1f398c25bb2043259265988df6d475b1fd814f2df67bae330124696feb9df3936a8eb6c8b77448249f2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
index b82f6bce4263..bd5a857cc145 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 1106906ac9dd..86d336fc4f9f 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-ethiopic-1.0.3.tar.bz2 245606 BLAKE2B e0cf89f4500226b7213d6f3f88b3bf575501140d8742fe5e30b07eefd2c1fe2fc9bfe941639032d3b5ce45eb7e6f352af7b6468e7f8b0fc941ed9cee8d531f96 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
-EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 518 BLAKE2B 2c6d5cd8a93665082eecf9fb6beeb6c5465fc00be9d7dbd8e40587a274273b7a35128cc10583cdb9e77c70fbba60ef0515378ce245b84c549a86e0ae0c0c6f5a SHA512 1fae5a73c91aa1e7cace8a82891267c759498088a2b0696e490c5bcefc4b9951762989d4c051f536fc75c3155c62acc3c3852e369b81b8953a46f5d064bce564
+EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 519 BLAKE2B 8ea8d1ca143c4269f00e7003cd35e69548f4dcd9023760a77d09a7991bcd275df9f37631a126e777a71e9a7c717fa8a051ff4c273b76aac4cdecdf702f84eadd SHA512 6ab2706eb1ee5e0de1f0c6096d72598285405d89cbf9c5d0a0f3acd8e050bb1777a892e01ebbadad92efd8c4006bf5ebdc5e88bc3c6d2790b08b8d025c48891b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
index 8d5c20f78c21..aa7c7e0be9ad 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index 355c50838d1d..d94bd4389cc1 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
-EBUILD font-misc-meltho-1.0.3-r1.ebuild 268 BLAKE2B 4a8b880a7f8466e58a0ff7b10d0bb7dd478f60e687a44130dbcedfc3d89f078995663f8f5048b4985225bea2bb1ed941849313cc72d56eaf832774665018ea4e SHA512 eeae643bbabdc6944c84293b273116e16bbf1be067f41c6022e3f28d887c4652f2cd985447b3251a0badef58db20187282c71818e74d5291fc9f475770c80cb9
+EBUILD font-misc-meltho-1.0.3-r1.ebuild 269 BLAKE2B 464f269b3a730e7f331444b6c3cd3c82952623b432aaff5ee5c3dd521eb5d6690c5f6834b4b83966e5bc2117ec66bd48262895e8f4b3d7cfd153f1a64a1e52ca SHA512 ced4837ed27b369e10b4c1b79667836588dd664a3de34d015939d09244db8b2cc4853b0f87a94f37c98eba104f67db6e5eb5e8a103d3a75fbd86a88686cea208
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
index 197e5de5fb43..2853c3d7cb65 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 95f193000b8f..abc99f274a6a 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -4,4 +4,4 @@ DIST fontawesome-5.11.2.tar.gz 10542743 BLAKE2B d17afa447acfa56ad42b6f36c6fd7ec0
 EBUILD fontawesome-4.7.0.ebuild 598 BLAKE2B 01c3f14e7a3ca641bb70397916f048d7b3e0980caf98e872e02d2f17f44478374e986817060627cb30b131f677c12746fd9dca0e4f89deb2e742bb1d2e5593ba SHA512 bb2d606384eef7dfa4208f26aae0126bc40a4c99a2fe8eabe89f6daf22f469bec12cdc88e2530ee2302f0b6cc353ee62f82a13148770ee757d21503555f35ec9
 EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
 EBUILD fontawesome-5.11.2.ebuild 632 BLAKE2B 3b3dc924017b666cee3963adc699eec7379fbb48373aa41dc9d8ef03a36576546e1672f1972cd31eba6326acccfb8c6139db92f9333a5910ba4294f08ce98e5b SHA512 d3d68891772b54d39eadd666d1ddd030b8763e2c458cf8451f1d3c22e0d21ab6378e80c2256e4d111b9f1cf5faf5df938c08fb818e0c197f634309e29b3f088f
-MISC metadata.xml 645 BLAKE2B 94016224c9009870ee64e7b7e436356698bf0111ec0f2fce9642fa6ad67097571b7950c0ff96735e6528042811e48d1cd5d39e642ab75140c4420171d62224e5 SHA512 631df0a2e4b8a7fea6b50170ab71bcd8384ab076f249880ca3a87f98c4552763efaeed5b3bd9aaa72b18abd12ffcf93f52a92f4c60eb5b8368a438b23b2c482f
+MISC metadata.xml 429 BLAKE2B fed6d6dbf2c1c84d80cd6d3004ba88c6d0ad82e7315976e630935efdd4314df8cc9e15fb33c2b2fafa6589aeef796e4d689e0e52931b2c9f0d84c1b1a654645a SHA512 24fe1d6df3a97828250bacda638ba5982be80bc13e687907778fa8c1874a30e80bfdf674cf59ee11e093bc14d35efb648e52f93faac8bd01a6096c0f951d153f
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index 77b53be527f7..cbc37d4c0550 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bernardo@standard.ai</email>
-		<name>Bernardo Meurer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">FortAwesome/Font-Awesome</remote-id>
 	</upstream>
diff --git a/media-fonts/ibm-plex/Manifest b/media-fonts/ibm-plex/Manifest
index 1aca76f86dfd..89723443617e 100644
--- a/media-fonts/ibm-plex/Manifest
+++ b/media-fonts/ibm-plex/Manifest
@@ -5,5 +5,5 @@ DIST ibm-plex-4.0.2.tar.gz 75546862 BLAKE2B aa1f0040a16d86dfee5c78c1a73ae26934a6
 EBUILD ibm-plex-2.0.0.ebuild 1416 BLAKE2B 10ab44bcf69b6c9a2e938b76b5f87454bc6109f3c7f1886b81bd07060fde899ddd2ca4d2113862b28a6075c5620e652ccd2b1ab0a80525fc4776d6cc4431347c SHA512 258ad5b3f04ede959d7d8876c9b78e0314fa6401838390dbdc72e8619029ed5496507fd7591ff71dca23c684ed0d0ff7e7643e3e7a8472d63a53a984e40a5b8b
 EBUILD ibm-plex-3.0.0.ebuild 1358 BLAKE2B 4e9fbe5a54387e5e5ec37293636d47673020b490a907a2057bad34d5bf1c0efa93aa367faf9ccdf18111f6bca5bda2b8e973fbd52251fd76126ac9f76a43a4bc SHA512 581d71920d658ac2e319d2c74a5045635b242b5a2f4d687d5447f67611a600a0376b14494cad90cf58e8456e53089b109da5097c78ba49aadd1242fcf34fc370
 EBUILD ibm-plex-4.0.1.ebuild 1307 BLAKE2B 96fa7afe8a8bc61c3a3120c4a092af17618586a63b6f489b9a38604cbdbe44e6d399b473bb81b4f2bf9dcf967610e727166054710a3f22d49d0a7860d8387df6 SHA512 439385db000b288ca559589c36e9bac08c304c9602fabd76c802c554a72f3217e7ad7a3f6f86912264960b712f4cfe8e987f05ee8b3957e60a11e3f6b97ac11b
-EBUILD ibm-plex-4.0.2.ebuild 1307 BLAKE2B 96fa7afe8a8bc61c3a3120c4a092af17618586a63b6f489b9a38604cbdbe44e6d399b473bb81b4f2bf9dcf967610e727166054710a3f22d49d0a7860d8387df6 SHA512 439385db000b288ca559589c36e9bac08c304c9602fabd76c802c554a72f3217e7ad7a3f6f86912264960b712f4cfe8e987f05ee8b3957e60a11e3f6b97ac11b
+EBUILD ibm-plex-4.0.2.ebuild 1209 BLAKE2B 7cf316883e37dd88b23f542fe0f0527ffb588ec3e023c2f633db48f4df663a62d27295d45f46d0cdc02f1e93c8844f69f2963a666fcc8c63f043d2dd3896af32 SHA512 be9e84c08ecebb5e713843c8c1c4ec72a53d957ec03c1a1e5a16bf5a3517ef1badb9f0529efdbfeb52e30061aad637742eab3cf5d6f3ccd5f76cb9f8fc7cb9e9
 MISC metadata.xml 350 BLAKE2B 7440f75b2e70848fdcaa34ba78a2b847b16e7202fa43e84b17b3c8abc6e0da2656e4d9e7488ff6f077ca5f245c8ff8582fb36b1169f8e258f3cead8bb02bdad0 SHA512 28b8cb595c5b0b4c5b56cafd8639a1ae59684b765309737bfc620110b376b73a4c86ec94ab9b4ff3161f7b8fdcc66b2c1a13874791d29c0ba024ad6b224b427a
diff --git a/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild b/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild
index 86983b1f16ca..f0c272b386a1 100644
--- a/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild
+++ b/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,29 +28,29 @@ if use otf; then
 
 	FONT_SUFFIX+="otf"
 
-	FONT_S="
-		"${S}"/IBM-Plex-Mono/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans/fonts/complete/otf
-		"${S}"/IBM-Plex-Serif/fonts/complete/otf
-		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/otf"
+	FONT_S=(
+		IBM-Plex-Mono/fonts/complete/otf
+		IBM-Plex-Sans-Condensed/fonts/complete/otf
+		IBM-Plex-Sans-Devanagari/fonts/complete/otf
+		IBM-Plex-Sans-Hebrew/fonts/complete/otf
+		IBM-Plex-Sans/fonts/complete/otf
+		IBM-Plex-Serif/fonts/complete/otf
+		IBM-Plex-Sans-Thai-Looped/fonts/complete/otf )
 fi
 
 if use ttf; then
 
 	FONT_SUFFIX+="ttf"
 
-	FONT_S="
-		"${S}"/IBM-Plex-Mono/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans/fonts/complete/ttf
-		"${S}"/IBM-Plex-Serif/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf
-		"${S}"/IBM-Plex-Sans-Variable/fonts/complete/ttf"
+	FONT_S=(
+		IBM-Plex-Mono/fonts/complete/ttf
+		IBM-Plex-Sans-Condensed/fonts/complete/ttf
+		IBM-Plex-Sans-Devanagari/fonts/complete/ttf
+		IBM-Plex-Sans-Hebrew/fonts/complete/ttf
+		IBM-Plex-Sans/fonts/complete/ttf
+		IBM-Plex-Serif/fonts/complete/ttf
+		IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf
+		IBM-Plex-Sans-Variable/fonts/complete/ttf )
 fi
 
 font_src_install
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index 1b0ded74583d..b6f6fca61eef 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -1,4 +1,4 @@
 DIST 01-iosevka-1.14.1.zip 9725331 BLAKE2B 58f0e51ba06d27eab18336effbe825c7c7bc88f24eb457be49746f8d3b1591f2cfafb8c2a7c9b56a7528edb207cbee6741dbe394b82331c6207a4dc6886cb388 SHA512 7e1dee79d78b1bc36ff2f55140a3538802dafc22677193e0657a6649ca55d5b1de868de86ba26d9458a3afe481298356dcf641afa72ecea2d69adb6382a5fd58
 DIST 02-iosevka-term-1.14.1.zip 9672957 BLAKE2B b03751969722919b4c4172b066f372f334f45f38636cff8cba764a5c30d906ab000887c290b4583f418307c2efea7c3650f5557d535b1e7c26c2078ee29ebcb6 SHA512 6b17960b960365a81ba78a68b6ad04c6146f51855f0f6abc288c12d8dd50669fe245f94aa135b032df14d0ec7bc6b291aef1c8a86ccbf948b8e5678862febe34
 EBUILD iosevka-1.14.1.ebuild 534 BLAKE2B 8d09aa3a01a2a345d58b1f1c6886e998a9ede11a28a2880747c32a2dbe08262a2edacfe4e26455664a3b0d5fe70cc7afa5671050b2686669814e88c79d3c487e SHA512 b85dcc89138630d064b8c766aebd1e037f84c8e9d8161f2741be9f49e58fef6fd881a664eca1dace7e80c112f080fca6af9c7eb9dad3a7b939c8e8a4865ce4cf
-MISC metadata.xml 480 BLAKE2B ee4b7a06682917226a926a5f6ded43a4716836fbb4946a19e87833e9ebe7500044e56fde1c3f2599e45e680fe62e7830567e4c13567db4c51dbf3bea09f6c712 SHA512 ca857dd987c6b6b13f2484ce94e6c3aa56030e81b3d1040237615d65f1e10bd1ec4369ecaff3bec7bc7c4e17bece31610d03888c4dfdf045840ecac62cec659a
+MISC metadata.xml 252 BLAKE2B c98b373c811fa8347ab7bdcd3c07d03151509e691762304ba6b5cff1513e617ba14c17bb286060ad30975fcfc25b32953d42c9a60b2f6a9b2917cb53bb7045d3 SHA512 e24fdca52235a7d57aed8adc92cb8e0f0d69e2b7ce8802f1d692bec984027179404529e008de74ea1a2f245a79d02bd1dc4b09c93c8969f826c80086e82fc6d4
diff --git a/media-fonts/iosevka/metadata.xml b/media-fonts/iosevka/metadata.xml
index c56169210d5b..953797c6c737 100644
--- a/media-fonts/iosevka/metadata.xml
+++ b/media-fonts/iosevka/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>david.truby@gmail.com</email>
-    <name>David Truby</name>
-  </maintainer>
-  <maintainer type="project">
-      <email>proxy-maint@gentoo.org</email>
-      <name>Gentoo Proxy Maintainers Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">b5invis/iosevka</remote-id>
   </upstream>
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index b3c0226dff79..856f9c16f309 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,7 +1,9 @@
 DIST jetbrains-mono-1.0.0.zip 514933 BLAKE2B 66067752bdabd173dbc3e0143483948ae94a4e67ec93579588f555c9e36fbdf6dfd6627fba8c8acdd976e76c4d23d0760953ed33ab4d6ba9d497aa06de70173b SHA512 7fd953f65951448bb358b3ade3b5be68b9994527781ee1059dc2e36e3b4042aa879472dadc37b13791c908238eb793bcfa06c4b3aedb4472943cd3852f512c30
 DIST jetbrains-mono-1.0.3.zip 1918755 BLAKE2B 9f8d8784936cb5f41d82b8b2aaa916a386d31d0830e743918142a97a1deef7a32d254a1617ef41a7c29e89c58bad2eb9fc7db129945982d37c4f6d179ed7cf9f SHA512 81852f330387084ed6df8eece6389c8683a416bcd3e5db51b572962ae57310725214448ddcf2617c5aff899e6825c26e068adccd16578123f03f4b2083b7c7b0
 DIST jetbrains-mono-1.0.4.zip 2884915 BLAKE2B 0874cb4a15d5c549659d0f485edb4bcc46b6d8de43d9968be871b2e31212c6855fb4099fc6b38147d454891223537a5b21b9be47070788d6c002b1f23a1fdc5f SHA512 ea7ba810192c0ae3f98921747d0601b2489387953675de649f1fe1c690dfeb9138d678643fc05c65b31776a90094280934ece3cecba997af38b465a68919a126
+DIST jetbrains-mono-1.0.5.zip 3313739 BLAKE2B 537805e5d489376cea29677c17486b3055a183df4f2ae7a2213395c9e81286949dd7305b4e88499d13e0b07a06fafac9dbb6c1b2f68f1ddd2e133f91d158951e SHA512 4fd19e2e43c217a2cd4cb36f24dbd0b394cd410696e61870a16b32920da800c6389b4ea62bdde7c48b1d9e88ba078e69140fb53ac65a2365db9bef8872049631
 EBUILD jetbrains-mono-1.0.0.ebuild 427 BLAKE2B a01ea42a187ee780d3049fa7eb6745108d02929cfb25b9a06e182f303e256c5d9e0424d5fd3bc06bb1b1c919d1409c39d4775416dcebb2c81daa710700bae29d SHA512 a2ec4da63c39e1105f7c1b06506c3a85368def3859a9e6e7afff6de1d92f95834124567a672a024d56d33269ee40d99839e7cf9c2ed7162e1544c45acbb44f94
 EBUILD jetbrains-mono-1.0.3.ebuild 450 BLAKE2B 465ea9f8af803385b9fe3575d609a2327354294c676d93053ff59795999a40a044a063e1e32e004788623072ddd8ef9a8042d9037ed7cf742cdd28deb2a0f69d SHA512 6ea29af3e934192ae34b97bedfcc9f74081a7ace59e711325dbdf71643af9011a576e78d406342c9eb95e46fe35504979d607b1abcf2aaab72ac052e3596e029
 EBUILD jetbrains-mono-1.0.4.ebuild 481 BLAKE2B 51f587c0ac48af9070c090e497420dba53eb685f08b176d69b996c87573e3696a4270c316bb0d61ec59785351f2c1c8f1f849fb2b3a3ffa3520d5ee07fbd849a SHA512 fc38299ce2e3aec4f14b559e366dd3075ddb6902347b92313f69973c706862ee741392a84113fadb11ebc036eca0b9acdf2628e43f11d273cd2bef9c8cb00969
+EBUILD jetbrains-mono-1.0.5.ebuild 481 BLAKE2B 51f587c0ac48af9070c090e497420dba53eb685f08b176d69b996c87573e3696a4270c316bb0d61ec59785351f2c1c8f1f849fb2b3a3ffa3520d5ee07fbd849a SHA512 fc38299ce2e3aec4f14b559e366dd3075ddb6902347b92313f69973c706862ee741392a84113fadb11ebc036eca0b9acdf2628e43f11d273cd2bef9c8cb00969
 MISC metadata.xml 446 BLAKE2B 616fbc05a7e6130dacb8ba06191f0cbced65910683bd67e581dbbce48fb7db68de84460a1a1a2b246c96436dc7347b3bb33c91a4dd46fad1aa52001d406bd33d SHA512 04d88a4c4d059801e7acf933d3217b3552dbaa99b08d1319e0593e5e3b6cc93eac491dd5fa17620ff30f3606f9a9ddcd27907fec564e361dfd184692f1e70dd1
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-1.0.5.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.5.ebuild
new file mode 100644
index 000000000000..75b662ef7cc1
--- /dev/null
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-1.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="A free and open-source typeface for developers"
+HOMEPAGE="https://www.jetbrains.com/lp/mono/"
+SRC_URI="https://github.com/JetBrains/JetBrainsMono/releases/download/v${PV}/JetBrainsMono-${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/JetBrainsMono-${PV}/ttf"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 92a563d16a5b..be8d4aa9c617 100644
--- a/media-fonts/kochi-substitute/Manifest
+++ b/media-fonts/kochi-substitute/Manifest
@@ -1,3 +1,3 @@
 DIST kochi-substitute-20030809.tar.bz2 8675822 BLAKE2B c825801d5d47ff312338393c09c5d2b03923fe8b6a5434dab36acd855a27a9f167409e8562f701c7da5dd4b313d8f19e18b7ee09c63e9d024cd3a2bade3b47a2 SHA512 24d990383aa1afb32523d05577da48bf07cabe0814af9c2f10c55d1db6dd4fd5e4b9df566431fe25f871f78494e62c07d5082c7596c50c410b45bf33ca9b2105
-EBUILD kochi-substitute-20030809-r3.ebuild 701 BLAKE2B 30bc97d91f37e26307943e91977cba3b6e6ceb9f179cb50d7ce8be1e509d10568d6f8e2a5582fdbff2aa0b09cc9c9197dd5ab3e55b91f3f62af23c2852a09ded SHA512 d5e97376d06be21b9655bde1b85d6a4cb956389599a52ebb5e5bc0e9697b48e0bd19677078a954a9b191a79dc17bb501290c2960b42d13b17f27806bd3efc39d
+EBUILD kochi-substitute-20030809-r3.ebuild 702 BLAKE2B 8e704ec22b7aae41723aa78652222dbcd71a3e85ef09a796b48109bb97538fa064f07d37b30154040d998450d6a8528c323b52669d99d317cdc209327afa33a7 SHA512 0d8ae4700715c0e305833876a54bc7197cb2781af5469e9a16bd253c211fa8468b1c7f234f39ff764a2c2aa0cca40a18fb0733edc1098cbcff87d67309c53b34
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 91f5776530b9..68bd24d7d4d6 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 195fe6bbb9dc..66ed3d023149 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,8 +1,11 @@
 AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58759d9ac265a3dfd7854fc6ba0466ace3c5ce9794c9c6493d08a89d29d4e9a5fa99d1553be13c49fc9f09fb82a82b6b61531f6 SHA512 544acdfd0f2dc0dcfc75b4081f7e1518ab914d02801bf7b38f31af9a0d55ed516a2f53e963606232a8742819b3005f8e9660c8a61257d0583bfee8f095d4e341
 AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
+AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
+AUX noto-emoji-zopflipng-verbose.patch 299 BLAKE2B ba5f18515ae77b8c5228f2ecdc0488a221bd0e44e1b91368fdaadd3318937a593790aa597ce554758c7197e9e28f874cd5b16fbc0782a55d1ffcff84ec1ab3d5 SHA512 fe83ace875d980c9c04845e10cb405e73223f3464c50607002526793acd46f885ba8ffe4fba66e1f408f2fba365478052b01063ea56ffbca8e90c2073e3bf6b6
 DIST noto-emoji-20200311.tar.gz 58539077 BLAKE2B 837ae7ef6a571e40b4ed83a0aa1edfd13404c3ca65e671cdc86f650e63cf77179ef283e6dc032fb93f5107411565f980e594be8880626417fa89c67347e6fe62 SHA512 cfafe9c06ccbf888eb1309dc2090abef2f92c0592460693cb45db8ab147311fdd63655d8df182043f05cf503bdfbe16563bc8cea0bddcd830fe193ca86f7fcfb
 DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e SHA512 958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb
-EBUILD noto-emoji-20200311.ebuild 1575 BLAKE2B 4cee9e26fd338b995de949adaa03cfa8a8faea83f072f37c1347e9e3b913a57d5ce55787ee88e6cfed6dbaf13a47fdcf954c98cebd3673cdce7c629f2674482c SHA512 7d02c408f9066446612b8e608e8d6c11310cad63d952daf5269f5dc7bb4a0359adca233380861ffba54d528fd4dc997adc993bc20893e9cb97a826c2eb2cf270
-EBUILD noto-emoji-20200317.ebuild 1576 BLAKE2B 5da2fc4108966de298c3efc792f5dc7135f098b31a2dff8c95690257e135f30c96a1ff122ea6d575d2444844f32f67c6a058b61ed23096820e0880d189d12554 SHA512 7b68bc1f0b32c94150b96f709ca592a9e21c9308341c1b25ec483827b5778602a0cf51e8abaa4244eb766e3423968f07f310970117099edcda06e21aec91ed09
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD noto-emoji-20200311.ebuild 1637 BLAKE2B d8e8cb7457c2a69672195cd7f9f4138fcceed4ab20161231e1e891f351c7f689eaf2b92c1b795ffb668bd306ef0e2be98d40cac4649828c85607401aae72dada SHA512 dd6ab5a2550adba9f53d4e27c4ad8ba51343966c1b2648ce29e925556eff068a2f6f901a4232c977de0b55d722845330f459cc58e09cfa09e62c4370238b88b9
+EBUILD noto-emoji-20200317-r1.ebuild 2342 BLAKE2B 1d934fff190f3413bbd1834cd28bbc58ae96451c396082a4969c41e90e2df6875a88160b23b0f800d97ebc0a020ef6ab7ea66acba4c08da38e7b70bf9ec197be SHA512 8de27c360a7871e655de9f279a9dce83b91bb7c8467cecb176a07fc4705fb59eafeab5fddeeafa4472b3e9ac01d598e47d6c677953279a31fca1a87b856eceef
+EBUILD noto-emoji-20200317.ebuild 1640 BLAKE2B 78b9d5d5584064dbbff464681239b6068ab4a85b1264e7c230b8de916b5adcb1ae78dc4b3f6cb43f68ae4947f8c6339358a9a505777e4cd6fbf599a639a89b74 SHA512 8d0ae747a252b107ea8196e9061ad2b680be4582492335285d33421b4fb95136c5996fb86fd8b8de33d02560e051033e99e9b30fe6c75a32ede8dcb6cd5f34b7
+MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
new file mode 100644
index 000000000000..8a152bea23d9
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
@@ -0,0 +1,11 @@
+--- a/Makefile~	2020-04-22 23:04:44.000000000 +0200
++++ b/Makefile	2020-04-22 23:06:42.069275340 +0200
+@@ -20,7 +20,7 @@
+ 
+ PNGQUANT = pngquant
+ PYTHON = python3
+-PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
++PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v
+ BODY_DIMENSIONS = 136x128
+ IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
+ 
diff --git a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
new file mode 100644
index 000000000000..0cb272994aa2
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
@@ -0,0 +1,11 @@
+--- a/Makefile~	2020-04-22 23:07:33.000000000 +0200
++++ b/Makefile	2020-04-22 23:11:46.356767595 +0200
+@@ -194,7 +194,7 @@
+ ifdef MISSING_ZOPFLI
+ 	@$(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<"
+ else
+-	@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1
++	@$(ZOPFLIPNG) -y "$<" "$@" 2>&1
+ endif
+ 
+ 
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
index 3da97a9953cc..18a049a172d7 100644
--- a/media-fonts/noto-emoji/metadata.xml
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<use>
+	<flag name="buildfont">Build Noto Emoji font with supplied images.</flag>
+</use>
 </pkgmetadata>
diff --git a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
index 8c9d46ac17e5..96e7679fa644 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
 	$(python_gen_any_dep '
 		dev-python/fonttools[${PYTHON_USEDEP}]
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS}
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
 "
-RDEPEND=""
 
 RESTRICT="binchecks strip"
 
@@ -37,8 +36,12 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
-        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
 }
 
 PATCHES=(
@@ -58,6 +61,11 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	python_setup
+	default
+}
+
 src_install() {
 	font_src_install
 
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
new file mode 100644
index 000000000000..c676a419e557
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
+
+COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
+SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="buildfont"
+
+BDEPEND="
+	buildfont? (
+		${PYTHON_DEPS}
+		app-arch/zopfli
+		$(python_gen_any_dep '
+			dev-python/fonttools[${PYTHON_USEDEP}]
+			dev-python/nototools[${PYTHON_USEDEP}]
+		')
+		media-gfx/pngquant
+		x11-libs/cairo
+		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+	)
+"
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use buildfont; then
+		# From Fedora
+		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
+
+		# https://github.com/googlei18n/noto-emoji/issues/240
+		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
+
+		# Be more verbose, bug #717654
+		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
+		eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
+
+		# Based on Fedora patch to allow graphicsmagick usage
+		if has_version -b media-gfx/graphicsmagick; then
+			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
+		fi
+	fi
+}
+
+src_compile() {
+	if ! use buildfont; then
+		einfo "Installing pre-built fonts provided by upstream."
+		einfo "They could be not fully updated or miss some items."
+		einfo "To build fonts based on latest images enable 'buildfont'"
+		einfo "USE (that will require more time and resources too)."
+	else
+		python_setup
+		einfo "Building fonts..."
+		default
+	fi
+}
+
+src_install() {
+	if ! use buildfont; then
+		FONT_S="${S}/fonts"
+	else
+		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
+		# Built font and Regular font
+		FONT_S="${S}"
+
+		# Don't lose fancy emoji icons
+		insinto /usr/share/icons/"${PN}"/128x128/emotes/
+		doins png/128/*.png
+
+		insinto /usr/share/icons/"${PN}"/scalable/emotes/
+		doins svg/*.svg
+	fi
+
+	FONT_SUFFIX="ttf"
+	font_src_install
+
+	dodoc README.md
+}
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
index 4006861c9605..b4230796aef1 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit font python-any-r1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
 	$(python_gen_any_dep '
 		dev-python/fonttools[${PYTHON_USEDEP}]
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS}
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
 "
-RDEPEND=""
 
 RESTRICT="binchecks strip"
 
@@ -37,8 +36,12 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
-        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
 }
 
 PATCHES=(
@@ -58,6 +61,11 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	python_setup
+	default
+}
+
 src_install() {
 	font_src_install
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 769b2647e7b2..6c30c5cc490e 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -3,5 +3,5 @@ DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cad
 DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
 EBUILD terminus-font-4.46.ebuild 2609 BLAKE2B 5b7d71a268c473e7a2a610c8128912e84ef6b8f6b2979589bd2a551acd0df74962a1b29080198d61be0ad760e400940e33c18dc24feee3e85fb5a56ac53f4718 SHA512 eff0f4526b709be6e08b98a397f545207486eb0b6381f6c3ed8d44e18dcf0f9384a595bf265b3eb79527b1a9f46281c10b244c9a1e2bfd57172091476662e900
 EBUILD terminus-font-4.47.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
-EBUILD terminus-font-4.48.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
+EBUILD terminus-font-4.48.ebuild 2621 BLAKE2B 343449cbbf32edb5856be205132ac9f93689e55f19b3da2b2324c35c5678ccb348c0f162f30572acaabd80cb3d07887b1622b9ed4b22b7e1b6a54dae3e8df214 SHA512 313c0892667bbf8e922e957bbdae1c2d58e3822ad952292d3c2ae728233a806865b4fd6b16c1d296a9de4ab9ea9924655ac1c8dac5ee05f2eb9669151104aeff
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
index 40ce47872db1..97ee711da059 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index ea45cd29930c..67e2975d746a 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 BLAKE2B 9f4c026af2ee6b472454be43b4e1d11616770cb63841fe022762f18a7c71abc37e442102a3d54b880a6a34117442cf45b2d65133ef9cca564e55a26ac1179824 SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b
-EBUILD urw-fonts-2.4.9.ebuild 1921 BLAKE2B 9290a0009852b1150b2d5737e83f2064b712db10d6bdb9ebf6e3aa43666ddb3b0c596636b978c99882bc3c0a8dbe1087213599f4164bbd7c451e7c973002eced SHA512 69ab2303a4ed82545633c6a23d5c5c76ad3ee35c5a73d3fb2ba4282f896f854de7e63e01838a65c5f7c8894d23118c072d5dff82e7e4c58488b9cfa456b1ee57
+EBUILD urw-fonts-2.4.9.ebuild 1922 BLAKE2B fdb163fbcc110de3cd50e9cacda67c76f3f4ab3443d781b4b3ec1592bf67ddb28d1b5c175528e5a3b7eb4915b8c9fb442f8e249cb521f8cac2df15e07abc127a SHA512 72e3470fbc8437e74f68df8d2e3b445dee28df450142419d46035850356d23ce6806aa654fe85aa42b9d3c97b871e650ff9c8f69e27f614e05361400b6eed30c
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 2e718da2c507..a92f6d162125 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!media-fonts/gnu-gs-fonts-std