gentoo resync : 16.09.2020

4 files changed, 2 insertions, 64 deletions

diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 642ddac843ee..89f8059a60a4 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,12 +1,8 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
-DIST fira-code-2.tar.gz 7100481 BLAKE2B 1ca41276c56b6edb174620224d2a0a72750cd29c48c71a350d033896e2ff6d59454236f193b6dc95f8f5ccd338951ac52f5c2e27c6a5286589382af938bc76f8 SHA512 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
 DIST fira-code-3.1.tar.gz 5665465 BLAKE2B d1ad5d8e2d217d9dc1f06b9ac52dcf87f4f108aab1469399f0d1fb011f3619a1ce1c85803213da33a7b7f6e48fffddc194627b3fe560f7340a6a41b15d822062 SHA512 6acb941664a773a1186e6b6150ce747977fc95963d4be8756de05eddf7c2785ba0a5eac8319361779f6e747e8cd1edadeff1a72045cdeb3b152ce5bb2c1b77dd
-DIST fira-code-3.tar.gz 5665172 BLAKE2B c27861867102b788da151e9b5ed3b8a1d3e610f9f40d6facfc7f850fb15ff6903bc4e0579674e4732b52bf1477b3f9bc223158c59991d4517af3476f7f5d819f SHA512 2518b2fe1e2454da32a023e93c38358b0c89691f2f47b2e26e9ccf583109911b83d73880800fe02f556e9ed5888edf08e447360628eedb4e7a693a2f9e778520
 DIST fira-code-4.tar.gz 5580474 BLAKE2B 0bc9b4c8a54f238f1c464398162a56dccf0ac5f4aaffac00357bc7ad0ed99436b44220180f9753a0bc6f2fccc5dafe4a47df9cac91dc87fb1441952e1f04eeae SHA512 037698435b3f77f5ad2dcfb6ea6ff3063c50d224c2b95ada472bf9b12a6342e892d60220e1993045858697fff9c4fb5da97b41ac3437c4fa50f48ef1398c9738
 DIST fira-code-5.2.tar.gz 4875970 BLAKE2B baff9ca088252e03a442860a95a03ae6e8ab59f102be3352e5b3c6a0b709907cc84bf70d4e9880ad5d48fca6a000e021a7453c8666638b4f9bfd0a2a441ddfe3 SHA512 10247bf8b72f4d44a5b5d727edeae2baee549b6654e12469ad3ab75d3926635b4b2cdfcbb2b9b4c89b28d7c5411c428c00729f94567dad3bc0dc23ff5446ce2d
-EBUILD fira-code-2.ebuild 640 BLAKE2B c367dcfe55a554cf3dfeb4102cf021554a178c1fdd51e85b50260a8c322c0c172f86165193a56763e34f3ac3af6d3c5a4adff54272b18f34cbd40c40907e923f SHA512 6ea833e78ddd5342f0535883bcb0fd70f7b54fe69543639bc890b8f8dee4fb8efe6bd1b7e489618bc56354ab1266d919d19c3a145560248b5c50ff50dc3cc63d
 EBUILD fira-code-3.1.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
-EBUILD fira-code-3.ebuild 644 BLAKE2B 05bce38ce17b9d640dfb06ec4f57962a20a466f1d11dd998223fdced8e99a895aa74d49525fdce30dc98e49919830e443cbd8bb92312355fb0858a5bb84e6b87 SHA512 60889b899c14e753791ac51256f0c93694e0d0b0d168c2182194155c7c27d3196cfcfb2d21f65ce7a913468ca4bbbe989f1258367c3299071dbe236d7bd36005
-EBUILD fira-code-4.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
+EBUILD fira-code-4.ebuild 644 BLAKE2B abe05b9a8ccc488b70ec0d122db585eade270bbb546b81fae187b3e0ee673aad2c2f5485d06ccf45c4c5c2d790eb5d140a3d797b28b473828ff7d7c1352779ba SHA512 b6776316ece039b6c216554d354a481915af878e8883ad96c171df190f0bdfee301a34bdb434461a4687bf4ab75abdb0267d873427ed908b62ad1e1005c12d7b
 EBUILD fira-code-5.2.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
 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
deleted file mode 100644
index 9e256b7b90f5..000000000000
--- a/media-fonts/fira-code/fira-code-2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-3.ebuild b/media-fonts/fira-code/fira-code-3.ebuild
deleted file mode 100644
index 9d7a61c0f352..000000000000
--- a/media-fonts/fira-code/fira-code-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/fira-code/fira-code-4.ebuild b/media-fonts/fira-code/fira-code-4.ebuild
index 73fe57c4a3dc..c9c8dbb7c8aa 100644
--- a/media-fonts/fira-code/fira-code-4.ebuild
+++ b/media-fonts/fira-code/fira-code-4.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}"