gentoo resync : 07.07.2018

4 files changed, 9 insertions, 123 deletions

diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 3e1711017170..234d04d9124b 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,9 +1,5 @@
-DIST mathjax-2.2.tar.gz 8974100 BLAKE2B 3947579fe5c02a66a68a276c2cdf8e3c8efd79c600c46e7ed0d5b88af5d4b6d10ba60a8c319a973799282cf735405bfc2d6bc1baa83a7c84babc403f54693e73 SHA512 11987a959a7b154ea8df4ad93ce6193eed930affcfbfd2ba3fd965356c3ea957ef73a3ea6830a841bbe81f64ed0d9a78ab9fd74d0cbf011671b7d174cdc1f80c
-DIST mathjax-2.4.0.tar.gz 23048567 BLAKE2B 02958eb1c6d60db127c9fe6edca0aeaea765a879e6a7a629aa260a593080251d356abb24f9edf294f61525096644b6ed4696d548b4e7ae1f6a22e368ad5c1338 SHA512 1f1cd590d0d584e38a51920e1d92e7dd1e0b8a0660b1ad29b522a5ced4d6c1f7d00074500d726aeee04c04f10c963944d1ef6aa2a662d7b53df609f9270b8de0
-DIST mathjax-2.5.3.tar.gz 23257294 BLAKE2B 2aac6c058315976266964c81096032a5bc6b1e533fdb9e1c8234fc5f67fd12f095462f679af4dcc6ee15d40062f3d7a8c67c5a92824986b5a606636128f9463d SHA512 007b3d4e7d4224746ea8996838f6d208ee6dd04a6c2e3dc38b6e7ad83421732d4f5c5b9b6714183d0a25a46fdc1a9cd73a6ca769f29dbe3f36c79a5ca0ee1178
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
-EBUILD mathjax-2.2.ebuild 1175 BLAKE2B d935186d274ce75dc8f5ecb4c3c70afa7d0ed7454ccd3753ecd3f147584064e511918a24b7f94177b57f357d39a64752b770fc60e0adacebeda1ca0530ffe7de SHA512 6966f52b9bbab31cb2a0bf532828de111a2328ebddf8e485e99e03391761618f837cd7d2dcb7949d2263f220a19c85e294dad67b2b866c13e07b087624e3959f
-EBUILD mathjax-2.4.0.ebuild 1183 BLAKE2B 917678402b7f6193416fad3219cbb86af91ebd54dc4b64af942daf39df9dbea5cf57677ae5bff94a6a6da6f48500628dd4c0fd51bf4d13cfe03cd640c1a35ca4 SHA512 30f74edb2300d82ed46f206cd25100bc407c3e9d65c719163105945b3494f0fb66075c92393b327e50278af9862a35548860a64f2202da3a49f0cc1b3b925d88
-EBUILD mathjax-2.5.3.ebuild 1178 BLAKE2B c7efe9d683c49c0d5d406af3373f3037f2073388d701faddc67904adaf6e589d63c987240cb3474d034a879d004837f6c8d5027235e72ce9689b37b089d73943 SHA512 62fd25330641476a19e9d1d9309665ae1b3d2e70edf90bc289f9eb93c3811377bada19d13a92521c77f5a19f0e803a98860f71bef637b1b0c813b6437dca8c16
+DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 EBUILD mathjax-2.7.0.ebuild 1219 BLAKE2B d6a55b0baf2dece7e35e043db8be4f41cc3705b9a032ae18537e6d1a5abd21c179d428b7c6defb809de30505aefc62a04b60db93655fadea15cbe01f4371be68 SHA512 41c37e0d36ecc2ef1eff3936bd6b47d90644e6ad31f54d3276acde4a0bb15f8b1c169bdd749c59c8e0f1ae7f92681a5b68463a6b1a40d12dec1dab7b9f9df1a8
+EBUILD mathjax-2.7.4.ebuild 1222 BLAKE2B 99be4290bb4275d3f17d866c42b6ced052976cbe2d65329372399de077b0193aedf241e1c75e756524f58d7b3877cbed5c060be7796dd73084faaa15c2be0efc SHA512 f3096b882da3c70b5fbbc4c1a78d84fa107ae32806d26b977d15bde5738ea90d4638b6715b20aa0da1e5ea1c6e45ea688a771dd9969bd0edb3798c162c840f27
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.2.ebuild b/dev-libs/mathjax/mathjax-2.2.ebuild
deleted file mode 100644
index 135d39f3fac4..000000000000
--- a/dev-libs/mathjax/mathjax-2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks"
-
-S=${WORKDIR}/MathJax-${PV}
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	egit_clean
-}
-
-src_install() {
-	dodoc README*
-	use doc && dohtml -r docs/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r test/*
-	fi
-	rm -rf test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.4.0.ebuild b/dev-libs/mathjax/mathjax-2.4.0.ebuild
deleted file mode 100644
index 9af94c276343..000000000000
--- a/dev-libs/mathjax/mathjax-2.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}/MathJax-${PV}
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	egit_clean
-}
-
-src_install() {
-	dodoc README*
-	use doc && dohtml -r docs/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r test/*
-	fi
-	rm -rf test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.5.3.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
index 9ecc9d45ac66..5aaff1048750 100644
--- a/dev-libs/mathjax/mathjax-2.5.3.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RESTRICT="binchecks strip"
@@ -34,12 +34,14 @@ make_webconf() {
 }
 
 src_prepare() {
+	default
 	egit_clean
 }
 
 src_install() {
-	dodoc README*
-	use doc && dohtml -r docs/html/*
+	local DOCS=( README* )
+	use doc && local HTML_DOCS=( docs/html/* )
+	default
 	if use examples; then
 		insinto /usr/share/${PN}/examples
 		doins -r test/*