Merge branch 'edge' into next

9 files changed, 111 insertions, 7 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index cfa901fe3152..f9784cdb194f 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 197cbe20df9f..124ee17ea2c3 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,8 +1,10 @@
 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.1.tar.gz 5665465 BLAKE2B d1ad5d8e2d217d9dc1f06b9ac52dcf87f4f108aab1469399f0d1fb011f3619a1ce1c85803213da33a7b7f6e48fffddc194627b3fe560f7340a6a41b15d822062 SHA512 6acb941664a773a1186e6b6150ce747977fc95963d4be8756de05eddf7c2785ba0a5eac8319361779f6e747e8cd1edadeff1a72045cdeb3b152ce5bb2c1b77dd
 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 640 BLAKE2B c367dcfe55a554cf3dfeb4102cf021554a178c1fdd51e85b50260a8c322c0c172f86165193a56763e34f3ac3af6d3c5a4adff54272b18f34cbd40c40907e923f SHA512 6ea833e78ddd5342f0535883bcb0fd70f7b54fe69543639bc890b8f8dee4fb8efe6bd1b7e489618bc56354ab1266d919d19c3a145560248b5c50ff50dc3cc63d
+EBUILD fira-code-3.1.ebuild 648 BLAKE2B eee09a876a83a583f76dec4a1384b93395737fab3efc135b457704b1e05d98b01f45dff4d51669ce15e8138613f3e5697e5eb921288720c1c05515be2eb5763b SHA512 9490431823171e136a9f97cc3ad1fad613a4a7dfc21090fcb4bd216a280a98ac20f11b5273ec336dfa1894bef905433206333600c550193274978710f9f54278
 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-3.1.ebuild b/media-fonts/fira-code/fira-code-3.1.ebuild
new file mode 100644
index 000000000000..73fe57c4a3dc
--- /dev/null
+++ b/media-fonts/fira-code/fira-code-3.1.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/ttf"
+FONT_SUFFIX="ttf otf"
+
+DOCS="README.md"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
+}
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index abc99f274a6a..11d12b610ffc 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,7 +1,10 @@
 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.11.2.tar.gz 10542743 BLAKE2B d17afa447acfa56ad42b6f36c6fd7ec049434028c00259f53f36d0896e2a679f83880c8e71f277316728d1ba5f18cf4af7cb22a935b0a300acc423bc02790fa8 SHA512 14267debf243aa3210125b4e45a2ab41cbcab599f2abab42e64432ff7b1f6b5716724012bc973b77bcee1b2d488738720ffa9b4f6ebaf8f4cc3375ff066fb72a
+DIST fontawesome-5.13.0.tar.gz 10998459 BLAKE2B 69ddfb0d8b3bb1a15911445b934cf0321e645164b34fc9f7844f0df04840a3e8d4d425b14589341cec0613ea4f2109678250198a1d5002e69c394eb053ceb4a2 SHA512 9fd3e1115acef6ac84667cf546374b204b947e229e4c645ab33f51026e993689a8295e7c0b02c88d735c4399efcd454f4252dcde7008eefb85c13846bf7c5bc4
 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 429 BLAKE2B fed6d6dbf2c1c84d80cd6d3004ba88c6d0ad82e7315976e630935efdd4314df8cc9e15fb33c2b2fafa6589aeef796e4d689e0e52931b2c9f0d84c1b1a654645a SHA512 24fe1d6df3a97828250bacda638ba5982be80bc13e687907778fa8c1874a30e80bfdf674cf59ee11e093bc14d35efb648e52f93faac8bd01a6096c0f951d153f
+EBUILD fontawesome-5.13.0.ebuild 747 BLAKE2B dba9b1386b81111d1565f548f43d4d3aba3305d19fcf964bf28c4751ef90e65b8a8b449cb16469e7cf61ab95259c8d86a1bdb121188bff71506485c987d5c6c6 SHA512 fa4f21874935f38e983bc59e5e04b9d517adaa0b69197b294ca5d594a53c98231ecce1c3765d95c99442d2cda5d6bf9c3889ba05ab757e4c4aac636e76b06529
+EBUILD fontawesome-9999.ebuild 747 BLAKE2B dba9b1386b81111d1565f548f43d4d3aba3305d19fcf964bf28c4751ef90e65b8a8b449cb16469e7cf61ab95259c8d86a1bdb121188bff71506485c987d5c6c6 SHA512 fa4f21874935f38e983bc59e5e04b9d517adaa0b69197b294ca5d594a53c98231ecce1c3765d95c99442d2cda5d6bf9c3889ba05ab757e4c4aac636e76b06529
+MISC metadata.xml 532 BLAKE2B 2a4d5bb78ff9948de3569171165e91bc9391863412dab5236ff996182671decde9ba0339d059c3ec2e58670c362ea7f49dab9b5e1abfc6d277c62a6c8f2dcd08 SHA512 862296f7e1ea8fa2fd4acbbe2d679df47076ad290bc6d571f15971c590745c47f3c7dba39d823411a0228aff71aedbb77b739fd4cfac990eed54f48c85406904
diff --git a/media-fonts/fontawesome/fontawesome-5.13.0.ebuild b/media-fonts/fontawesome/fontawesome-5.13.0.ebuild
new file mode 100644
index 000000000000..73c98da49484
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.13.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-fonts/fontawesome/fontawesome-9999.ebuild b/media-fonts/fontawesome/fontawesome-9999.ebuild
new file mode 100644
index 000000000000..73c98da49484
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index cbc37d4c0550..795d5dc16535 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">FortAwesome/Font-Awesome</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="otf">Install the OpenType version of the font</flag>
 		<flag name="ttf">Install the TrueType version of the font</flag>
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 6c30c5cc490e..39ecba31f724 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 2621 BLAKE2B 343449cbbf32edb5856be205132ac9f93689e55f19b3da2b2324c35c5678ccb348c0f162f30572acaabd80cb3d07887b1622b9ed4b22b7e1b6a54dae3e8df214 SHA512 313c0892667bbf8e922e957bbdae1c2d58e3822ad952292d3c2ae728233a806865b4fd6b16c1d296a9de4ab9ea9924655ac1c8dac5ee05f2eb9669151104aeff
+EBUILD terminus-font-4.48.ebuild 2615 BLAKE2B 59fd038e23e2df28f9af2e8b14aa438a1af5ed1e172e15788b07da8035357d72fcfafa3c406ee5e42e1fc67d1066c2be2f29fbfacacb3d18383ca1d2a27e6498 SHA512 205c101eeafdca6b04e8fccff95782cbc45ef8d05805bec1c12cb697d55e9af004a747c455204013c768d5cebc24bdbc2a94160fc8843de008d6d634ac29c0be
 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 97ee711da059..b64d4da43516 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"