gentoo resync : 13.10.2019

9 files changed, 71 insertions, 10 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 15dbd52e6a44..fb88ea9536cc 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 727874d2a73d..32af9b2815be 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,9 +5,9 @@ AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9ee8bd3a6aa41c5782c5162bfc8af64ffdfec77d4996af6a634f5f3424404eab77c0efd91c65bd34412f5b8f17c7 SHA512 557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90
 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
-EBUILD gnuplot-5.0.7.ebuild 5806 BLAKE2B 607e8b7fe93e1be3cfd37a880b5f411b2251d629be301292bc3643e5534f76958d084e421e41d7cb6d3214df8335f9b91f7dd6f070cfc91e6f891cce283bb0b2 SHA512 7030a85d6143d87ddba5b871452e835333982b0dd0cc7676cf6d5eb4613448a9d34eec6518565ff3597f1956c604677e68b04286124dc033d0df3b5605b91a77
-EBUILD gnuplot-5.2.6.ebuild 5870 BLAKE2B ef0cc10156338e431e050f9a8d67d0ee8c740806a973df31490d3db864e6cd8cdcd796b88b5558ea1f2ca322e8ea82362dbc8b208642cf9ad15fbc3d70dad50d SHA512 c32d354b3440b59c0e9698b8b65ff2ab8de8d963d8b186a7ec2b51fe2e87404e22bdc68acb2688fb0e6f063c541af3de548951b693925c1a27ddf2204d67728e
-EBUILD gnuplot-5.2.7.ebuild 5878 BLAKE2B 7615f96cfb0e470d4fa78d0d9470fd4eac3e2d9dc9d1ace64c2f2ce0f027f40ceef72d016513dc1693c1835d3fe5914027803d603a5136c5213f55f2eec9ae8e SHA512 b058e8d84d4d820d664ceeeacc822ea9ffe9c44a908452d80b96dac8b41f8b700ba9cfb3fc76e70dd600129724d5adb2db27513da7fcbb0d676984b917e8e219
-EBUILD gnuplot-5.2.9999.ebuild 5767 BLAKE2B 77f5b4227e7dd6fcd3ef15935bc5009203b1730a9e17c0e1a0cbee5b64802d322fe565c01490ab826e3ce8d6d920427060d3643bbac19c452a036fea63c9ebbd SHA512 08812545cb0f4f7007fca977583234f6bec6a1f3b30e64b068ae617de8a0dec07eab0d5ad253bc268ae13ff7aba06af94075c6cacf711fea7ebb7d8e6be6366c
-EBUILD gnuplot-5.3.9999.ebuild 5189 BLAKE2B caf4ce5aeaf52a310f9f5163384e9a5663b15dac659079141f02e11a6c64572b7307c1c52bf63ff4ddc313218c594858241d59a0036694211185a8bf73012f88 SHA512 ac03609bff28227681876cf336f4db56835a79eb3ca36832556ebce62f1047a3caea381d747b56f7e9e5a47fe07041465d9c82fe3f3bac8eaaf5924c7740d8de
+EBUILD gnuplot-5.0.7.ebuild 5796 BLAKE2B 055c13b67f9a8242f986cbc99364ecb9bb8dda241db3de84e97c4b68b92b50c44600933a07a6da0064595828fd5c718640bc7ff7aa62fc85314944a2970d6f00 SHA512 22453ef591dc01114f4caacd0cb1ecb88ba4d5fb2fb95139a6698ee019e385955ab18487e279500be491f1fcd335885cd19b5afe58bb42b107a3516b1bacc2cd
+EBUILD gnuplot-5.2.6.ebuild 5860 BLAKE2B 75e70fe4a0c2dad6e8f2cf3f6faceb064c862824eb02625fbf1182ebc4944c16102b4fb4a855e34f65823cac9dfa47795d7798498a49b9cf62068782a5970dde SHA512 99eea66f0ad9414f1877093c27b25d0ec95ef657991732a53a0b730986c46e688d3351eff7b3176aa16fe0be63cdae5d904341326300a5b1f507a2d4b0e5d16e
+EBUILD gnuplot-5.2.7.ebuild 5868 BLAKE2B 560d2f38b1ac2981ed5b5eabdb555dd87911217bd84eca5b22d4b403b4f4110fd556d3d57259487da851de08557de7677fe6a823e4dcd765b405cc0b7e9233e5 SHA512 f46df011e43c5fb7c376410bd202989b3b3731ec91bb310b0c562b0dbdb33c374c8f01436f5afb4ec39424520cc86fcd9646584875dedd5eeef042eff1ac9ca3
+EBUILD gnuplot-5.2.9999.ebuild 5757 BLAKE2B d06057469c991523ea917e44454557fb3e4e9889d212f7dfb939b61ae72f0dddaf2a54139bc180eeaf9d3f70b3cb58a6b602a3cdb620022de07c14520aa67bd5 SHA512 55a8b01b7738e5e5afd765d0b5471f01f3d25a6e48e45c45f8773b241d7394c87f9ac0e535f9eefaadb19af45a3f56ae96586ca35e626b710dd9764179549afe
+EBUILD gnuplot-5.3.9999.ebuild 5179 BLAKE2B ab729324b1774afe1b91922b1d68fc6b5eba7eba6da633c76a80d72ad15880367c82ad35d2f9ddf9933dac8c053ec533575167366cbf66dbac7b60d6c7e5d71f SHA512 6c90878ff3c226e6d9a1de64d4e61523491f51bf95345f280109c8e113ac1375e7b4973bf21b437df5375d0f998ad03f26a9c7a2e385269af2ccf9eba03410fa
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 27def81ca7fe..e21477341594 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -19,7 +19,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index 051fc3d39912..8e81688a60e2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index 9ac0df288a51..72a83029201a 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index 38d6d67f756b..30db5365c54c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index b3ded5a93b29..3a6eae54ee7d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 808ec46071e9..26aa3bf3e2a5 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,7 +1,9 @@
 DIST tensorboard-1.13.1.zip 3187614 BLAKE2B e1b8cb43f7941b843e4fa8c84746f4b341e7c7e246422182eec9e1d3e2a5c367fb818c8e3ddd20cb6b5f64515a986dc5e814728340f0592d346dc55ec6065648 SHA512 d1581b7f694909e94a09d4c3fb2d34ddc31a18a6a09323ef48221e88560a9ec3bbb050ff12a2cd78607a2545053cabc448eab7264036a54dddc4720becfc44b3
 DIST tensorboard-1.14.0.zip 3149160 BLAKE2B 85a3544c2274757cdfb99e3d82751082415d9283a68808de50c4b14662542bd278db3320560cb39aee6bb62d1434dedfa720cfc83b7d464d99256cfe46081f78 SHA512 b19856b1c252b22e472efb9b91ea5c4509d0c3a9d5f99071dea04325e2346b37967b0be151227d150cf013aee5ae6f6273cd311085f4c6b1ca8021d14c2cf562
 DIST tensorboard-1.15.0.zip 3765194 BLAKE2B 54a9987b65d4e2b127789f0e66eb5bdef8c024d19a82867632b44eefc4718bc6eb6c68fa61fdb2306af2c3adbacc3c75ec15f7aa331038b15cec27af2d846f85 SHA512 7b47d60929b4be91b4d56e36fc5a19b79511b8f3a1081fe308d3a107f978f2c5d23ad2d209104de983bc44f4506cdb0cb6e09b37e552dc042600ea16e14827dc
+DIST tensorboard-2.0.0.zip 3776140 BLAKE2B 2bfd5b9d5b1c21f7df19ce5dae8a3d72381092630d1f53409fa0b96cab56be323ddef116bab95184d045f82fec88f4162e1f7277b25ed9c19b77189cf1a132ba SHA512 e87ea39eae9b64c3314de771de98c21148517aee4103a4bc23d674273b1a220248d6ba85a9f94481c6d67e8d3733af099b91df3dae38537411082c1595aad73d
 EBUILD tensorboard-1.13.1.ebuild 1709 BLAKE2B 77ed22515d805d87ced976128fb1437a050317e9522e0fcffdadca46aa224a27f6eb7bb65132332405bca07b8ace3b77b3eb43f0245c4ce5e8c95a5884de156f SHA512 48c270dca6bedd6b37aff0519270d96f5b991645ec2a95ac963cc7ff13a1c62d393c81a79ddf503d4655ef5f236936b32dfcc64e54d826f202d96bb75883ecdd
 EBUILD tensorboard-1.14.0.ebuild 1755 BLAKE2B babc76e17559a0af994038d1fd1fece08955617b17059b2f6f69b6ae010f64993deaf267c69830bf2a22dce15f4c53f6caf39bb3da198ab700ac45862ec00377 SHA512 ab3673346dfb5b1e94f8322c99c840bc7b08f07778fb15e19b4dc7cd850d9561091751c9cbb5b7b5b37be97d570dd95ec6f2904984c09eca627016edb12fbba6
 EBUILD tensorboard-1.15.0.ebuild 1755 BLAKE2B babc76e17559a0af994038d1fd1fece08955617b17059b2f6f69b6ae010f64993deaf267c69830bf2a22dce15f4c53f6caf39bb3da198ab700ac45862ec00377 SHA512 ab3673346dfb5b1e94f8322c99c840bc7b08f07778fb15e19b4dc7cd850d9561091751c9cbb5b7b5b37be97d570dd95ec6f2904984c09eca627016edb12fbba6
+EBUILD tensorboard-2.0.0.ebuild 1755 BLAKE2B babc76e17559a0af994038d1fd1fece08955617b17059b2f6f69b6ae010f64993deaf267c69830bf2a22dce15f4c53f6caf39bb3da198ab700ac45862ec00377 SHA512 ab3673346dfb5b1e94f8322c99c840bc7b08f07778fb15e19b4dc7cd850d9561091751c9cbb5b7b5b37be97d570dd95ec6f2904984c09eca627016edb12fbba6
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild
new file mode 100644
index 000000000000..7c8540d2dd19
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit python-r1 python-utils-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/grpcio[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply_user
+
+	rm -rf "${S}/${PN}/_vendor/bleach" || die
+	rm -rf "${S}/${PN}/_vendor/html5lib" || die
+	sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+	find "${S}/${PN}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+		-e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+		-e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+		-e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+		{} + || die "failed to unvendor"
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${PN}"
+		python_domodule "${P}.dist-info"
+	}
+	python_foreach_impl do_install
+}