gentoo resync : 25.04.2020

3 files changed, 34 insertions, 3 deletions

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
+}