gentoo resync : 15.09.2019

3 files changed, 31 insertions, 2 deletions

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