gentoo resync : 05.12.2021

5 files changed, 18 insertions, 15 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 0a79d329d729..8594da1e4240 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 758703bbc327..a6eaa4604d67 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,4 +1,4 @@
 AUX scidavis-build.patch 1397 BLAKE2B 70abb5dee8d3afbf4eaf88d50c8df30fb0ad34345e92d049113c5ef0e1ecf9f5d7b127166453905f79056d812128f2c427ddcb3736363591c2e3aba67ed8b3d1 SHA512 91044ad9994ffe8047529b262d578b575a559d888b17da772be10346b87c655a2c53c67ba06b7a5bb85870510de5a1c4f1f14777b5c60bbfaab4ccd545d00929
 DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
-EBUILD scidavis-2.4.0-r1.ebuild 2721 BLAKE2B ee43d94ebb50062f2a9e8ca5518fa24b7edaa58c173a5724b0c544354a4b635b4a1db9e1b7f2711fa70dac17d8aa06ae932204e4744681f1b0381a46684b9660 SHA512 2481bfc163f589c359c104db8eb3bd6bfd511fac4b899866f8625b08045fe59821cfbcf9d1034a64752d833d30c4748d76a8b57e2ec185bb8736faa52b0c9887
+EBUILD scidavis-2.4.0-r2.ebuild 2894 BLAKE2B 3edd4fb5526eb6d1f2688c23d49c66a686125c07de8875efe9c576ec68ff2d014357e1a66c58c6a2551bffaa119cc8daee8d9a33f65985dbd8806d66780c7f81 SHA512 4646b6d6c507861f24cbd28e2cbb594e4b82caca938213ab352cb84137d31e985a0eb7a9f2ba10b818f25ec3c5313b1d2e218bc269d8961aaa65971e38fd953c
 MISC metadata.xml 1139 BLAKE2B 406046dd8fb76e0ba5041ffd4ab1348adbb220b1d60f54d771b47fc8f592c9d8a54ead641e6ffb57c4aa41e9135bbb0bdb207042a4a68a831124ad6544b87b62 SHA512 96662659dbd13c848af7a06642aa4af6b5b53d233c342fdbf39f4470c2504fc2d6354a09f3296968d2aa664f771ae0819b457c3508e5d82e4eb262925931fcc4
diff --git a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
index 44611a1ad6bc..70fc6b255c6b 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 docs qmake-utils xdg
 
@@ -25,6 +25,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # compile with CONFIG+="test"
 RESTRICT="test"
 
+# We need to depend on a version of PyQt5 that depends on <sip-5:0. If PyQt5 is
+# built with sip:5 then we will get Syntax Error when running sip-4 for scidavis.
 RDEPEND="
 	dev-cpp/muParser
 	dev-qt/qtcore:5
@@ -43,9 +45,9 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP}]
+			<dev-python/PyQt5-5.15.5[${PYTHON_USEDEP}]
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			<dev-python/sip-5[${PYTHON_USEDEP}]
+			<dev-python/sip-5:0[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 67cfca832ae8..68df595b9638 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,5 +1,5 @@
-DIST tensorboard-2.4.0.zip 10631832 BLAKE2B e892c3f62855bd900320adbbea2758191296e2863e8865f4ffed3c5623fe5273a5a26554504b63db58c60d2a8c407e234d6cf3edc3868c88dfebd894def99859 SHA512 2301f526a98ac85cf5d182fff0f565c86883ec795bbaf2322696416621c8473d850a3f508079f89ca2a86a05fe020acde1282b72e2bb5ad77aab2d0e5ea2db4f
 DIST tensorboard-2.5.0.zip 6019104 BLAKE2B f07db4fec7cc39e15c4f580f479679f0db4f06e66d81768799ed3652bb9ba63c7b61bde7f12119d09474009e55c12d91ef0f2b3aeeb05682532630314cab871a SHA512 e39ca09bd00fab9b5f6f9393e48cb6be2313f86c24b2f0ffcfd08b08b9ed4e95e7e19297bb67d8b558e1913640774f9b9d512a34153251acb9f566d6485e0f78
-EBUILD tensorboard-2.4.0.ebuild 1944 BLAKE2B 8de93c1331c5a18ae04c366fbc38288c28bb80c2c1dff889bbd88683ce5c451f1e9db4a9011ff7980448e778ef01475f2838442e871ea039d9a3eb4a9b3d61d8 SHA512 da210f7574f030b59f2944f6fcbdbf45d6395dad603e69e24344d21942c2aa0a2eb9b5a3eca883ab9d83337f2648b47f162bcee4044de5f61148fcdb1f3ebeb1
+DIST tensorboard-2.7.0.zip 5757617 BLAKE2B 98e67e322548f4b88448856da3a2457a6aae9ecb1540916d46a90401307f4919df37af8a3048bdb850ea78886d18423edc87fca51812f3b9489de62d3effa0fc SHA512 e9b046000250a78eab4e6e68e5cc05696254893cf7422b59d2e168d7322287501654370a797e90af7437e91b64a27743e348513bcb5571805b3f10bb2059636d
 EBUILD tensorboard-2.5.0.ebuild 2060 BLAKE2B 5eec94d8cb854130b0bae18c4fc2c96497beb5ab9daf1e8086b0171fef3fa50c50483b160a83ecee605db6126ff455fa666557a1baa30d36c8314cae388aa6ed SHA512 12c1c737a9eced8fc90b9dfd570d00d6430cb30ff836a399ac1dd2cad62f2d3e1d5a2741d0a4ab7fe527df8b1e588cb0d77b3f6cc08abc85a6e5cbd1bdcd1627
+EBUILD tensorboard-2.7.0.ebuild 1991 BLAKE2B 86ca8924a455bbcae095492799c3d481e220e8175b4c66d8d9e15f33cccee2d6e9f75af543a6b5b6ddc90d43469d2b388d39900d0c6b3bfd688dfe65e6e33b4b SHA512 80c9d6ea3f4bddb508daf5c1c63b7d198f8147badb7c0802a99a7997356687a0a7e8b516e1a6838dd0fa41279726be2587d226002c6e2f4d8e552fd5e8489f68
 MISC metadata.xml 495 BLAKE2B 29256478e1ec3cfd33b592d66ac413d784a581cf95d47efac7e828adc8230ec333e3ab3637cdc21e37298c0ba9f52d231b37127a7bd61149a56df8dca4fabb31 SHA512 9532577d0a0aa30608cb724983a9d070eab68b5ba6f6adea125b02cf55aad6a8dcb658b9179fd0d74d1dbbc0299f85e0e2c0b6ec084127060b2e12ab1b706948
diff --git a/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.7.0.ebuild
index 7b70747a4e9b..8328b5e42f4b 100644
--- a/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
+++ b/sci-visualization/tensorboard/tensorboard-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-r1
 
 DESCRIPTION="TensorFlow's Visualization Toolkit"
@@ -40,18 +40,19 @@ 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"
+	sed -i -e '/_vendor.__init__/d' -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' -e '/_vendor.webencodings/d' \
+		"${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+	grep -q "_vendor" "${S}/${P}.dist-info/RECORD" && die "More vendored deps found"
 
 	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/' \
+		-e 's/^from tensorboard\._vendor import /import /' \
+		-e 's/^from tensorboard\._vendor\./from /' \
 		{} + || die "failed to unvendor"
 
+	rm -rf "${S}/${PN}/_vendor" || die
+
 	sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+	sed -i -e '/tensorboard-data-server/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove data-server deps"
 }
 
 src_install() {