gentoo resync : 29.12.2022

20 files changed, 221 insertions, 526 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index d4aa3e29926f..531a096f3c0c 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/dash/Manifest b/sci-visualization/dash/Manifest
index dd1af6ca56ec..2132f99e3767 100644
--- a/sci-visualization/dash/Manifest
+++ b/sci-visualization/dash/Manifest
@@ -1,5 +1,4 @@
-DIST dash-1.20.0.tar.gz 1786368 BLAKE2B 2826336f72b9bea80be6ef77df49109b7b68ed93678b606c998a1906907551551a3228e1140d20c6e1b5bf5e53fb9cebd0c0a4d7ab5cc1a590e47ef351558a40 SHA512 670cf593068370c70f1db25c70c7a76ce98c696efbff1146cc90f90a99b8b48bf80cf47688504d173ef253ccb9f1170c2067b3af9414eacb226f7ef25149ffff
+AUX 0001-Fix-werkzeug-2.1.0-import-dev-tools-error-html-rende.patch 3611 BLAKE2B 2b659570a48d282a818db5614cf3103bdd958057d499198d5e540fa1d5e366e214d564c5b6caa21592a1561bc54dfc2d7dbaafc1b1711fbe0b94e82be0cc3ef5 SHA512 a748163f48b4578499a8e4d5be3017aa4c75fc23cf5ad00197c8ba2c79c702e580f1f4a5e3199de76da1ff00a8d134259883f5aad85af425523c9bc7365b0919
 DIST dash-1.21.0.tar.gz 1753608 BLAKE2B 07530da9e39065e80f653f97eda5ae8840a05cbc90969640910e1788daea8c5227841fd7de74b90bbb763e3c4b027442eb9e35f52d8ea57a0e8bae4dcab87ce0 SHA512 8254a918f60de9dc329af53f8ff15841be39b130c56c6c6037a2fe4d699fa71f565d7cb0a14d1405f0a1d32cfe886e1531558158596ea1a2b69fd7c62af5a8ce
-EBUILD dash-1.20.0-r1.ebuild 1106 BLAKE2B d91fdb01507b04792bb4bcba1ce57bd3aeeaa69572ba0a006fdf107e6f4b4e1861acff3fd32ec75e90d2436c98f94030c776b354fcfae086d98003c8c4774569 SHA512 f208552fce4e6b8f4ce4b633fe9e986e1caf78e92678cd33ff67c80eaaeac5dcee4c9af2664f4cca8765ca6be6fb1d549f0aa80ea5c14d7d174d161a995b1e9b
-EBUILD dash-1.21.0.ebuild 906 BLAKE2B b9793a68ff45a16c8dd4a9f1d720358a26ebc14ecc2d13ba51ac906aca2e33b370ce20f3b63f7feaac14559ab455f1258b683982042de558ba2919e30ede892d SHA512 104642c926fe6ba6563f7d08ebed8d38fbb2d5b7d0c1907e70aeb3cc767691dbccdc757696d563cafe13708112ed823b6bdf54f0bd842a11b0c096d04a503268
+EBUILD dash-1.21.0-r1.ebuild 998 BLAKE2B c954b9833bc25a206b27265b039b50af2427aada2ff6c54670656ffb5192c66c83da67ff77bd379734727a0460e429700f4574f38ba06b0bf67c8bffef25c6a7 SHA512 fe026de22dab44bdd973b7f67789de1bbd0e7144390cca9dfbeab3a6e7d23d1a8348c10d6be502327a7e5cdaa56ececac96d2cc5f627680d5558234ae48e2232
 MISC metadata.xml 1362 BLAKE2B 476d401a89b61e6f3351eb372460651ca969ec7ce0e93610f446f502a37ff29b40cd16108f0b38a9d2639e76b8845d0da6eb313367c8b1d248b6d41c266f57e8 SHA512 beb967cce5f39ae8af1aa1e123ee901cc2a3683a820d61e9daf21ce8363e35236d97b1896229cecc7a605092a9ba189d848af0d0b31c515b1c02e2f1094b2eb5
diff --git a/sci-visualization/dash/dash-1.20.0-r1.ebuild b/sci-visualization/dash/dash-1.20.0-r1.ebuild
deleted file mode 100644
index 0b2685f17351..000000000000
--- a/sci-visualization/dash/dash-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python framework for building ML & data science web apps"
-HOMEPAGE="https://github.com/plotly/dash"
-SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]
-	sci-visualization/dash-table[${PYTHON_USEDEP}]
-	sci-visualization/dash-html-components[${PYTHON_USEDEP}]
-	sci-visualization/dash-core-components[${PYTHON_USEDEP}]
-	dev-python/plotly[${PYTHON_USEDEP}]
-	dev-python/flask-compress[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-	cd dash-renderer
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	distutils-r1_src_configure
-	cd dash-renderer
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	cd dash-renderer
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	cd dash-renderer
-	distutils-r1_src_install
-}
diff --git a/sci-visualization/dash/dash-1.21.0.ebuild b/sci-visualization/dash/dash-1.21.0-r1.ebuild
index 0c622cae63c1..9d388cb84220 100644
--- a/sci-visualization/dash/dash-1.21.0.ebuild
+++ b/sci-visualization/dash/dash-1.21.0-r1.ebuild
@@ -32,3 +32,7 @@ DEPEND="${RDEPEND}
 BDEPEND=""
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/0001-Fix-werkzeug-2.1.0-import-dev-tools-error-html-rende.patch
+)
diff --git a/sci-visualization/dash/files/0001-Fix-werkzeug-2.1.0-import-dev-tools-error-html-rende.patch b/sci-visualization/dash/files/0001-Fix-werkzeug-2.1.0-import-dev-tools-error-html-rende.patch
new file mode 100644
index 000000000000..7f19380dc7cb
--- /dev/null
+++ b/sci-visualization/dash/files/0001-Fix-werkzeug-2.1.0-import-dev-tools-error-html-rende.patch
@@ -0,0 +1,98 @@
+From f9079bfd8a9576947655e1fee0dc343171c21e37 Mon Sep 17 00:00:00 2001
+From: philippe <t4rk@outlook.com>
+Date: Tue, 29 Mar 2022 12:17:40 -0400
+Subject: [PATCH] Fix werkzeug 2.1.0 import & dev tools error html rendering.
+
+---
+ .../error/FrontEnd/FrontEndError.react.js     |  2 +-
+ dash/dash.py                                  | 42 +++++++++++++++----
+ 2 files changed, 34 insertions(+), 10 deletions(-)
+
+diff --git a/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js b/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js
+index 5703add4..49939ea1 100644
+--- a/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js
++++ b/dash/dash-renderer/src/components/error/FrontEnd/FrontEndError.react.js
+@@ -110,7 +110,7 @@ function UnconnectedErrorContent({error, base}) {
+             )}
+             {/* Backend Error */}
+             {typeof error.html !== 'string' ? null : error.html.indexOf(
+-                  '<!DOCTYPE HTML'
++                  '<!DOCTYPE'
+               ) === 0 ? (
+                 <div className='dash-be-error__st'>
+                     <div className='dash-backend-error'>
+diff --git a/dash/dash.py b/dash/dash.py
+index b4a3adf0..3d5dae25 100644
+--- a/dash/dash.py
++++ b/dash/dash.py
+@@ -19,7 +19,10 @@ from future.moves.urllib.parse import urlparse
+ 
+ import flask
+ from flask_compress import Compress
+-from werkzeug.debug.tbtools import get_current_traceback
++
++from werkzeug.debug import tbtools
++from werkzeug.security import gen_salt
++
+ from pkg_resources import get_distribution, parse_version
+ 
+ import plotly
+@@ -91,6 +94,30 @@ _re_index_scripts_id = 'src="[^"]*dash[-_]renderer[^"]*"', "dash-renderer"
+ _re_renderer_scripts_id = 'id="_dash-renderer', "new DashRenderer"
+ 
+ 
++def _get_traceback(secret, error):
++    def _get_skip(text):
++        skip = 0
++        for i, line in enumerate(text.splitlines()):
++            if "%% callback invoked %%" in line:
++                skip = int((i + 1) / 2)
++                break
++        return skip
++
++    # werkzeug<2.1.0
++    if hasattr(tbtools, "get_current_traceback"):
++        tb = tbtools.get_current_traceback()
++        skip = _get_skip(tb.plaintext)
++        return tbtools.get_current_traceback(skip=skip).render_full()
++
++    tb = tbtools.DebugTraceback(error)  # pylint: disable=no-member
++    skip = _get_skip(tb.render_traceback_text())
++
++    # pylint: disable=no-member
++    return tbtools.DebugTraceback(error, skip=skip).render_debugger_html(
++        True, secret, True
++    )
++
++
+ class _NoUpdate(object):
+     # pylint: disable=too-few-public-methods
+     pass
+@@ -1463,19 +1490,16 @@ class Dash(object):
+ 
+         if debug and dev_tools.prune_errors:
+ 
++            secret = gen_salt(20)
++
+             @self.server.errorhandler(Exception)
+-            def _wrap_errors(_):
++            def _wrap_errors(error):
+                 # find the callback invocation, if the error is from a callback
+                 # and skip the traceback up to that point
+                 # if the error didn't come from inside a callback, we won't
+                 # skip anything.
+-                tb = get_current_traceback()
+-                skip = 0
+-                for i, line in enumerate(tb.plaintext.splitlines()):
+-                    if "%% callback invoked %%" in line:
+-                        skip = int((i + 1) / 2)
+-                        break
+-                return get_current_traceback(skip=skip).render_full(), 500
++                tb = _get_traceback(secret, error)
++                return tb, 500
+ 
+         if debug and dev_tools.ui:
+ 
+-- 
+2.35.1
+
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 50486de12148..953b32835d88 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -2,6 +2,8 @@ AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45
 AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc79c246503fb51e53d20ba6a3b8b0a76cc433b75e867d448d7622ef190f1f54225b0f45be3860d32672397090be619d9 SHA512 50eca983c81bb14c33415e3ad69bf2e18be4a88fb674537dc335d8aa9986edb1baa962f7a4eead41d70b54828729165d413387c64696a0f4e1aa9ad49675afb0
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
 DIST gwyddion-2.60.tar.xz 4973404 BLAKE2B 6ded40f34bfcd70db2e897abc1f07b070aca78e08c90661ee4fe281d19f16337ca81b5a4e2adaeb29e1870e8194eb77976910a54248842c8474864065d64defd SHA512 e568df77ef580aaedfcdd1f746a78f3ca93676a07a331fc6e70f997780bb403d1c3967aa93440c7fa1f010bd01f5376700c869a38dacaf1f98b075c4c950cf54
+DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
 EBUILD gwyddion-2.56.ebuild 1646 BLAKE2B 56173da9c59cff136b908ae5a1eac7767199a73a3fa09c2b1a5480cc9d5d191ba7604e731a1b0c43b2f65f19a0580481efe91742cdb0581645c43215daf8768c SHA512 1205b0dc85fd5c418089555b3a31ab555576ff91fcddfe925595e29a2f31de2d529269aa7092eb80e9a0995e4a0627dc19edbc6de88e58b35ab1e209c1b8e6da
-EBUILD gwyddion-2.60.ebuild 1940 BLAKE2B 20b7359a3232946696773dcdfd7ae65857638a970045632dc39516d32564e578d9d511d5ba64e6d8c953cf41d0df5e7c225027a4482eaf78c318c6d858c037bf SHA512 968338bb87644350ebf7240896cf0cd8fbbad643fe60719f43fa482e2499ebb163e2aa796c8d8d64d745159f123d972f4d0525d6c6f66be170b3d2b5dffc8cfb
+EBUILD gwyddion-2.60.ebuild 1938 BLAKE2B 0b84d6f9b360a1f801cd062e81eac4845db625366531058081da2d2703a65a5d38f5389307b3767a378418c8b6b9ab47ffe2943500fd4c6df0ff1c6eebaba1eb SHA512 8eda1fca9ce3e963517409c834a1467d5e561d1b523568be310f7a36e16bf7db5a9490d3d74568c158e9f097c11be11761efd24465caaa60113db99bf0de72ec
+EBUILD gwyddion-2.61.ebuild 2018 BLAKE2B 1bcccbf7b76d746711b37b22cbd69d7216eb0430c309ec59f8c481fa7880eeb93013d55fcd39ed7e3440df5a7c8c2cde7a4156d0bcda0d91f58b80bf7911669c SHA512 60996852800aae8ae7e4383251d6f553320b90f73b7a5224886072df60bdd4757fbaa70098c2d71e15a2819c3e45e250e927b6bb91e4b88f624aba48f197ec1e
 MISC metadata.xml 1152 BLAKE2B c3ab652b26ed500c74d53dd479fe33a3647749478881f79780f360a551bcd262a1652a0e96de7b9bc6ef5d694f40387926b919515c879c8aeb5e2275fe807583 SHA512 8ab81680f6e02090d84f1e43d05c459ae9856b4195341718080b5e8e41a4c722933c6258fb69ddb1c5b7f087356c80d35f8d4fb259c0cb5dabe2636a79b2c64e
diff --git a/sci-visualization/gwyddion/gwyddion-2.60.ebuild b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
index 4680d9f429f2..1b65cd80be57 100644
--- a/sci-visualization/gwyddion/gwyddion-2.60.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.61.ebuild b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
new file mode 100644
index 000000000000..7a324f0066a3
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/"
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.32
+	dev-libs/libzip
+	media-libs/libpng:0=
+	>=sci-libs/fftw-3.1:3.0=[openmp?]
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libXmu
+	x11-libs/pango
+	bzip2? ( app-arch/bzip2 )
+	fits? ( sci-libs/cfitsio[bzip2?] )
+	jansson? ( dev-libs/jansson )
+	hdf5? ( sci-libs/hdf5[zlib?] )
+	openexr? ( media-libs/openexr:= )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-ruby/narray )
+	unique? ( dev-libs/libunique:3 )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.60-automagic.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+# There are python bindings (--enable-pygwy) but they are py2 only
+# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext
+src_configure() {
+	# hack for bug 741840
+	use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
+	econf \
+		--disable-rpath \
+		--without-kde4-thumbnailer \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openmp) \
+		$(use_enable nls) \
+		--disable-pygwy \
+		--without-python \
+		$(use_with bzip2) \
+		$(use_with fits cfitsio) \
+		$(use_with hdf5) \
+		$(use_with jansson) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with openexr exr) \
+		--without-gl \
+		$(use_with sourceview gtksourceview) \
+		$(use_with unique) \
+		$(use_with xml libxml2) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		--with-zip=libzip
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index c0f01cb3ddfa..7ad801916109 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,6 +1,4 @@
-DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1
 DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45
-EBUILD labplot-2.8.2.ebuild 2394 BLAKE2B be54185403a3166173302351d58b279e34c2c60b0e31ae340f71d0d520477a7ab10786a4cc0367ea32ca912d90d42b57e712525c71608c3846280b3f76fd16b4 SHA512 8ac9dc2d1f96c9fa5314d2845443c6dc37798fc716b25848d7eec62faaf69cec41288d0632b6b154484eeebbf00fe98e0443971860479b9422226549680e08f7
 EBUILD labplot-2.9.0-r1.ebuild 2635 BLAKE2B 0f78cfd439665721f0fc656ca6fb79344f6c720a5a757c76901d483cb3d787ed4f2a713bf690c3bfa94b1a3f27f27950365732f1a8ac1a13f8296d83e242d8aa SHA512 ea9f1a60752fef3094af2273d2e3c7a380f1472b828d852628aae4e431f8db513b578ffdbf3618fa926f741ea333504e2ebffc1a499bd88cc6882352922b7485
 EBUILD labplot-9999.ebuild 2635 BLAKE2B 0f78cfd439665721f0fc656ca6fb79344f6c720a5a757c76901d483cb3d787ed4f2a713bf690c3bfa94b1a3f27f27950365732f1a8ac1a13f8296d83e242d8aa SHA512 ea9f1a60752fef3094af2273d2e3c7a380f1472b828d852628aae4e431f8db513b578ffdbf3618fa926f741ea333504e2ebffc1a499bd88cc6882352922b7485
 MISC metadata.xml 1328 BLAKE2B 7c5afcd644eb98a6afdaba264e24e225e44075e223c47e10922f2aa7ea4658ad34b6f3a55e82a72109413da8bd41df55c2aeb02d93db12ae154acf116d300706 SHA512 ac715b846c70cf31d8a3f92c291848fb9f6c3e571f3cdadc9670c2eb3211ebf2e96dae4263232544506f2cf4db2bb408beeea2cb322f1ac56c179048bd77ba20
diff --git a/sci-visualization/labplot/labplot-2.8.2.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild
deleted file mode 100644
index 7872a5add1e5..000000000000
--- a/sci-visualization/labplot/labplot-2.8.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry test"
-
-# not packaged: dev-qt/qtmqtt, bug 683994
-BDEPEND="
-	sys-devel/bison
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=sci-libs/gsl-1.15:=
-	cantor? (
-		>=kde-apps/cantor-19.12.0:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:= )
-	hdf5? ( sci-libs/hdf5:= )
-	libcerf? ( sci-libs/libcerf )
-	netcdf? ( sci-libs/netcdf:= )
-	test? ( >=kde-frameworks/kparts-${KFMIN}:5 )
-	root? (
-		app-arch/lz4
-		sys-libs/zlib
-	)
-	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CANTOR=$(usex cantor)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_FITS=$(usex fits)
-		-DENABLE_HDF5=$(usex hdf5)
-		-DENABLE_LIBCERF=$(usex libcerf)
-		-DENABLE_NETCDF=$(usex netcdf)
-		-DENABLE_ROOT=$(usex root)
-		-DENABLE_QTSERIALPORT=$(usex serial)
-		$(cmake_use_find_package telemetry KUserFeedback)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_MQTT=OFF
-	)
-
-	ecm_src_configure
-}
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 3dfb8a72eb46..f4845d97818b 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,8 +1,4 @@
-AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
-AUX paraview-5.9.0-gcc11-include.patch 1045 BLAKE2B 2b6b709cf081391f6b3c9c214ce7da33a8c83f187b00e803a9df651cbf6aac8a7dc7ba080f073fcbfba5266369d2f556cc4b21fe6d3ad830bd24fb3a0908aad0 SHA512 f3af80d8c59edb1625207b447e1c6975c67e8d988e9af3592597e5a2b4c39d4e6f0c6786abc0e31a6b30fa77124e9368802d5b9e4bab5453c5ed82c5b9391dbb
-DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5
-DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2
-EBUILD paraview-5.9.0.ebuild 5787 BLAKE2B 44cbe70e16d604a7051620f596411c93414da8ba444a08c0dfbeb782f86e60c2af3dc47cb73db9e593393b1a7689ecabaa026361533c709e54244a84948169ce SHA512 b2121bd30d3b1536f45239afb11f0486a3590be7d8e1a1ab89c39d555ff82426bafe068b36b8a176c299d5848c97f842a8710bc8be96ef4cca626b82b3ea691e
-EBUILD paraview-5.9.1.ebuild 5787 BLAKE2B 44cbe70e16d604a7051620f596411c93414da8ba444a08c0dfbeb782f86e60c2af3dc47cb73db9e593393b1a7689ecabaa026361533c709e54244a84948169ce SHA512 b2121bd30d3b1536f45239afb11f0486a3590be7d8e1a1ab89c39d555ff82426bafe068b36b8a176c299d5848c97f842a8710bc8be96ef4cca626b82b3ea691e
+DIST ParaView-v5.10.1.tar.xz 70218088 BLAKE2B 3134c5df35994a3a153ebd97770066b9963911ae7fb1877681135e01a19c4a879306ae844ef3a29719be5cd509f35117f74eb3c264f1a101fa19180d9a126011 SHA512 1feb855432ea7bc40f77ee214e5877d5170e4f31f520dc7198d72a271506b65a4bc79922875d2c176e54219818a428497c606390a2b9da2770de403bd1593e6c
+EBUILD paraview-5.10.1.ebuild 5628 BLAKE2B 5a19cb58c3e03b0cdc583e8ebf70127a8320310939a78bf319db4a7f27a2f9fe8e70256c3628c2a6c5a50b4a689b6b807348c93c56d62f4e8f33e299e5f0e68a SHA512 15f2bb377ee6949e1408b125866335897f018cd9506c9c321f94b8f1bde8bd2239b96822c6fc203bf82549841e1408b95d33f5ec55d35827ee3c476735ed0cf7
 MISC metadata.xml 672 BLAKE2B d7b831a15dca3e43eb563b7ae157ccb0fe7e2df6aa82aa7f291473a13d75ac433e04fbf39b4a420bef5c0a9fd6e23cecc3d8d4a48768768ffdd059abc4f1106b SHA512 bcca9b9dec041dc8ea9738b6f141f4bc2d6b214e8c20f92e95ee5870293cf428e7c1e4a2b219f2a94079c2b5295e105e40ca899d30b13e344476a0ad05725e9e
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
deleted file mode 100644
index 665f40ad4fa7..000000000000
--- a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gcc header fix
-
---- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
-@@ -82,6 +82,7 @@
- # ifdef UNIX
- #  include "sys/file.h"
- #  include "strings.h"
-+#  include <cstring>
- #  define STRCASECMP strcasecmp
- #  define STRNCASECMP strncasecmp
- #  define STRCMP strcmp
diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
deleted file mode 100644
index d5850073fb94..000000000000
--- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/789573
---- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
- 
---- a/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ b/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
- 
---- a/VTK/Rendering/Core/vtkColorTransferFunction.cxx
-+++ b/VTK/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
- 
---- a/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ b/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -27,6 +27,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
- 
- #include <cmath>
-+#include <limits>
- 
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
- 
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.10.1.ebuild
index ce3f2c9d4d44..c7ac19439bf6 100644
--- a/sci-visualization/paraview/paraview-5.9.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
@@ -17,14 +17,12 @@ SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
 LICENSE="paraview GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
+IUSE="boost cg doc examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
 
 RESTRICT="mirror test"
 
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
 REQUIRED_USE="
 	python? ( mpi ${PYTHON_REQUIRED_USE} )
-	mysql? ( sqlite )
 	webengine? ( qt5 )
 	qt5? ( sqlite )
 	?? ( offscreen qt5 )"
@@ -51,14 +49,13 @@ RDEPEND="
 	>=sci-libs/netcdf-cxx-4.2:3
 	sys-libs/zlib
 	virtual/glu
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	ffmpeg? ( media-video/ffmpeg )
 	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mysql-connector-c )
 	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
 	!offscreen? ( virtual/opengl )
 	python? (
@@ -69,7 +66,7 @@ RDEPEND="
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
+			dev-python/sip:0[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			dev-python/twisted[${PYTHON_USEDEP}]
 			dev-python/zope-interface[${PYTHON_USEDEP}]
@@ -103,13 +100,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-	"${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use python && python-single-r1_pkg_setup
 	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
 }
@@ -130,6 +129,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Make sure qmlplugindump is in path:
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
 		-UBUILD_SHARED_LIBS
@@ -147,16 +149,12 @@ src_configure() {
 
 		# ffmpeg
 		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
-		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
 
 		# mpi
 		-DPARAVIEW_USE_MPI="$(usex mpi)"
 		-DXDMF_BUILD_MPI="$(usex mpi)"
 		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
 
-		# mysql
-		-DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
-
 		# offscreen
 		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
 		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
diff --git a/sci-visualization/paraview/paraview-5.9.1.ebuild b/sci-visualization/paraview/paraview-5.9.1.ebuild
deleted file mode 100644
index ce3f2c9d4d44..000000000000
--- a/sci-visualization/paraview/paraview-5.9.1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
-
-LICENSE="paraview GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="
-	python? ( mpi ${PYTHON_REQUIRED_USE} )
-	mysql? ( sqlite )
-	webengine? ( qt5 )
-	qt5? ( sqlite )
-	?? ( offscreen qt5 )"
-
-# TODO: Verify that these two are not needed any more for the catalyst
-# module:
-#  - dev-python/PyQt5
-#  - dev-qt/qtgui:5[-gles2-only]
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	dev-libs/protobuf:=
-	dev-libs/pugixml
-	media-libs/freetype
-	media-libs/glew:0
-	media-libs/libpng:0
-	media-libs/libtheora
-	media-libs/tiff:0=
-	sci-libs/cgnslib
-	sci-libs/hdf5:=[mpi=]
-	>=sci-libs/netcdf-4.2[hdf5]
-	>=sci-libs/netcdf-cxx-4.2:3
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	ffmpeg? ( media-video/ffmpeg )
-	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mysql-connector-c )
-	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
-	!offscreen? ( virtual/opengl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/constantly[${PYTHON_USEDEP}]
-			dev-python/incremental[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			dev-python/twisted[${PYTHON_USEDEP}]
-			dev-python/zope-interface[${PYTHON_USEDEP}]
-			mpi? ( dev-python/mpi4py )
-			qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
-		')
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qthelp:5
-		dev-qt/qtopengl:5[-gles2-only]
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qttest:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxmlpatterns:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	tk? ( dev-lang/tk:0= )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	boost? (
-		$(python_gen_cond_dep '
-			dev-libs/boost[mpi?,${PYTHON_USEDEP}]
-		')
-	)
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
-	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-	"${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
-	use python && python-single-r1_pkg_setup
-	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-	# Bug #661812
-	mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
-	cmake_src_prepare
-
-	# lib64 fixes
-	sed -i \
-		-e "s:/lib/python:/$(get_libdir)/python:g" \
-		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
-	sed -i \
-		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
-		Remoting/Application/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
-		-UBUILD_SHARED_LIBS
-		-DPARAVIEW_BUILD_SHARED_LIBS=ON
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-
-		# boost
-		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
-
-		# doc
-		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
-
-		# examples
-		-DBUILD_EXAMPLES="$(usex examples)"
-
-		# ffmpeg
-		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
-		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-
-		# mpi
-		-DPARAVIEW_USE_MPI="$(usex mpi)"
-		-DXDMF_BUILD_MPI="$(usex mpi)"
-		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
-
-		# mysql
-		-DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
-
-		# offscreen
-		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
-		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
-
-		# plugins
-		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
-
-		# python
-		-DModule_pqPython="$(usex python)"
-		-DPARAVIEW_USE_PYTHON="$(usex python)"
-
-		# qt5
-		-DPARAVIEW_USE_QT="$(usex qt5)"
-		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
-		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-		-DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
-
-		# sqlite
-		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
-
-		# test
-		-DBUILD_TESTING="$(usex test)"
-
-		# tk
-		-DVTK_USE_TK="$(usex tk)"
-		-DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
-
-		# webengine
-		-DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
-		-DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
-	)
-
-	if use openmp; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
-			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove wrapper binaries and put the actual executable in place
-	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
-		if [ -f "${ED}"/usr/lib/"$i" ]; then
-			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
-		fi
-	done
-
-	# set up the environment
-	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-	doenvd "${T}"/40${PN}
-
-	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
-	make_desktop_entry paraview "Paraview" paraview
-
-	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 352a9ca28ba9..b1b5150bfbe4 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,3 +1,3 @@
 DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba
-EBUILD scidavis-2.9.0.ebuild 2194 BLAKE2B 26f47f34bada5d5eb7bb4e88b2d4f75d74fa676b47e5db06aebe8992bb2d8fba2e2d63cb762c280a7155ea2f0ffa7b2155cfb13ebac921f5a4e048036f213718 SHA512 61233cd82c78fe8c1bbc0eff85c6b938208ada616f47f053c34f89a9fa2fee807fcf13c03310d1400ae79ab83d8251b220136eae2680939c176416538cc9fe4d
+EBUILD scidavis-2.9.0.ebuild 2194 BLAKE2B bcb47ebf63e749c29a05677ff9c2d7fc0d90778f5998636f4263b0057c785afac4ffa10b1bd275079c073e413774ae0ec5b28ccbd6470abf5fd80c67dfa2e768 SHA512 a35b001550e1d7c1f450f87ffb40875fe4dd83cb756dd1053ecb1ddb85b81e83f94203d27afa464cecc23302aba9c2fe2685865dacb4af79b4e6369a2bf60fff
 MISC metadata.xml 1016 BLAKE2B 77c5f9c2df96f624091439ef5390a25142cd88b940a4376d8b9051e80dbc44b7d196421f2b73d6021615f3e5579106e36da6e94613c631d4e41bf4decb67eb28 SHA512 8238b9c89915f7a8a4644db5ae63b9221401794e53ad6357f5d35ab303e3d0ddf84cf5b616bfa736f78f1b94974af3a9b55bc5eaece6302f82b7e68f608ec00a
diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
index 0487299231ed..804c41cd7ccc 100644
--- a/sci-visualization/scidavis/scidavis-2.9.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-single-r1 cmake docs virtualx xdg
 
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 4bab49426034..3c6e5b9c05a9 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,7 +1,5 @@
-DIST tensorboard-2.5.0.zip 6019104 BLAKE2B f07db4fec7cc39e15c4f580f479679f0db4f06e66d81768799ed3652bb9ba63c7b61bde7f12119d09474009e55c12d91ef0f2b3aeeb05682532630314cab871a SHA512 e39ca09bd00fab9b5f6f9393e48cb6be2313f86c24b2f0ffcfd08b08b9ed4e95e7e19297bb67d8b558e1913640774f9b9d512a34153251acb9f566d6485e0f78
-DIST tensorboard-2.7.0.zip 5757617 BLAKE2B 98e67e322548f4b88448856da3a2457a6aae9ecb1540916d46a90401307f4919df37af8a3048bdb850ea78886d18423edc87fca51812f3b9489de62d3effa0fc SHA512 e9b046000250a78eab4e6e68e5cc05696254893cf7422b59d2e168d7322287501654370a797e90af7437e91b64a27743e348513bcb5571805b3f10bb2059636d
 DIST tensorboard-2.8.0.zip 5776309 BLAKE2B b06c740fbe01c707e937018184e286fb7221391715c5ca6d843a89c9dd3a364b8693e748ccbde735d074b0abdbca65d4e2dd9a6e57b4ede61f78a661bd16e702 SHA512 3d937e41ac0abfe44cfab12f0b5269de45615c512499107a239bb348df7f3ccaabf283afcea2a7bac4a34d7b9318947c709a84154d0d2e61912138c31c86673f
-EBUILD tensorboard-2.5.0.ebuild 2060 BLAKE2B 5eec94d8cb854130b0bae18c4fc2c96497beb5ab9daf1e8086b0171fef3fa50c50483b160a83ecee605db6126ff455fa666557a1baa30d36c8314cae388aa6ed SHA512 12c1c737a9eced8fc90b9dfd570d00d6430cb30ff836a399ac1dd2cad62f2d3e1d5a2741d0a4ab7fe527df8b1e588cb0d77b3f6cc08abc85a6e5cbd1bdcd1627
-EBUILD tensorboard-2.7.0.ebuild 1991 BLAKE2B 86ca8924a455bbcae095492799c3d481e220e8175b4c66d8d9e15f33cccee2d6e9f75af543a6b5b6ddc90d43469d2b388d39900d0c6b3bfd688dfe65e6e33b4b SHA512 80c9d6ea3f4bddb508daf5c1c63b7d198f8147badb7c0802a99a7997356687a0a7e8b516e1a6838dd0fa41279726be2587d226002c6e2f4d8e552fd5e8489f68
+DIST tensorboard-2.9.0.zip 5797045 BLAKE2B e91988637a0e30fcd6341f02bc5e83ba92ae1f6e65a2aa5ddb1626ec4bb95a97d1306984b899279281e5d5f5ac70be76669ddc87524910861429e02259269b79 SHA512 244e117de989a56efc4120b6374d5cc6c31bb233e234cf95df9ddf7cbd0ec494b925dae238c59f3663087136bbf789284096f20b300f0b4c56c9de7faddc520b
 EBUILD tensorboard-2.8.0.ebuild 1989 BLAKE2B 7be66c15f34a2c5ada826d3f52baba864ea2b2e38a6f8cb45bb73df2e73a08b56e1e3198006c28e301876d1e821fe1fbce6d270b8b6d2a999669112e42892282 SHA512 cb7dbc970814bb129d6854fde45f3ac8cfa3c2e14946d127e3f573258fa3e9367f0fce827c8a735202622f3c9f052b925d7031e17308fe30c6a570397a5572e0
+EBUILD tensorboard-2.9.0.ebuild 2124 BLAKE2B 60ba28bb80ce56cf9a55c08c8d95dc11c8bcdce34d76d76966fde2b4ac68e3b3e22f3099df49de6b51ad540e94cc16068f863cbf3b3438ff93d044a163155568 SHA512 735a3730f46a649182efa0100f2dea3ead0f0a6d906fe963d49f32eeff34f26e6ce6eaea2c8f06089eb8eb5ea904bae0b6132dd384568b007999ef4256e532e3
 MISC metadata.xml 495 BLAKE2B 29256478e1ec3cfd33b592d66ac413d784a581cf95d47efac7e828adc8230ec333e3ab3637cdc21e37298c0ba9f52d231b37127a7bd61149a56df8dca4fabb31 SHA512 9532577d0a0aa30608cb724983a9d070eab68b5ba6f6adea125b02cf55aad6a8dcb658b9179fd0d74d1dbbc0299f85e0e2c0b6ec084127060b2e12ab1b706948
diff --git a/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild
deleted file mode 100644
index d2ada5a97d3e..000000000000
--- a/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-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/google-auth-1.6.3[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-oauthlib-0.4.1[${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}]
-	>=dev-python/scipy-1.4.1[${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"
-
-	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() {
-	do_install() {
-		python_domodule "${PN}"
-		python_domodule "${P}.dist-info"
-	}
-	python_foreach_impl do_install
-}
diff --git a/sci-visualization/tensorboard/tensorboard-2.7.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.9.0.ebuild
index 8328b5e42f4b..33cd44742483 100644
--- a/sci-visualization/tensorboard/tensorboard-2.7.0.ebuild
+++ b/sci-visualization/tensorboard/tensorboard-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit python-r1
 
 DESCRIPTION="TensorFlow's Visualization Toolkit"
@@ -53,6 +53,8 @@ src_prepare() {
 
 	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"
+	sed -i -e 's/google-auth-oauthlib.*$/google-auth-oauthlib/' "${S}/${P}.dist-info/METADATA" \
+		|| die "failed to relax oauth deps"
 }
 
 src_install() {