gentoo Easter resync : 12.04.2020

4 files changed, 59 insertions, 204 deletions

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 3321cead4c10..dce1ce25c0fb 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,7 +1,6 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
-AUX paraview-5.6.1-fix_openmp_4.0.patch 3790 BLAKE2B 1da9193af5022e543d794802c50b868a4cf12f5a0943787d845b9b90540efe63d4952df588dc033a8d60978dd109801c3c791460c020bf811dfa5e1c7e028c07 SHA512 fa197c29d5e175c0f0743d3b820ee1be6cf3b1cff21cc98941d853693c0875e200b0ace67c9405a724c356646d8d302193af2226e936b97688dec553ce673b3d
-DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
-EBUILD paraview-5.6.1-r1.ebuild 8689 BLAKE2B fb1153248908e538e9b94fa5970f77d98356ec9f3295b69f47f1f3377166ea955eeac39951d1d369e0159bed618bcd42b1386bbc2dd43ba09c83ea88aeb55a6a SHA512 212bf2665707e2d623305fe9ac01bb7095208443b404a8c1f64e3500d9c64504b7ab06424c9cd7aeaf476c8b3eaead90f458537c5c1235701faa0f639832df32
-MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca
+DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2
+EBUILD paraview-5.8.0-r2.ebuild 6270 BLAKE2B c580e71f4d3b32d806cc0a5045ce4c067d3db540c9a8aea1992e5db79e9ca9836d1a131660f43eaae1e7ee237b09aa7dc76a2d514533b465e12a5d128e9b43ad SHA512 0665d569ae2bfcc1f3ee24c178323c796b497c036cb49862fec581fa08160728b968ef994fd55d591ceea99bf2115f53392bad2508c574028cea62f677b0d414
+MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
deleted file mode 100644
index cf2150708935..000000000000
--- a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From e30cb0872593d1614392817762b871de36e4c2f3 Mon Sep 17 00:00:00 2001
-From: Allison Vacanti <allison.vacanti@kitware.com>
-Date: Thu, 27 Jun 2019 16:04:53 -0400
-Subject: [PATCH] Fix OpenMP for gcc-9 backwards incompatibility.
-
-For details, see
-
-https://www.gnu.org/software/gcc/gcc-9/porting_to.html
----
- vtkm/cont/openmp/internal/FunctorsOpenMP.h     | 18 +++++++++++++++---
- vtkm/cont/openmp/internal/ParallelSortOpenMP.h |  4 +++-
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h b/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-index 27cd2bc0..0271754c 100644
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-@@ -36,6 +36,18 @@
- #define VTKM_OPENMP_DIRECTIVE(directive)
- #endif // _OPENMP
- 
-+// See "OpenMP data sharing" section of
-+// https://www.gnu.org/software/gcc/gcc-9/porting_to.html. OpenMP broke
-+// backwards compatibility regarding const variable handling.
-+// tl;dr, put all const variables accessed from openmp blocks in a
-+// VTKM_OPENMP_SHARED_CONST(var1, var2, ...) macro. This will do The Right Thing
-+// on all gcc.
-+#if defined(__GNUC__) && __GNUC__ >= 9
-+#define VTKM_OPENMP_SHARED_CONST(...) shared(__VA_ARGS__)
-+#else
-+#define VTKM_OPENMP_SHARED_CONST(...)
-+#endif
-+
- // When defined, supported type / operator combinations will use the OpenMP
- // reduction(...) clause. Otherwise, all reductions use the general
- // implementation with a manual reduction once the threads complete.
-@@ -279,8 +291,8 @@ struct ReduceHelper
-     int numThreads = 0;
-     std::unique_ptr<ReturnType[]> threadData;
- 
--    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
--                            shared(data, doParallel, numThreads, threadData))
-+    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared(
-+      data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals))
-     {
- 
-       int tid = omp_get_thread_num();
-@@ -412,7 +424,7 @@ void ReduceByKeyHelper(KeysInArray keysInArray,
-   vtkm::Id outIdx = 0;
- 
-   VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
--                          shared(outIdx))
-+                          shared(outIdx) VTKM_OPENMP_SHARED_CONST(numValues))
-   {
-     int tid = omp_get_thread_num();
-     int numThreads = omp_get_num_threads();
-diff --git a/vtkm/cont/openmp/internal/ParallelSortOpenMP.h b/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-index e06d1762..a973eee6 100644
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-@@ -123,7 +123,8 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
-       VTKM_OPENMP_DIRECTIVE(parallel for
-                             default(none)
-                             firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
--                            schedule(static))
-+                            schedule(static)
-+                            VTKM_OPENMP_SHARED_CONST(size))
-       for (vtkm::Id i = 0; i < size; ++i)
-       {
-         valuesOutPortal.Set(i, valuesInPortal.Get(indexPortal.Get(i)));
-@@ -209,6 +210,7 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
-     VTKM_OPENMP_DIRECTIVE(parallel for
-                           default(none)
-                           firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
-+                          VTKM_OPENMP_SHARED_CONST(size)
-                           schedule(static))
-     for (vtkm::Id i = 0; i < size; ++i)
-     {
--- 
-2.21.0
-
diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index f5e4c3c6676a..8b232e108f44 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <use>
-    <flag name="boost">Enable the usage of dev-libs/boost</flag>
-    <flag name="cg">Add support for nvidia's cg shaders</flag>
-    <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
-    <flag name="development">Install development files including headers</flag>
-    <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag>
-    <flag name="offscreen">Offscreen rendering through OSMesa</flag>
-    <flag name="plugins">Build and install additional plugins</flag>
-  </use>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<use>
+		<flag name="boost">Enable the usage of dev-libs/boost</flag>
+		<flag name="cg">Add support for nvidia's cg shaders</flag>
+		<flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
+		<flag name="development">Install development files including headers</flag>
+		<flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag>
+		<flag name="offscreen">Offscreen rendering through OSMesa</flag>
+		<flag name="plugins">Build and install additional plugins</flag>
+		<flag name="webengine">Add support for <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild b/sci-visualization/paraview/paraview-5.8.0-r2.ebuild
index 6233e8195c65..0de4586ea318 100644
--- a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.0-r2.ebuild
@@ -17,13 +17,16 @@ SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
 LICENSE="paraview GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
+IUSE="boost cg coprocessing development 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} )
+REQUIRED_USE="
+	python? ( mpi ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )
+	webengine? ( qt5 )
+	qt5? ( sqlite )
 	?? ( offscreen qt5 )"
 
 RDEPEND="
@@ -50,10 +53,8 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXt
 	coprocessing? (
-		plugins? (
-			dev-python/PyQt5
-			dev-qt/qtgui:5[-gles2]
-		)
+		dev-python/PyQt5
+		dev-qt/qtgui:5[-gles2-only]
 	)
 	ffmpeg? ( virtual/ffmpeg )
 	mpi? ( virtual/mpi[cxx,romio] )
@@ -70,27 +71,25 @@ RDEPEND="
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
 			dev-python/sip[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			|| ( dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-				dev-python/twisted-core[${PYTHON_MULTI_USEDEP}]
-			)
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
 			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
 			mpi? ( dev-python/mpi4py )
-			qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_MULTI_USEDEP}] )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
 		')
 	)
 	qt5? (
 		dev-qt/designer:5
-		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qthelp:5
-		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtopengl:5[-gles2-only]
 		dev-qt/qtsql:5
 		dev-qt/qttest:5
-		dev-qt/qtwebengine:5[widgets]
 		dev-qt/qtx11extras:5
+		dev-qt/qtxmlpatterns:5
 	)
 	sqlite? ( dev-db/sqlite:3 )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )"
+	tk? ( dev-lang/tk:0= )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	boost? (
@@ -106,14 +105,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-	"${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch
 )
 
 CMAKE_MAKEFILE_GENERATOR="emake" #579474
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
 }
 
@@ -130,7 +128,7 @@ src_prepare() {
 		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
 	sed -i \
 		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
-		ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
+		Remoting/Application/vtkInitializationHelper.cxx || die
 }
 
 src_configure() {
@@ -140,41 +138,27 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
-		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
-		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
-		-DBUILD_SHARED_LIBS=ON
+		-UBUILD_SHARED_LIBS
+		-DPARAVIEW_BUILD_SHARED_LIBS=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 
-		-DVTK_Group_StandAlone=ON
 		-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
 
 		-DVTK_USE_OGGTHEORA_ENCODER=TRUE
-		-DVTK_USE_SYSTEM_CGNS=ON
-		-DVTK_USE_SYSTEM_PUGIXML=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
-		-DVTK_USE_SYSTEM_GLEW=ON
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_JSONCPP=ON
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LZ4=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_PROTOBUF=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
-		-DVTK_USE_SYSTEM_ZLIB=ON
+
+		-DVTK_GROUP_ENABLE_Imaging=YES
+		-DVTK_GROUP_ENABLE_Rendering=YES
+		-DVTK_GROUP_ENABLE_StandAlone=YES
+		-DVTK_GROUP_ENABLE_Views=YES
 
 		# boost
-		-DModule_vtkInfovisBoost="$(usex boost)"
+		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
 
 		# coprocessing
-		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+#         -DVTK_MODULE_ENABLE_ParaView_Catalyst="$(usex coprocessing YES NO)"
 
 		# doc
-		-DBUILD_DOCUMENTATION="$(usex doc)"
+		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
 
 		# examples
 		-DBUILD_EXAMPLES="$(usex examples)"
@@ -182,100 +166,58 @@ src_configure() {
 		# ffmpeg
 		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
 		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
 
 		# mpi
-		-DPARAVIEW_USE_ICE_T="$(usex mpi)"
-		-DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
 		-DPARAVIEW_USE_MPI="$(usex mpi)"
-		-DVTK_Group_MPI="$(usex mpi)"
-		-DVTK_XDMF_USE_MPI="$(usex mpi)"
 		-DXDMF_BUILD_MPI="$(usex mpi)"
+		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
 
 		# mysql
-		-DModule_vtkIOMySQL="$(usex mysql)"
+		-DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
 
 		# offscreen
-		-DVTK_USE_X=$(usex !offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_X="$(usex !offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
 
 		# plugins
-		-DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
-		# these are always needed for plugins
-		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
-		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
-		# force this module due to incorrect build system deps wrt bug 460528
-		-DModule_vtkUtilitiesProcessXML=ON
+		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
 
 		# python
 		-DModule_pqPython="$(usex python)"
-		-DModule_vtkmpi4py="$(usex python)"
-		-DModule_vtkPython="$(usex python)"
-		-DModule_vtkWrappingPythonCore="$(usex python)"
-		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
-		-DXDMF_WRAP_PYTHON="$(usex python)"
+		-DPARAVIEW_USE_PYTHON="$(usex python)"
 
 		# qt5
 		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
-		-DModule_vtkRenderingQt="$(usex qt5)"
-		-DModule_vtkViewsQt="$(usex qt5)"
-		-DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
-		-DVTK_Group_ParaViewQt="$(usex qt5)"
-		-DVTK_Group_Qt="$(usex qt5)"
+		-DPARAVIEW_USE_QT="$(usex qt5)"
 		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
-		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
 		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		-DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
 
 		# sqlite
-		-DModule_vtksqlite="$(usex sqlite)"
-
-		# tcl
-		-DModule_vtkTclTk="$(usex tcl)"
+		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
 
 		# test
 		-DBUILD_TESTING="$(usex test)"
 
 		# tk
-		-DVTK_Group_Tk="$(usex tk)"
 		-DVTK_USE_TK="$(usex tk)"
-		-DModule_vtkRenderingTk="$(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 python; then
-		mycmakeargs+=(
-			-DVTK_USE_SYSTEM_TWISTED=ON
-			-DVTK_USE_SYSTEM_AUTOBAHN=ON
-			-DVTK_USE_SYSTEM_ZOPE=ON
-		)
-	fi
-
 	if use qt5; then
 		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
 			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
 			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
-			-DVTK_QT_VERSION=5
 			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
 		)
 	fi
 
@@ -292,17 +234,11 @@ src_install() {
 			fi
 		done
 
-		# install libraries into correct directory respecting get_libdir:
-		mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
-		mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
-		mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
-		rmdir "${ED}"/usr/lib_tmp || die
-
 		# set up the environment
 		echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
 		doenvd "${T}"/40${PN}
 
-		newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+		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}