8 files changed, 35 insertions, 6 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 4ab2708702ca..47e63253371a 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index aab2aed394e1..7f4ae9e3ae17 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -2,7 +2,9 @@ DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c
 DIST fira-code-1.205.tar.gz 5348822 BLAKE2B 9167765fb986a0b4552387fa43e71ddcfb97371692ad071659cc6a198dd4bee707e15a2f438daac1d5e038b8a4d2ddf4d5e0b94cf182655cd83b5085af3a207a SHA512 cbeb5fe4577ff6de5c4d58247c3b82b7aec4022afa5552394c660846d8caab8cca3a1a44aed8cccd10d03fe8c38e419d97663f5a750bd9d4e11ec4d2e5659bf8
 DIST fira-code-1.206.tar.gz 4679094 BLAKE2B 95a705979db3d96944986b78945734e87de0f7164db50313d9bcec5da3b2a8f6281bc1b1506c65a29358bc8fa65d9ffc2bb76b9e734077f6d487bc3bd63680e2 SHA512 022216fb3b7c553cd0608a51e8e5a2903375a15d3600a694dad68666897a5ed33d7ad6819db55e0ce4b7c58ac1dd3c33d2e05aded62ebf38365ffee8fb7f8ee0
 DIST fira-code-1.207.tar.gz 6640459 BLAKE2B ccd61201c5fe9d8755f0822d413df66184763f57b69965c22a6aceacda9ba117d4ffc0fbacb85e2c9202cd00de4b942ed36b599c3ecc46781fd3085b5a4ee688 SHA512 b0c555489f196c958a2abda4108fea10f13d2e62a94f26eebdc894e31ba5a34591e2a0214c4a8fb93fdb423b3e40c2e11045774a462c37faae24db1c85e4ce0e
+DIST fira-code-2.tar.gz 7100481 BLAKE2B 1ca41276c56b6edb174620224d2a0a72750cd29c48c71a350d033896e2ff6d59454236f193b6dc95f8f5ccd338951ac52f5c2e27c6a5286589382af938bc76f8 SHA512 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
 EBUILD fira-code-1.205.ebuild 618 BLAKE2B 88137715e4430f3807b1c9eb806cb51154235c634cbbc6498d32de302affb95d773de2b0639233ae1cf5cff9ed842a8d2ed3e6a749e46be0e8a5ff24d5151a58 SHA512 f0deec2a27ddbc65cf8dda234c7abbed40286f4dc0143b156cd20104b681b47eeba4b98f078283d3e283e6f7da1c7755e65d1e2f7adb7cf07557d5aa46c013e4
 EBUILD fira-code-1.206.ebuild 619 BLAKE2B d045a58476bf8af3f26150ea578b1e069818869b7a09f9261f12e2a75998bd01f5968312f105ae904af26d3a5476eebedee334f857e68f1428a64e0b6bf9580a SHA512 d3f4eddc634a578252e2d4ea086da45804d00c59589638806cf79317c86eb765a264346c864c109b130e52b42f73ad977322459aca277a7ca4bdec862f6c9bbd
-EBUILD fira-code-1.207.ebuild 619 BLAKE2B a10eab1225ebf883eb8fbef288134ebc055232d8d9b0ff783871fa070e38c291e2fc0e87942a03bb733507e9c43e65f7bfa016327693adbdb61e7b0678548975 SHA512 cfdecc5da09f445621f93fd598474453c1c9d14823153efd4e445b7d12e8af9b5e3756e524ebb5b98da94a3aed5a029721405b44f66dcde0fe98c91732d6f673
+EBUILD fira-code-1.207.ebuild 615 BLAKE2B 94ffad9429749b3ade41f47cd598be8b0f6dd2edcc1e09e2961c9222794f0f68a93387aa053b595cd1e0706cb9387ec4bf084e8412a65c29c2529747fe507b6b SHA512 9da2f1fb6a322a36a425da7b79b19a10f7432a123b0c046151a0523d8c250102e29bffa67b006b81bb776696897a07f16e5ba2bd2dcecaccf44c4314a97726b5
+EBUILD fira-code-2.ebuild 619 BLAKE2B a10eab1225ebf883eb8fbef288134ebc055232d8d9b0ff783871fa070e38c291e2fc0e87942a03bb733507e9c43e65f7bfa016327693adbdb61e7b0678548975 SHA512 cfdecc5da09f445621f93fd598474453c1c9d14823153efd4e445b7d12e8af9b5e3756e524ebb5b98da94a3aed5a029721405b44f66dcde0fe98c91732d6f673
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-1.207.ebuild b/media-fonts/fira-code/fira-code-1.207.ebuild
index 7f97b424cbfe..e4dc762c950b 100644
--- a/media-fonts/fira-code/fira-code-1.207.ebuild
+++ b/media-fonts/fira-code/fira-code-1.207.ebuild
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-fonts/fira-code/fira-code-2.ebuild b/media-fonts/fira-code/fira-code-2.ebuild
new file mode 100644
index 000000000000..7f97b424cbfe
--- /dev/null
+++ b/media-fonts/fira-code/fira-code-2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="Monospaced font with programming ligatures"
+HOMEPAGE="https://github.com/tonsky/FiraCode"
+SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/FiraCode-${PV}"
+FONT_S="${S}/distr/otf"
+FONT_SUFFIX="otf"
+
+DOCS="README.md"
+
+src_prepare() {
+	default
+	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
+}
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 87cfc8fbc77b..59df16fbbc09 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,7 +1,7 @@
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
 DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
 DIST fontawesome-5.10.2.tar.gz 10458602 BLAKE2B f4adc84a352a4ca4fb3fe0216f5672c36d4f972ce4ff7785f088afcef5c0049310116a188325508be23a5949dd75a2bc8504dcf94d614d66e8f73b9ce1674b7e SHA512 dec887c9379972cd6e4d5eb06a947cd2d6b418ef9db5526759b653ca163377d3a0634d300e24b1d3c8bdfec6ea062dad4da191045ce5fa245100f16dd2e657ca
-EBUILD fontawesome-4.7.0.ebuild 599 BLAKE2B c5df5a5878a75ed80d1c9fba6341a451f6b0851cea7086fb3559ae650d774f1fbde7a04ef624c69381d5791af4297222addf84930403c9c868f240bef7818c06 SHA512 21b0109d6deb9e8cba6d43b4a9faaef02ce5bb325744d34d7f723a93eeaa4b46d05cd0a4e35f68a9abd6c22f4e6f064ce370e7e884e122189de11ca802a33372
+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.10.2.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
 MISC metadata.xml 757 BLAKE2B 0052f352b2dd2ecf94c93033fb785bffac4f9d002257f7e6ecd5119c0df2c79add5cbad191ea4a2e1299ff52d045ed7e393344e15a4bccc59f8eb38be78266b3 SHA512 5527f5537b93e9ded68263ac22ad8f959efd923c221cfc882dc8f77bb5ed87e2657f01eabe18b7019fd5556927574c576448d08f65db473f47c2df3a3fcf0e4d
diff --git a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
index 04e6bd276a82..4b14f1212e86 100644
--- a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
+++ b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="CC-BY-3.0 OFL-1.1"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+otf +ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index 08bc7832a052..5db17c0d0db6 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,3 +1,3 @@
 DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
-EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 4950e808e21d9729d741b17d6c51c5766d5c05777c1749b66463f287c9ecadf1ee0c3065d368a80ce94eb0acfeb6f3240fdfe88e8dae4dde665746adb638ff8a SHA512 de4b9991e5597c22efecfe95fde6ef053317939341f6bd65117767ab9eaf367fa93d51ada3df56857ec1c789682f1bbe5349ea68714a76ffa31ba17eea013adc
+EBUILD glass-tty-vt220-001.3.ebuild 567 BLAKE2B d3e5077a3705dffb21df135c38ab6aaf7fa0146b820ced341e6db9d45584f5346f7572a69da27a0137a99f8842a7aef55dc41c8cad220605fe596df50a18f1fa SHA512 e5aee8aad4b8149511f94bc2342bfa0141e4b360aae256164d940b687b433af86bf96b83e097dfdb4d3716c8d0c6f32c0dd1c87aa67706954d369038677b98e0
 MISC metadata.xml 857 BLAKE2B 2c79eff84b11bae387c6d591fb90551c6e6f5b31d72f14925a135c23b62c95e9e4ba81513a3ccfa44eda0da20fc2b0e432268b122dae09197e89cc7ffa97f671 SHA512 c5bc22dc0a7bb56da981b7eb9b1403f937a51f9d6e646dd6693db24aa7bb8064d206f0b51ab07f8f1358b4039c87957c6f33bca608d74880375081456e70f5cd
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
index 704b5cb1b0f5..2cc36d005d84 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Hacking with Style: TrueType VT220 Font"
 HOMEPAGE="http://sensi.org/~svo/glasstty/"
 SRC_URI="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-${PV}.ttf"
 
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 LICENSE="freedist"
 SLOT="0"