gentoo resync : 29.12.2022

5 files changed, 15 insertions, 308 deletions

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
-}