gentoo resync : 27.01.2018

4 files changed, 41 insertions, 37 deletions

diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index b19c4a8e7fe8..8ad09e8b706f 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,5 +1,5 @@
-DIST fontawesome-4.6.3.tar.gz 2526615 BLAKE2B 5ecc9cff9ba09bf72427a4170f450aeadda8f2b6a8925b1ce76409debe2b5fd0e1d13a995df13459a7a0b57e8ef1e03c63af054ef990ffeec80caad4094abce6 SHA512 ecf78028e7948e89d352c7f0de413198d95c235e36f49c24146d246012145ac62e0f4d1148655ef88be15710340688b2f3cc55247cfb6742a41400422f88d69f
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
-EBUILD fontawesome-4.6.3.ebuild 599 BLAKE2B 75e2c003ed3aac16cef42fefdae1984f0aa65870be71c738b3713648bcfb3e09a7379c99197b5d64d4af15520af45cf3e8fc855cfa4cfd82ad19758f4045cc4f SHA512 0c7ca7cf44d1078dcfecec56c622a03014914b3964be31cda20261f0e026d5d90c2daeb8fb873324d7e6791fef8fe5c6b7b4dc8fbebbef2604a810d1a9e669d6
-EBUILD fontawesome-4.7.0.ebuild 603 BLAKE2B 54e6cd36f597b4d5ecbd19810af57fd442663a937a6c79284beaa582d0c1e64412f2edc33307f5ba55e15c1daebba888a89567a10f60efdfb26bbcb885c67e72 SHA512 456e3f7c08e5121d32cc0ae392ed4610c52ca503af70ced28c165e926e054b737713ef1d1619d84c9cd1c2d67cde2df589704d3a050f435e9fc5f2204dda4b5e
+DIST fontawesome-free-5.0.4.zip 14981074 BLAKE2B e899c4bde9012ee8496e6c55a7c37cc65daf195366ebb6ba4eaa536bb0912c8558ba709f61b3ccc7807f064f247a151630c4b763e9bb8c5e8e659484ed5c26a6 SHA512 af5dc97d2672a307f4867925aa3a45e6148d2565e53c99300dd9b204f6f9304270821271ab3c5240944e6c3ce0997c48b1cd483185f85cb81d30620af5d87a73
+EBUILD fontawesome-4.7.0.ebuild 605 BLAKE2B a2ab612d6c2b1ef834dcb384391383f1bcce2df7d3ad01e9349f50f604b510d3e782aa3dafdb6e45dc9b5ddb29c7666fa1c291f1853ecbaa7f16b85ae2a554ce SHA512 35d1c23ba8a514c33424b9806a142059cc522ed99e1ae69df543b81482bb09f97cd056e037f7862abb777b557c8cf464c1c89fc90100e52e39aabae463afef6e
+EBUILD fontawesome-5.0.4.ebuild 790 BLAKE2B b6fe16fc5ef3ac0ec831760e68fad46861037149282551a162ec608e8fee867c33cca1d030a1ec7dfa3133dd24c42d88bcecbbf72c0fc7039b8aa94c6d6ba172 SHA512 43f42587eac345820ea069905d5c5ed3d843157397b72f08cd62f02ea5cedccb4163535b8dd6562416eba99140e01d3d96aaeee91e2cb98a1e453eab632814ff
 MISC metadata.xml 621 BLAKE2B fefcdf06ea11f267a41d7749056954e7e2f16ba1554fefc8d54ce4cbe3bf2c35177a79ba0c795b898fefc62ccb3d79da346bc938b22423c0b238e8d6d234b77e SHA512 5709fc280c0d0d1fd5c266cf4f4985446682ac955fcb94775298e4c2fe0c352d94a6b863c3e0b1b73aa70ba5c815460f786deae7cc43ccdce6cdf7950246910a
diff --git a/media-fonts/fontawesome/fontawesome-4.6.3.ebuild b/media-fonts/fontawesome/fontawesome-4.6.3.ebuild
deleted file mode 100644
index d43429db8adb..000000000000
--- a/media-fonts/fontawesome/fontawesome-4.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-REPO_PN="Font-Awesome"
-
-DESCRIPTION="The iconic font"
-HOMEPAGE="http://fontawesome.io"
-SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+otf +ttf"
-
-REQUIRED_USE="|| ( otf ttf )"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${REPO_PN}-${PV}"
-
-FONT_S="${S}/fonts"
-FONT_SUFFIX=""
-
-src_configure() {
-	use otf && FONT_SUFFIX+="otf "
-	use ttf && FONT_SUFFIX+="ttf "
-}
diff --git a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
index 5c623f0053b7..2b9a2ca0b133 100644
--- a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
+++ b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://fontawesome.io"
 SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0"
+SLOT="0/4"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+otf +ttf"
 
diff --git a/media-fonts/fontawesome/fontawesome-5.0.4.ebuild b/media-fonts/fontawesome/fontawesome-5.0.4.ebuild
new file mode 100644
index 000000000000..aafd04922e96
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+REPO_PN="Font-Awesome"
+
+MY_P="${PN}-free-${PV}"
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://use.fontawesome.com/releases/v${PV}/${MY_P}.zip"
+
+LICENSE="CC-BY-3.0 OFL-1.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+otf +ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/use-on-desktop" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/web-fonts-with-css/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}